Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/stylesheet/stylesheet.css
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/stylesheet/stylesheet.css	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/stylesheet/stylesheet.css	(revision 6)
@@ -2086,14 +2086,12 @@
 
 #menu > ul > li > div.none_descr > ul.list > li > a{
     min-width: 120px;
-    background: #bc8f8f
 }
 
-#menu > ul > li > div.width-3,
-#menu > ul > li > div.width-4{
+#menu > ul > li > div.none_descr.width-3,
+#menu > ul > li > div.none_descr.width-4{
     min-width:70em
 }
-#menu > ul > li > div.width-5{
+#menu > ul > li > div.none_descr.width-5{
     min-width:80em
 }
-
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/related_products.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/related_products.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/related_products.tpl	(revision 6)
@@ -1,60 +1,60 @@
-<div class="tab-content-inner-related">
-    <?php foreach ($products as $product) { ?>
-    <div class="four columns product omega">
-
-
-        <?php if ($product['thumb']) { ?>
-            <div class="product-image-wrapper">
-
-                <?php if ( $sale !== 'disable') : ?>
-                    <span class="product_sticker sticker_sale sticker_onsale_<?php echo $saleposition; ?> <?php echo ($sale ? ($product['special'] ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
-                <?php endif; ?>
-                <?php if ( $video !== 'disable') : ?>
-                    <span class="product_sticker sticker_video sticker_video_<?php echo $videoposition; ?> <?php echo ($video ? (($product['youtube_video_rel'][0] !== '') ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
-                <?php endif; ?>
-
-
-                <a class="img_conteiner" href="<?php echo $product['href']; ?>">
-                    <img id="image-<?php echo $product['product_id']; ?>" class="scale-with-grid" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" />
-
-                    <?php if ($product['popup']) { ?>
-                        <div class="roll_over_img">
-                            <img class="scale-with-grid" src="<?php echo $product['popup']; ?>" alt="<?php echo $product['name']; ?>" />
-                        </div>
-                    <?php } ?>
-
-
-                    <div class="product-image-wrapper-hover"></div>
-                </a>
-            </div>
-        <?php } ?>
-
-        <div class="wrapper-hover">
-            <div class="product-price">
-                <?php if ($product['price']) { ?>
-                <div class="price">
-                    <?php if (!$product['special']) { ?>
-                    <span><?php echo $product['price']; ?></span>
-                    <?php } else { ?>
-                    <span class="price-old"><?php echo $product['price']; ?></span>
-                    <span class="price-new"><?php echo $product['special']; ?></span>
-                    <?php } ?>
-                </div>
-                <?php } ?>
-            </div>
-
-            <div class="product-name">
-                <div class="clearfix">
-                    <a class="icon_cart_title" href="<?php echo $product['href']; ?>">
-                        <?php echo $product['name-main']; ?>
-                    </a>
-                    <div class="icon_cart_rollover">
-                        <a onclick="addToCartFly('<?php echo $ajaxcart; ?>', '<?php echo $product['product_id']; ?>');"></a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <?php } ?>
-
+<div class="tab-content-inner-related">
+    <?php foreach ($products as $product) { ?>
+    <div class="four columns product omega">
+
+
+        <?php if ($product['thumb']) { ?>
+            <div class="product-image-wrapper">
+
+                <?php if ( $sale !== 'disable') : ?>
+                    <span class="product_sticker sticker_sale sticker_onsale_<?php echo $saleposition; ?> <?php echo ($sale ? ($product['special'] ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
+                <?php endif; ?>
+                <?php if ( $video !== 'disable') : ?>
+                    <span class="product_sticker sticker_video sticker_video_<?php echo $videoposition; ?> <?php echo ($video ? (($product['youtube_video_rel'][0] !== '') ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
+                <?php endif; ?>
+
+
+                <a class="img_conteiner" href="<?php echo $product['href']; ?>">
+                    <img id="image-<?php echo $product['product_id']; ?>" class="scale-with-grid" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" />
+
+                    <?php if ($product['popup']) { ?>
+                        <div class="roll_over_img">
+                            <img class="scale-with-grid" src="<?php echo $product['popup']; ?>" alt="<?php echo $product['name']; ?>" />
+                        </div>
+                    <?php } ?>
+
+
+                    <div class="product-image-wrapper-hover"></div>
+                </a>
+            </div>
+        <?php } ?>
+
+        <div class="wrapper-hover">
+            <div class="product-price">
+                <?php if ($product['price']) { ?>
+                <div class="price">
+                    <?php if (!$product['special']) { ?>
+                    <span><?php echo $product['price']; ?></span>
+                    <?php } else { ?>
+                    <span class="price-old"><?php echo $product['price']; ?></span>
+                    <span class="price-new"><?php echo $product['special']; ?></span>
+                    <?php } ?>
+                </div>
+                <?php } ?>
+            </div>
+
+            <div class="product-name">
+                <div class="clearfix">
+                    <a class="icon_cart_title" href="<?php echo $product['href']; ?>">
+                        <?php echo $product['name-main']; ?>
+                    </a>
+                    <div class="icon_cart_rollover">
+                        <a onclick="addToCartFly('<?php echo $ajaxcart; ?>', '<?php echo $product['product_id']; ?>');"></a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <?php } ?>
+
 </div>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/search.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/search.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/search.tpl	(revision 6)
@@ -1,176 +1,176 @@
-<?php echo $header; ?>
-<div class="display_block">
-    <?php include('breadcrumbs.php'); ?>
-</div>
-
-<?php echo $column_left; ?><?php echo $column_right; ?>
-<div id="content"><?php echo $content_top; ?>
-  <h1><?php echo $heading_title; ?></h1>
-  <b><?php echo $text_critea; ?></b>
-  <div class="content">
-    <p>
-	   <div class="search_criteria">
-          <div class="title_search">
-            <?php echo $entry_search; ?>
-          </div>
-          <div class="input_search">
-            <?php if ($search) { ?>
-      <input type="text" name="search" value="<?php echo $search; ?>" />
-      <?php } else { ?>
-      <input type="text" name="search" value="<?php echo $search; ?>" onclick="this.value = '';" onkeydown="this.style.color = '000000'" style="color: #999;" />
-      <?php } ?>
-          </div>
-
-          <div class="dropdown_search">
-            <select name="category_id">
-            <option value="0"><?php echo $text_category; ?></option>
-            <?php foreach ($categories as $category_1) { ?>
-            <?php if ($category_1['category_id'] == $category_id) { ?>
-            <option value="<?php echo $category_1['category_id']; ?>" selected="selected"><?php echo $category_1['name']; ?></option>
-            <?php } else { ?>
-            <option value="<?php echo $category_1['category_id']; ?>"><?php echo $category_1['name']; ?></option>
-            <?php } ?>
-            <?php foreach ($category_1['children'] as $category_2) { ?>
-            <?php if ($category_2['category_id'] == $category_id) { ?>
-            <option value="<?php echo $category_2['category_id']; ?>" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $category_2['name']; ?></option>
-            <?php } else { ?>
-            <option value="<?php echo $category_2['category_id']; ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $category_2['name']; ?></option>
-            <?php } ?>
-            <?php foreach ($category_2['children'] as $category_3) { ?>
-            <?php if ($category_3['category_id'] == $category_id) { ?>
-            <option value="<?php echo $category_3['category_id']; ?>" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $category_3['name']; ?></option>
-            <?php } else { ?>
-            <option value="<?php echo $category_3['category_id']; ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $category_3['name']; ?></option>
-            <?php } ?>
-            <?php } ?>
-            <?php } ?>
-            <?php } ?>
-          </select>
-          </div>
-
-          <div class="checkbox_search">
-              <?php if ($sub_category) { ?>
-                <input type="checkbox" name="sub_category" value="1" id="sub_category" checked="checked" />
-              <?php } else { ?>
-                <input type="checkbox" name="sub_category" value="1" id="sub_category" />
-              <?php } ?>
-              <label for="sub_category"><?php echo $text_sub_category; ?></label>
-          </div>
-          <div class="clear"></div>
-      </div>
-	  
-	  
-    </p>
-    <?php if ($description) { ?>
-    <input type="checkbox" name="description" value="1" id="description" checked="checked" />
-    <?php } else { ?>
-    <input type="checkbox" name="description" value="1" id="description" />
-    <?php } ?>
-    <label for="description"><?php echo $entry_description; ?></label>
-  </div>
-  <div class="buttons">
-    <div class="right"><input type="button" value="<?php echo $button_search; ?>" id="button-search" class="button" /></div>
-  </div>
-  <h2><?php echo $text_search; ?></h2>
-  <?php if ($products) { ?>
-
-    <?php include('pager.php'); ?>
-
-    <div class="product-grid hide">
-        <?php require('listing_view_grid.php'); ?>
-    </div>
-    <div class="product-list hide">
-        <?php require('listing_view_list.php'); ?>
-    </div>
-
-    <div class="pagination"><?php echo $pagination; ?></div>
-  <?php } else { ?>
-  <div class="content"><?php echo $text_empty; ?></div>
-  <?php }?>
-  <?php echo $content_bottom; ?></div>
-<script type="text/javascript"><!--
-$('#content input[name=\'search\']').keydown(function(e) {
-	if (e.keyCode == 13) {
-		$('#button-search').trigger('click');
-	}
-});
-
-$('select[name=\'category_id\']').bind('change', function() {
-	if (this.value == '0') {
-		$('input[name=\'sub_category\']').attr('disabled', 'disabled');
-		$('input[name=\'sub_category\']').removeAttr('checked');
-	} else {
-		$('input[name=\'sub_category\']').removeAttr('disabled');
-	}
-});
-
-$('select[name=\'category_id\']').trigger('change');
-
-$('#button-search').bind('click', function() {
-	url = 'index.php?route=product/search';
-	
-	var search = $('#content input[name=\'search\']').attr('value');
-	
-	if (search) {
-		url += '&search=' + encodeURIComponent(search);
-	}
-
-	var category_id = $('#content select[name=\'category_id\']').attr('value');
-	
-	if (category_id > 0) {
-		url += '&category_id=' + encodeURIComponent(category_id);
-	}
-	
-	var sub_category = $('#content input[name=\'sub_category\']:checked').attr('value');
-	
-	if (sub_category) {
-		url += '&sub_category=true';
-	}
-		
-	var filter_description = $('#content input[name=\'description\']:checked').attr('value');
-	
-	if (filter_description) {
-		url += '&description=true';
-	}
-
-	location = url;
-});
-
-function display(view) {
-    if (view == 'list') {
-        $('.product-grid').addClass('hide');
-        $('.product-list').removeClass('hide');
-
-        $('.display').html('<div class="f_left"><?php echo $text_display; ?><\/div> <span class="display-list">&nbsp;<\/span>  <a class="display-grid" onclick="display(\'grid\');">&nbsp;</a><div class="clear"><\/div>');
-
-        $.totalStorage('display', 'list'); 
-    } else {
-        $('.product-list').addClass('hide');
-        $('.product-grid').removeClass('hide');
-        $('.display').html('<div class="f_left"><?php echo $text_display; ?><\/div> <a class="display-list" onclick="display(\'list\');">&nbsp;</a>  <span class="display-grid"><\/span><div class="clear"><\/div>');
-
-        $.cookie('display', 'grid');
-
-        var colH = 0;
-        $('.product-grid .grid_row').each(function(){
-            colH = 0;
-            $('.grid_item', $(this)).each(function(){
-                if(parseInt($(this).height()) > colH){
-                    colH = $(this).height();
-                }
-            });
-            $('.grid_item', $(this)).height(colH);
-        });
-    }
-}
-
-view = $.totalStorage('display');
-
-if (view) {
-    display(view);
-} else {
-    display('grid');
-}
-
-//--></script> 
+<?php echo $header; ?>
+<div class="display_block">
+    <?php include('breadcrumbs.php'); ?>
+</div>
+
+<?php echo $column_left; ?><?php echo $column_right; ?>
+<div id="content"><?php echo $content_top; ?>
+  <h1><?php echo $heading_title; ?></h1>
+  <b><?php echo $text_critea; ?></b>
+  <div class="content">
+    <p>
+	   <div class="search_criteria">
+          <div class="title_search">
+            <?php echo $entry_search; ?>
+          </div>
+          <div class="input_search">
+            <?php if ($search) { ?>
+      <input type="text" name="search" value="<?php echo $search; ?>" />
+      <?php } else { ?>
+      <input type="text" name="search" value="<?php echo $search; ?>" onclick="this.value = '';" onkeydown="this.style.color = '000000'" style="color: #999;" />
+      <?php } ?>
+          </div>
+
+          <div class="dropdown_search">
+            <select name="category_id">
+            <option value="0"><?php echo $text_category; ?></option>
+            <?php foreach ($categories as $category_1) { ?>
+            <?php if ($category_1['category_id'] == $category_id) { ?>
+            <option value="<?php echo $category_1['category_id']; ?>" selected="selected"><?php echo $category_1['name']; ?></option>
+            <?php } else { ?>
+            <option value="<?php echo $category_1['category_id']; ?>"><?php echo $category_1['name']; ?></option>
+            <?php } ?>
+            <?php foreach ($category_1['children'] as $category_2) { ?>
+            <?php if ($category_2['category_id'] == $category_id) { ?>
+            <option value="<?php echo $category_2['category_id']; ?>" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $category_2['name']; ?></option>
+            <?php } else { ?>
+            <option value="<?php echo $category_2['category_id']; ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $category_2['name']; ?></option>
+            <?php } ?>
+            <?php foreach ($category_2['children'] as $category_3) { ?>
+            <?php if ($category_3['category_id'] == $category_id) { ?>
+            <option value="<?php echo $category_3['category_id']; ?>" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $category_3['name']; ?></option>
+            <?php } else { ?>
+            <option value="<?php echo $category_3['category_id']; ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $category_3['name']; ?></option>
+            <?php } ?>
+            <?php } ?>
+            <?php } ?>
+            <?php } ?>
+          </select>
+          </div>
+
+          <div class="checkbox_search">
+              <?php if ($sub_category) { ?>
+                <input type="checkbox" name="sub_category" value="1" id="sub_category" checked="checked" />
+              <?php } else { ?>
+                <input type="checkbox" name="sub_category" value="1" id="sub_category" />
+              <?php } ?>
+              <label for="sub_category"><?php echo $text_sub_category; ?></label>
+          </div>
+          <div class="clear"></div>
+      </div>
+	  
+	  
+    </p>
+    <?php if ($description) { ?>
+    <input type="checkbox" name="description" value="1" id="description" checked="checked" />
+    <?php } else { ?>
+    <input type="checkbox" name="description" value="1" id="description" />
+    <?php } ?>
+    <label for="description"><?php echo $entry_description; ?></label>
+  </div>
+  <div class="buttons">
+    <div class="right"><input type="button" value="<?php echo $button_search; ?>" id="button-search" class="button" /></div>
+  </div>
+  <h2><?php echo $text_search; ?></h2>
+  <?php if ($products) { ?>
+
+    <?php include('pager.php'); ?>
+
+    <div class="product-grid hide">
+        <?php require('listing_view_grid.php'); ?>
+    </div>
+    <div class="product-list hide">
+        <?php require('listing_view_list.php'); ?>
+    </div>
+
+    <div class="pagination"><?php echo $pagination; ?></div>
+  <?php } else { ?>
+  <div class="content"><?php echo $text_empty; ?></div>
+  <?php }?>
+  <?php echo $content_bottom; ?></div>
+<script type="text/javascript"><!--
+$('#content input[name=\'search\']').keydown(function(e) {
+	if (e.keyCode == 13) {
+		$('#button-search').trigger('click');
+	}
+});
+
+$('select[name=\'category_id\']').bind('change', function() {
+	if (this.value == '0') {
+		$('input[name=\'sub_category\']').attr('disabled', 'disabled');
+		$('input[name=\'sub_category\']').removeAttr('checked');
+	} else {
+		$('input[name=\'sub_category\']').removeAttr('disabled');
+	}
+});
+
+$('select[name=\'category_id\']').trigger('change');
+
+$('#button-search').bind('click', function() {
+	url = 'index.php?route=product/search';
+	
+	var search = $('#content input[name=\'search\']').attr('value');
+	
+	if (search) {
+		url += '&search=' + encodeURIComponent(search);
+	}
+
+	var category_id = $('#content select[name=\'category_id\']').attr('value');
+	
+	if (category_id > 0) {
+		url += '&category_id=' + encodeURIComponent(category_id);
+	}
+	
+	var sub_category = $('#content input[name=\'sub_category\']:checked').attr('value');
+	
+	if (sub_category) {
+		url += '&sub_category=true';
+	}
+		
+	var filter_description = $('#content input[name=\'description\']:checked').attr('value');
+	
+	if (filter_description) {
+		url += '&description=true';
+	}
+
+	location = url;
+});
+
+function display(view) {
+    if (view == 'list') {
+        $('.product-grid').addClass('hide');
+        $('.product-list').removeClass('hide');
+
+        $('.display').html('<div class="f_left"><?php echo $text_display; ?><\/div> <span class="display-list">&nbsp;<\/span>  <a class="display-grid" onclick="display(\'grid\');">&nbsp;</a><div class="clear"><\/div>');
+
+        $.totalStorage('display', 'list'); 
+    } else {
+        $('.product-list').addClass('hide');
+        $('.product-grid').removeClass('hide');
+        $('.display').html('<div class="f_left"><?php echo $text_display; ?><\/div> <a class="display-list" onclick="display(\'list\');">&nbsp;</a>  <span class="display-grid"><\/span><div class="clear"><\/div>');
+
+        $.cookie('display', 'grid');
+
+        var colH = 0;
+        $('.product-grid .grid_row').each(function(){
+            colH = 0;
+            $('.grid_item', $(this)).each(function(){
+                if(parseInt($(this).height()) > colH){
+                    colH = $(this).height();
+                }
+            });
+            $('.grid_item', $(this)).height(colH);
+        });
+    }
+}
+
+view = $.totalStorage('display');
+
+if (view) {
+    display(view);
+} else {
+    display('grid');
+}
+
+//--></script> 
 <?php echo $footer; ?>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/compare.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/compare.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/compare.tpl	(revision 6)
@@ -1,144 +1,144 @@
-<?php echo $header; ?>
-<?php if ($success) { ?>
-<div class="success"><?php echo $success; ?><img src="catalog/view/theme/default/image/close.png" alt="" class="close" /></div>
-<?php } ?>
-<?php echo $column_left; ?><?php echo $column_right; ?>
-<div id="content"><?php echo $content_top; ?>
-  <div class="breadcrumb">
-    <?php foreach ($breadcrumbs as $breadcrumb) { ?>
-    <?php echo $breadcrumb['separator']; ?><a href="<?php echo $breadcrumb['href']; ?>"><?php echo $breadcrumb['text']; ?></a>
-    <?php } ?>
-  </div>
-  <h1><?php echo $heading_title; ?></h1>
-  <?php if ($products) { ?>
-
-    <!-- compare -->
-    <div class="compare_table_wrapper">
-        <table class="compare-info">
-    <thead>
-      <tr>
-        <td class="compare-product" colspan="<?php echo count($products) + 1; ?>"><?php echo $text_product; ?></td>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><?php echo $text_name; ?></td>
-        <?php foreach ($products as $product) { ?>
-        <td class="name"><a href="<?php echo $products[$product['product_id']]['href']; ?>"><?php echo $products[$product['product_id']]['name']; ?></a></td>
-        <?php } ?>
-      </tr>
-      <tr>
-        <td><?php echo $text_image; ?></td>
-        <?php foreach ($products as $product) { ?>
-        <td><?php if ($products[$product['product_id']]['thumb']) { ?>
-          <img src="<?php echo $products[$product['product_id']]['thumb']; ?>" alt="<?php echo $products[$product['product_id']]['name']; ?>" />
-          <?php } ?></td>
-        <?php } ?>
-      </tr>
-      <tr>
-        <td><?php echo $text_price; ?></td>
-        <?php foreach ($products as $product) { ?>
-        <td><?php if ($products[$product['product_id']]['price']) { ?>
-          <?php if (!$products[$product['product_id']]['special']) { ?>
-            <span class="price_normal"><?php echo $products[$product['product_id']]['price']; ?></span>
-          <?php } else { ?>
-                <span class="price-old"><?php echo $products[$product['product_id']]['price']; ?></span>
-                <span class="price-new"><?php echo $products[$product['product_id']]['special']; ?></span>
-          <?php } ?>
-          <?php } ?></td>
-        <?php } ?>
-      </tr>
-      <tr>
-        <td><?php echo $text_model; ?></td>
-        <?php foreach ($products as $product) { ?>
-        <td><?php echo $products[$product['product_id']]['model']; ?></td>
-        <?php } ?>
-      </tr>
-      <tr>
-        <td><?php echo $text_manufacturer; ?></td>
-        <?php foreach ($products as $product) { ?>
-        <td><?php echo $products[$product['product_id']]['manufacturer']; ?></td>
-        <?php } ?>
-      </tr>
-      <tr>
-        <td><?php echo $text_availability; ?></td>
-        <?php foreach ($products as $product) { ?>
-        <td><?php echo $products[$product['product_id']]['availability']; ?></td>
-        <?php } ?>
-      </tr>
-	  <?php if ($review_status) { ?>
-      <tr>
-        <td><?php echo $text_rating; ?></td>
-        <?php foreach ($products as $product) { ?>
-          <td><img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/stars-<?php echo $products[$product['product_id']]['rating']; ?>.gif" alt="<?php echo $products[$product['product_id']]['reviews']; ?>" /><br />
-              <?php echo $products[$product['product_id']]['reviews']; ?></td>
-        <?php } ?>
-      </tr>
-      <?php } ?>
-	  <tr>
-        <td><?php echo $text_summary; ?></td>
-        <?php foreach ($products as $product) { ?>
-        <td class="description"><?php echo $products[$product['product_id']]['description']; ?></td>
-        <?php } ?>
-      </tr>
-      <tr>
-        <td><?php echo $text_weight; ?></td>
-        <?php foreach ($products as $product) { ?>
-        <td><?php echo $products[$product['product_id']]['weight']; ?></td>
-        <?php } ?>
-      </tr>
-      <tr>
-        <td><?php echo $text_dimension; ?></td>
-        <?php foreach ($products as $product) { ?>
-        <td><?php echo $products[$product['product_id']]['length']; ?> x <?php echo $products[$product['product_id']]['width']; ?> x <?php echo $products[$product['product_id']]['height']; ?></td>
-        <?php } ?>
-      </tr>
-    </tbody>
-    <?php foreach ($attribute_groups as $attribute_group) { ?>
-    <thead>
-      <tr>
-        <td class="compare-attribute" colspan="<?php echo count($products) + 1; ?>"><?php echo $attribute_group['name']; ?></td>
-      </tr>
-    </thead>
-    <?php foreach ($attribute_group['attribute'] as $key => $attribute) { ?>
-    <tbody>
-      <tr>
-        <td><?php echo $attribute['name']; ?></td>
-        <?php foreach ($products as $product) { ?>
-        <?php if (isset($products[$product['product_id']]['attribute'][$key])) { ?>
-        <td><?php echo $products[$product['product_id']]['attribute'][$key]; ?></td>
-        <?php } else { ?>
-        <td></td>
-        <?php } ?>
-        <?php } ?>
-      </tr>
-    </tbody>
-    <?php } ?>
-    <?php } ?>
-    <tr>
-      <td></td>
-      <?php foreach ($products as $product) { ?>
-      <td><input type="button" value="<?php echo $button_cart; ?>" onclick="addToCart('<?php echo $product['product_id']; ?>');" class="button" /></td>
-      <?php } ?>
-    </tr>
-    <tr>
-      <td></td>
-      <?php foreach ($products as $product) { ?>
-      <td class="remove"><a href="<?php echo $product['remove']; ?>" class="button"><?php echo $button_remove; ?></a></td>
-      <?php } ?>
-    </tr>
-  </table>
-    </div>
-    <!-- compare -->
-
-    <div class="buttons">
-    <div class="right"><a href="<?php echo $continue; ?>" class="button"><?php echo $button_continue; ?></a></div>
-  </div>
-  <?php } else { ?>
-  <div class="content"><?php echo $text_empty; ?></div>
-  <div class="buttons">
-    <div class="right"><a href="<?php echo $continue; ?>" class="button"><?php echo $button_continue; ?></a></div>
-  </div>
-  <?php } ?>
-  <?php echo $content_bottom; ?></div>
+<?php echo $header; ?>
+<?php if ($success) { ?>
+<div class="success"><?php echo $success; ?><img src="catalog/view/theme/default/image/close.png" alt="" class="close" /></div>
+<?php } ?>
+<?php echo $column_left; ?><?php echo $column_right; ?>
+<div id="content"><?php echo $content_top; ?>
+  <div class="breadcrumb">
+    <?php foreach ($breadcrumbs as $breadcrumb) { ?>
+    <?php echo $breadcrumb['separator']; ?><a href="<?php echo $breadcrumb['href']; ?>"><?php echo $breadcrumb['text']; ?></a>
+    <?php } ?>
+  </div>
+  <h1><?php echo $heading_title; ?></h1>
+  <?php if ($products) { ?>
+
+    <!-- compare -->
+    <div class="compare_table_wrapper">
+        <table class="compare-info">
+    <thead>
+      <tr>
+        <td class="compare-product" colspan="<?php echo count($products) + 1; ?>"><?php echo $text_product; ?></td>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td><?php echo $text_name; ?></td>
+        <?php foreach ($products as $product) { ?>
+        <td class="name"><a href="<?php echo $products[$product['product_id']]['href']; ?>"><?php echo $products[$product['product_id']]['name']; ?></a></td>
+        <?php } ?>
+      </tr>
+      <tr>
+        <td><?php echo $text_image; ?></td>
+        <?php foreach ($products as $product) { ?>
+        <td><?php if ($products[$product['product_id']]['thumb']) { ?>
+          <img src="<?php echo $products[$product['product_id']]['thumb']; ?>" alt="<?php echo $products[$product['product_id']]['name']; ?>" />
+          <?php } ?></td>
+        <?php } ?>
+      </tr>
+      <tr>
+        <td><?php echo $text_price; ?></td>
+        <?php foreach ($products as $product) { ?>
+        <td><?php if ($products[$product['product_id']]['price']) { ?>
+          <?php if (!$products[$product['product_id']]['special']) { ?>
+            <span class="price_normal"><?php echo $products[$product['product_id']]['price']; ?></span>
+          <?php } else { ?>
+                <span class="price-old"><?php echo $products[$product['product_id']]['price']; ?></span>
+                <span class="price-new"><?php echo $products[$product['product_id']]['special']; ?></span>
+          <?php } ?>
+          <?php } ?></td>
+        <?php } ?>
+      </tr>
+      <tr>
+        <td><?php echo $text_model; ?></td>
+        <?php foreach ($products as $product) { ?>
+        <td><?php echo $products[$product['product_id']]['model']; ?></td>
+        <?php } ?>
+      </tr>
+      <tr>
+        <td><?php echo $text_manufacturer; ?></td>
+        <?php foreach ($products as $product) { ?>
+        <td><?php echo $products[$product['product_id']]['manufacturer']; ?></td>
+        <?php } ?>
+      </tr>
+      <tr>
+        <td><?php echo $text_availability; ?></td>
+        <?php foreach ($products as $product) { ?>
+        <td><?php echo $products[$product['product_id']]['availability']; ?></td>
+        <?php } ?>
+      </tr>
+	  <?php if ($review_status) { ?>
+      <tr>
+        <td><?php echo $text_rating; ?></td>
+        <?php foreach ($products as $product) { ?>
+          <td><img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/stars-<?php echo $products[$product['product_id']]['rating']; ?>.gif" alt="<?php echo $products[$product['product_id']]['reviews']; ?>" /><br />
+              <?php echo $products[$product['product_id']]['reviews']; ?></td>
+        <?php } ?>
+      </tr>
+      <?php } ?>
+	  <tr>
+        <td><?php echo $text_summary; ?></td>
+        <?php foreach ($products as $product) { ?>
+        <td class="description"><?php echo $products[$product['product_id']]['description']; ?></td>
+        <?php } ?>
+      </tr>
+      <tr>
+        <td><?php echo $text_weight; ?></td>
+        <?php foreach ($products as $product) { ?>
+        <td><?php echo $products[$product['product_id']]['weight']; ?></td>
+        <?php } ?>
+      </tr>
+      <tr>
+        <td><?php echo $text_dimension; ?></td>
+        <?php foreach ($products as $product) { ?>
+        <td><?php echo $products[$product['product_id']]['length']; ?> x <?php echo $products[$product['product_id']]['width']; ?> x <?php echo $products[$product['product_id']]['height']; ?></td>
+        <?php } ?>
+      </tr>
+    </tbody>
+    <?php foreach ($attribute_groups as $attribute_group) { ?>
+    <thead>
+      <tr>
+        <td class="compare-attribute" colspan="<?php echo count($products) + 1; ?>"><?php echo $attribute_group['name']; ?></td>
+      </tr>
+    </thead>
+    <?php foreach ($attribute_group['attribute'] as $key => $attribute) { ?>
+    <tbody>
+      <tr>
+        <td><?php echo $attribute['name']; ?></td>
+        <?php foreach ($products as $product) { ?>
+        <?php if (isset($products[$product['product_id']]['attribute'][$key])) { ?>
+        <td><?php echo $products[$product['product_id']]['attribute'][$key]; ?></td>
+        <?php } else { ?>
+        <td></td>
+        <?php } ?>
+        <?php } ?>
+      </tr>
+    </tbody>
+    <?php } ?>
+    <?php } ?>
+    <tr>
+      <td></td>
+      <?php foreach ($products as $product) { ?>
+      <td><input type="button" value="<?php echo $button_cart; ?>" onclick="addToCart('<?php echo $product['product_id']; ?>');" class="button" /></td>
+      <?php } ?>
+    </tr>
+    <tr>
+      <td></td>
+      <?php foreach ($products as $product) { ?>
+      <td class="remove"><a href="<?php echo $product['remove']; ?>" class="button"><?php echo $button_remove; ?></a></td>
+      <?php } ?>
+    </tr>
+  </table>
+    </div>
+    <!-- compare -->
+
+    <div class="buttons">
+    <div class="right"><a href="<?php echo $continue; ?>" class="button"><?php echo $button_continue; ?></a></div>
+  </div>
+  <?php } else { ?>
+  <div class="content"><?php echo $text_empty; ?></div>
+  <div class="buttons">
+    <div class="right"><a href="<?php echo $continue; ?>" class="button"><?php echo $button_continue; ?></a></div>
+  </div>
+  <?php } ?>
+  <?php echo $content_bottom; ?></div>
 <?php echo $footer; ?>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/listing_view_list.php
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/listing_view_list.php	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/listing_view_list.php	(revision 6)
@@ -1,51 +1,51 @@
-<?php foreach ($products as $product) { ?>
-<div class="product">
-    <?php if ($product['thumb']) { ?>
-    <div class="image product-image-wrapper">
-        <span class="product_sticker sticker_onsale_top_left <?php echo ($product['special']) ? 'sticker_onsale_display' : 'sticker_onsale_display_none'; ?>"></span>
-
-        <a style="display: block;" class="img_conteiner" href="<?php echo $product['href']; ?>">
-            <img class="scale-with-grid" src="<?php echo $product['thumb']; ?>" title="<?php echo $product['name']; ?>" alt="<?php echo $product['name']; ?>" />
-            <div class="product-image-wrapper-hover"></div>
-        </a>
-    </div>
-    <?php } ?>
-    <div class="right">
-
-        <div class="name">
-            <a href="<?php echo $product['href']; ?>"><?php echo $product['name']; ?></a>
-        </div>
-        <div class="description"><?php echo $product['description']; ?></div>
-        <div class="overflow_hidden">
-        <?php if ($product['price']) { ?>
-        <div class="product-price">
-            <div class="price">
-                <?php if (!$product['special']) { ?>
-                <span><?php echo $product['price']; ?></span>
-                <?php } else { ?>
-                <span class="price-old"><?php echo $product['price']; ?></span> <span class="price-new"><?php echo $product['special']; ?></span>
-                <?php } ?>
-                <?php if ($product['tax']) { ?>
-
-                <span class="price-tax"><?php echo $text_tax; ?> <?php echo $product['tax']; ?></span>
-                <?php } ?>
-            </div>
-        </div>
-        <?php } ?>
-
-            <?php if ($product['rating']) { ?>
-            <div class="rating"><img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/stars-<?php echo $product['rating']; ?>.png" alt="<?php echo $product['reviews']; ?>" /></div>
-            <?php } ?>
-        <div class="listing_cart">
-            <input class="listing_button" type="button" value="<?php echo $button_cart; ?>" onclick="addToCart('<?php echo $product['product_id']; ?>');" />
-        </div>
-    </div>
-        <div class="overflow_hidden">
-
-            <div class="wishlist"><a onclick="addToWishList('<?php echo $product['product_id']; ?>');"><?php echo $button_wishlist; ?></a></div>
-            <div class="compare"><a onclick="addToCompare('<?php echo $product['product_id']; ?>');"><?php echo $button_compare; ?></a></div>
-        </div>
-    </div>
-
-</div>
+<?php foreach ($products as $product) { ?>
+<div class="product">
+    <?php if ($product['thumb']) { ?>
+    <div class="image product-image-wrapper">
+        <span class="product_sticker sticker_onsale_top_left <?php echo ($product['special']) ? 'sticker_onsale_display' : 'sticker_onsale_display_none'; ?>"></span>
+
+        <a style="display: block;" class="img_conteiner" href="<?php echo $product['href']; ?>">
+            <img class="scale-with-grid" src="<?php echo $product['thumb']; ?>" title="<?php echo $product['name']; ?>" alt="<?php echo $product['name']; ?>" />
+            <div class="product-image-wrapper-hover"></div>
+        </a>
+    </div>
+    <?php } ?>
+    <div class="right">
+
+        <div class="name">
+            <a href="<?php echo $product['href']; ?>"><?php echo $product['name']; ?></a>
+        </div>
+        <div class="description"><?php echo $product['description']; ?></div>
+        <div class="overflow_hidden">
+        <?php if ($product['price']) { ?>
+        <div class="product-price">
+            <div class="price">
+                <?php if (!$product['special']) { ?>
+                <span><?php echo $product['price']; ?></span>
+                <?php } else { ?>
+                <span class="price-old"><?php echo $product['price']; ?></span> <span class="price-new"><?php echo $product['special']; ?></span>
+                <?php } ?>
+                <?php if ($product['tax']) { ?>
+
+                <span class="price-tax"><?php echo $text_tax; ?> <?php echo $product['tax']; ?></span>
+                <?php } ?>
+            </div>
+        </div>
+        <?php } ?>
+
+            <?php if ($product['rating']) { ?>
+            <div class="rating"><img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/stars-<?php echo $product['rating']; ?>.png" alt="<?php echo $product['reviews']; ?>" /></div>
+            <?php } ?>
+        <div class="listing_cart">
+            <input class="listing_button" type="button" value="<?php echo $button_cart; ?>" onclick="addToCart('<?php echo $product['product_id']; ?>');" />
+        </div>
+    </div>
+        <div class="overflow_hidden">
+
+            <div class="wishlist"><a onclick="addToWishList('<?php echo $product['product_id']; ?>');"><?php echo $button_wishlist; ?></a></div>
+            <div class="compare"><a onclick="addToCompare('<?php echo $product['product_id']; ?>');"><?php echo $button_compare; ?></a></div>
+        </div>
+    </div>
+
+</div>
 <?php } ?>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/pager.php
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/pager.php	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/pager.php	(revision 6)
@@ -1,35 +1,35 @@
-<div class="product-filter">
-	<div class="sort">
-	  <?php echo $text_sort; ?>
-      <select onchange="location = this.value;">
-        <?php foreach ($sorts as $sorts) { ?>
-        <?php if ($sorts['value'] == $sort . '-' . $order) { ?>
-        <option value="<?php echo $sorts['href']; ?>" selected="selected"><?php echo $sorts['text']; ?></option>
-        <?php } else { ?>
-        <option value="<?php echo $sorts['href']; ?>"><?php echo $sorts['text']; ?></option>
-        <?php } ?>
-        <?php } ?>
-      </select>
-    </div>
-	<div class="limit">
-	  <?php echo $text_limit; ?>
-      <select onchange="location = this.value;">
-        <?php foreach ($limits as $limits) { ?>
-        <?php if ($limits['value'] == $limit) { ?>
-        <option value="<?php echo $limits['href']; ?>" selected="selected"><?php echo $limits['text']; ?></option>
-        <?php } else { ?>
-        <option value="<?php echo $limits['href']; ?>"><?php echo $limits['text']; ?></option>
-        <?php } ?>
-        <?php } ?>
-      </select>
-    </div>
-	<div class="product-compare"><a href="<?php echo $compare; ?>" id="compare-total"><?php echo $text_compare; ?></a></div>
-	<div class="display">
-		<div class="f_left"><?php echo $text_display; ?></div>
-	 	<span class="display-list">&nbsp;</span>
-	 	<a class="display-grid" onclick="display('grid');"></a>
-		<div class="clear"></div>
-	</div>
-	<div class="clear"></div>
-  </div>
+<div class="product-filter">
+	<div class="sort">
+	  <?php echo $text_sort; ?>
+      <select onchange="location = this.value;">
+        <?php foreach ($sorts as $sorts) { ?>
+        <?php if ($sorts['value'] == $sort . '-' . $order) { ?>
+        <option value="<?php echo $sorts['href']; ?>" selected="selected"><?php echo $sorts['text']; ?></option>
+        <?php } else { ?>
+        <option value="<?php echo $sorts['href']; ?>"><?php echo $sorts['text']; ?></option>
+        <?php } ?>
+        <?php } ?>
+      </select>
+    </div>
+	<div class="limit">
+	  <?php echo $text_limit; ?>
+      <select onchange="location = this.value;">
+        <?php foreach ($limits as $limits) { ?>
+        <?php if ($limits['value'] == $limit) { ?>
+        <option value="<?php echo $limits['href']; ?>" selected="selected"><?php echo $limits['text']; ?></option>
+        <?php } else { ?>
+        <option value="<?php echo $limits['href']; ?>"><?php echo $limits['text']; ?></option>
+        <?php } ?>
+        <?php } ?>
+      </select>
+    </div>
+	<div class="product-compare"><a href="<?php echo $compare; ?>" id="compare-total"><?php echo $text_compare; ?></a></div>
+	<div class="display">
+		<div class="f_left"><?php echo $text_display; ?></div>
+	 	<span class="display-list">&nbsp;</span>
+	 	<a class="display-grid" onclick="display('grid');"></a>
+		<div class="clear"></div>
+	</div>
+	<div class="clear"></div>
+  </div>
   
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/manufacturer_info.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/manufacturer_info.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/manufacturer_info.tpl	(revision 6)
@@ -1,65 +1,65 @@
-<?php echo $header; ?><?php echo $column_left; ?><?php echo $column_right; ?>
-<div id="content"><?php echo $content_top; ?>
-  <div class="breadcrumb">
-    <?php foreach ($breadcrumbs as $breadcrumb) { ?>
-    <?php echo $breadcrumb['separator']; ?><a href="<?php echo $breadcrumb['href']; ?>"><?php echo $breadcrumb['text']; ?></a>
-    <?php } ?>
-  </div>
-  <h1><?php echo $heading_title; ?></h1>
-  <?php if ($products) { ?>
-
-    <?php include('pager.php'); ?>
-
-    <div class="product-grid hide">
-        <?php require('listing_view_grid.php'); ?>
-    </div>
-    <div class="product-list hide">
-        <?php require('listing_view_list.php'); ?>
-    </div>
-
-  <div class="pagination"><?php echo $pagination; ?></div>
-  <?php } else { ?>
-  <div class="content"><?php echo $text_empty; ?></div>
-  <div class="buttons">
-    <div class="right"><a href="<?php echo $continue; ?>" class="button"><?php echo $button_continue; ?></a></div>
-  </div>
-  <?php }?>
-  <?php echo $content_bottom; ?></div>
-<script type="text/javascript"><!--
-function display(view) {
-    if (view == 'list') {
-        $('.product-grid').addClass('hide');
-        $('.product-list').removeClass('hide');
-
-        $('.display').html('<div class="f_left"><?php echo $text_display; ?><\/div> <span class="display-list">&nbsp;<\/span>  <a class="display-grid" onclick="display(\'grid\');">&nbsp;</a><div class="clear"><\/div>');
-
-        $.cookie('display', 'list');
-    } else {
-        $('.product-list').addClass('hide');
-        $('.product-grid').removeClass('hide');
-        $('.display').html('<div class="f_left"><?php echo $text_display; ?><\/div> <a class="display-list" onclick="display(\'list\');">&nbsp;</a>  <span class="display-grid"><\/span><div class="clear"><\/div>');
-
-        $.cookie('display', 'grid');
-
-        var colH = 0;
-        $('.product-grid .grid_row').each(function(){
-            colH = 0;
-            $('.grid_item', $(this)).each(function(){
-                if(parseInt($(this).height()) > colH){
-                    colH = $(this).height();
-                }
-            });
-            $('.grid_item', $(this)).height(colH);
-        });
-    }
-}
-
-view = $.cookie('display');
-
-if (view) {
-    display(view);
-} else {
-    display('grid');
-}
-//--></script>
+<?php echo $header; ?><?php echo $column_left; ?><?php echo $column_right; ?>
+<div id="content"><?php echo $content_top; ?>
+  <div class="breadcrumb">
+    <?php foreach ($breadcrumbs as $breadcrumb) { ?>
+    <?php echo $breadcrumb['separator']; ?><a href="<?php echo $breadcrumb['href']; ?>"><?php echo $breadcrumb['text']; ?></a>
+    <?php } ?>
+  </div>
+  <h1><?php echo $heading_title; ?></h1>
+  <?php if ($products) { ?>
+
+    <?php include('pager.php'); ?>
+
+    <div class="product-grid hide">
+        <?php require('listing_view_grid.php'); ?>
+    </div>
+    <div class="product-list hide">
+        <?php require('listing_view_list.php'); ?>
+    </div>
+
+  <div class="pagination"><?php echo $pagination; ?></div>
+  <?php } else { ?>
+  <div class="content"><?php echo $text_empty; ?></div>
+  <div class="buttons">
+    <div class="right"><a href="<?php echo $continue; ?>" class="button"><?php echo $button_continue; ?></a></div>
+  </div>
+  <?php }?>
+  <?php echo $content_bottom; ?></div>
+<script type="text/javascript"><!--
+function display(view) {
+    if (view == 'list') {
+        $('.product-grid').addClass('hide');
+        $('.product-list').removeClass('hide');
+
+        $('.display').html('<div class="f_left"><?php echo $text_display; ?><\/div> <span class="display-list">&nbsp;<\/span>  <a class="display-grid" onclick="display(\'grid\');">&nbsp;</a><div class="clear"><\/div>');
+
+        $.cookie('display', 'list');
+    } else {
+        $('.product-list').addClass('hide');
+        $('.product-grid').removeClass('hide');
+        $('.display').html('<div class="f_left"><?php echo $text_display; ?><\/div> <a class="display-list" onclick="display(\'list\');">&nbsp;</a>  <span class="display-grid"><\/span><div class="clear"><\/div>');
+
+        $.cookie('display', 'grid');
+
+        var colH = 0;
+        $('.product-grid .grid_row').each(function(){
+            colH = 0;
+            $('.grid_item', $(this)).each(function(){
+                if(parseInt($(this).height()) > colH){
+                    colH = $(this).height();
+                }
+            });
+            $('.grid_item', $(this)).height(colH);
+        });
+    }
+}
+
+view = $.cookie('display');
+
+if (view) {
+    display(view);
+} else {
+    display('grid');
+}
+//--></script>
 <?php echo $footer; ?>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/category.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/category.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/category.tpl	(revision 6)
@@ -1,109 +1,109 @@
-<?php echo $header; ?>
-<div class="az-content-bg">
-
-    <?php include('breadcrumbs.php'); ?>
-
-        <div class="twelve columns omega right_column">
-          <?php echo $content_top; ?>
-          <h1 class="listing_title"><?php echo $heading_title; ?></h1>
-          <?php if ($thumb || $description) { ?>
-          <div class="category-info">
-            <?php if ($thumb) { ?>
-            <div class="image"><img class="scale-with-grid" src="<?php echo $thumb; ?>" alt="<?php echo $heading_title; ?>" /></div>
-            <?php } ?>
-            <?php if ($description) { ?>
-            <?php echo $description; ?>
-            <?php } ?>
-          </div>
-          <?php } ?>
-          <?php if ($categories) { ?>
-          <h2><?php echo $text_refine; ?></h2>
-          <div class="category-list">
-            <?php if (count($categories) <= 5) { ?>
-            <ul>
-              <?php foreach ($categories as $category) { ?>
-              <li><a href="<?php echo $category['href']; ?>"><?php echo $category['name']; ?></a></li>
-              <?php } ?>
-            </ul>
-            <?php } else { ?>
-            <?php for ($i = 0; $i < count($categories);) { ?>
-            <ul>
-              <?php $j = $i + ceil(count($categories) / 4); ?>
-              <?php for (; $i < $j; $i++) { ?>
-              <?php if (isset($categories[$i])) { ?>
-              <li><a href="<?php echo $categories[$i]['href']; ?>"><?php echo $categories[$i]['name']; ?></a></li>
-              <?php } ?>
-              <?php } ?>
-            </ul>
-            <?php } ?>
-            <?php } ?>
-          </div>
-          <?php } ?>
-          <?php if ($products) { ?>
-
-
-          <?php include('pager.php'); ?>
-
-          <div class="product-grid hide">
-             <?php require('listing_view_grid.php'); ?>
-          </div>
-          <div class="product-list hide">
-              <?php require('listing_view_list.php'); ?>
-          </div>
-
-
-          <div class="pagination"><?php echo $pagination; ?></div>
-          <?php } ?>
-          <?php if (!$categories && !$products) { ?>
-          <div class="content"><?php echo $text_empty; ?></div>
-          <div class="buttons">
-            <div class="right"><a href="<?php echo $continue; ?>" class="button"><?php echo $button_continue; ?></a></div>
-          </div>
-          <?php } ?>
-          <?php echo $content_bottom; ?></div>
-
-
-    <?php echo $column_left; ?>
-
-
-</div>
-
-
-<script type="text/javascript"><!--
-function display(view) {
-	if (view == 'list') {
-		$('.product-grid').addClass('hide');
-        $('.product-list').removeClass('hide');
-		
-		$('.display').html('<div class="f_left"><?php echo $text_display; ?><\/div> <span class="display-list">&nbsp;<\/span>  <a class="display-grid" onclick="display(\'grid\');">&nbsp;</a><div class="clear"><\/div>');
-		
-		$.cookie('display', 'list'); 
-	} else {
-		$('.product-list').addClass('hide');
-$('.product-grid').removeClass('hide');
-$('.display').html('<div class="f_left"><?php echo $text_display; ?><\/div> <a class="display-list" onclick="display(\'list\');">&nbsp;</a>  <span class="display-grid"><\/span><div class="clear"><\/div>');
-		
-		$.cookie('display', 'grid');
-		
-		var colH = 0;
-		$('.product-grid .grid_row').each(function(){
-			colH = 0;
-			$('.grid_item', $(this)).each(function(){
-				if(parseInt($(this).height()) > colH){
-					colH = $(this).height();
-				}
-			});
-			$('.grid_item', $(this)).height(colH);
-		});
-	}
-}
-
-view = $.cookie('display');
-
-if (view) {
-	display(view);
-} else {
-	display('grid');
-}
-//--></script> 
+<?php echo $header; ?>
+<div class="az-content-bg">
+
+    <?php include('breadcrumbs.php'); ?>
+
+        <div class="twelve columns omega right_column">
+          <?php echo $content_top; ?>
+          <h1 class="listing_title"><?php echo $heading_title; ?></h1>
+          <?php if ($thumb || $description) { ?>
+          <div class="category-info">
+            <?php if ($thumb) { ?>
+            <div class="image"><img class="scale-with-grid" src="<?php echo $thumb; ?>" alt="<?php echo $heading_title; ?>" /></div>
+            <?php } ?>
+            <?php if ($description) { ?>
+            <?php echo $description; ?>
+            <?php } ?>
+          </div>
+          <?php } ?>
+          <?php if ($categories) { ?>
+          <h2><?php echo $text_refine; ?></h2>
+          <div class="category-list">
+            <?php if (count($categories) <= 5) { ?>
+            <ul>
+              <?php foreach ($categories as $category) { ?>
+              <li><a href="<?php echo $category['href']; ?>"><?php echo $category['name']; ?></a></li>
+              <?php } ?>
+            </ul>
+            <?php } else { ?>
+            <?php for ($i = 0; $i < count($categories);) { ?>
+            <ul>
+              <?php $j = $i + ceil(count($categories) / 4); ?>
+              <?php for (; $i < $j; $i++) { ?>
+              <?php if (isset($categories[$i])) { ?>
+              <li><a href="<?php echo $categories[$i]['href']; ?>"><?php echo $categories[$i]['name']; ?></a></li>
+              <?php } ?>
+              <?php } ?>
+            </ul>
+            <?php } ?>
+            <?php } ?>
+          </div>
+          <?php } ?>
+          <?php if ($products) { ?>
+
+
+          <?php include('pager.php'); ?>
+
+          <div class="product-grid hide">
+             <?php require('listing_view_grid.php'); ?>
+          </div>
+          <div class="product-list hide">
+              <?php require('listing_view_list.php'); ?>
+          </div>
+
+
+          <div class="pagination"><?php echo $pagination; ?></div>
+          <?php } ?>
+          <?php if (!$categories && !$products) { ?>
+          <div class="content"><?php echo $text_empty; ?></div>
+          <div class="buttons">
+            <div class="right"><a href="<?php echo $continue; ?>" class="button"><?php echo $button_continue; ?></a></div>
+          </div>
+          <?php } ?>
+          <?php echo $content_bottom; ?></div>
+
+
+    <?php echo $column_left; ?>
+
+
+</div>
+
+
+<script type="text/javascript"><!--
+function display(view) {
+	if (view == 'list') {
+		$('.product-grid').addClass('hide');
+        $('.product-list').removeClass('hide');
+		
+		$('.display').html('<div class="f_left"><?php echo $text_display; ?><\/div> <span class="display-list">&nbsp;<\/span>  <a class="display-grid" onclick="display(\'grid\');">&nbsp;</a><div class="clear"><\/div>');
+		
+		$.totalStorage('display', 'list');
+	} else {
+		$('.product-list').addClass('hide');
+$('.product-grid').removeClass('hide');
+$('.display').html('<div class="f_left"><?php echo $text_display; ?><\/div> <a class="display-list" onclick="display(\'list\');">&nbsp;</a>  <span class="display-grid"><\/span><div class="clear"><\/div>');
+		
+		$.totalStorage('display', 'grid');
+		
+		var colH = 0;
+		$('.product-grid .grid_row').each(function(){
+			colH = 0;
+			$('.grid_item', $(this)).each(function(){
+				if(parseInt($(this).height()) > colH){
+					colH = $(this).height();
+				}
+			});
+			$('.grid_item', $(this)).height(colH);
+		});
+	}
+}
+
+view = $.totalStorage('display');
+
+if (view) {
+	display(view);
+} else {
+	display('grid');
+}
+//--></script> 
 <?php echo $footer; ?>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/listing_view_grid.php
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/listing_view_grid.php	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/listing_view_grid.php	(revision 6)
@@ -1,78 +1,78 @@
-<?php
-$col3 = 1;
-$col2 = 1;
-
-
-foreach ($products as $k => $product) { ?>
-    <div class="four columns product_wrapper count_3cols_col_<?php echo $col3; ?> count_2cols_col_<?php echo $col2; ?>">
-
-        <div class="product">
-            <?php if ($product['thumb']) { ?>
-            <div class="image product-image-wrapper">
-
-                <?php if ( $sale !== 'disable') : ?>
-                    <span class="product_sticker sticker_sale sticker_onsale_<?php echo $saleposition; ?> <?php echo ($sale ? ($product['special'] ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
-                <?php endif; ?>
-                <?php if ( $video !== 'disable') : ?>
-                    <span class="product_sticker sticker_video sticker_video_<?php echo $videoposition; ?> <?php echo ($video ? (($product['youtube_video'][0] !== '') ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
-                <?php endif; ?>
-
-                <a style="display: block;" class="img_conteiner" href="<?php echo $product['href']; ?>">
-                    <img class="scale-with-grid image-<?php echo $product['product_id']; ?>" src="<?php echo $product['thumb']; ?>" title="<?php echo $product['name']; ?>" alt="<?php echo $product['name']; ?>" />
-
-                    <?php if ($product['popup']) { ?>
-                        <div class="roll_over_img">
-                            <img class="scale-with-grid" src="<?php echo $product['popup']; ?>" alt="<?php echo $product['name']; ?>" />
-                        </div>
-                    <?php } ?>
-
-
-
-                    <div class="product-image-wrapper-hover"></div>
-                </a>
-            </div>
-            <?php } ?>
-            <div class="wrapper-hover">
-
-                <div class="description"><?php echo $product['description']; ?></div>
-                <?php if ($product['price']) { ?>
-                <div class="product-price">
-                    <div class="price">
-                        <?php if (!$product['special']) { ?>
-                        <span><?php echo $product['price']; ?></span>
-                        <?php } else { ?>
-                        <span class="price-old"><?php echo $product['price']; ?></span> <span class="price-new"><?php echo $product['special']; ?></span>
-                        <?php } ?>
-                        <?php if ($product['tax']) { ?>
-                        <br />
-                        <span class="price-tax"><?php echo $text_tax; ?> <?php echo $product['tax']; ?></span>
-                        <?php } ?>
-                    </div>
-                </div>
-                <?php } ?>
-
-
-
-                <div class="product-name">
-                    <div class="name">
-                        <a href="<?php echo $product['href']; ?>"><?php echo $product['name-main']; ?></a>
-                    </div>
-                    <div class="cart">
-                        <a onclick="addToCartFly('<?php echo $ajaxcart; ?>', '<?php echo $product['product_id']; ?>');"></a>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-    </div>
-
-
-<?php
-    $col3 ++;
-    $col2 ++;
-    if ($col3 == 4 ) {$col3 = 1;}
-    if ($col2 == 3 ) {$col2 = 1;}
-
-
-} ?>
-
+<?php
+$col3 = 1;
+$col2 = 1;
+
+
+foreach ($products as $k => $product) { ?>
+    <div class="four columns product_wrapper count_3cols_col_<?php echo $col3; ?> count_2cols_col_<?php echo $col2; ?>">
+
+        <div class="product">
+            <?php if ($product['thumb']) { ?>
+            <div class="image product-image-wrapper">
+
+                <?php if ( $sale !== 'disable') : ?>
+                    <span class="product_sticker sticker_sale sticker_onsale_<?php echo $saleposition; ?> <?php echo ($sale ? ($product['special'] ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
+                <?php endif; ?>
+                <?php if ( $video !== 'disable') : ?>
+                    <span class="product_sticker sticker_video sticker_video_<?php echo $videoposition; ?> <?php echo ($video ? (($product['youtube_video'][0] !== '') ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
+                <?php endif; ?>
+
+                <a style="display: block;" class="img_conteiner" href="<?php echo $product['href']; ?>">
+                    <img class="scale-with-grid image-<?php echo $product['product_id']; ?>" src="<?php echo $product['thumb']; ?>" title="<?php echo $product['name']; ?>" alt="<?php echo $product['name']; ?>" />
+
+                    <?php if ($product['popup']) { ?>
+                        <div class="roll_over_img">
+                            <img class="scale-with-grid" src="<?php echo $product['popup']; ?>" alt="<?php echo $product['name']; ?>" />
+                        </div>
+                    <?php } ?>
+
+
+
+                    <div class="product-image-wrapper-hover"></div>
+                </a>
+            </div>
+            <?php } ?>
+            <div class="wrapper-hover">
+
+                <div class="description"><?php echo $product['description']; ?></div>
+                <?php if ($product['price']) { ?>
+                <div class="product-price">
+                    <div class="price">
+                        <?php if (!$product['special']) { ?>
+                        <span><?php echo $product['price']; ?></span>
+                        <?php } else { ?>
+                        <span class="price-old"><?php echo $product['price']; ?></span> <span class="price-new"><?php echo $product['special']; ?></span>
+                        <?php } ?>
+                        <?php if ($product['tax']) { ?>
+                        <br />
+                        <span class="price-tax"><?php echo $text_tax; ?> <?php echo $product['tax']; ?></span>
+                        <?php } ?>
+                    </div>
+                </div>
+                <?php } ?>
+
+
+
+                <div class="product-name">
+                    <div class="name">
+                        <a href="<?php echo $product['href']; ?>"><?php echo $product['name-main']; ?></a>
+                    </div>
+                    <div class="cart">
+                        <a onclick="addToCartFly('<?php echo $ajaxcart; ?>', '<?php echo $product['product_id']; ?>');"></a>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+
+<?php
+    $col3 ++;
+    $col2 ++;
+    if ($col3 == 4 ) {$col3 = 1;}
+    if ($col2 == 3 ) {$col2 = 1;}
+
+
+} ?>
+
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/special.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/special.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/special.tpl	(revision 6)
@@ -1,61 +1,61 @@
-<?php echo $header; ?>
-<div class="display_block">
-    <?php include('breadcrumbs.php'); ?>
-</div>
-<?php echo $column_left; ?><?php echo $column_right; ?>
-<div id="content"><?php echo $content_top; ?>
-
-  <h1><?php echo $heading_title; ?></h1>
-  <?php if ($products) { ?>
-
-    <?php include('pager.php'); ?>
-
-    <div class="product-grid hide">
-        <?php require('listing_view_grid.php'); ?>
-    </div>
-    <div class="product-list hide">
-        <?php require('listing_view_list.php'); ?>
-    </div>
-  <div class="pagination"><?php echo $pagination; ?></div>
-  <?php } else { ?>
-  <div class="content"><?php echo $text_empty; ?></div>
-  <?php }?>
-  <?php echo $content_bottom; ?></div>
-<script type="text/javascript"><!--
-function display(view) {
-    if (view == 'list') {
-        $('.product-grid').addClass('hide');
-        $('.product-list').removeClass('hide');
-
-        $('.display').html('<div class="f_left"><?php echo $text_display; ?><\/div> <span class="display-list">&nbsp;<\/span>  <a class="display-grid" onclick="display(\'grid\');">&nbsp;</a><div class="clear"><\/div>');
-
-        $.totalStorage('display', 'list');
-    } else {
-        $('.product-list').addClass('hide');
-        $('.product-grid').removeClass('hide');
-        $('.display').html('<div class="f_left"><?php echo $text_display; ?><\/div> <a class="display-list" onclick="display(\'list\');">&nbsp;</a>  <span class="display-grid"><\/span><div class="clear"><\/div>');
-
-        $.cookie('display', 'grid');
-
-        var colH = 0;
-        $('.product-grid .grid_row').each(function(){
-            colH = 0;
-            $('.grid_item', $(this)).each(function(){
-                if(parseInt($(this).height()) > colH){
-                    colH = $(this).height();
-                }
-            });
-            $('.grid_item', $(this)).height(colH);
-        });
-    }
-}
-
-view = $.totalStorage('display');
-
-if (view) {
-    display(view);
-} else {
-    display('grid');
-}
-//--></script>
+<?php echo $header; ?>
+<div class="display_block">
+    <?php include('breadcrumbs.php'); ?>
+</div>
+<?php echo $column_left; ?><?php echo $column_right; ?>
+<div id="content"><?php echo $content_top; ?>
+
+  <h1><?php echo $heading_title; ?></h1>
+  <?php if ($products) { ?>
+
+    <?php include('pager.php'); ?>
+
+    <div class="product-grid hide">
+        <?php require('listing_view_grid.php'); ?>
+    </div>
+    <div class="product-list hide">
+        <?php require('listing_view_list.php'); ?>
+    </div>
+  <div class="pagination"><?php echo $pagination; ?></div>
+  <?php } else { ?>
+  <div class="content"><?php echo $text_empty; ?></div>
+  <?php }?>
+  <?php echo $content_bottom; ?></div>
+<script type="text/javascript"><!--
+function display(view) {
+    if (view == 'list') {
+        $('.product-grid').addClass('hide');
+        $('.product-list').removeClass('hide');
+
+        $('.display').html('<div class="f_left"><?php echo $text_display; ?><\/div> <span class="display-list">&nbsp;<\/span>  <a class="display-grid" onclick="display(\'grid\');">&nbsp;</a><div class="clear"><\/div>');
+
+        $.totalStorage('display', 'list');
+    } else {
+        $('.product-list').addClass('hide');
+        $('.product-grid').removeClass('hide');
+        $('.display').html('<div class="f_left"><?php echo $text_display; ?><\/div> <a class="display-list" onclick="display(\'list\');">&nbsp;</a>  <span class="display-grid"><\/span><div class="clear"><\/div>');
+
+        $.cookie('display', 'grid');
+
+        var colH = 0;
+        $('.product-grid .grid_row').each(function(){
+            colH = 0;
+            $('.grid_item', $(this)).each(function(){
+                if(parseInt($(this).height()) > colH){
+                    colH = $(this).height();
+                }
+            });
+            $('.grid_item', $(this)).height(colH);
+        });
+    }
+}
+
+view = $.totalStorage('display');
+
+if (view) {
+    display(view);
+} else {
+    display('grid');
+}
+//--></script>
 <?php echo $footer; ?>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/breadcrumbs.php
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/breadcrumbs.php	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/breadcrumbs.php	(revision 6)
@@ -1,5 +1,5 @@
-<div class="sixteen columns breadcrumb">
-    <?php foreach ($breadcrumbs as $breadcrumb) { ?>
-    	<a href="<?php echo $breadcrumb['href']; ?>"><?php echo $breadcrumb['text']; ?></a>
-    <?php } ?>
+<div class="sixteen columns breadcrumb">
+    <?php foreach ($breadcrumbs as $breadcrumb) { ?>
+    	<a href="<?php echo $breadcrumb['href']; ?>"><?php echo $breadcrumb['text']; ?></a>
+    <?php } ?>
 </div>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/review.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/review.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/product/review.tpl	(revision 6)
@@ -1,12 +1,12 @@
-<?php if ($reviews) { ?>
-<?php foreach ($reviews as $review) { ?>
-<div class="review-list">
-  <div class="author"><b><?php echo $review['author']; ?></b> <?php echo $text_on; ?> <?php echo $review['date_added']; ?></div>
-  <div class="rating"><img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/stars-<?php echo $review['rating'] . '.png'; ?>" alt="<?php echo $review['reviews']; ?>" /></div>
-  <div class="text"><?php echo $review['text']; ?></div>
-</div>
-<?php } ?>
-<div class="pagination"><?php echo $pagination; ?></div>
-<?php } else { ?>
-<div class="content"><?php echo $text_no_reviews; ?></div>
-<?php } ?>
+<?php if ($reviews) { ?>
+<?php foreach ($reviews as $review) { ?>
+<div class="review-list">
+  <div class="author"><b><?php echo $review['author']; ?></b> <?php echo $text_on; ?> <?php echo $review['date_added']; ?></div>
+  <div class="rating"><img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/stars-<?php echo $review['rating'] . '.png'; ?>" alt="<?php echo $review['reviews']; ?>" /></div>
+  <div class="text"><?php echo $review['text']; ?></div>
+</div>
+<?php } ?>
+<div class="pagination"><?php echo $pagination; ?></div>
+<?php } else { ?>
+<div class="content"><?php echo $text_no_reviews; ?></div>
+<?php } ?>
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/affiliate/register.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/affiliate/register.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/affiliate/register.tpl	(revision 6)
@@ -1,281 +1,281 @@
-<?php echo $header; ?>
-<?php if ($error_warning) { ?>
-<div class="warning"><?php echo $error_warning; ?></div>
-<?php } ?>
-<?php echo $column_left; ?><?php echo $column_right; ?>
-<div id="content"><?php echo $content_top; ?>
-  <div class="breadcrumb">
-    <?php foreach ($breadcrumbs as $breadcrumb) { ?>
-    <?php echo $breadcrumb['separator']; ?><a href="<?php echo $breadcrumb['href']; ?>"><?php echo $breadcrumb['text']; ?></a>
-    <?php } ?>
-  </div>
-  <h1><?php echo $heading_title; ?></h1>
-  <p><?php echo $text_account_already; ?></p>
-  <p><?php echo $text_signup; ?></p>
-  <form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
-    <h2><?php echo $text_your_details; ?></h2>
-    <div class="content">
-      <table class="form">
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_firstname; ?></td>
-          <td><input type="text" name="firstname" value="<?php echo $firstname; ?>" />
-            <?php if ($error_firstname) { ?>
-            <span class="error"><?php echo $error_firstname; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_lastname; ?></td>
-          <td><input type="text" name="lastname" value="<?php echo $lastname; ?>" />
-            <?php if ($error_lastname) { ?>
-            <span class="error"><?php echo $error_lastname; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_email; ?></td>
-          <td><input type="text" name="email" value="<?php echo $email; ?>" />
-            <?php if ($error_email) { ?>
-            <span class="error"><?php echo $error_email; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_telephone; ?></td>
-          <td><input type="text" name="telephone" value="<?php echo $telephone; ?>" />
-            <?php if ($error_telephone) { ?>
-            <span class="error"><?php echo $error_telephone; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><?php echo $entry_fax; ?></td>
-          <td><input type="text" name="fax" value="<?php echo $fax; ?>" /></td>
-        </tr>
-      </table>
-    </div>
-    <h2><?php echo $text_your_address; ?></h2>
-    <div class="content">
-      <table class="form">
-        <tr>
-          <td><?php echo $entry_company; ?></td>
-          <td><input type="text" name="company" value="<?php echo $company; ?>" /></td>
-        </tr>
-        <tr>
-          <td><?php echo $entry_website; ?></td>
-          <td><input type="text" name="website" value="<?php echo $website; ?>" /></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_address_1; ?></td>
-          <td><input type="text" name="address_1" value="<?php echo $address_1; ?>" />
-            <?php if ($error_address_1) { ?>
-            <span class="error"><?php echo $error_address_1; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><?php echo $entry_address_2; ?></td>
-          <td><input type="text" name="address_2" value="<?php echo $address_2; ?>" /></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_city; ?></td>
-          <td><input type="text" name="city" value="<?php echo $city; ?>" />
-            <?php if ($error_city) { ?>
-            <span class="error"><?php echo $error_city; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><span id="postcode-required" class="required">*</span> <?php echo $entry_postcode; ?></td>
-          <td><input type="text" name="postcode" value="<?php echo $postcode; ?>" />
-            <?php if ($error_postcode) { ?>
-            <span class="error"><?php echo $error_postcode; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_country; ?></td>
-          <td><select name="country_id">
-              <option value="false"><?php echo $text_select; ?></option>
-              <?php foreach ($countries as $country) { ?>
-              <?php if ($country['country_id'] == $country_id) { ?>
-              <option value="<?php echo $country['country_id']; ?>" selected="selected"><?php echo $country['name']; ?></option>
-              <?php } else { ?>
-              <option value="<?php echo $country['country_id']; ?>"><?php echo $country['name']; ?></option>
-              <?php } ?>
-              <?php } ?>
-            </select>
-            <?php if ($error_country) { ?>
-            <span class="error"><?php echo $error_country; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_zone; ?></td>
-          <td><select name="zone_id">
-            </select>
-            <?php if ($error_zone) { ?>
-            <span class="error"><?php echo $error_zone; ?></span>
-            <?php } ?></td>
-        </tr>
-      </table>
-    </div>
-    <h2><?php echo $text_payment; ?></h2>
-    <div class="content">
-      <table class="form">
-        <tbody>
-          <tr>
-            <td><?php echo $entry_tax; ?></td>
-            <td><input type="text" name="tax" value="<?php echo $tax; ?>" /></td>
-          </tr>
-          <tr>
-            <td><?php echo $entry_payment; ?></td>
-            <td><?php if ($payment == 'cheque') { ?>
-              <input type="radio" name="payment" value="cheque" id="cheque" checked="checked" />
-              <?php } else { ?>
-              <input type="radio" name="payment" value="cheque" id="cheque" />
-              <?php } ?>
-              <label for="cheque"><?php echo $text_cheque; ?></label>
-              <?php if ($payment == 'paypal') { ?>
-              <input type="radio" name="payment" value="paypal" id="paypal" checked="checked" />
-              <?php } else { ?>
-              <input type="radio" name="payment" value="paypal" id="paypal" />
-              <?php } ?>
-              <label for="paypal"><?php echo $text_paypal; ?></label>
-              <?php if ($payment == 'bank') { ?>
-              <input type="radio" name="payment" value="bank" id="bank" checked="checked" />
-              <?php } else { ?>
-              <input type="radio" name="payment" value="bank" id="bank" />
-              <?php } ?>
-              <label for="bank"><?php echo $text_bank; ?></label></td>
-          </tr>
-        </tbody>
-        <tbody id="payment-cheque" class="payment">
-          <tr>
-            <td><?php echo $entry_cheque; ?></td>
-            <td><input type="text" name="cheque" value="<?php echo $cheque; ?>" /></td>
-          </tr>
-        </tbody>
-        <tbody class="payment" id="payment-paypal">
-          <tr>
-            <td><?php echo $entry_paypal; ?></td>
-            <td><input type="text" name="paypal" value="<?php echo $paypal; ?>" /></td>
-          </tr>
-        </tbody>
-        <tbody id="payment-bank" class="payment">
-          <tr>
-            <td><?php echo $entry_bank_name; ?></td>
-            <td><input type="text" name="bank_name" value="<?php echo $bank_name; ?>" /></td>
-          </tr>
-          <tr>
-            <td><?php echo $entry_bank_branch_number; ?></td>
-            <td><input type="text" name="bank_branch_number" value="<?php echo $bank_branch_number; ?>" /></td>
-          </tr>
-          <tr>
-            <td><?php echo $entry_bank_swift_code; ?></td>
-            <td><input type="text" name="bank_swift_code" value="<?php echo $bank_swift_code; ?>" /></td>
-          </tr>
-          <tr>
-            <td><?php echo $entry_bank_account_name; ?></td>
-            <td><input type="text" name="bank_account_name" value="<?php echo $bank_account_name; ?>" /></td>
-          </tr>
-          <tr>
-            <td><?php echo $entry_bank_account_number; ?></td>
-            <td><input type="text" name="bank_account_number" value="<?php echo $bank_account_number; ?>" /></td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <h2><?php echo $text_your_password; ?></h2>
-    <div class="content">
-      <table class="form">
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_password; ?></td>
-          <td><input type="password" name="password" value="<?php echo $password; ?>" />
-            <?php if ($error_password) { ?>
-            <span class="error"><?php echo $error_password; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_confirm; ?></td>
-          <td><input type="password" name="confirm" value="<?php echo $confirm; ?>" />
-            <?php if ($error_confirm) { ?>
-            <span class="error"><?php echo $error_confirm; ?></span>
-            <?php } ?></td>
-        </tr>
-      </table>
-    </div>
-    <?php if ($text_agree) { ?>
-    <div class="buttons">
-      <div class="right"><?php echo $text_agree; ?>
-        <?php if ($agree) { ?>
-        <input type="checkbox" name="agree" value="1" checked="checked" />
-        <?php } else { ?>
-        <input type="checkbox" name="agree" value="1" />
-        <?php } ?>
-        <input type="submit" value="<?php echo $button_continue; ?>" class="button" />
-      </div>
-    </div>
-    <?php } else { ?>
-    <div class="buttons">
-      <div class="right">
-        <input type="submit" value="<?php echo $button_continue; ?>" class="button" />
-      </div>
-    </div>
-    <?php } ?>
-  </form>
-  <?php echo $content_bottom; ?></div>
-<script type="text/javascript"><!--
-$('select[name=\'country_id\']').bind('change', function() {
-	$.ajax({
-		url: 'index.php?route=affiliate/register/country&country_id=' + this.value,
-		dataType: 'json',
-		beforeSend: function() {
-			$('select[name=\'country_id\']').after('<span class="wait">&nbsp;<img src="catalog/view/theme/default/image/loading.gif" alt="" /></span>');
-		},
-		complete: function() {
-			$('.wait').remove();
-		},			
-		success: function(json) {
-			if (json['postcode_required'] == '1') {
-				$('#postcode-required').show();
-			} else {
-				$('#postcode-required').hide();
-			}
-			
-			html = '<option value=""><?php echo $text_select; ?></option>';
-			
-			if (json['zone'] != '') {
-				for (i = 0; i < json['zone'].length; i++) {
-        			html += '<option value="' + json['zone'][i]['zone_id'] + '"';
-	    			
-					if (json['zone'][i]['zone_id'] == '<?php echo $zone_id; ?>') {
-	      				html += ' selected="selected"';
-	    			}
-	
-	    			html += '>' + json['zone'][i]['name'] + '</option>';
-				}
-			} else {
-				html += '<option value="0" selected="selected"><?php echo $text_none; ?></option>';
-			}
-			
-			$('select[name=\'zone_id\']').html(html);
-		},
-		error: function(xhr, ajaxOptions, thrownError) {
-			alert(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
-		}
-	});
-});
-
-$('select[name=\'country_id\']').trigger('change');
-//--></script>
-<script type="text/javascript"><!--
-$('input[name=\'payment\']').bind('change', function() {
-	$('.payment').hide();
-	
-	$('#payment-' + this.value).show();
-});
-
-$('input[name=\'payment\']:checked').trigger('change');
-//--></script> 
-<script type="text/javascript"><!--
-$(document).ready(function() {
-	$('.colorbox').colorbox({
-		width: 280,
-		height: 480
-	});
-});
-//--></script> 
+<?php echo $header; ?>
+<?php if ($error_warning) { ?>
+<div class="warning"><?php echo $error_warning; ?></div>
+<?php } ?>
+<?php echo $column_left; ?><?php echo $column_right; ?>
+<div id="content"><?php echo $content_top; ?>
+  <div class="breadcrumb">
+    <?php foreach ($breadcrumbs as $breadcrumb) { ?>
+    <?php echo $breadcrumb['separator']; ?><a href="<?php echo $breadcrumb['href']; ?>"><?php echo $breadcrumb['text']; ?></a>
+    <?php } ?>
+  </div>
+  <h1><?php echo $heading_title; ?></h1>
+  <p><?php echo $text_account_already; ?></p>
+  <p><?php echo $text_signup; ?></p>
+  <form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
+    <h2><?php echo $text_your_details; ?></h2>
+    <div class="content">
+      <table class="form">
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_firstname; ?></td>
+          <td><input type="text" name="firstname" value="<?php echo $firstname; ?>" />
+            <?php if ($error_firstname) { ?>
+            <span class="error"><?php echo $error_firstname; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_lastname; ?></td>
+          <td><input type="text" name="lastname" value="<?php echo $lastname; ?>" />
+            <?php if ($error_lastname) { ?>
+            <span class="error"><?php echo $error_lastname; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_email; ?></td>
+          <td><input type="text" name="email" value="<?php echo $email; ?>" />
+            <?php if ($error_email) { ?>
+            <span class="error"><?php echo $error_email; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_telephone; ?></td>
+          <td><input type="text" name="telephone" value="<?php echo $telephone; ?>" />
+            <?php if ($error_telephone) { ?>
+            <span class="error"><?php echo $error_telephone; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><?php echo $entry_fax; ?></td>
+          <td><input type="text" name="fax" value="<?php echo $fax; ?>" /></td>
+        </tr>
+      </table>
+    </div>
+    <h2><?php echo $text_your_address; ?></h2>
+    <div class="content">
+      <table class="form">
+        <tr>
+          <td><?php echo $entry_company; ?></td>
+          <td><input type="text" name="company" value="<?php echo $company; ?>" /></td>
+        </tr>
+        <tr>
+          <td><?php echo $entry_website; ?></td>
+          <td><input type="text" name="website" value="<?php echo $website; ?>" /></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_address_1; ?></td>
+          <td><input type="text" name="address_1" value="<?php echo $address_1; ?>" />
+            <?php if ($error_address_1) { ?>
+            <span class="error"><?php echo $error_address_1; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><?php echo $entry_address_2; ?></td>
+          <td><input type="text" name="address_2" value="<?php echo $address_2; ?>" /></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_city; ?></td>
+          <td><input type="text" name="city" value="<?php echo $city; ?>" />
+            <?php if ($error_city) { ?>
+            <span class="error"><?php echo $error_city; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><span id="postcode-required" class="required">*</span> <?php echo $entry_postcode; ?></td>
+          <td><input type="text" name="postcode" value="<?php echo $postcode; ?>" />
+            <?php if ($error_postcode) { ?>
+            <span class="error"><?php echo $error_postcode; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_country; ?></td>
+          <td><select name="country_id">
+              <option value="false"><?php echo $text_select; ?></option>
+              <?php foreach ($countries as $country) { ?>
+              <?php if ($country['country_id'] == $country_id) { ?>
+              <option value="<?php echo $country['country_id']; ?>" selected="selected"><?php echo $country['name']; ?></option>
+              <?php } else { ?>
+              <option value="<?php echo $country['country_id']; ?>"><?php echo $country['name']; ?></option>
+              <?php } ?>
+              <?php } ?>
+            </select>
+            <?php if ($error_country) { ?>
+            <span class="error"><?php echo $error_country; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_zone; ?></td>
+          <td><select name="zone_id">
+            </select>
+            <?php if ($error_zone) { ?>
+            <span class="error"><?php echo $error_zone; ?></span>
+            <?php } ?></td>
+        </tr>
+      </table>
+    </div>
+    <h2><?php echo $text_payment; ?></h2>
+    <div class="content">
+      <table class="form">
+        <tbody>
+          <tr>
+            <td><?php echo $entry_tax; ?></td>
+            <td><input type="text" name="tax" value="<?php echo $tax; ?>" /></td>
+          </tr>
+          <tr>
+            <td><?php echo $entry_payment; ?></td>
+            <td><?php if ($payment == 'cheque') { ?>
+              <input type="radio" name="payment" value="cheque" id="cheque" checked="checked" />
+              <?php } else { ?>
+              <input type="radio" name="payment" value="cheque" id="cheque" />
+              <?php } ?>
+              <label for="cheque"><?php echo $text_cheque; ?></label>
+              <?php if ($payment == 'paypal') { ?>
+              <input type="radio" name="payment" value="paypal" id="paypal" checked="checked" />
+              <?php } else { ?>
+              <input type="radio" name="payment" value="paypal" id="paypal" />
+              <?php } ?>
+              <label for="paypal"><?php echo $text_paypal; ?></label>
+              <?php if ($payment == 'bank') { ?>
+              <input type="radio" name="payment" value="bank" id="bank" checked="checked" />
+              <?php } else { ?>
+              <input type="radio" name="payment" value="bank" id="bank" />
+              <?php } ?>
+              <label for="bank"><?php echo $text_bank; ?></label></td>
+          </tr>
+        </tbody>
+        <tbody id="payment-cheque" class="payment">
+          <tr>
+            <td><?php echo $entry_cheque; ?></td>
+            <td><input type="text" name="cheque" value="<?php echo $cheque; ?>" /></td>
+          </tr>
+        </tbody>
+        <tbody class="payment" id="payment-paypal">
+          <tr>
+            <td><?php echo $entry_paypal; ?></td>
+            <td><input type="text" name="paypal" value="<?php echo $paypal; ?>" /></td>
+          </tr>
+        </tbody>
+        <tbody id="payment-bank" class="payment">
+          <tr>
+            <td><?php echo $entry_bank_name; ?></td>
+            <td><input type="text" name="bank_name" value="<?php echo $bank_name; ?>" /></td>
+          </tr>
+          <tr>
+            <td><?php echo $entry_bank_branch_number; ?></td>
+            <td><input type="text" name="bank_branch_number" value="<?php echo $bank_branch_number; ?>" /></td>
+          </tr>
+          <tr>
+            <td><?php echo $entry_bank_swift_code; ?></td>
+            <td><input type="text" name="bank_swift_code" value="<?php echo $bank_swift_code; ?>" /></td>
+          </tr>
+          <tr>
+            <td><?php echo $entry_bank_account_name; ?></td>
+            <td><input type="text" name="bank_account_name" value="<?php echo $bank_account_name; ?>" /></td>
+          </tr>
+          <tr>
+            <td><?php echo $entry_bank_account_number; ?></td>
+            <td><input type="text" name="bank_account_number" value="<?php echo $bank_account_number; ?>" /></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <h2><?php echo $text_your_password; ?></h2>
+    <div class="content">
+      <table class="form">
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_password; ?></td>
+          <td><input type="password" name="password" value="<?php echo $password; ?>" />
+            <?php if ($error_password) { ?>
+            <span class="error"><?php echo $error_password; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_confirm; ?></td>
+          <td><input type="password" name="confirm" value="<?php echo $confirm; ?>" />
+            <?php if ($error_confirm) { ?>
+            <span class="error"><?php echo $error_confirm; ?></span>
+            <?php } ?></td>
+        </tr>
+      </table>
+    </div>
+    <?php if ($text_agree) { ?>
+    <div class="buttons">
+      <div class="right"><?php echo $text_agree; ?>
+        <?php if ($agree) { ?>
+        <input type="checkbox" name="agree" value="1" checked="checked" />
+        <?php } else { ?>
+        <input type="checkbox" name="agree" value="1" />
+        <?php } ?>
+        <input type="submit" value="<?php echo $button_continue; ?>" class="button" />
+      </div>
+    </div>
+    <?php } else { ?>
+    <div class="buttons">
+      <div class="right">
+        <input type="submit" value="<?php echo $button_continue; ?>" class="button" />
+      </div>
+    </div>
+    <?php } ?>
+  </form>
+  <?php echo $content_bottom; ?></div>
+<script type="text/javascript"><!--
+$('select[name=\'country_id\']').bind('change', function() {
+	$.ajax({
+		url: 'index.php?route=affiliate/register/country&country_id=' + this.value,
+		dataType: 'json',
+		beforeSend: function() {
+			$('select[name=\'country_id\']').after('<span class="wait">&nbsp;<img src="catalog/view/theme/default/image/loading.gif" alt="" /></span>');
+		},
+		complete: function() {
+			$('.wait').remove();
+		},			
+		success: function(json) {
+			if (json['postcode_required'] == '1') {
+				$('#postcode-required').show();
+			} else {
+				$('#postcode-required').hide();
+			}
+			
+			html = '<option value=""><?php echo $text_select; ?></option>';
+			
+			if (json['zone'] != '') {
+				for (i = 0; i < json['zone'].length; i++) {
+        			html += '<option value="' + json['zone'][i]['zone_id'] + '"';
+	    			
+					if (json['zone'][i]['zone_id'] == '<?php echo $zone_id; ?>') {
+	      				html += ' selected="selected"';
+	    			}
+	
+	    			html += '>' + json['zone'][i]['name'] + '</option>';
+				}
+			} else {
+				html += '<option value="0" selected="selected"><?php echo $text_none; ?></option>';
+			}
+			
+			$('select[name=\'zone_id\']').html(html);
+		},
+		error: function(xhr, ajaxOptions, thrownError) {
+			alert(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
+		}
+	});
+});
+
+$('select[name=\'country_id\']').trigger('change');
+//--></script>
+<script type="text/javascript"><!--
+$('input[name=\'payment\']').bind('change', function() {
+	$('.payment').hide();
+	
+	$('#payment-' + this.value).show();
+});
+
+$('input[name=\'payment\']:checked').trigger('change');
+//--></script> 
+<script type="text/javascript"><!--
+$(document).ready(function() {
+	$('.colorbox').colorbox({
+		width: 280,
+		height: 480
+	});
+});
+//--></script> 
 <?php echo $footer; ?>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/checkout/register.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/checkout/register.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/checkout/register.tpl	(revision 6)
@@ -1,219 +1,219 @@
-<div class="left">
-  <h2><?php echo $text_your_details; ?></h2>
-  <span class="required">*</span> <?php echo $entry_firstname; ?><br />
-  <input type="text" name="firstname" value="" class="large-field" />
-  <br />
-  <br />
-  <span class="required">*</span> <?php echo $entry_lastname; ?><br />
-  <input type="text" name="lastname" value="" class="large-field" />
-  <br />
-  <br />
-  <span class="required">*</span> <?php echo $entry_email; ?><br />
-  <input type="text" name="email" value="" class="large-field" />
-  <br />
-  <br />
-  <span class="required">*</span> <?php echo $entry_telephone; ?><br />
-  <input type="text" name="telephone" value="" class="large-field" />
-  <br />
-  <br />
-  <?php echo $entry_fax; ?><br />
-  <input type="text" name="fax" value="" class="large-field" />
-  <br />
-  <br />
-  <h2><?php echo $text_your_password; ?></h2>
-  <span class="required">*</span> <?php echo $entry_password; ?><br />
-  <input type="password" name="password" value="" class="large-field" />
-  <br />
-  <br />
-  <span class="required">*</span> <?php echo $entry_confirm; ?> <br />
-  <input type="password" name="confirm" value="" class="large-field" />
-  <br />
-  <br />
-  <br />
-</div>
-<div class="right">
-  <h2><?php echo $text_your_address; ?></h2>
-  <?php echo $entry_company; ?><br />
-  <input type="text" name="company" value="" class="large-field" />
-  <br />
-  <br />
-  <div style="display: <?php echo (count($customer_groups) > 1 ? 'table-row' : 'none'); ?>;">
-  <?php echo $entry_customer_group; ?><br />
-  <?php foreach ($customer_groups as $customer_group) { ?>
-  <?php if ($customer_group['customer_group_id'] == $customer_group_id) { ?>
-  <input type="radio" name="customer_group_id" value="<?php echo $customer_group['customer_group_id']; ?>" id="customer_group_id<?php echo $customer_group['customer_group_id']; ?>" checked="checked" />
-  <label for="customer_group_id<?php echo $customer_group['customer_group_id']; ?>"><?php echo $customer_group['name']; ?></label>
-  <br />
-  <?php } else { ?>
-  <input type="radio" name="customer_group_id" value="<?php echo $customer_group['customer_group_id']; ?>" id="customer_group_id<?php echo $customer_group['customer_group_id']; ?>" />
-  <label for="customer_group_id<?php echo $customer_group['customer_group_id']; ?>"><?php echo $customer_group['name']; ?></label>
-  <br />
-  <?php } ?>
-  <?php } ?>
-  <br />
-</div>
-<div id="company-id-display"><span id="company-id-required" class="required">*</span> <?php echo $entry_company_id; ?><br />
-  <input type="text" name="company_id" value="" class="large-field" />
-  <br />
-  <br />
-</div>
-<div id="tax-id-display"><span id="tax-id-required" class="required">*</span> <?php echo $entry_tax_id; ?><br />
-  <input type="text" name="tax_id" value="" class="large-field" />
-  <br />
-  <br />
-</div>
-<span class="required">*</span> <?php echo $entry_address_1; ?><br />
-<input type="text" name="address_1" value="" class="large-field" />
-<br />
-<br />
-<?php echo $entry_address_2; ?><br />
-<input type="text" name="address_2" value="" class="large-field" />
-<br />
-<br />
-<span class="required">*</span> <?php echo $entry_city; ?><br />
-<input type="text" name="city" value="" class="large-field" />
-<br />
-<br />
-<span id="payment-postcode-required" class="required">*</span> <?php echo $entry_postcode; ?><br />
-<input type="text" name="postcode" value="<?php echo $postcode; ?>" class="large-field" />
-<br />
-<br />
-<span class="required">*</span> <?php echo $entry_country; ?><br />
-<select name="country_id" class="large-field">
-  <option value=""><?php echo $text_select; ?></option>
-  <?php foreach ($countries as $country) { ?>
-  <?php if ($country['country_id'] == $country_id) { ?>
-  <option value="<?php echo $country['country_id']; ?>" selected="selected"><?php echo $country['name']; ?></option>
-  <?php } else { ?>
-  <option value="<?php echo $country['country_id']; ?>"><?php echo $country['name']; ?></option>
-  <?php } ?>
-  <?php } ?>
-</select>
-<br />
-<br />
-<span class="required">*</span> <?php echo $entry_zone; ?><br />
-<select name="zone_id" class="large-field">
-</select>
-<br />
-<br />
-<br />
-</div>
-<div style="clear: both; padding-top: 15px; border-top: 1px solid #EEEEEE;">
-  <input type="checkbox" name="newsletter" value="1" id="newsletter" />
-  <label for="newsletter"><?php echo $entry_newsletter; ?></label>
-  <br />
-  <?php if ($shipping_required) { ?>
-  <input type="checkbox" name="shipping_address" value="1" id="shipping" checked="checked" />
-  <label for="shipping"><?php echo $entry_shipping; ?></label>
-  <br />
-  <?php } ?>
-  <br />
-  <br />
-</div>
-<?php if ($text_agree) { ?>
-<div class="buttons">
-  <div class="right"><?php echo $text_agree; ?>
-    <input type="checkbox" name="agree" value="1" />
-    <input type="button" value="<?php echo $button_continue; ?>" id="button-register" class="button" />
-  </div>
-</div>
-<?php } else { ?>
-<div class="buttons">
-  <div class="right">
-    <input type="button" value="<?php echo $button_continue; ?>" id="button-register" class="button" />
-  </div>
-</div>
-<?php } ?>
-<script type="text/javascript"><!--
-$('#payment-address input[name=\'customer_group_id\']:checked').live('change', function() {
-	var customer_group = [];
-	
-<?php foreach ($customer_groups as $customer_group) { ?>
-	customer_group[<?php echo $customer_group['customer_group_id']; ?>] = [];
-	customer_group[<?php echo $customer_group['customer_group_id']; ?>]['company_id_display'] = '<?php echo $customer_group['company_id_display']; ?>';
-	customer_group[<?php echo $customer_group['customer_group_id']; ?>]['company_id_required'] = '<?php echo $customer_group['company_id_required']; ?>';
-	customer_group[<?php echo $customer_group['customer_group_id']; ?>]['tax_id_display'] = '<?php echo $customer_group['tax_id_display']; ?>';
-	customer_group[<?php echo $customer_group['customer_group_id']; ?>]['tax_id_required'] = '<?php echo $customer_group['tax_id_required']; ?>';
-<?php } ?>	
-
-	if (customer_group[this.value]) {
-		if (customer_group[this.value]['company_id_display'] == '1') {
-			$('#company-id-display').show();
-		} else {
-			$('#company-id-display').hide();
-		}
-		
-		if (customer_group[this.value]['company_id_required'] == '1') {
-			$('#company-id-required').show();
-		} else {
-			$('#company-id-required').hide();
-		}
-		
-		if (customer_group[this.value]['tax_id_display'] == '1') {
-			$('#tax-id-display').show();
-		} else {
-			$('#tax-id-display').hide();
-		}
-		
-		if (customer_group[this.value]['tax_id_required'] == '1') {
-			$('#tax-id-required').show();
-		} else {
-			$('#tax-id-required').hide();
-		}	
-	}
-});
-
-$('#payment-address input[name=\'customer_group_id\']:checked').trigger('change');
-//--></script> 
-<script type="text/javascript"><!--
-$('#payment-address select[name=\'country_id\']').bind('change', function() {
-	if (this.value == '') return;
-	$.ajax({
-		url: 'index.php?route=checkout/checkout/country&country_id=' + this.value,
-		dataType: 'json',
-		beforeSend: function() {
-			$('#payment-address select[name=\'country_id\']').after('<span class="wait">&nbsp;<img src="catalog/view/theme/default/image/loading.gif" alt="" /></span>');
-		},
-		complete: function() {
-			$('.wait').remove();
-		},			
-		success: function(json) {
-			if (json['postcode_required'] == '1') {
-				$('#payment-postcode-required').show();
-			} else {
-				$('#payment-postcode-required').hide();
-			}
-			
-			html = '<option value=""><?php echo $text_select; ?></option>';
-			
-			if (json['zone'] != '') {
-
-				for (i = 0; i < json['zone'].length; i++) {
-        			html += '<option value="' + json['zone'][i]['zone_id'] + '"';
-	    			
-					if (json['zone'][i]['zone_id'] == '<?php echo $zone_id; ?>') {
-	      				html += ' selected="selected"';
-	    			}
-	
-	    			html += '>' + json['zone'][i]['name'] + '</option>';
-				}
-			} else {
-				html += '<option value="0" selected="selected"><?php echo $text_none; ?></option>';
-			}
-			
-			$('#payment-address select[name=\'zone_id\']').html(html);
-		},
-		error: function(xhr, ajaxOptions, thrownError) {
-			alert(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
-		}
-	});
-});
-
-$('#payment-address select[name=\'country_id\']').trigger('change');
-//--></script> 
-<script type="text/javascript"><!--
-$('.colorbox').colorbox({
-	width: 280,
-	height: 480
-});
+<div class="left">
+  <h2><?php echo $text_your_details; ?></h2>
+  <span class="required">*</span> <?php echo $entry_firstname; ?><br />
+  <input type="text" name="firstname" value="" class="large-field" />
+  <br />
+  <br />
+  <span class="required">*</span> <?php echo $entry_lastname; ?><br />
+  <input type="text" name="lastname" value="" class="large-field" />
+  <br />
+  <br />
+  <span class="required">*</span> <?php echo $entry_email; ?><br />
+  <input type="text" name="email" value="" class="large-field" />
+  <br />
+  <br />
+  <span class="required">*</span> <?php echo $entry_telephone; ?><br />
+  <input type="text" name="telephone" value="" class="large-field" />
+  <br />
+  <br />
+  <?php echo $entry_fax; ?><br />
+  <input type="text" name="fax" value="" class="large-field" />
+  <br />
+  <br />
+  <h2><?php echo $text_your_password; ?></h2>
+  <span class="required">*</span> <?php echo $entry_password; ?><br />
+  <input type="password" name="password" value="" class="large-field" />
+  <br />
+  <br />
+  <span class="required">*</span> <?php echo $entry_confirm; ?> <br />
+  <input type="password" name="confirm" value="" class="large-field" />
+  <br />
+  <br />
+  <br />
+</div>
+<div class="right">
+  <h2><?php echo $text_your_address; ?></h2>
+  <?php echo $entry_company; ?><br />
+  <input type="text" name="company" value="" class="large-field" />
+  <br />
+  <br />
+  <div style="display: <?php echo (count($customer_groups) > 1 ? 'table-row' : 'none'); ?>;">
+  <?php echo $entry_customer_group; ?><br />
+  <?php foreach ($customer_groups as $customer_group) { ?>
+  <?php if ($customer_group['customer_group_id'] == $customer_group_id) { ?>
+  <input type="radio" name="customer_group_id" value="<?php echo $customer_group['customer_group_id']; ?>" id="customer_group_id<?php echo $customer_group['customer_group_id']; ?>" checked="checked" />
+  <label for="customer_group_id<?php echo $customer_group['customer_group_id']; ?>"><?php echo $customer_group['name']; ?></label>
+  <br />
+  <?php } else { ?>
+  <input type="radio" name="customer_group_id" value="<?php echo $customer_group['customer_group_id']; ?>" id="customer_group_id<?php echo $customer_group['customer_group_id']; ?>" />
+  <label for="customer_group_id<?php echo $customer_group['customer_group_id']; ?>"><?php echo $customer_group['name']; ?></label>
+  <br />
+  <?php } ?>
+  <?php } ?>
+  <br />
+</div>
+<div id="company-id-display"><span id="company-id-required" class="required">*</span> <?php echo $entry_company_id; ?><br />
+  <input type="text" name="company_id" value="" class="large-field" />
+  <br />
+  <br />
+</div>
+<div id="tax-id-display"><span id="tax-id-required" class="required">*</span> <?php echo $entry_tax_id; ?><br />
+  <input type="text" name="tax_id" value="" class="large-field" />
+  <br />
+  <br />
+</div>
+<span class="required">*</span> <?php echo $entry_address_1; ?><br />
+<input type="text" name="address_1" value="" class="large-field" />
+<br />
+<br />
+<?php echo $entry_address_2; ?><br />
+<input type="text" name="address_2" value="" class="large-field" />
+<br />
+<br />
+<span class="required">*</span> <?php echo $entry_city; ?><br />
+<input type="text" name="city" value="" class="large-field" />
+<br />
+<br />
+<span id="payment-postcode-required" class="required">*</span> <?php echo $entry_postcode; ?><br />
+<input type="text" name="postcode" value="<?php echo $postcode; ?>" class="large-field" />
+<br />
+<br />
+<span class="required">*</span> <?php echo $entry_country; ?><br />
+<select name="country_id" class="large-field">
+  <option value=""><?php echo $text_select; ?></option>
+  <?php foreach ($countries as $country) { ?>
+  <?php if ($country['country_id'] == $country_id) { ?>
+  <option value="<?php echo $country['country_id']; ?>" selected="selected"><?php echo $country['name']; ?></option>
+  <?php } else { ?>
+  <option value="<?php echo $country['country_id']; ?>"><?php echo $country['name']; ?></option>
+  <?php } ?>
+  <?php } ?>
+</select>
+<br />
+<br />
+<span class="required">*</span> <?php echo $entry_zone; ?><br />
+<select name="zone_id" class="large-field">
+</select>
+<br />
+<br />
+<br />
+</div>
+<div style="clear: both; padding-top: 15px; border-top: 1px solid #EEEEEE;">
+  <input type="checkbox" name="newsletter" value="1" id="newsletter" />
+  <label for="newsletter"><?php echo $entry_newsletter; ?></label>
+  <br />
+  <?php if ($shipping_required) { ?>
+  <input type="checkbox" name="shipping_address" value="1" id="shipping" checked="checked" />
+  <label for="shipping"><?php echo $entry_shipping; ?></label>
+  <br />
+  <?php } ?>
+  <br />
+  <br />
+</div>
+<?php if ($text_agree) { ?>
+<div class="buttons">
+  <div class="right"><?php echo $text_agree; ?>
+    <input type="checkbox" name="agree" value="1" />
+    <input type="button" value="<?php echo $button_continue; ?>" id="button-register" class="button" />
+  </div>
+</div>
+<?php } else { ?>
+<div class="buttons">
+  <div class="right">
+    <input type="button" value="<?php echo $button_continue; ?>" id="button-register" class="button" />
+  </div>
+</div>
+<?php } ?>
+<script type="text/javascript"><!--
+$('#payment-address input[name=\'customer_group_id\']:checked').live('change', function() {
+	var customer_group = [];
+	
+<?php foreach ($customer_groups as $customer_group) { ?>
+	customer_group[<?php echo $customer_group['customer_group_id']; ?>] = [];
+	customer_group[<?php echo $customer_group['customer_group_id']; ?>]['company_id_display'] = '<?php echo $customer_group['company_id_display']; ?>';
+	customer_group[<?php echo $customer_group['customer_group_id']; ?>]['company_id_required'] = '<?php echo $customer_group['company_id_required']; ?>';
+	customer_group[<?php echo $customer_group['customer_group_id']; ?>]['tax_id_display'] = '<?php echo $customer_group['tax_id_display']; ?>';
+	customer_group[<?php echo $customer_group['customer_group_id']; ?>]['tax_id_required'] = '<?php echo $customer_group['tax_id_required']; ?>';
+<?php } ?>	
+
+	if (customer_group[this.value]) {
+		if (customer_group[this.value]['company_id_display'] == '1') {
+			$('#company-id-display').show();
+		} else {
+			$('#company-id-display').hide();
+		}
+		
+		if (customer_group[this.value]['company_id_required'] == '1') {
+			$('#company-id-required').show();
+		} else {
+			$('#company-id-required').hide();
+		}
+		
+		if (customer_group[this.value]['tax_id_display'] == '1') {
+			$('#tax-id-display').show();
+		} else {
+			$('#tax-id-display').hide();
+		}
+		
+		if (customer_group[this.value]['tax_id_required'] == '1') {
+			$('#tax-id-required').show();
+		} else {
+			$('#tax-id-required').hide();
+		}	
+	}
+});
+
+$('#payment-address input[name=\'customer_group_id\']:checked').trigger('change');
+//--></script> 
+<script type="text/javascript"><!--
+$('#payment-address select[name=\'country_id\']').bind('change', function() {
+	if (this.value == '') return;
+	$.ajax({
+		url: 'index.php?route=checkout/checkout/country&country_id=' + this.value,
+		dataType: 'json',
+		beforeSend: function() {
+			$('#payment-address select[name=\'country_id\']').after('<span class="wait">&nbsp;<img src="catalog/view/theme/default/image/loading.gif" alt="" /></span>');
+		},
+		complete: function() {
+			$('.wait').remove();
+		},			
+		success: function(json) {
+			if (json['postcode_required'] == '1') {
+				$('#payment-postcode-required').show();
+			} else {
+				$('#payment-postcode-required').hide();
+			}
+			
+			html = '<option value=""><?php echo $text_select; ?></option>';
+			
+			if (json['zone'] != '') {
+
+				for (i = 0; i < json['zone'].length; i++) {
+        			html += '<option value="' + json['zone'][i]['zone_id'] + '"';
+	    			
+					if (json['zone'][i]['zone_id'] == '<?php echo $zone_id; ?>') {
+	      				html += ' selected="selected"';
+	    			}
+	
+	    			html += '>' + json['zone'][i]['name'] + '</option>';
+				}
+			} else {
+				html += '<option value="0" selected="selected"><?php echo $text_none; ?></option>';
+			}
+			
+			$('#payment-address select[name=\'zone_id\']').html(html);
+		},
+		error: function(xhr, ajaxOptions, thrownError) {
+			alert(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
+		}
+	});
+});
+
+$('#payment-address select[name=\'country_id\']').trigger('change');
+//--></script> 
+<script type="text/javascript"><!--
+$('.colorbox').colorbox({
+	width: 280,
+	height: 480
+});
 //--></script> 
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/checkout/cart.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/checkout/cart.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/checkout/cart.tpl	(revision 6)
@@ -1,354 +1,354 @@
-<?php echo $header; ?>
- <div class="sixteen columns">
-<?php if ($attention) { ?>
-<div class="attention"><?php echo $attention; ?><img src="catalog/view/theme/default/image/close.png" alt="" class="close" /></div>
-<?php } ?>
-<?php if ($success) { ?>
-<div class="success"><?php echo $success; ?><img src="catalog/view/theme/default/image/close.png" alt="" class="close" /></div>
-<?php } ?>
-<?php if ($error_warning) { ?>
-<div class="warning"><?php echo $error_warning; ?><img src="catalog/view/theme/default/image/close.png" alt="" class="close" /></div>
-<?php } ?>
-</div>
-
-<div class="sixteen columns cart_page">
-    <?php echo $content_top; ?>
-  <div class="breadcrumb">
-    <?php foreach ($breadcrumbs as $breadcrumb) { ?>
-    <?php echo $breadcrumb['separator']; ?><a href="<?php echo $breadcrumb['href']; ?>"><?php echo $breadcrumb['text']; ?></a>
-    <?php } ?>
-  </div>
-  <h1><?php echo $heading_title; ?>
-    <?php if ($weight) { ?>
-    &nbsp;(<?php echo $weight; ?>)
-    <?php } ?>
-  </h1>
-  <form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
-    <div class="cart-info">
-      <table>
-        <thead>
-          <tr>
-            <td class="image"><?php echo $column_image; ?></td>
-            <td class="name"><?php echo $column_name; ?></td>
-            <td class="model"><?php echo $column_model; ?></td>
-            <td class="quantity"><?php echo $column_quantity; ?></td>
-            <td class="price"><?php echo $column_price; ?></td>
-            <td class="total"><?php echo $column_total; ?></td>
-          </tr>
-        </thead>
-        <tbody>
-          <?php foreach ($products as $product) { ?>
-          <tr>
-            <td class="image"><?php if ($product['thumb']) { ?>
-              <a href="<?php echo $product['href']; ?>"><img src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" title="<?php echo $product['name']; ?>" /></a>
-              <?php } ?></td>
-            <td class="name"><a href="<?php echo $product['href']; ?>"><?php echo $product['name']; ?></a>
-              <?php if (!$product['stock']) { ?>
-              <span class="stock">***</span>
-              <?php } ?>
-              <div>
-                <?php foreach ($product['option'] as $option) { ?>
-                - <small><?php echo $option['name']; ?>: <?php echo $option['value']; ?></small><br />
-                <?php } ?>
-              </div>
-              <?php if ($product['reward']) { ?>
-              <small><?php echo $product['reward']; ?></small>
-              <?php } ?></td>
-            <td class="model"><?php echo $product['model']; ?></td>
-            <td class="quantity"><input type="text" name="quantity[<?php echo $product['key']; ?>]" value="<?php echo $product['quantity']; ?>" size="1" />
-              &nbsp;
-              <input type="image" src="catalog/view/theme/default/image/update.png" alt="<?php echo $button_update; ?>" title="<?php echo $button_update; ?>" />
-              &nbsp;<a href="<?php echo $product['remove']; ?>"><img src="catalog/view/theme/default/image/remove.png" alt="<?php echo $button_remove; ?>" title="<?php echo $button_remove; ?>" /></a></td>
-            <td class="price"><?php echo $product['price']; ?></td>
-            <td class="total"><?php echo $product['total']; ?></td>
-          </tr>
-          <?php } ?>
-          <?php foreach ($vouchers as $vouchers) { ?>
-          <tr>
-            <td class="image"></td>
-            <td class="name"><?php echo $vouchers['description']; ?></td>
-            <td class="model"></td>
-            <td class="quantity"><input type="text" name="" value="1" size="1" disabled="disabled" />
-              &nbsp;<a href="<?php echo $vouchers['remove']; ?>"><img src="catalog/view/theme/default/image/remove.png" alt="<?php echo $button_remove; ?>" title="<?php echo $button_remove; ?>" /></a></td>
-            <td class="price"><?php echo $vouchers['amount']; ?></td>
-            <td class="total"><?php echo $vouchers['amount']; ?></td>
-          </tr>
-          <?php } ?>
-        </tbody>
-      </table>
-    </div>
-  </form>
-  <?php if ($coupon_status || $voucher_status || $reward_status || $shipping_status) { ?>
-  <h2><?php echo $text_next; ?></h2>
-  <div class="content">
-    <p><?php echo $text_next_choice; ?></p>
-    <table class="radio">
-      <?php if ($coupon_status) { ?>
-      <tr class="highlight">
-        <td><?php if ($next == 'coupon') { ?>
-          <input type="radio" name="next" value="coupon" id="use_coupon" checked="checked" />
-          <?php } else { ?>
-          <input type="radio" name="next" value="coupon" id="use_coupon" />
-          <?php } ?></td>
-        <td><label for="use_coupon"><?php echo $text_use_coupon; ?></label></td>
-      </tr>
-      <?php } ?>
-      <?php if ($voucher_status) { ?>
-      <tr class="highlight">
-        <td><?php if ($next == 'voucher') { ?>
-          <input type="radio" name="next" value="voucher" id="use_voucher" checked="checked" />
-          <?php } else { ?>
-          <input type="radio" name="next" value="voucher" id="use_voucher" />
-          <?php } ?></td>
-        <td><label for="use_voucher"><?php echo $text_use_voucher; ?></label></td>
-      </tr>
-      <?php } ?>
-      <?php if ($reward_status) { ?>
-      <tr class="highlight">
-        <td><?php if ($next == 'reward') { ?>
-          <input type="radio" name="next" value="reward" id="use_reward" checked="checked" />
-          <?php } else { ?>
-          <input type="radio" name="next" value="reward" id="use_reward" />
-          <?php } ?></td>
-        <td><label for="use_reward"><?php echo $text_use_reward; ?></label></td>
-      </tr>
-      <?php } ?>
-      <?php if ($shipping_status) { ?>
-      <tr class="highlight">
-        <td><?php if ($next == 'shipping') { ?>
-          <input type="radio" name="next" value="shipping" id="shipping_estimate" checked="checked" />
-          <?php } else { ?>
-          <input type="radio" name="next" value="shipping" id="shipping_estimate" />
-          <?php } ?></td>
-        <td><label for="shipping_estimate"><?php echo $text_shipping_estimate; ?></label></td>
-      </tr>
-      <?php } ?>
-    </table>
-  </div>
-  <div class="cart-module">
-    <div id="coupon" class="content" style="display: <?php echo ($next == 'coupon' ? 'block' : 'none'); ?>;">
-      <form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
-        <?php echo $entry_coupon; ?>&nbsp;
-        <input type="text" name="coupon" value="<?php echo $coupon; ?>" />
-        <input type="hidden" name="next" value="coupon" />
-        &nbsp;
-        <input type="submit" value="<?php echo $button_coupon; ?>" class="button" />
-      </form>
-    </div>
-    <div id="voucher" class="content" style="display: <?php echo ($next == 'voucher' ? 'block' : 'none'); ?>;">
-      <form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
-        <?php echo $entry_voucher; ?>&nbsp;
-        <input type="text" name="voucher" value="<?php echo $voucher; ?>" />
-        <input type="hidden" name="next" value="voucher" />
-        &nbsp;
-        <input type="submit" value="<?php echo $button_voucher; ?>" class="button" />
-      </form>
-    </div>
-    <div id="reward" class="content" style="display: <?php echo ($next == 'reward' ? 'block' : 'none'); ?>;">
-      <form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
-        <?php echo $entry_reward; ?>&nbsp;
-        <input type="text" name="reward" value="<?php echo $reward; ?>" />
-        <input type="hidden" name="next" value="reward" />
-        &nbsp;
-        <input type="submit" value="<?php echo $button_reward; ?>" class="button" />
-      </form>
-    </div>
-    <div id="shipping" class="content" style="display: <?php echo ($next == 'shipping' ? 'block' : 'none'); ?>;">
-      <p><?php echo $text_shipping_detail; ?></p>
-      <table>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_country; ?></td>
-          <td><select name="country_id">
-              <option value=""><?php echo $text_select; ?></option>
-              <?php foreach ($countries as $country) { ?>
-              <?php if ($country['country_id'] == $country_id) { ?>
-              <option value="<?php echo $country['country_id']; ?>" selected="selected"><?php echo $country['name']; ?></option>
-              <?php } else { ?>
-              <option value="<?php echo $country['country_id']; ?>"><?php echo $country['name']; ?></option>
-              <?php } ?>
-              <?php } ?>
-            </select></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_zone; ?></td>
-          <td><select name="zone_id">
-            </select></td>
-        </tr>
-        <tr>
-          <td><span id="postcode-required" class="required">*</span> <?php echo $entry_postcode; ?></td>
-          <td><input type="text" name="postcode" value="<?php echo $postcode; ?>" /></td>
-        </tr>
-      </table>
-      <input type="button" value="<?php echo $button_quote; ?>" id="button-quote" class="button" />
-    </div>
-  </div>
-  <?php } ?>
-  <div class="cart-total">
-    <table id="total">
-      <?php foreach ($totals as $total) { ?>
-      <tr>
-        <td class="right"><b><?php echo $total['title']; ?>:</b></td>
-        <td class="right"><?php echo $total['text']; ?></td>
-      </tr>
-      <?php } ?>
-    </table>
-  </div>
-  <div class="buttons">
-    <div class="right"><a href="<?php echo $checkout; ?>" class="button"><?php echo $button_checkout; ?></a></div>
-    <div class="center"><a href="<?php echo $continue; ?>" class="button"><?php echo $button_shopping; ?></a></div>
-  </div>
-  <?php echo $content_bottom; ?></div>
-<script type="text/javascript"><!--
-$('input[name=\'next\']').bind('change', function() {
-	$('.cart-module > div').hide();
-	
-	$('#' + this.value).show();
-});
-//--></script>
-<?php if ($shipping_status) { ?>
-<script type="text/javascript"><!--
-$('#button-quote').live('click', function() {
-	$.ajax({
-		url: 'index.php?route=checkout/cart/quote',
-		type: 'post',
-		data: 'country_id=' + $('select[name=\'country_id\']').val() + '&zone_id=' + $('select[name=\'zone_id\']').val() + '&postcode=' + encodeURIComponent($('input[name=\'postcode\']').val()),
-		dataType: 'json',		
-		beforeSend: function() {
-			$('#button-quote').attr('disabled', true);
-			$('#button-quote').after('<span class="wait">&nbsp;<img src="catalog/view/theme/default/image/loading.gif" alt="" /></span>');
-		},
-		complete: function() {
-			$('#button-quote').attr('disabled', false);
-			$('.wait').remove();
-		},		
-		success: function(json) {
-			$('.success, .warning, .attention, .error').remove();			
-						
-			if (json['error']) {
-				if (json['error']['warning']) {
-					$('#notification').html('<div class="warning" style="display: none;">' + json['error']['warning'] + '<img src="catalog/view/theme/default/image/close.png" alt="" class="close" /></div>');
-					
-					$('.warning').fadeIn('slow');
-					
-					$('html, body').animate({ scrollTop: 0 }, 'slow'); 
-				}	
-							
-				if (json['error']['country']) {
-					$('select[name=\'country_id\']').after('<span class="error">' + json['error']['country'] + '</span>');
-				}	
-				
-				if (json['error']['zone']) {
-					$('select[name=\'zone_id\']').after('<span class="error">' + json['error']['zone'] + '</span>');
-				}
-				
-				if (json['error']['postcode']) {
-					$('input[name=\'postcode\']').after('<span class="error">' + json['error']['postcode'] + '</span>');
-				}					
-			}
-			
-			if (json['shipping_method']) {
-				html  = '<h2><?php echo $text_shipping_method; ?></h2>';
-				html += '<form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">';
-				html += '  <table class="radio">';
-				
-				for (i in json['shipping_method']) {
-					html += '<tr>';
-					html += '  <td colspan="3"><b>' + json['shipping_method'][i]['title'] + '</b></td>';
-					html += '</tr>';
-				
-					if (!json['shipping_method'][i]['error']) {
-						for (j in json['shipping_method'][i]['quote']) {
-							html += '<tr class="highlight">';
-							
-							if (json['shipping_method'][i]['quote'][j]['code'] == '<?php echo $shipping_method; ?>') {
-								html += '<td><input type="radio" name="shipping_method" value="' + json['shipping_method'][i]['quote'][j]['code'] + '" id="' + json['shipping_method'][i]['quote'][j]['code'] + '" checked="checked" /></td>';
-							} else {
-								html += '<td><input type="radio" name="shipping_method" value="' + json['shipping_method'][i]['quote'][j]['code'] + '" id="' + json['shipping_method'][i]['quote'][j]['code'] + '" /></td>';
-							}
-								
-							html += '  <td><label for="' + json['shipping_method'][i]['quote'][j]['code'] + '">' + json['shipping_method'][i]['quote'][j]['title'] + '</label></td>';
-							html += '  <td style="text-align: right;"><label for="' + json['shipping_method'][i]['quote'][j]['code'] + '">' + json['shipping_method'][i]['quote'][j]['text'] + '</label></td>';
-							html += '</tr>';
-						}		
-					} else {
-						html += '<tr>';
-						html += '  <td colspan="3"><div class="error">' + json['shipping_method'][i]['error'] + '</div></td>';
-						html += '</tr>';						
-					}
-				}
-				
-				html += '  </table>';
-				html += '  <br />';
-				html += '  <input type="hidden" name="next" value="shipping" />';
-				
-				<?php if ($shipping_method) { ?>
-				html += '  <input type="submit" value="<?php echo $button_shipping; ?>" id="button-shipping" class="button" />';	
-				<?php } else { ?>
-				html += '  <input type="submit" value="<?php echo $button_shipping; ?>" id="button-shipping" class="button" disabled="disabled" />';	
-				<?php } ?>
-							
-				html += '</form>';
-				
-				$.colorbox({
-					overlayClose: true,
-					opacity: 0.5,
-					width: '280px',
-					height: '400px',
-					href: false,
-					html: html
-				});
-				
-				$('input[name=\'shipping_method\']').bind('change', function() {
-					$('#button-shipping').attr('disabled', false);
-				});
-			}
-		}
-	});
-});
-//--></script> 
-<script type="text/javascript"><!--
-$('select[name=\'country_id\']').bind('change', function() {
-	$.ajax({
-		url: 'index.php?route=checkout/cart/country&country_id=' + this.value,
-		dataType: 'json',
-		beforeSend: function() {
-			$('select[name=\'country_id\']').after('<span class="wait">&nbsp;<img src="catalog/view/theme/default/image/loading.gif" alt="" /></span>');
-		},
-		complete: function() {
-			$('.wait').remove();
-		},			
-		success: function(json) {
-			if (json['postcode_required'] == '1') {
-				$('#postcode-required').show();
-			} else {
-				$('#postcode-required').hide();
-			}
-			
-			html = '<option value=""><?php echo $text_select; ?></option>';
-			
-			if (json['zone'] != '') {
-				for (i = 0; i < json['zone'].length; i++) {
-        			html += '<option value="' + json['zone'][i]['zone_id'] + '"';
-	    			
-					if (json['zone'][i]['zone_id'] == '<?php echo $zone_id; ?>') {
-	      				html += ' selected="selected"';
-	    			}
-	
-	    			html += '>' + json['zone'][i]['name'] + '</option>';
-				}
-			} else {
-				html += '<option value="0" selected="selected"><?php echo $text_none; ?></option>';
-			}
-			
-			$('select[name=\'zone_id\']').html(html);
-		},
-		error: function(xhr, ajaxOptions, thrownError) {
-			alert(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
-		}
-	});
-});
-
-$('select[name=\'country_id\']').trigger('change');
-//--></script>
-<?php } ?>
+<?php echo $header; ?>
+ <div class="sixteen columns">
+<?php if ($attention) { ?>
+<div class="attention"><?php echo $attention; ?><img src="catalog/view/theme/default/image/close.png" alt="" class="close" /></div>
+<?php } ?>
+<?php if ($success) { ?>
+<div class="success"><?php echo $success; ?><img src="catalog/view/theme/default/image/close.png" alt="" class="close" /></div>
+<?php } ?>
+<?php if ($error_warning) { ?>
+<div class="warning"><?php echo $error_warning; ?><img src="catalog/view/theme/default/image/close.png" alt="" class="close" /></div>
+<?php } ?>
+</div>
+
+<div class="sixteen columns cart_page">
+    <?php echo $content_top; ?>
+  <div class="breadcrumb">
+    <?php foreach ($breadcrumbs as $breadcrumb) { ?>
+    <?php echo $breadcrumb['separator']; ?><a href="<?php echo $breadcrumb['href']; ?>"><?php echo $breadcrumb['text']; ?></a>
+    <?php } ?>
+  </div>
+  <h1><?php echo $heading_title; ?>
+    <?php if ($weight) { ?>
+    &nbsp;(<?php echo $weight; ?>)
+    <?php } ?>
+  </h1>
+  <form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
+    <div class="cart-info">
+      <table>
+        <thead>
+          <tr>
+            <td class="image"><?php echo $column_image; ?></td>
+            <td class="name"><?php echo $column_name; ?></td>
+            <td class="model"><?php echo $column_model; ?></td>
+            <td class="quantity"><?php echo $column_quantity; ?></td>
+            <td class="price"><?php echo $column_price; ?></td>
+            <td class="total"><?php echo $column_total; ?></td>
+          </tr>
+        </thead>
+        <tbody>
+          <?php foreach ($products as $product) { ?>
+          <tr>
+            <td class="image"><?php if ($product['thumb']) { ?>
+              <a href="<?php echo $product['href']; ?>"><img src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" title="<?php echo $product['name']; ?>" /></a>
+              <?php } ?></td>
+            <td class="name"><a href="<?php echo $product['href']; ?>"><?php echo $product['name']; ?></a>
+              <?php if (!$product['stock']) { ?>
+              <span class="stock">***</span>
+              <?php } ?>
+              <div>
+                <?php foreach ($product['option'] as $option) { ?>
+                - <small><?php echo $option['name']; ?>: <?php echo $option['value']; ?></small><br />
+                <?php } ?>
+              </div>
+              <?php if ($product['reward']) { ?>
+              <small><?php echo $product['reward']; ?></small>
+              <?php } ?></td>
+            <td class="model"><?php echo $product['model']; ?></td>
+            <td class="quantity"><input type="text" name="quantity[<?php echo $product['key']; ?>]" value="<?php echo $product['quantity']; ?>" size="1" />
+              &nbsp;
+              <input type="image" src="catalog/view/theme/default/image/update.png" alt="<?php echo $button_update; ?>" title="<?php echo $button_update; ?>" />
+              &nbsp;<a href="<?php echo $product['remove']; ?>"><img src="catalog/view/theme/default/image/remove.png" alt="<?php echo $button_remove; ?>" title="<?php echo $button_remove; ?>" /></a></td>
+            <td class="price"><?php echo $product['price']; ?></td>
+            <td class="total"><?php echo $product['total']; ?></td>
+          </tr>
+          <?php } ?>
+          <?php foreach ($vouchers as $vouchers) { ?>
+          <tr>
+            <td class="image"></td>
+            <td class="name"><?php echo $vouchers['description']; ?></td>
+            <td class="model"></td>
+            <td class="quantity"><input type="text" name="" value="1" size="1" disabled="disabled" />
+              &nbsp;<a href="<?php echo $vouchers['remove']; ?>"><img src="catalog/view/theme/default/image/remove.png" alt="<?php echo $button_remove; ?>" title="<?php echo $button_remove; ?>" /></a></td>
+            <td class="price"><?php echo $vouchers['amount']; ?></td>
+            <td class="total"><?php echo $vouchers['amount']; ?></td>
+          </tr>
+          <?php } ?>
+        </tbody>
+      </table>
+    </div>
+  </form>
+  <?php if ($coupon_status || $voucher_status || $reward_status || $shipping_status) { ?>
+  <h2><?php echo $text_next; ?></h2>
+  <div class="content">
+    <p><?php echo $text_next_choice; ?></p>
+    <table class="radio">
+      <?php if ($coupon_status) { ?>
+      <tr class="highlight">
+        <td><?php if ($next == 'coupon') { ?>
+          <input type="radio" name="next" value="coupon" id="use_coupon" checked="checked" />
+          <?php } else { ?>
+          <input type="radio" name="next" value="coupon" id="use_coupon" />
+          <?php } ?></td>
+        <td><label for="use_coupon"><?php echo $text_use_coupon; ?></label></td>
+      </tr>
+      <?php } ?>
+      <?php if ($voucher_status) { ?>
+      <tr class="highlight">
+        <td><?php if ($next == 'voucher') { ?>
+          <input type="radio" name="next" value="voucher" id="use_voucher" checked="checked" />
+          <?php } else { ?>
+          <input type="radio" name="next" value="voucher" id="use_voucher" />
+          <?php } ?></td>
+        <td><label for="use_voucher"><?php echo $text_use_voucher; ?></label></td>
+      </tr>
+      <?php } ?>
+      <?php if ($reward_status) { ?>
+      <tr class="highlight">
+        <td><?php if ($next == 'reward') { ?>
+          <input type="radio" name="next" value="reward" id="use_reward" checked="checked" />
+          <?php } else { ?>
+          <input type="radio" name="next" value="reward" id="use_reward" />
+          <?php } ?></td>
+        <td><label for="use_reward"><?php echo $text_use_reward; ?></label></td>
+      </tr>
+      <?php } ?>
+      <?php if ($shipping_status) { ?>
+      <tr class="highlight">
+        <td><?php if ($next == 'shipping') { ?>
+          <input type="radio" name="next" value="shipping" id="shipping_estimate" checked="checked" />
+          <?php } else { ?>
+          <input type="radio" name="next" value="shipping" id="shipping_estimate" />
+          <?php } ?></td>
+        <td><label for="shipping_estimate"><?php echo $text_shipping_estimate; ?></label></td>
+      </tr>
+      <?php } ?>
+    </table>
+  </div>
+  <div class="cart-module">
+    <div id="coupon" class="content" style="display: <?php echo ($next == 'coupon' ? 'block' : 'none'); ?>;">
+      <form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
+        <?php echo $entry_coupon; ?>&nbsp;
+        <input type="text" name="coupon" value="<?php echo $coupon; ?>" />
+        <input type="hidden" name="next" value="coupon" />
+        &nbsp;
+        <input type="submit" value="<?php echo $button_coupon; ?>" class="button" />
+      </form>
+    </div>
+    <div id="voucher" class="content" style="display: <?php echo ($next == 'voucher' ? 'block' : 'none'); ?>;">
+      <form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
+        <?php echo $entry_voucher; ?>&nbsp;
+        <input type="text" name="voucher" value="<?php echo $voucher; ?>" />
+        <input type="hidden" name="next" value="voucher" />
+        &nbsp;
+        <input type="submit" value="<?php echo $button_voucher; ?>" class="button" />
+      </form>
+    </div>
+    <div id="reward" class="content" style="display: <?php echo ($next == 'reward' ? 'block' : 'none'); ?>;">
+      <form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
+        <?php echo $entry_reward; ?>&nbsp;
+        <input type="text" name="reward" value="<?php echo $reward; ?>" />
+        <input type="hidden" name="next" value="reward" />
+        &nbsp;
+        <input type="submit" value="<?php echo $button_reward; ?>" class="button" />
+      </form>
+    </div>
+    <div id="shipping" class="content" style="display: <?php echo ($next == 'shipping' ? 'block' : 'none'); ?>;">
+      <p><?php echo $text_shipping_detail; ?></p>
+      <table>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_country; ?></td>
+          <td><select name="country_id">
+              <option value=""><?php echo $text_select; ?></option>
+              <?php foreach ($countries as $country) { ?>
+              <?php if ($country['country_id'] == $country_id) { ?>
+              <option value="<?php echo $country['country_id']; ?>" selected="selected"><?php echo $country['name']; ?></option>
+              <?php } else { ?>
+              <option value="<?php echo $country['country_id']; ?>"><?php echo $country['name']; ?></option>
+              <?php } ?>
+              <?php } ?>
+            </select></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_zone; ?></td>
+          <td><select name="zone_id">
+            </select></td>
+        </tr>
+        <tr>
+          <td><span id="postcode-required" class="required">*</span> <?php echo $entry_postcode; ?></td>
+          <td><input type="text" name="postcode" value="<?php echo $postcode; ?>" /></td>
+        </tr>
+      </table>
+      <input type="button" value="<?php echo $button_quote; ?>" id="button-quote" class="button" />
+    </div>
+  </div>
+  <?php } ?>
+  <div class="cart-total">
+    <table id="total">
+      <?php foreach ($totals as $total) { ?>
+      <tr>
+        <td class="right"><b><?php echo $total['title']; ?>:</b></td>
+        <td class="right"><?php echo $total['text']; ?></td>
+      </tr>
+      <?php } ?>
+    </table>
+  </div>
+  <div class="buttons">
+    <div class="right"><a href="<?php echo $checkout; ?>" class="button"><?php echo $button_checkout; ?></a></div>
+    <div class="center"><a href="<?php echo $continue; ?>" class="button"><?php echo $button_shopping; ?></a></div>
+  </div>
+  <?php echo $content_bottom; ?></div>
+<script type="text/javascript"><!--
+$('input[name=\'next\']').bind('change', function() {
+	$('.cart-module > div').hide();
+	
+	$('#' + this.value).show();
+});
+//--></script>
+<?php if ($shipping_status) { ?>
+<script type="text/javascript"><!--
+$('#button-quote').live('click', function() {
+	$.ajax({
+		url: 'index.php?route=checkout/cart/quote',
+		type: 'post',
+		data: 'country_id=' + $('select[name=\'country_id\']').val() + '&zone_id=' + $('select[name=\'zone_id\']').val() + '&postcode=' + encodeURIComponent($('input[name=\'postcode\']').val()),
+		dataType: 'json',		
+		beforeSend: function() {
+			$('#button-quote').attr('disabled', true);
+			$('#button-quote').after('<span class="wait">&nbsp;<img src="catalog/view/theme/default/image/loading.gif" alt="" /></span>');
+		},
+		complete: function() {
+			$('#button-quote').attr('disabled', false);
+			$('.wait').remove();
+		},		
+		success: function(json) {
+			$('.success, .warning, .attention, .error').remove();			
+						
+			if (json['error']) {
+				if (json['error']['warning']) {
+					$('#notification').html('<div class="warning" style="display: none;">' + json['error']['warning'] + '<img src="catalog/view/theme/default/image/close.png" alt="" class="close" /></div>');
+					
+					$('.warning').fadeIn('slow');
+					
+					$('html, body').animate({ scrollTop: 0 }, 'slow'); 
+				}	
+							
+				if (json['error']['country']) {
+					$('select[name=\'country_id\']').after('<span class="error">' + json['error']['country'] + '</span>');
+				}	
+				
+				if (json['error']['zone']) {
+					$('select[name=\'zone_id\']').after('<span class="error">' + json['error']['zone'] + '</span>');
+				}
+				
+				if (json['error']['postcode']) {
+					$('input[name=\'postcode\']').after('<span class="error">' + json['error']['postcode'] + '</span>');
+				}					
+			}
+			
+			if (json['shipping_method']) {
+				html  = '<h2><?php echo $text_shipping_method; ?></h2>';
+				html += '<form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">';
+				html += '  <table class="radio">';
+				
+				for (i in json['shipping_method']) {
+					html += '<tr>';
+					html += '  <td colspan="3"><b>' + json['shipping_method'][i]['title'] + '</b></td>';
+					html += '</tr>';
+				
+					if (!json['shipping_method'][i]['error']) {
+						for (j in json['shipping_method'][i]['quote']) {
+							html += '<tr class="highlight">';
+							
+							if (json['shipping_method'][i]['quote'][j]['code'] == '<?php echo $shipping_method; ?>') {
+								html += '<td><input type="radio" name="shipping_method" value="' + json['shipping_method'][i]['quote'][j]['code'] + '" id="' + json['shipping_method'][i]['quote'][j]['code'] + '" checked="checked" /></td>';
+							} else {
+								html += '<td><input type="radio" name="shipping_method" value="' + json['shipping_method'][i]['quote'][j]['code'] + '" id="' + json['shipping_method'][i]['quote'][j]['code'] + '" /></td>';
+							}
+								
+							html += '  <td><label for="' + json['shipping_method'][i]['quote'][j]['code'] + '">' + json['shipping_method'][i]['quote'][j]['title'] + '</label></td>';
+							html += '  <td style="text-align: right;"><label for="' + json['shipping_method'][i]['quote'][j]['code'] + '">' + json['shipping_method'][i]['quote'][j]['text'] + '</label></td>';
+							html += '</tr>';
+						}		
+					} else {
+						html += '<tr>';
+						html += '  <td colspan="3"><div class="error">' + json['shipping_method'][i]['error'] + '</div></td>';
+						html += '</tr>';						
+					}
+				}
+				
+				html += '  </table>';
+				html += '  <br />';
+				html += '  <input type="hidden" name="next" value="shipping" />';
+				
+				<?php if ($shipping_method) { ?>
+				html += '  <input type="submit" value="<?php echo $button_shipping; ?>" id="button-shipping" class="button" />';	
+				<?php } else { ?>
+				html += '  <input type="submit" value="<?php echo $button_shipping; ?>" id="button-shipping" class="button" disabled="disabled" />';	
+				<?php } ?>
+							
+				html += '</form>';
+				
+				$.colorbox({
+					overlayClose: true,
+					opacity: 0.5,
+					width: '280px',
+					height: '400px',
+					href: false,
+					html: html
+				});
+				
+				$('input[name=\'shipping_method\']').bind('change', function() {
+					$('#button-shipping').attr('disabled', false);
+				});
+			}
+		}
+	});
+});
+//--></script> 
+<script type="text/javascript"><!--
+$('select[name=\'country_id\']').bind('change', function() {
+	$.ajax({
+		url: 'index.php?route=checkout/cart/country&country_id=' + this.value,
+		dataType: 'json',
+		beforeSend: function() {
+			$('select[name=\'country_id\']').after('<span class="wait">&nbsp;<img src="catalog/view/theme/default/image/loading.gif" alt="" /></span>');
+		},
+		complete: function() {
+			$('.wait').remove();
+		},			
+		success: function(json) {
+			if (json['postcode_required'] == '1') {
+				$('#postcode-required').show();
+			} else {
+				$('#postcode-required').hide();
+			}
+			
+			html = '<option value=""><?php echo $text_select; ?></option>';
+			
+			if (json['zone'] != '') {
+				for (i = 0; i < json['zone'].length; i++) {
+        			html += '<option value="' + json['zone'][i]['zone_id'] + '"';
+	    			
+					if (json['zone'][i]['zone_id'] == '<?php echo $zone_id; ?>') {
+	      				html += ' selected="selected"';
+	    			}
+	
+	    			html += '>' + json['zone'][i]['name'] + '</option>';
+				}
+			} else {
+				html += '<option value="0" selected="selected"><?php echo $text_none; ?></option>';
+			}
+			
+			$('select[name=\'zone_id\']').html(html);
+		},
+		error: function(xhr, ajaxOptions, thrownError) {
+			alert(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
+		}
+	});
+});
+
+$('select[name=\'country_id\']').trigger('change');
+//--></script>
+<?php } ?>
 <?php echo $footer; ?>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/checkout/payment_method.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/checkout/payment_method.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/checkout/payment_method.tpl	(revision 6)
@@ -1,48 +1,48 @@
-<?php if ($error_warning) { ?>
-<div class="warning"><?php echo $error_warning; ?></div>
-<?php } ?>
-<?php if ($payment_methods) { ?>
-<p><?php echo $text_payment_method; ?></p>
-<table class="radio">
-  <?php foreach ($payment_methods as $payment_method) { ?>
-  <tr class="highlight">
-    <td><?php if ($payment_method['code'] == $code || !$code) { ?>
-      <?php $code = $payment_method['code']; ?>
-      <input type="radio" name="payment_method" value="<?php echo $payment_method['code']; ?>" id="<?php echo $payment_method['code']; ?>" checked="checked" />
-      <?php } else { ?>
-      <input type="radio" name="payment_method" value="<?php echo $payment_method['code']; ?>" id="<?php echo $payment_method['code']; ?>" />
-      <?php } ?></td>
-    <td><label for="<?php echo $payment_method['code']; ?>"><?php echo $payment_method['title']; ?></label></td>
-  </tr>
-  <?php } ?>
-</table>
-<br />
-<?php } ?>
-<b><?php echo $text_comments; ?></b>
-<textarea name="comment" rows="8" style="width: 98%;"><?php echo $comment; ?></textarea>
-<br />
-<br />
-<?php if ($text_agree) { ?>
-<div class="buttons">
-  <div class="right"><?php echo $text_agree; ?>
-    <?php if ($agree) { ?>
-    <input type="checkbox" name="agree" value="1" checked="checked" />
-    <?php } else { ?>
-    <input type="checkbox" name="agree" value="1" />
-    <?php } ?>
-    <input type="button" value="<?php echo $button_continue; ?>" id="button-payment-method" class="button" />
-  </div>
-</div>
-<?php } else { ?>
-<div class="buttons">
-  <div class="right">
-    <input type="button" value="<?php echo $button_continue; ?>" id="button-payment-method" class="button" />
-  </div>
-</div>
-<?php } ?>
-<script type="text/javascript"><!--
-$('.colorbox').colorbox({
-    width: 280,
-    height: 480
-});
+<?php if ($error_warning) { ?>
+<div class="warning"><?php echo $error_warning; ?></div>
+<?php } ?>
+<?php if ($payment_methods) { ?>
+<p><?php echo $text_payment_method; ?></p>
+<table class="radio">
+  <?php foreach ($payment_methods as $payment_method) { ?>
+  <tr class="highlight">
+    <td><?php if ($payment_method['code'] == $code || !$code) { ?>
+      <?php $code = $payment_method['code']; ?>
+      <input type="radio" name="payment_method" value="<?php echo $payment_method['code']; ?>" id="<?php echo $payment_method['code']; ?>" checked="checked" />
+      <?php } else { ?>
+      <input type="radio" name="payment_method" value="<?php echo $payment_method['code']; ?>" id="<?php echo $payment_method['code']; ?>" />
+      <?php } ?></td>
+    <td><label for="<?php echo $payment_method['code']; ?>"><?php echo $payment_method['title']; ?></label></td>
+  </tr>
+  <?php } ?>
+</table>
+<br />
+<?php } ?>
+<b><?php echo $text_comments; ?></b>
+<textarea name="comment" rows="8" style="width: 98%;"><?php echo $comment; ?></textarea>
+<br />
+<br />
+<?php if ($text_agree) { ?>
+<div class="buttons">
+  <div class="right"><?php echo $text_agree; ?>
+    <?php if ($agree) { ?>
+    <input type="checkbox" name="agree" value="1" checked="checked" />
+    <?php } else { ?>
+    <input type="checkbox" name="agree" value="1" />
+    <?php } ?>
+    <input type="button" value="<?php echo $button_continue; ?>" id="button-payment-method" class="button" />
+  </div>
+</div>
+<?php } else { ?>
+<div class="buttons">
+  <div class="right">
+    <input type="button" value="<?php echo $button_continue; ?>" id="button-payment-method" class="button" />
+  </div>
+</div>
+<?php } ?>
+<script type="text/javascript"><!--
+$('.colorbox').colorbox({
+    width: 280,
+    height: 480
+});
 //--></script> 
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/bestseller.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/bestseller.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/bestseller.tpl	(revision 6)
@@ -1,28 +1,28 @@
-<div class="box">
-  <div class="box-heading"><?php echo $heading_title; ?></div>
-  <div class="box-content">
-    <div class="box-product">
-      <?php foreach ($products as $product) { ?>
-      <div>
-        <?php if ($product['thumb']) { ?>
-        <div class="image"><a href="<?php echo $product['href']; ?>"><img class="scale-with-grid" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" /></a></div>
-        <?php } ?>
-        <?php if ($product['price']) { ?>
-        <div class="price">
-          <?php if (!$product['special']) { ?>
-          <?php echo $product['price']; ?>
-          <?php } else { ?>
-          <span class="price-old"><?php echo $product['price']; ?></span> <span class="price-new"><?php echo $product['special']; ?></span>
-          <?php } ?>
-        </div>
-        <?php } ?>
-          <div class="name"><a href="<?php echo $product['href']; ?>"><?php echo $product['name']; ?></a></div>
-          <?php if ($product['rating']) { ?>
-        <div class="rating"><img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/stars-<?php echo $product['rating']; ?>.gif" alt="<?php echo $product['reviews']; ?>" /></div>
-        <?php } ?>
-        <div class="cart"><input type="button" value="<?php echo $button_cart; ?>" onclick="addToCart('<?php echo $product['product_id']; ?>');" class="button" /></div>
-      </div>
-      <?php } ?>
-    </div>
-  </div>
-</div>
+<div class="box">
+  <div class="box-heading"><?php echo $heading_title; ?></div>
+  <div class="box-content">
+    <div class="box-product">
+      <?php foreach ($products as $product) { ?>
+      <div>
+        <?php if ($product['thumb']) { ?>
+        <div class="image"><a href="<?php echo $product['href']; ?>"><img class="scale-with-grid" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" /></a></div>
+        <?php } ?>
+        <?php if ($product['price']) { ?>
+        <div class="price">
+          <?php if (!$product['special']) { ?>
+          <?php echo $product['price']; ?>
+          <?php } else { ?>
+          <span class="price-old"><?php echo $product['price']; ?></span> <span class="price-new"><?php echo $product['special']; ?></span>
+          <?php } ?>
+        </div>
+        <?php } ?>
+          <div class="name"><a href="<?php echo $product['href']; ?>"><?php echo $product['name']; ?></a></div>
+          <?php if ($product['rating']) { ?>
+        <div class="rating"><img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/stars-<?php echo $product['rating']; ?>.gif" alt="<?php echo $product['reviews']; ?>" /></div>
+        <?php } ?>
+        <div class="cart"><input type="button" value="<?php echo $button_cart; ?>" onclick="addToCart('<?php echo $product['product_id']; ?>');" class="button" /></div>
+      </div>
+      <?php } ?>
+    </div>
+  </div>
+</div>
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_special.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_special.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_special.tpl	(revision 6)
@@ -1,69 +1,69 @@
-<div id="specials_slider">
-    <div id="carousel_specials" class="es-carousel-wrapper">
-        <div class="es-carousel container">
-
-            <ul>
-
-
-            <?php foreach ($products as $product) { ?>
-                <li class="four columns product">
-
-
-                    <?php if ($product['thumb']) { ?>
-                    <div class="product-image-wrapper">
-
-                        <?php if ( $sale !== 'disable') : ?>
-                        <span class="product_sticker sticker_sale sticker_onsale_<?php echo $saleposition; ?> <?php echo ($sale ? ($product['special'] ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
-                        <?php endif; ?>
-                        <?php if ( $video !== 'disable') : ?>
-                        <span class="product_sticker sticker_video sticker_video_<?php echo $videoposition; ?> <?php echo ($video ? (($product['youtube_video'][0] !== '') ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
-                        <?php endif; ?>
-
-                        <a class="img_conteiner" href="<?php echo $product['href']; ?>">
-                            <img class="scale-with-grid image-<?php echo $product['product_id']; ?>" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" />
-                            <?php if ($product['popup']) { ?>
-                                <div class="roll_over_img">
-                                    <img class="scale-with-grid" src="<?php echo $product['popup']; ?>" alt="<?php echo $product['name']; ?>" />
-                                </div>
-                            <?php } ?>
-                            <div class="product-image-wrapper-hover"></div>
-                        </a>
-                    </div>
-                    <?php } ?>
-
-
-                    <div class="wrapper-hover">
-                        <div class="product-price">
-                            <?php if ($product['price']) { ?>
-                            <div class="price">
-                                <?php if (!$product['special']) { ?>
-                                <span><?php echo $product['price']; ?></span>
-                                <?php } else { ?>
-                                <span class="price-old"><?php echo $product['price']; ?></span>
-                                <span class="price-new"><?php echo $product['special']; ?></span>
-                                <?php } ?>
-                            </div>
-                            <?php } ?>
-                        </div>
-
-                        <div class="product-name">
-                            <div class="clearfix">
-                                <a class="icon_cart_title" onclick="location.href='<?php echo $product['href']; ?>';">
-                                    <?php echo $product['name-main']; ?>
-                                </a>
-                                <div class="icon_cart_rollover">
-                                    <a onclick="addToCartFly('<?php echo $ajaxcart; ?>', '<?php echo $product['product_id']; ?>');"></a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </li>
-        <?php } ?>
-
-
-        </ul>
-
-    </div>
-  </div>
-</div>
+<div id="specials_slider">
+    <div id="carousel_specials" class="es-carousel-wrapper">
+        <div class="es-carousel container">
+
+            <ul>
+
+
+            <?php foreach ($products as $product) { ?>
+                <li class="four columns product">
+
+
+                    <?php if ($product['thumb']) { ?>
+                    <div class="product-image-wrapper">
+
+                        <?php if ( $sale !== 'disable') : ?>
+                        <span class="product_sticker sticker_sale sticker_onsale_<?php echo $saleposition; ?> <?php echo ($sale ? ($product['special'] ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
+                        <?php endif; ?>
+                        <?php if ( $video !== 'disable') : ?>
+                        <span class="product_sticker sticker_video sticker_video_<?php echo $videoposition; ?> <?php echo ($video ? (($product['youtube_video'][0] !== '') ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
+                        <?php endif; ?>
+
+                        <a class="img_conteiner" href="<?php echo $product['href']; ?>">
+                            <img class="scale-with-grid image-<?php echo $product['product_id']; ?>" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" />
+                            <?php if ($product['popup']) { ?>
+                                <div class="roll_over_img">
+                                    <img class="scale-with-grid" src="<?php echo $product['popup']; ?>" alt="<?php echo $product['name']; ?>" />
+                                </div>
+                            <?php } ?>
+                            <div class="product-image-wrapper-hover"></div>
+                        </a>
+                    </div>
+                    <?php } ?>
+
+
+                    <div class="wrapper-hover">
+                        <div class="product-price">
+                            <?php if ($product['price']) { ?>
+                            <div class="price">
+                                <?php if (!$product['special']) { ?>
+                                <span><?php echo $product['price']; ?></span>
+                                <?php } else { ?>
+                                <span class="price-old"><?php echo $product['price']; ?></span>
+                                <span class="price-new"><?php echo $product['special']; ?></span>
+                                <?php } ?>
+                            </div>
+                            <?php } ?>
+                        </div>
+
+                        <div class="product-name">
+                            <div class="clearfix">
+                                <a class="icon_cart_title" onclick="location.href='<?php echo $product['href']; ?>';">
+                                    <?php echo $product['name-main']; ?>
+                                </a>
+                                <div class="icon_cart_rollover">
+                                    <a onclick="addToCartFly('<?php echo $ajaxcart; ?>', '<?php echo $product['product_id']; ?>');"></a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                </li>
+        <?php } ?>
+
+
+        </ul>
+
+    </div>
+  </div>
+</div>
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/category.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/category.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/category.tpl	(revision 6)
@@ -1,31 +1,31 @@
-<div class="box">
-  <div class="box-heading"><?php echo $heading_title; ?></div>
-  <div class="box-content">
-    <div class="box-category">
-      <ul>
-        <?php foreach ($categories as $category) { ?>
-        <li>
-          <?php if ($category['category_id'] == $category_id) { ?>
-          <a href="<?php echo $category['href']; ?>" class="active"><?php echo $category['name']; ?></a>
-          <?php } else { ?>
-          <a href="<?php echo $category['href']; ?>"><?php echo $category['name']; ?></a>
-          <?php } ?>
-          <?php if ($category['children']) { ?>
-          <ul>
-            <?php foreach ($category['children'] as $child) { ?>
-            <li>
-              <?php if ($child['category_id'] == $child_id) { ?>
-              <a href="<?php echo $child['href']; ?>" class="active"> - <?php echo $child['name']; ?></a>
-              <?php } else { ?>
-              <a href="<?php echo $child['href']; ?>"> - <?php echo $child['name']; ?></a>
-              <?php } ?>
-            </li>
-            <?php } ?>
-          </ul>
-          <?php } ?>
-        </li>
-        <?php } ?>
-      </ul>
-    </div>
-  </div>
-</div>
+<div class="box">
+  <div class="box-heading"><?php echo $heading_title; ?></div>
+  <div class="box-content">
+    <div class="box-category">
+      <ul>
+        <?php foreach ($categories as $category) { ?>
+        <li>
+          <?php if ($category['category_id'] == $category_id) { ?>
+          <a href="<?php echo $category['href']; ?>" class="active"><?php echo $category['name']; ?></a>
+          <?php } else { ?>
+          <a href="<?php echo $category['href']; ?>"><?php echo $category['name']; ?></a>
+          <?php } ?>
+          <?php if ($category['children']) { ?>
+          <ul>
+            <?php foreach ($category['children'] as $child) { ?>
+            <li>
+              <?php if ($child['category_id'] == $child_id) { ?>
+              <a href="<?php echo $child['href']; ?>" class="active"> - <?php echo $child['name']; ?></a>
+              <?php } else { ?>
+              <a href="<?php echo $child['href']; ?>"> - <?php echo $child['name']; ?></a>
+              <?php } ?>
+            </li>
+            <?php } ?>
+          </ul>
+          <?php } ?>
+        </li>
+        <?php } ?>
+      </ul>
+    </div>
+  </div>
+</div>
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_custom_product_box.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_custom_product_box.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_custom_product_box.tpl	(revision 6)
@@ -1,2 +1,2 @@
-<div class="dresscode_product_custom_block_title"><?php echo $heading_title; ?></div>
+<div class="dresscode_product_custom_block_title"><?php echo $heading_title; ?></div>
 <?php echo $message; ?>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/special.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/special.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/special.tpl	(revision 6)
@@ -1,28 +1,28 @@
-<div class="box">
-  <div class="box-heading"><?php echo $heading_title; ?></div>
-  <div class="box-content">
-    <div class="box-product">
-      <?php foreach ($products as $product) { ?>
-      <div>
-        <?php if ($product['thumb']) { ?>
-        <div class="image"><a href="<?php echo $product['href']; ?>"><img class="scale-with-grid" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" /></a></div>
-        <?php } ?>
-        <?php if ($product['price']) { ?>
-        <div class="price">
-          <?php if (!$product['special']) { ?>
-          <?php echo $product['price']; ?>
-          <?php } else { ?>
-          <span class="price-old"><?php echo $product['price']; ?></span> <span class="price-new"><?php echo $product['special']; ?></span>
-          <?php } ?>
-        </div>
-        <?php } ?>
-          <div class="name"><a href="<?php echo $product['href']; ?>"><?php echo $product['name']; ?></a></div>
-          <?php if ($product['rating']) { ?>
-        <div class="rating"><img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/stars-<?php echo $product['rating']; ?>.gif" alt="<?php echo $product['reviews']; ?>" /></div>
-        <?php } ?>
-        <div class="cart"><input type="button" value="<?php echo $button_cart; ?>" onclick="addToCart('<?php echo $product['product_id']; ?>');" class="button" /></div>
-      </div>
-      <?php } ?>
-    </div>
-  </div>
-</div>
+<div class="box">
+  <div class="box-heading"><?php echo $heading_title; ?></div>
+  <div class="box-content">
+    <div class="box-product">
+      <?php foreach ($products as $product) { ?>
+      <div>
+        <?php if ($product['thumb']) { ?>
+        <div class="image"><a href="<?php echo $product['href']; ?>"><img class="scale-with-grid" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" /></a></div>
+        <?php } ?>
+        <?php if ($product['price']) { ?>
+        <div class="price">
+          <?php if (!$product['special']) { ?>
+          <?php echo $product['price']; ?>
+          <?php } else { ?>
+          <span class="price-old"><?php echo $product['price']; ?></span> <span class="price-new"><?php echo $product['special']; ?></span>
+          <?php } ?>
+        </div>
+        <?php } ?>
+          <div class="name"><a href="<?php echo $product['href']; ?>"><?php echo $product['name']; ?></a></div>
+          <?php if ($product['rating']) { ?>
+        <div class="rating"><img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/stars-<?php echo $product['rating']; ?>.gif" alt="<?php echo $product['reviews']; ?>" /></div>
+        <?php } ?>
+        <div class="cart"><input type="button" value="<?php echo $button_cart; ?>" onclick="addToCart('<?php echo $product['product_id']; ?>');" class="button" /></div>
+      </div>
+      <?php } ?>
+    </div>
+  </div>
+</div>
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/language.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/language.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/language.tpl	(revision 6)
@@ -1,19 +1,19 @@
- <div id="language">
-            <?php //if (count($languages) > 1) { ?>
-                 <form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
-                     <div>
-                         <?php foreach ($languages as $language) { ?>
-                         <a onClick="$('input[name=\'language_code\']').attr('value', '<?php echo $language['code']; ?>').submit(); $(this).parent().parent().submit();">
-                            <img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/flags/<?php echo $language['image']; ?>" alt="<?php echo $language['name']; ?>" title="<?php echo $language['name']; ?>" />
-                         </a>
-                         <?php } ?>
-                         <input type="hidden" name="language_code" value="" />
-                         <input type="hidden" name="redirect" value="<?php echo $redirect; ?>" />
-                     </div>
-                 </form>
-            <?php //} ?>
-		 </div>
-
-
-
-
+ <div id="language">
+            <?php //if (count($languages) > 1) { ?>
+                 <form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
+                     <div>
+                         <?php foreach ($languages as $language) { ?>
+                         <a onClick="$('input[name=\'language_code\']').attr('value', '<?php echo $language['code']; ?>').submit(); $(this).parent().parent().submit();">
+                            <img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/flags/<?php echo $language['image']; ?>" alt="<?php echo $language['name']; ?>" title="<?php echo $language['name']; ?>" />
+                         </a>
+                         <?php } ?>
+                         <input type="hidden" name="language_code" value="" />
+                         <input type="hidden" name="redirect" value="<?php echo $redirect; ?>" />
+                     </div>
+                 </form>
+            <?php //} ?>
+		 </div>
+
+
+
+
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_latest.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_latest.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_latest.tpl	(revision 6)
@@ -1,68 +1,68 @@
-<div id="newproducts_slider">
-    <div id="carousel_newproducts" class="es-carousel-wrapper">
-        <div class="es-carousel container">
-            <ul>
-
-
-                <?php foreach ($products as $product) { ?>
-                <li class="four columns product">
-                    <?php if ($product['thumb']) { ?>
-                    <div class="product-image-wrapper">
-
-                        <?php if ( $sale !== 'disable') : ?>
-                        <span class="product_sticker sticker_sale sticker_onsale_<?php echo $saleposition; ?> <?php echo ($sale ? ($product['special'] ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
-                        <?php endif; ?>
-                        <?php if ( $video !== 'disable') : ?>
-                        <span class="product_sticker sticker_video sticker_video_<?php echo $videoposition; ?> <?php echo ($video ? (($product['youtube_video'][0] !== '') ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
-                        <?php endif; ?>
-
-                        <a class="img_conteiner" href="<?php echo $product['href']; ?>">
-                            <img class="scale-with-grid image-<?php echo $product['product_id']; ?>" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" />
-                            <?php if ($product['popup']) { ?>
-                                <div class="roll_over_img">
-                                    <img class="scale-with-grid" src="<?php echo $product['popup']; ?>" alt="<?php echo $product['name']; ?>" />
-                                </div>
-                            <?php } ?>
-                            <div class="product-image-wrapper-hover"></div>
-                        </a>
-                    </div>
-                    <?php } ?>
-
-
-                    <div class="wrapper-hover">
-                        <div class="product-price">
-                            <?php if ($product['price']) { ?>
-                            <div class="price">
-                                <?php if (!$product['special']) { ?>
-                                <span><?php echo $product['price']; ?></span>
-                                <?php } else { ?>
-                                <span class="price-old"><?php echo $product['price']; ?></span>
-                                <span class="price-new"><?php echo $product['special']; ?></span>
-                                <?php } ?>
-                            </div>
-                            <?php } ?>
-                        </div>
-
-                        <div class="product-name">
-                            <div class="clearfix">
-                                <a class="icon_cart_title" onclick="location.href='<?php echo $product['href']; ?>';">
-                                    <?php echo $product['name-main']; ?>
-                                </a>
-                                <div class="icon_cart_rollover">
-                                    <a onclick="addToCartFly('<?php echo $ajaxcart; ?>', '<?php echo $product['product_id']; ?>');"></a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-
-
-
-                </li>
-                <?php } ?>
-
-
-            </ul>
-        </div>
-  </div>
-</div>
+<div id="newproducts_slider">
+    <div id="carousel_newproducts" class="es-carousel-wrapper">
+        <div class="es-carousel container">
+            <ul>
+
+
+                <?php foreach ($products as $product) { ?>
+                <li class="four columns product">
+                    <?php if ($product['thumb']) { ?>
+                    <div class="product-image-wrapper">
+
+                        <?php if ( $sale !== 'disable') : ?>
+                        <span class="product_sticker sticker_sale sticker_onsale_<?php echo $saleposition; ?> <?php echo ($sale ? ($product['special'] ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
+                        <?php endif; ?>
+                        <?php if ( $video !== 'disable') : ?>
+                        <span class="product_sticker sticker_video sticker_video_<?php echo $videoposition; ?> <?php echo ($video ? (($product['youtube_video'][0] !== '') ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
+                        <?php endif; ?>
+
+                        <a class="img_conteiner" href="<?php echo $product['href']; ?>">
+                            <img class="scale-with-grid image-<?php echo $product['product_id']; ?>" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" />
+                            <?php if ($product['popup']) { ?>
+                                <div class="roll_over_img">
+                                    <img class="scale-with-grid" src="<?php echo $product['popup']; ?>" alt="<?php echo $product['name']; ?>" />
+                                </div>
+                            <?php } ?>
+                            <div class="product-image-wrapper-hover"></div>
+                        </a>
+                    </div>
+                    <?php } ?>
+
+
+                    <div class="wrapper-hover">
+                        <div class="product-price">
+                            <?php if ($product['price']) { ?>
+                            <div class="price">
+                                <?php if (!$product['special']) { ?>
+                                <span><?php echo $product['price']; ?></span>
+                                <?php } else { ?>
+                                <span class="price-old"><?php echo $product['price']; ?></span>
+                                <span class="price-new"><?php echo $product['special']; ?></span>
+                                <?php } ?>
+                            </div>
+                            <?php } ?>
+                        </div>
+
+                        <div class="product-name">
+                            <div class="clearfix">
+                                <a class="icon_cart_title" onclick="location.href='<?php echo $product['href']; ?>';">
+                                    <?php echo $product['name-main']; ?>
+                                </a>
+                                <div class="icon_cart_rollover">
+                                    <a onclick="addToCartFly('<?php echo $ajaxcart; ?>', '<?php echo $product['product_id']; ?>');"></a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+
+
+
+                </li>
+                <?php } ?>
+
+
+            </ul>
+        </div>
+  </div>
+</div>
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/currency.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/currency.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/currency.tpl	(revision 6)
@@ -1,23 +1,23 @@
-<?php if (count($currencies) > 1) { ?>
-<form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
-  <div id="currency">
-    <?php foreach ($currencies as $currency) { ?>
-    <?php if ($currency['code'] == $currency_code) { ?>
-    <?php if ($currency['symbol_left']) { ?>
-    <a title="<?php echo $currency['title']; ?>"><b><?php echo $currency['symbol_left']; ?></b></a>
-    <?php } else { ?>
-    <a title="<?php echo $currency['title']; ?>"><b><?php echo $currency['symbol_right']; ?></b></a>
-    <?php } ?>
-    <?php } else { ?>
-    <?php if ($currency['symbol_left']) { ?>
-    <a title="<?php echo $currency['title']; ?>" onclick="$('input[name=\'currency_code\']').attr('value', '<?php echo $currency['code']; ?>'); $(this).parent().parent().submit();"><span><?php echo $currency['symbol_left']; ?></span></a>
-    <?php } else { ?>
-    <a title="<?php echo $currency['title']; ?>" onclick="$('input[name=\'currency_code\']').attr('value', '<?php echo $currency['code']; ?>'); $(this).parent().parent().submit();"><span><?php echo $currency['symbol_right']; ?></span></a>
-    <?php } ?>
-    <?php } ?>
-    <?php } ?>
-    <input type="hidden" name="currency_code" value="" />
-    <input type="hidden" name="redirect" value="<?php echo $redirect; ?>" />
-  </div>
-</form>
-<?php } ?>
+<?php if (count($currencies) > 1) { ?>
+<form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
+  <div id="currency">
+    <?php foreach ($currencies as $currency) { ?>
+    <?php if ($currency['code'] == $currency_code) { ?>
+    <?php if ($currency['symbol_left']) { ?>
+    <a title="<?php echo $currency['title']; ?>"><b><?php echo $currency['symbol_left']; ?></b></a>
+    <?php } else { ?>
+    <a title="<?php echo $currency['title']; ?>"><b><?php echo $currency['symbol_right']; ?></b></a>
+    <?php } ?>
+    <?php } else { ?>
+    <?php if ($currency['symbol_left']) { ?>
+    <a title="<?php echo $currency['title']; ?>" onclick="$('input[name=\'currency_code\']').attr('value', '<?php echo $currency['code']; ?>'); $(this).parent().parent().submit();"><span><?php echo $currency['symbol_left']; ?></span></a>
+    <?php } else { ?>
+    <a title="<?php echo $currency['title']; ?>" onclick="$('input[name=\'currency_code\']').attr('value', '<?php echo $currency['code']; ?>'); $(this).parent().parent().submit();"><span><?php echo $currency['symbol_right']; ?></span></a>
+    <?php } ?>
+    <?php } ?>
+    <?php } ?>
+    <input type="hidden" name="currency_code" value="" />
+    <input type="hidden" name="redirect" value="<?php echo $redirect; ?>" />
+  </div>
+</form>
+<?php } ?>
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_featured.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_featured.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_featured.tpl	(revision 6)
@@ -1,57 +1,57 @@
-<div class="four columns alpha" id="deal">
-  <h3><?php echo $heading_title; ?></h3>
-    <div class="product" style="position: relative;">
-      <div class="product-image-wrapper">
-      <?php foreach ($products as $product) { ?>
-
-        <?php if ($product['thumb']) { ?>
-
-          <?php if ( $sale !== 'disable') : ?>
-          <span class="product_sticker sticker_sale sticker_onsale_<?php echo $saleposition; ?> <?php echo ($sale ? ($product['special'] ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
-          <?php endif; ?>
-          <?php if ( $video !== 'disable') : ?>
-          <span class="product_sticker sticker_video sticker_video_<?php echo $videoposition; ?> <?php echo ($video ? (($product['youtube_video'][0] !== '') ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
-          <?php endif; ?>
-
-          <a class="img_border" href="<?php echo $product['href']; ?>">
-                <img class="scale-with-grid image-<?php echo $product['product_id']; ?>" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" />
-                <div class="product-image-wrapper-hover"></div>
-            </a>
-
-          <?php } ?>
-
-
-          <table style="width: 100%" class="wrapper-hover-hidden">
-
-              <tr>
-                  <td>
-                      <div class="clearfix product-price">
-                          <?php if ($product['price']) { ?>
-                          <div class="price">
-                              <?php if (!$product['special']) { ?>
-                              <?php echo $product['price']; ?>
-                              <?php } else { ?>
-                              <s class="price-old"><?php echo $product['price']; ?></s> <span class="price-new"><?php echo $product['special']; ?></span>
-                              <?php } ?>
-                          </div>
-                          <?php } ?>
-                      </div>
-
-                      <div class="product-name">
-                          <div class="clearfix">
-                                <a class="icon_cart_title" href="<?php echo $product['href']; ?>"><?php echo $product['name-main']; ?></a>
-                               <div class="icon_cart_rollover">
-                                   <a onclick="addToCartFly('<?php echo $ajaxcart; ?>', '<?php echo $product['product_id']; ?>');"></a>
-                               </div>
-                          </div>
-                      </div>
-                  </td>
-              </tr>
-
-          </table>
-
-
-      <?php } ?>
-    </div>
-  </div>
-</div>
+<div class="four columns alpha" id="deal">
+  <h3><?php echo $heading_title; ?></h3>
+    <div class="product" style="position: relative;">
+      <div class="product-image-wrapper">
+      <?php foreach ($products as $product) { ?>
+
+        <?php if ($product['thumb']) { ?>
+
+          <?php if ( $sale !== 'disable') : ?>
+          <span class="product_sticker sticker_sale sticker_onsale_<?php echo $saleposition; ?> <?php echo ($sale ? ($product['special'] ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
+          <?php endif; ?>
+          <?php if ( $video !== 'disable') : ?>
+          <span class="product_sticker sticker_video sticker_video_<?php echo $videoposition; ?> <?php echo ($video ? (($product['youtube_video'][0] !== '') ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
+          <?php endif; ?>
+
+          <a class="img_border" href="<?php echo $product['href']; ?>">
+                <img class="scale-with-grid image-<?php echo $product['product_id']; ?>" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" />
+                <div class="product-image-wrapper-hover"></div>
+            </a>
+
+          <?php } ?>
+
+
+          <table style="width: 100%" class="wrapper-hover-hidden">
+
+              <tr>
+                  <td>
+                      <div class="clearfix product-price">
+                          <?php if ($product['price']) { ?>
+                          <div class="price">
+                              <?php if (!$product['special']) { ?>
+                              <?php echo $product['price']; ?>
+                              <?php } else { ?>
+                              <s class="price-old"><?php echo $product['price']; ?></s> <span class="price-new"><?php echo $product['special']; ?></span>
+                              <?php } ?>
+                          </div>
+                          <?php } ?>
+                      </div>
+
+                      <div class="product-name">
+                          <div class="clearfix">
+                                <a class="icon_cart_title" href="<?php echo $product['href']; ?>"><?php echo $product['name-main']; ?></a>
+                               <div class="icon_cart_rollover">
+                                   <a onclick="addToCartFly('<?php echo $ajaxcart; ?>', '<?php echo $product['product_id']; ?>');"></a>
+                               </div>
+                          </div>
+                      </div>
+                  </td>
+              </tr>
+
+          </table>
+
+
+      <?php } ?>
+    </div>
+  </div>
+</div>
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/account.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/account.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/account.tpl	(revision 6)
@@ -1,26 +1,26 @@
-<div class="box box-account">
-  <div class="box-heading"><?php echo $heading_title; ?></div>
-  <div class="box-content">
-    <ul>
-      <?php if (!$logged) { ?>
-      <li><a href="<?php echo $login; ?>"><?php echo $text_login; ?></a> / <a href="<?php echo $register; ?>"><?php echo $text_register; ?></a></li>
-      <li><a href="<?php echo $forgotten; ?>"><?php echo $text_forgotten; ?></a></li>
-      <?php } ?>
-      <li><a href="<?php echo $account; ?>"><?php echo $text_account; ?></a></li>
-      <?php if ($logged) { ?>
-      <li><a href="<?php echo $edit; ?>"><?php echo $text_edit; ?></a></li>
-      <li><a href="<?php echo $password; ?>"><?php echo $text_password; ?></a></li>
-      <?php } ?>
-      <li><a href="<?php echo $address; ?>"><?php echo $text_address; ?></a></li>
-      <li><a href="<?php echo $wishlist; ?>"><?php echo $text_wishlist; ?></a></li>
-      <li><a href="<?php echo $order; ?>"><?php echo $text_order; ?></a></li>
-      <li><a href="<?php echo $download; ?>"><?php echo $text_download; ?></a></li>
-      <li><a href="<?php echo $return; ?>"><?php echo $text_return; ?></a></li>
-      <li><a href="<?php echo $transaction; ?>"><?php echo $text_transaction; ?></a></li>
-      <li><a href="<?php echo $newsletter; ?>"><?php echo $text_newsletter; ?></a></li>
-      <?php if ($logged) { ?>
-      <li><a href="<?php echo $logout; ?>"><?php echo $text_logout; ?></a></li>
-      <?php } ?>
-    </ul>
-  </div>
-</div>
+<div class="box box-account">
+  <div class="box-heading"><?php echo $heading_title; ?></div>
+  <div class="box-content">
+    <ul>
+      <?php if (!$logged) { ?>
+      <li><a href="<?php echo $login; ?>"><?php echo $text_login; ?></a> / <a href="<?php echo $register; ?>"><?php echo $text_register; ?></a></li>
+      <li><a href="<?php echo $forgotten; ?>"><?php echo $text_forgotten; ?></a></li>
+      <?php } ?>
+      <li><a href="<?php echo $account; ?>"><?php echo $text_account; ?></a></li>
+      <?php if ($logged) { ?>
+      <li><a href="<?php echo $edit; ?>"><?php echo $text_edit; ?></a></li>
+      <li><a href="<?php echo $password; ?>"><?php echo $text_password; ?></a></li>
+      <?php } ?>
+      <li><a href="<?php echo $address; ?>"><?php echo $text_address; ?></a></li>
+      <li><a href="<?php echo $wishlist; ?>"><?php echo $text_wishlist; ?></a></li>
+      <li><a href="<?php echo $order; ?>"><?php echo $text_order; ?></a></li>
+      <li><a href="<?php echo $download; ?>"><?php echo $text_download; ?></a></li>
+      <li><a href="<?php echo $return; ?>"><?php echo $text_return; ?></a></li>
+      <li><a href="<?php echo $transaction; ?>"><?php echo $text_transaction; ?></a></li>
+      <li><a href="<?php echo $newsletter; ?>"><?php echo $text_newsletter; ?></a></li>
+      <?php if ($logged) { ?>
+      <li><a href="<?php echo $logout; ?>"><?php echo $text_logout; ?></a></li>
+      <?php } ?>
+    </ul>
+  </div>
+</div>
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/latest.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/latest.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/latest.tpl	(revision 6)
@@ -1,28 +1,29 @@
-<div class="box">
-  <div class="box-heading"><?php echo $heading_title; ?></div>
-  <div class="box-content">
-    <div class="box-product">
-      <?php foreach ($products as $product) { ?>
-      <div>
-        <?php if ($product['thumb']) { ?>
-        <div class="image"><a href="<?php echo $product['href']; ?>"><img class="scale-with-grid" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" /></a></div>
-        <?php } ?>
-        <?php if ($product['price']) { ?>
-        <div class="price">
-          <?php if (!$product['special']) { ?>
-          <?php echo $product['price']; ?>
-          <?php } else { ?>
-          <span class="price-old"><?php echo $product['price']; ?></span> <span class="price-new"><?php echo $product['special']; ?></span>
-          <?php } ?>
-        </div>
-        <?php } ?>
-          <div class="name"><a href="<?php echo $product['href']; ?>"><?php echo $product['name']; ?></a></div>
-          <?php if ($product['rating']) { ?>
-        <div class="rating"><img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/stars-<?php echo $product['rating']; ?>.gif" alt="<?php echo $product['reviews']; ?>" /></div>
-        <?php } ?>
-        <div class="cart"><input type="button" value="<?php echo $button_cart; ?>" onclick="addToCart('<?php echo $product['product_id']; ?>');" class="button" /></div>
-      </div>
-      <?php } ?>
-    </div>
-  </div>
-</div>
+<div class="box">
+  <div class="box-heading"><?php echo $heading_title; ?></div>
+  <div class="box-content">
+    <div class="box-product">
+      <?php foreach ($products as $product) { ?>
+      <div>
+        <?php if ($product['thumb']) { ?>
+        <div class="image"><a href="<?php echo $product['href']; ?>"><img class="scale-with-grid" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" /></a></div>
+        <?php } ?>
+
+        <?php if ($product['price']) { ?>
+        <div class="price">
+          <?php if (!$product['special']) { ?>
+          <?php echo $product['price']; ?>
+          <?php } else { ?>
+          <span class="price-old"><?php echo $product['price']; ?></span> <span class="price-new"><?php echo $product['special']; ?></span>
+          <?php } ?>
+        </div>
+        <?php } ?>
+          <div class="name"><a href="<?php echo $product['href']; ?>"><?php echo $product['name']; ?></a></div>
+          <?php if ($product['rating']) { ?>
+        <div class="rating"><img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/stars-<?php echo $product['rating']; ?>.gif" alt="<?php echo $product['reviews']; ?>" /></div>
+        <?php } ?>
+        <div class="cart"><input type="button" value="<?php echo $button_cart; ?>" onclick="addToCart('<?php echo $product['product_id']; ?>');" class="button" /></div>
+      </div>
+      <?php } ?>
+    </div>
+  </div>
+</div>
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/newslettersubscribe.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/newslettersubscribe.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/newslettersubscribe.tpl	(revision 6)
@@ -1,99 +1,99 @@
-  <div>
-  
-  <?php 
-   if($thickbox) { ?>
-	<a href="#frm_subscribe" title="Newsletter Subscribe" class="fancybox_sub"> <?php echo($text_subscribe); ?> </a>
-  <?php }  ?>
-  
-  <?php if($thickbox) { ?> 
-   	<div id="frm_subscribe_hidden"> 
-   <?php } ?>
-   
-  <div id="frm_subscribe">
-  <form name="subscribe" id="subscribe">
-
-      <div class="newsletter_footer_submit"><a class="button" onclick="email_subscribe()"></a></div>
-      <div class="input_bg"><input type="text" value="Newsletter sign up" name="subscribe_email" id="subscribe_email" onfocus="if(this.value=='Newsletter sign up'){this.value=''}" onblur="if(this.value==''){this.value='Newsletter sign up'}"></div>
-	<div style="display:none"><input type="text" value="" name="subscribe_name" id="subscribe_name"></div>
-   <?php 
-     for($ns=1;$ns<=$option_fields;$ns++) {
-     $ns_var= "option_fields".$ns;
-   ?>
-  
-   
-    <div>
-      <?php 
-       if($$ns_var!=""){
-         echo($$ns_var."&nbsp;<br/>");
-         echo('<input type="text" value="" name="option'.$ns.'" id="option'.$ns.'">');
-       }
-      ?>
-     </div>
-
-   <?php 
-     }
-   ?>
-   
-      <div id="subscribe_result"></div>
-
- 
-  </form>
-  </div>
-  <?php if($thickbox) { ?> </div> <?php } ?>
-  </div>
-
-
-<?php if(!$thickbox) { ?>
-  <script type="text/javascript">
-      function email_subscribe(){
-			$.ajax({
-					type: 'post',
-					url: 'index.php?route=module/newslettersubscribe/subscribe',
-					dataType: 'html',
-					data:$("#subscribe").serialize(),
-					success: function (html) {
-						eval(html);
-					}
-            });
-		}
-		function email_unsubscribe(){
-			$.ajax({
-					type: 'post',
-					url: 'index.php?route=module/newslettersubscribe/unsubscribe',
-					dataType: 'html',
-					data:$("#subscribe").serialize(),
-					success: function (html) {
-						eval(html);
-					}
-            });
-		}
-</script>
-
-<?php } else { ?>
-  <script language="javascript">
-      function email_subscribe(){
-			$.ajax({
-					type: 'post',
-					url: 'index.php?route=module/newslettersubscribe/subscribe',
-					dataType: 'html',
-					data:$("#subscribe").serialize(),
-					success: function (html) {
-						eval(html);
-					}
-            });
-	  }
-	  function email_unsubscribe(){
-			$.ajax({
-					type: 'post',
-					url: 'index.php?route=module/newslettersubscribe/unsubscribe',
-					dataType: 'html',
-					data:$("#subscribe").serialize(),
-					success: function (html) {
-						eval(html);
-					}
-            });
-	  }
-  </script>
-
-<?php } ?>
-
+  <div>
+  
+  <?php 
+   if($thickbox) { ?>
+	<a href="#frm_subscribe" title="Newsletter Subscribe" class="fancybox_sub"> <?php echo($text_subscribe); ?> </a>
+  <?php }  ?>
+  
+  <?php if($thickbox) { ?> 
+   	<div id="frm_subscribe_hidden"> 
+   <?php } ?>
+   
+  <div id="frm_subscribe">
+  <form name="subscribe" id="subscribe">
+
+      <div class="newsletter_footer_submit"><a class="button" onclick="email_subscribe()"></a></div>
+      <div class="input_bg"><input type="text" value="Newsletter sign up" name="subscribe_email" id="subscribe_email" onfocus="if(this.value=='Newsletter sign up'){this.value=''}" onblur="if(this.value==''){this.value='Newsletter sign up'}"></div>
+	<div style="display:none"><input type="text" value="" name="subscribe_name" id="subscribe_name"></div>
+   <?php 
+     for($ns=1;$ns<=$option_fields;$ns++) {
+     $ns_var= "option_fields".$ns;
+   ?>
+  
+   
+    <div>
+      <?php 
+       if($$ns_var!=""){
+         echo($$ns_var."&nbsp;<br/>");
+         echo('<input type="text" value="" name="option'.$ns.'" id="option'.$ns.'">');
+       }
+      ?>
+     </div>
+
+   <?php 
+     }
+   ?>
+   
+      <div id="subscribe_result"></div>
+
+ 
+  </form>
+  </div>
+  <?php if($thickbox) { ?> </div> <?php } ?>
+  </div>
+
+
+<?php if(!$thickbox) { ?>
+  <script type="text/javascript">
+      function email_subscribe(){
+			$.ajax({
+					type: 'post',
+					url: 'index.php?route=module/newslettersubscribe/subscribe',
+					dataType: 'html',
+					data:$("#subscribe").serialize(),
+					success: function (html) {
+						eval(html);
+					}
+            });
+		}
+		function email_unsubscribe(){
+			$.ajax({
+					type: 'post',
+					url: 'index.php?route=module/newslettersubscribe/unsubscribe',
+					dataType: 'html',
+					data:$("#subscribe").serialize(),
+					success: function (html) {
+						eval(html);
+					}
+            });
+		}
+</script>
+
+<?php } else { ?>
+  <script language="javascript">
+      function email_subscribe(){
+			$.ajax({
+					type: 'post',
+					url: 'index.php?route=module/newslettersubscribe/subscribe',
+					dataType: 'html',
+					data:$("#subscribe").serialize(),
+					success: function (html) {
+						eval(html);
+					}
+            });
+	  }
+	  function email_unsubscribe(){
+			$.ajax({
+					type: 'post',
+					url: 'index.php?route=module/newslettersubscribe/unsubscribe',
+					dataType: 'html',
+					data:$("#subscribe").serialize(),
+					success: function (html) {
+						eval(html);
+					}
+            });
+	  }
+  </script>
+
+<?php } ?>
+
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_bestseller.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_bestseller.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_bestseller.tpl	(revision 6)
@@ -1,74 +1,74 @@
-<div id="bestsellers_slider">
-
-    <div id="carousel_bestsellers" class="es-carousel-wrapper">
-
-        <div class="es-carousel container">
-
-            <ul>
-
-                <?php foreach ($products as $product) { ?>
-                    <li class="four columns product"   >
-                        <?php if ($product['thumb']) { ?>
-                            <div class="product-image-wrapper">
-
-                                <?php if ( $sale !== 'disable') : ?>
-                                <span class="product_sticker sticker_sale sticker_onsale_<?php echo $saleposition; ?> <?php echo ($sale ? ($product['special'] ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
-                                <?php endif; ?>
-                                <?php if ( $video !== 'disable') : ?>
-                                <span class="product_sticker sticker_video sticker_video_<?php echo $videoposition; ?> <?php echo ($video ? (($product['youtube_video'][0] !== '') ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
-                                <?php endif; ?>
-
-                                <a class="img_conteiner" href="<?php echo $product['href']; ?>">
-                                    <img class="scale-with-grid image-<?php echo $product['product_id']; ?>" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" />
-
-                                    <?php if ($product['popup']) { ?>
-                                        <div class="roll_over_img">
-                                            <img class="scale-with-grid" src="<?php echo $product['popup']; ?>" alt="<?php echo $product['name']; ?>" />
-                                        </div>
-                                    <?php } ?>
-
-                                    <div class="product-image-wrapper-hover"></div>
-                                </a>
-                            </div>
-                        <?php } ?>
-
-
-                        <div class="wrapper-hover">
-                            <div class="product-price">
-                                <?php if ($product['price']) { ?>
-                                <div class="price">
-                                    <?php if (!$product['special']) { ?>
-                                        <span><?php echo $product['price']; ?></span>
-                                    <?php } else { ?>
-                                    <span class="price-old"><?php echo $product['price']; ?></span>
-                                    <span class="price-new"><?php echo $product['special']; ?></span>
-                                    <?php } ?>
-                                </div>
-                                <?php } ?>
-                            </div>
-
-                            <div class="product-name">
-                                <div class="clearfix">
-                                    <a class="icon_cart_title" onclick="location.href='<?php echo $product['href']; ?>';">
-                                        <?php echo $product['name-main']; ?>
-                                    </a>
-                                    <div class="icon_cart_rollover">
-                                        <a onclick="addToCartFly('<?php echo $ajaxcart; ?>', '<?php echo $product['product_id']; ?>');"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-
-
-
-                    </li>
-                <?php } ?>
-
-            </ul>
-
-
-
-    </div>
-  </div>
-</div>
+<div id="bestsellers_slider">
+
+    <div id="carousel_bestsellers" class="es-carousel-wrapper">
+
+        <div class="es-carousel container">
+
+            <ul>
+
+                <?php foreach ($products as $product) { ?>
+                    <li class="four columns product"   >
+                        <?php if ($product['thumb']) { ?>
+                            <div class="product-image-wrapper">
+
+                                <?php if ( $sale !== 'disable') : ?>
+                                <span class="product_sticker sticker_sale sticker_onsale_<?php echo $saleposition; ?> <?php echo ($sale ? ($product['special'] ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
+                                <?php endif; ?>
+                                <?php if ( $video !== 'disable') : ?>
+                                <span class="product_sticker sticker_video sticker_video_<?php echo $videoposition; ?> <?php echo ($video ? (($product['youtube_video'][0] !== '') ? 'sticker_display' : 'sticker_display_none') : 'sticker_display_none'); ?>"></span>
+                                <?php endif; ?>
+
+                                <a class="img_conteiner" href="<?php echo $product['href']; ?>">
+                                    <img class="scale-with-grid image-<?php echo $product['product_id']; ?>" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" />
+
+                                    <?php if ($product['popup']) { ?>
+                                        <div class="roll_over_img">
+                                            <img class="scale-with-grid" src="<?php echo $product['popup']; ?>" alt="<?php echo $product['name']; ?>" />
+                                        </div>
+                                    <?php } ?>
+
+                                    <div class="product-image-wrapper-hover"></div>
+                                </a>
+                            </div>
+                        <?php } ?>
+
+
+                        <div class="wrapper-hover">
+                            <div class="product-price">
+                                <?php if ($product['price']) { ?>
+                                <div class="price">
+                                    <?php if (!$product['special']) { ?>
+                                        <span><?php echo $product['price']; ?></span>
+                                    <?php } else { ?>
+                                    <span class="price-old"><?php echo $product['price']; ?></span>
+                                    <span class="price-new"><?php echo $product['special']; ?></span>
+                                    <?php } ?>
+                                </div>
+                                <?php } ?>
+                            </div>
+
+                            <div class="product-name">
+                                <div class="clearfix">
+                                    <a class="icon_cart_title" onclick="location.href='<?php echo $product['href']; ?>';">
+                                        <?php echo $product['name-main']; ?>
+                                    </a>
+                                    <div class="icon_cart_rollover">
+                                        <a onclick="addToCartFly('<?php echo $ajaxcart; ?>', '<?php echo $product['product_id']; ?>');"></a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+
+
+
+                    </li>
+                <?php } ?>
+
+            </ul>
+
+
+
+    </div>
+  </div>
+</div>
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/featured.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/featured.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/featured.tpl	(revision 6)
@@ -1,29 +1,29 @@
-<div class="box">
-  <div class="box-heading"><?php echo $heading_title; ?></div>
-  <div class="box-content">
-    <div class="box-product">
-      <?php foreach ($products as $product) { ?>
-      <div>
-        <?php if ($product['thumb']) { ?>
-        <div class="image"><a href="<?php echo $product['href']; ?>"><img class="scale-with-grid" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" /></a></div>
-        <?php } ?>
-
-        <?php if ($product['price']) { ?>
-        <div class="price">
-          <?php if (!$product['special']) { ?>
-          <?php echo $product['price']; ?>
-          <?php } else { ?>
-          <span class="price-old"><?php echo $product['price']; ?></span> <span class="price-new"><?php echo $product['special']; ?></span>
-          <?php } ?>
-        </div>
-        <?php } ?>
-          <div class="name"><a href="<?php echo $product['href']; ?>"><?php echo $product['name']; ?></a></div>
-          <?php if ($product['rating']) { ?>
-        <div class="rating"><img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/stars-<?php echo $product['rating']; ?>.gif" alt="<?php echo $product['reviews']; ?>" /></div>
-        <?php } ?>
-        <div class="cart"><input type="button" value="<?php echo $button_cart; ?>" onclick="addToCart('<?php echo $product['product_id']; ?>');" class="button" /></div>
-      </div>
-      <?php } ?>
-    </div>
-  </div>
-</div>
+<div class="box">
+  <div class="box-heading"><?php echo $heading_title; ?></div>
+  <div class="box-content">
+    <div class="box-product">
+      <?php foreach ($products as $product) { ?>
+      <div>
+        <?php if ($product['thumb']) { ?>
+        <div class="image"><a href="<?php echo $product['href']; ?>"><img class="scale-with-grid" src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" /></a></div>
+        <?php } ?>
+
+        <?php if ($product['price']) { ?>
+        <div class="price">
+          <?php if (!$product['special']) { ?>
+          <?php echo $product['price']; ?>
+          <?php } else { ?>
+          <span class="price-old"><?php echo $product['price']; ?></span> <span class="price-new"><?php echo $product['special']; ?></span>
+          <?php } ?>
+        </div>
+        <?php } ?>
+          <div class="name"><a href="<?php echo $product['href']; ?>"><?php echo $product['name']; ?></a></div>
+          <?php if ($product['rating']) { ?>
+        <div class="rating"><img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/stars-<?php echo $product['rating']; ?>.gif" alt="<?php echo $product['reviews']; ?>" /></div>
+        <?php } ?>
+        <div class="cart"><input type="button" value="<?php echo $button_cart; ?>" onclick="addToCart('<?php echo $product['product_id']; ?>');" class="button" /></div>
+      </div>
+      <?php } ?>
+    </div>
+  </div>
+</div>
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_banner.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_banner.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_banner.tpl	(revision 6)
@@ -1,30 +1,30 @@
-<div id="slider_top">
-    <ul class="rslides" id="carousel1">
-    <?php
-        $i = 0;
-        while ($i < count($banners)) {
-    ?>
-        <li>
-            <div class="overlap_widget_wrapper">
-                <?php for ($j = $i; $j < $i + 2; $j++) { ?>
-                    <div class="<?php echo (($j%2 == 0) ? 'left' : 'right'); ?>_image">
-                        <div class="placeholder">
-                            <?php if ($banners[$j]['link']) { ?>
-                            <a href="<?php echo $banners[$j]['link']; ?>">
-                                <img class="scale-with-grid" src="<?php echo $banners[$j]['image']; ?>" alt="<?php echo $banners[$j]['title']; ?>" title="<?php echo $banners[$j]['title']; ?>" />
-                            </a>
-                            <?php } else { ?>
-                                <img class="scale-with-grid" src="<?php echo $banners[$j]['image']; ?>" alt="<?php echo $banners[$j]['title']; ?>" title="<?php echo $banners[$j]['title']; ?>" />
-                            <?php } ?>
-                        </div>
-                    </div>
-                <?php } $i = $i + 2; ?>
-                    <div class="clear"></div>
-            </div>
-        </li>
-    <?php
-        }
-    ?>
-    </ul>
-</div>
-
+<div id="slider_top">
+    <ul class="rslides" id="carousel1">
+    <?php
+        $i = 0;
+        while ($i < count($banners)) {
+    ?>
+        <li>
+            <div class="overlap_widget_wrapper">
+                <?php for ($j = $i; $j < $i + 2; $j++) { ?>
+                    <div class="<?php echo (($j%2 == 0) ? 'left' : 'right'); ?>_image">
+                        <div class="placeholder">
+                            <?php if ($banners[$j]['link']) { ?>
+                            <a href="<?php echo $banners[$j]['link']; ?>">
+                                <img class="scale-with-grid" src="<?php echo $banners[$j]['image']; ?>" alt="<?php echo $banners[$j]['title']; ?>" title="<?php echo $banners[$j]['title']; ?>" />
+                            </a>
+                            <?php } else { ?>
+                                <img class="scale-with-grid" src="<?php echo $banners[$j]['image']; ?>" alt="<?php echo $banners[$j]['title']; ?>" title="<?php echo $banners[$j]['title']; ?>" />
+                            <?php } ?>
+                        </div>
+                    </div>
+                <?php } $i = $i + 2; ?>
+                    <div class="clear"></div>
+            </div>
+        </li>
+    <?php
+        }
+    ?>
+    </ul>
+</div>
+
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_custom_menu_box.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_custom_menu_box.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/module/dresscode_custom_menu_box.tpl	(revision 6)
@@ -1,15 +1,15 @@
-<li id="menu_custom_title">
-    <a href="#"><?php echo $heading_title; ?></a>
-    <div id="menu_custom_block">
-        <?php
-            if ($message !== '') {
-                echo $message;
-            } else {
-                echo 'Your text here!';
-            }
-        ?>
-    </div>
-</li>
-
-
-
+<li id="menu_custom_title">
+    <a href="#"><?php echo $heading_title; ?></a>
+    <div id="menu_custom_block">
+        <?php
+            if ($message !== '') {
+                echo $message;
+            } else {
+                echo 'Your text here!';
+            }
+        ?>
+    </div>
+</li>
+
+
+
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/content_footer.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/content_footer.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/content_footer.tpl	(revision 6)
@@ -1,3 +1,3 @@
-<?php foreach ($modules as $module) { ?>
-   <?php echo $module; ?>
+<?php foreach ($modules as $module) { ?>
+   <?php echo $module; ?>
 <?php } ?>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/header.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/header.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/header.tpl	(revision 6)
@@ -1,340 +1,340 @@
-<!DOCTYPE html>
-<html dir="<?php echo $direction; ?>" lang="<?php echo $lang; ?>">
-<head>
-<meta charset="UTF-8" />
-<title><?php echo $title; ?></title>
-
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-
-    <base href="<?php echo $base; ?>" />
-<?php if ($description) { ?>
-<meta name="description" content="<?php echo $description; ?>" />
-<?php } ?>
-<?php if ($keywords) { ?>
-<meta name="keywords" content="<?php echo $keywords; ?>" />
-<?php } ?>
-<?php if ($icon) { ?>
-<link href="<?php echo $icon; ?>" rel="icon" />
-<?php } ?>
-<?php foreach ($links as $link) { ?>
-<link href="<?php echo $link['href']; ?>" rel="<?php echo $link['rel']; ?>" />
-<?php } ?>
-<?php foreach ($styles as $style) { ?>
-<link rel="<?php echo $style['rel']; ?>" type="text/css" href="<?php echo $style['href']; ?>" media="<?php echo $style['media']; ?>" />
-<?php } ?>
-
-
-
-<link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/base.css" />
-<link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/skeleton.css" />
-
-<link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/stylesheet.css" />
-<link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/dresscode.css" />
-<link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/sliders_styles.css" />
-
-<!-- Responsibility switching -->
-<?php if ( $response !== 'disable') { ?>
-    <link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/layout.css" />
-<?php } else { ?>
-    <link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/layout-response-off.css" />
-<?php } ?>
-<!-- Responsibility switching -->
-
-<link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/effects.css" />
-
-
-<script type="text/javascript" src="catalog/view/javascript/jquery/jquery-1.7.1.min.js"></script>
-<script type="text/javascript" src="catalog/view/javascript/jquery/ui/jquery-ui-1.8.16.custom.min.js"></script>
-<link rel="stylesheet" type="text/css" href="catalog/view/javascript/jquery/ui/themes/ui-lightness/jquery-ui-1.8.16.custom.css" />
-<script type="text/javascript" src="catalog/view/javascript/jquery/ui/external/jquery.cookie.js"></script>
-<script type="text/javascript" src="catalog/view/javascript/jquery/colorbox/jquery.colorbox.js"></script>
-<link rel="stylesheet" type="text/css" href="catalog/view/javascript/jquery/colorbox/colorbox.css" media="screen" />
-<script type="text/javascript" src="catalog/view/javascript/jquery/tabs.js"></script>
-<script type="text/javascript" src="catalog/view/javascript/common.js"></script>
-<?php foreach ($scripts as $script) { ?>
-<script type="text/javascript" src="<?php echo $script; ?>"></script>
-<?php } ?>
-
-
-    <script type="text/javascript" src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/js/cloud-zoom.1.0.2.js"></script>
-
-<script type="text/javascript" src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/js/jquery.selectbox-0.2.js"></script>
-
-    <script type="text/javascript" src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/js/jquery.jcarousel.min.js"></script>
-
-    <script type="text/javascript" src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/js/jquery.elastislide.js"></script>
-
-    <script type="text/javascript" src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/js/AC_RunActiveContent.js"></script>
-
-
-
-    <script type="text/javascript" src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/js/jcloud.js"></script>
-
-
-    <script type="text/javascript" src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/js/custom.js"></script>
-    <!--[if !IE]><!-->
-    <script>if(/*@cc_on!@*/false){document.documentElement.className+='ie10';}</script>
-    <!--<![endif]-->
-
-
-
-    <link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
-    <link href='http://fonts.googleapis.com/css?family=<?php echo str_replace(' ', '+', $font); ?>:200,300,400,500,600,700,800' rel='stylesheet' type='text/css'>
-
-
-
-    <!--[if IE 7]>
-<link rel="stylesheet" type="text/css" href="catalog/view/theme/default/stylesheet/ie7.css" />
-<![endif]-->
-<!--[if lt IE 7]>
-<link rel="stylesheet" type="text/css" href="catalog/view/theme/default/stylesheet/ie6.css" />
-<script type="text/javascript" src="catalog/view/javascript/DD_belatedPNG_0.0.8a-min.js"></script>
-<script type="text/javascript">
-DD_belatedPNG.fix('#logo img');
-</script>
-<![endif]-->
-<?php if ($stores) { ?>
-<script type="text/javascript"><!--
-$(document).ready(function() {
-<?php foreach ($stores as $store) { ?>
-$('body').prepend('<iframe src="<?php echo $store; ?>" style="display: none;"></iframe>');
-<?php } ?>
-});
-//--></script>
-<?php } ?>
-<!--[if IE 8]>
-<link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/ie8.css" />
-<![endif]-->
-<!--[if IE 9]>
-<link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/ie9.css" />
-<![endif]-->
-
-
-<!-- changing options from admin panel  -->
-
-<style type="text/css">
-
-       /* font family */
-<?php if ( !empty($font) ) : ?>
-        h1, h2, h3, h4, h5, h6,
-        .phone,
-        #slogan li a,
-        .tabs div a, .box .box-heading,
-        .product-list .name a,
-        .product-info .price-bottom-box .regular-price,
-        .product-info .price-bottom-box .special-price-box{
-            font-family: <?php echo $font; ?>
-        }
-<?php endif; ?>
-       /* body bg pattern */
-<?php if ( !empty($bgpattern) && ($bgpattern !== '0') ) : ?>
-        body{
-           background-image: url("catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/dresscode_images/bg-patterns/<?php echo $bgpattern; ?>");
-         }
-<?php endif; ?>
-
-        /* theme color */
-<?php if ( !empty($themecolor)) : ?>
-    #header .button-search,
-    #footer_button,
-    .newsletter_footer a.button,
-    .es-nav span,
-    #header #cart .content .checkout a,
-    #menu > ul > li:hover > a {
-       background-color: <?php echo $themecolor; ?>
-    }
-
-    #menu > ul > li > div{
-        border-top: 3px solid <?php echo $themecolor; ?>;
-    }
-    input.button, a.button, .product-list .listing_cart input{
-        background-color: <?php echo $themecolor; ?>
-    }
-    input.button:hover, a.button:hover, .product-list .listing_cart input:hover{
-        background: <?php echo $themecolor; ?>
-    }
-
-    <?php endif; ?>
-
-        /* content bg color */
-<?php if ( !empty($contentbgcolor)) : ?>
-    body{
-      background-color: <?php echo $contentbgcolor; ?>
-    }
-<?php endif; ?>
-
-       /* font color */
-<?php if ( !empty($fontcolor)) : ?>
-    h1, h2, h3, h4, h5, h6, .phone, #nav_first .nav_block_dropdown a, .shopping_cart span.cart_link, .shopping_cart span em, #select_top .sbOptions a:link, #select_top .sbOptions a:visited, #slogan li a, .tabs div a, #footer h3, #footer_higher h3, #footer li a, #powered, #footer_higher_content #deal, #footer_higher_content #contact, #footer_higher_content #twitter, #footer_higher_content #facebook, #footer_higher_content #contact a, #header input[type="text"], #menu > ul > li > div > ul > li > a, .breadcrumb a, #content h1, h1.listing_title, .category-info, .box-category > ul > li > a, .box .box-content a, .category-list ul li a, .product-filter, .product-filter a, .pagination .results, .htabs a, .htabs a.selected, .product-page-content .left_info, .product-info .add-to-links a, .product-info .price-bottom-box .regular-price, .product-page-content .dresscode_product_custom_block_subtitle, .custom_block_items .custom_block_item, .product-info .gallery_note, .product-page-content .sixteen.columns.alpha > div, .product-info .review .review-stars p.no-rating a, .tab-content, .tags, .tags a, .attribute thead td, .attribute thead tr td:first-child, .attribute tr td:first-child, .attribute td{
-       color: <?php echo $fontcolor; ?>
-}
-<?php endif; ?>
-
-
-       /* product rollover disable */
-<?php if ( $productrollover == 'disable') : ?>
-    .roll_over_img{
-        display: none!important;
-}
-<?php endif; ?>
-
-</style>
-<!-- changing options from admin panel  -->
-
-<?php echo $google_analytics; ?>
-</head>
-<body>
-
-
-<?php if(!empty($this->request->get['route']) && $this->request->get['route'] != 'common/home') { ?>
- <div class="main_page">
-<?php } ?>
-
-<div id="container">
-    <div id="header">
-        <div class="container">
-                <?php if ($logo) { ?>
-                    <div id="logo" class="five columns"><a href="<?php echo $home; ?>"><img class="scale-with-grid" src="<?php echo $logo; ?>" title="<?php echo $name; ?>" alt="<?php echo $name; ?>" /></a></div>
-                <?php } ?>
-
-                <div id="top_link" class="eleven columns">
-
-                <div class="row padding-2">
-                    <div class="phone">
-                        <?php echo $text_phone_number; ?>
-                    </div>
-                    <?php echo $language; ?>
-                    <?php echo $currency; ?>
-                    <?php echo $cart; ?>
-
-                </div>
-                <div class="row">
-
-                    <div id="nav_first">
-                        <div id="nav_block_head">
-                            <div class="nav_block_head_field"><?php echo $text_service_tools; ?></div>
-                            <span class="nav_block_head_button"> </span>
-                            <div class="clear"></div>
-                        </div>
-                        <div class="nav_block_dropdown">
-                            <ul class="links">
-                                <li><a href="<?php echo $account; ?>"><?php echo $text_account; ?></a></li>
-                                <li><a href="<?php echo $wishlist; ?>" id="wishlist-total"><?php echo $text_wishlist; ?></a></li>
-                                <li><a href="<?php echo $shopping_cart; ?>"><?php echo $text_shopping_cart; ?></a></li>
-                                <li><a href="<?php echo $checkout; ?>"><?php echo $text_checkout; ?></a></li>
-                                <li class="last">
-                                    <?php if (!$logged) { ?>
-                                        <?php echo $text_welcome_dresscode; ?>
-                                    <?php } else { ?>
-                                        <?php echo $text_logged_dresscode; ?>
-                                    <?php } ?>
-                                </li>
-                            </ul>
-
-                        </div>
-                    </div>
-
-
-
-                    <div id="select_top" class="select_wrapper">
-                        <select name="select1" id="select1" tabindex="1">
-                            <option value="<?php echo $text_option_1; ?>"><?php echo $text_option_1; ?></option>
-                            <option value="<?php echo $text_option_2; ?>"><?php echo $text_option_2; ?></option>
-                        </select>
-
-
-                        <div id="search_dresscode">
-                            <div id="search">
-                                <input id="search_input" type="text" onclick="this.value = '';" name="search" value="<?php echo $text_search; ?>" />
-                            </div>
-                            <div class="button-search"></div>
-                        </div>
-
-                    </div>
-
-
-
-                </div>
-
-
-        </div>
-
-    </div>
-
-
-<?php if ($categories) { ?>
-   <div class="nav-container">
-       <div class="container">
-            <div class="sixteen columns">
-
-                <div id="menu_block_head">
-                    <div class="nav_block_head_field"><?php echo $text_choose_category; ?></div>
-                    <span class="menu_block_head_button"> </span>
-                    <div class="clear"></div>
-                </div>
-
-                <div class="menu_block_dropdown">
-
-                        <div id="menu">
-                            <ul id="nav">
-                                <li class="img_link_wrapper"><a class="image-link" href="<?php echo $home; ?>"></a></li>
-                                <?php foreach ($categories as $category) { ?>
-
-                                    <li>
-                                        <a href="<?php echo $category['href']; ?>"><?php echo $category['name']; ?></a>
-                                        <?php if ($category['children']) { ?>
-                                        <div class="<?php echo ($category['description'] ? 'with_descr' : 'none_descr'); ?> width-<?php echo $category['column']; ?>">
-                                            <?php for ($i = 0; $i < count($category['children']);) { ?>
-                                            <ul class="<?php echo (($category['column']>1) ? 'list' : 'grid'); ?>">
-                                            <?php
-                                                    if ($category['description']) {
-                                                        $j = $i + ceil(count($category['children']) / 1);
-                                                    } else {
-                                                        $j = $i + ceil(count($category['children']) / $category['column']);
-                                                    }
-                                                  ?>
-                                                  <?php for (; $i < $j; $i++) { ?>
-                                                  <?php if (isset($category['children'][$i])) { ?>
-                                                  <li><a href="<?php echo $category['children'][$i]['href']; ?>"><?php echo $category['children'][$i]['name']; ?></a></li>
-                                                  <?php } ?>
-                                                  <?php } ?>
-                                                </ul>
-                                            <?php } ?>
-
-                                            <?php if ($category['description']) { ?>
-                                                <div class="category_description_block">
-                                                    <?php echo $category['description']; ?>
-                                                </div>
-                                            <?php } ?>
-                                        </div>
-                                        <?php } ?>
-                                    </li>
-                                <?php } ?>
-
-                                <!-- menu custom block -->
-                                <?php echo $custom_menu; ?>
-                                <!-- menu custom block -->
-
-                            </ul>
-                        </div>
-
-
-
-
-
-                </div>
-           </div>
-       </div>
-   </div>
-
-
-<?php } ?>
-</div>
-
-    <div class="container">
-        <div class="sixteen columns">
-            <div id="notification"></div>
-        </div>
-    </div>
-
-    <div class="<?php echo (!empty($this->request->get['route']) && $this->request->get['route'] != 'common/home') ? 'container all_pages' : 'base_page'; ?>">
+<!DOCTYPE html>
+<html dir="<?php echo $direction; ?>" lang="<?php echo $lang; ?>">
+<head>
+<meta charset="UTF-8" />
+<title><?php echo $title; ?></title>
+
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+
+    <base href="<?php echo $base; ?>" />
+<?php if ($description) { ?>
+<meta name="description" content="<?php echo $description; ?>" />
+<?php } ?>
+<?php if ($keywords) { ?>
+<meta name="keywords" content="<?php echo $keywords; ?>" />
+<?php } ?>
+<?php if ($icon) { ?>
+<link href="<?php echo $icon; ?>" rel="icon" />
+<?php } ?>
+<?php foreach ($links as $link) { ?>
+<link href="<?php echo $link['href']; ?>" rel="<?php echo $link['rel']; ?>" />
+<?php } ?>
+<?php foreach ($styles as $style) { ?>
+<link rel="<?php echo $style['rel']; ?>" type="text/css" href="<?php echo $style['href']; ?>" media="<?php echo $style['media']; ?>" />
+<?php } ?>
+
+
+
+<link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/base.css" />
+<link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/skeleton.css" />
+
+<link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/stylesheet.css" />
+<link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/dresscode.css" />
+<link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/sliders_styles.css" />
+
+<!-- Responsibility switching -->
+<?php if ( $response !== 'disable') { ?>
+    <link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/layout.css" />
+<?php } else { ?>
+    <link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/layout-response-off.css" />
+<?php } ?>
+<!-- Responsibility switching -->
+
+<link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/effects.css" />
+
+
+<script type="text/javascript" src="catalog/view/javascript/jquery/jquery-1.7.1.min.js"></script>
+<script type="text/javascript" src="catalog/view/javascript/jquery/ui/jquery-ui-1.8.16.custom.min.js"></script>
+<link rel="stylesheet" type="text/css" href="catalog/view/javascript/jquery/ui/themes/ui-lightness/jquery-ui-1.8.16.custom.css" />
+<script type="text/javascript" src="catalog/view/javascript/jquery/ui/external/jquery.cookie.js"></script>
+<script type="text/javascript" src="catalog/view/javascript/jquery/colorbox/jquery.colorbox.js"></script>
+<link rel="stylesheet" type="text/css" href="catalog/view/javascript/jquery/colorbox/colorbox.css" media="screen" />
+<script type="text/javascript" src="catalog/view/javascript/jquery/tabs.js"></script>
+<script type="text/javascript" src="catalog/view/javascript/common.js"></script>
+<?php foreach ($scripts as $script) { ?>
+<script type="text/javascript" src="<?php echo $script; ?>"></script>
+<?php } ?>
+
+
+    <script type="text/javascript" src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/js/cloud-zoom.1.0.2.js"></script>
+
+<script type="text/javascript" src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/js/jquery.selectbox-0.2.js"></script>
+
+    <script type="text/javascript" src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/js/jquery.jcarousel.min.js"></script>
+
+    <script type="text/javascript" src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/js/jquery.elastislide.js"></script>
+
+    <script type="text/javascript" src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/js/AC_RunActiveContent.js"></script>
+
+
+
+    <script type="text/javascript" src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/js/jcloud.js"></script>
+
+
+    <script type="text/javascript" src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/js/custom.js"></script>
+    <!--[if !IE]><!-->
+    <script>if(/*@cc_on!@*/false){document.documentElement.className+='ie10';}</script>
+    <!--<![endif]-->
+
+
+
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+    <link href='http://fonts.googleapis.com/css?family=<?php echo str_replace(' ', '+', $font); ?>:200,300,400,500,600,700,800' rel='stylesheet' type='text/css'>
+
+
+
+    <!--[if IE 7]>
+<link rel="stylesheet" type="text/css" href="catalog/view/theme/default/stylesheet/ie7.css" />
+<![endif]-->
+<!--[if lt IE 7]>
+<link rel="stylesheet" type="text/css" href="catalog/view/theme/default/stylesheet/ie6.css" />
+<script type="text/javascript" src="catalog/view/javascript/DD_belatedPNG_0.0.8a-min.js"></script>
+<script type="text/javascript">
+DD_belatedPNG.fix('#logo img');
+</script>
+<![endif]-->
+<?php if ($stores) { ?>
+<script type="text/javascript"><!--
+$(document).ready(function() {
+<?php foreach ($stores as $store) { ?>
+$('body').prepend('<iframe src="<?php echo $store; ?>" style="display: none;"></iframe>');
+<?php } ?>
+});
+//--></script>
+<?php } ?>
+<!--[if IE 8]>
+<link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/ie8.css" />
+<![endif]-->
+<!--[if IE 9]>
+<link rel="stylesheet" type="text/css" href="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/stylesheet/ie9.css" />
+<![endif]-->
+
+
+<!-- changing options from admin panel  -->
+
+<style type="text/css">
+
+       /* font family */
+<?php if ( !empty($font) ) : ?>
+        h1, h2, h3, h4, h5, h6,
+        .phone,
+        #slogan li a,
+        .tabs div a, .box .box-heading,
+        .product-list .name a,
+        .product-info .price-bottom-box .regular-price,
+        .product-info .price-bottom-box .special-price-box{
+            font-family: <?php echo $font; ?>
+        }
+<?php endif; ?>
+       /* body bg pattern */
+<?php if ( !empty($bgpattern) && ($bgpattern !== '0') ) : ?>
+        body{
+           background-image: url("catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/dresscode_images/bg-patterns/<?php echo $bgpattern; ?>");
+         }
+<?php endif; ?>
+
+        /* theme color */
+<?php if ( !empty($themecolor)) : ?>
+    #header .button-search,
+    #footer_button,
+    .newsletter_footer a.button,
+    .es-nav span,
+    #header #cart .content .checkout a,
+    #menu > ul > li:hover > a {
+       background-color: <?php echo $themecolor; ?>
+    }
+
+    #menu > ul > li > div{
+        border-top: 3px solid <?php echo $themecolor; ?>;
+    }
+    input.button, a.button, .product-list .listing_cart input{
+        background-color: <?php echo $themecolor; ?>
+    }
+    input.button:hover, a.button:hover, .product-list .listing_cart input:hover{
+        background: <?php echo $themecolor; ?>
+    }
+
+    <?php endif; ?>
+
+        /* content bg color */
+<?php if ( !empty($contentbgcolor)) : ?>
+    body{
+      background-color: <?php echo $contentbgcolor; ?>
+    }
+<?php endif; ?>
+
+       /* font color */
+<?php if ( !empty($fontcolor)) : ?>
+    h1, h2, h3, h4, h5, h6, .phone, #nav_first .nav_block_dropdown a, .shopping_cart span.cart_link, .shopping_cart span em, #select_top .sbOptions a:link, #select_top .sbOptions a:visited, #slogan li a, .tabs div a, #footer h3, #footer_higher h3, #footer li a, #powered, #footer_higher_content #deal, #footer_higher_content #contact, #footer_higher_content #twitter, #footer_higher_content #facebook, #footer_higher_content #contact a, #header input[type="text"], #menu > ul > li > div > ul > li > a, .breadcrumb a, #content h1, h1.listing_title, .category-info, .box-category > ul > li > a, .box .box-content a, .category-list ul li a, .product-filter, .product-filter a, .pagination .results, .htabs a, .htabs a.selected, .product-page-content .left_info, .product-info .add-to-links a, .product-info .price-bottom-box .regular-price, .product-page-content .dresscode_product_custom_block_subtitle, .custom_block_items .custom_block_item, .product-info .gallery_note, .product-page-content .sixteen.columns.alpha > div, .product-info .review .review-stars p.no-rating a, .tab-content, .tags, .tags a, .attribute thead td, .attribute thead tr td:first-child, .attribute tr td:first-child, .attribute td{
+       color: <?php echo $fontcolor; ?>
+}
+<?php endif; ?>
+
+
+       /* product rollover disable */
+<?php if ( $productrollover == 'disable') : ?>
+    .roll_over_img{
+        display: none!important;
+}
+<?php endif; ?>
+
+</style>
+<!-- changing options from admin panel  -->
+
+<?php echo $google_analytics; ?>
+</head>
+<body>
+
+
+<?php if(!empty($this->request->get['route']) && $this->request->get['route'] != 'common/home') { ?>
+ <div class="main_page">
+<?php } ?>
+
+<div id="container">
+    <div id="header">
+        <div class="container">
+                <?php if ($logo) { ?>
+                    <div id="logo" class="five columns"><a href="<?php echo $home; ?>"><img class="scale-with-grid" src="<?php echo $logo; ?>" title="<?php echo $name; ?>" alt="<?php echo $name; ?>" /></a></div>
+                <?php } ?>
+
+                <div id="top_link" class="eleven columns">
+
+                <div class="row padding-2">
+                    <div class="phone">
+                        <?php echo $text_phone_number; ?>
+                    </div>
+                    <?php echo $language; ?>
+                    <?php echo $currency; ?>
+                    <?php echo $cart; ?>
+
+                </div>
+                <div class="row">
+
+                    <div id="nav_first">
+                        <div id="nav_block_head">
+                            <div class="nav_block_head_field"><?php echo $text_service_tools; ?></div>
+                            <span class="nav_block_head_button"> </span>
+                            <div class="clear"></div>
+                        </div>
+                        <div class="nav_block_dropdown">
+                            <ul class="links">
+                                <li><a href="<?php echo $account; ?>"><?php echo $text_account; ?></a></li>
+                                <li><a href="<?php echo $wishlist; ?>" id="wishlist-total"><?php echo $text_wishlist; ?></a></li>
+                                <li><a href="<?php echo $shopping_cart; ?>"><?php echo $text_shopping_cart; ?></a></li>
+                                <li><a href="<?php echo $checkout; ?>"><?php echo $text_checkout; ?></a></li>
+                                <li class="last">
+                                    <?php if (!$logged) { ?>
+                                        <?php echo $text_welcome_dresscode; ?>
+                                    <?php } else { ?>
+                                        <?php echo $text_logged_dresscode; ?>
+                                    <?php } ?>
+                                </li>
+                            </ul>
+
+                        </div>
+                    </div>
+
+
+
+                    <div id="select_top" class="select_wrapper">
+                        <select name="select1" id="select1" tabindex="1">
+                            <option value="<?php echo $text_option_1; ?>"><?php echo $text_option_1; ?></option>
+                            <option value="<?php echo $text_option_2; ?>"><?php echo $text_option_2; ?></option>
+                        </select>
+
+
+                        <div id="search_dresscode">
+                            <div id="search">
+                                <input id="search_input" type="text" onclick="this.value = '';" name="search" value="<?php echo $text_search; ?>" />
+                            </div>
+                            <div class="button-search"></div>
+                        </div>
+
+                    </div>
+
+
+
+                </div>
+
+
+        </div>
+
+    </div>
+
+
+<?php if ($categories) { ?>
+   <div class="nav-container">
+       <div class="container">
+            <div class="sixteen columns">
+
+                <div id="menu_block_head">
+                    <div class="nav_block_head_field"><?php echo $text_choose_category; ?></div>
+                    <span class="menu_block_head_button"> </span>
+                    <div class="clear"></div>
+                </div>
+
+                <div class="menu_block_dropdown">
+
+                        <div id="menu">
+                            <ul id="nav">
+                                <li class="img_link_wrapper"><a class="image-link" href="<?php echo $home; ?>"></a></li>
+                                <?php foreach ($categories as $category) { ?>
+
+                                    <li>
+                                        <a href="<?php echo $category['href']; ?>"><?php echo $category['name']; ?></a>
+                                        <?php if ($category['children']) { ?>
+                                        <div class="<?php echo ($category['description'] ? 'with_descr' : 'none_descr'); ?> width-<?php echo $category['column']; ?>">
+                                            <?php for ($i = 0; $i < count($category['children']);) { ?>
+                                            <ul class="<?php echo (($category['column']>1) ? 'list' : 'grid'); ?>">
+                                            <?php
+                                                    if ($category['description']) {
+                                                        $j = $i + ceil(count($category['children']) / 1);
+                                                    } else {
+                                                        $j = $i + ceil(count($category['children']) / $category['column']);
+                                                    }
+                                                  ?>
+                                                  <?php for (; $i < $j; $i++) { ?>
+                                                  <?php if (isset($category['children'][$i])) { ?>
+                                                  <li><a href="<?php echo $category['children'][$i]['href']; ?>"><?php echo $category['children'][$i]['name']; ?></a></li>
+                                                  <?php } ?>
+                                                  <?php } ?>
+                                                </ul>
+                                            <?php } ?>
+
+                                            <?php if ($category['description']) { ?>
+                                                <div class="category_description_block">
+                                                    <?php echo $category['description']; ?>
+                                                </div>
+                                            <?php } ?>
+                                        </div>
+                                        <?php } ?>
+                                    </li>
+                                <?php } ?>
+
+                                <!-- menu custom block -->
+                                <?php echo $custom_menu; ?>
+                                <!-- menu custom block -->
+
+                            </ul>
+                        </div>
+
+
+
+
+
+                </div>
+           </div>
+       </div>
+   </div>
+
+
+<?php } ?>
+</div>
+
+    <div class="container">
+        <div class="sixteen columns">
+            <div id="notification"></div>
+        </div>
+    </div>
+
+    <div class="<?php echo (!empty($this->request->get['route']) && $this->request->get['route'] != 'common/home') ? 'container all_pages' : 'base_page'; ?>">
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/home.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/home.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/home.tpl	(revision 6)
@@ -1,13 +1,13 @@
-<?php echo $header; ?>
-<?php echo $column_left; ?>
-<?php echo $column_right; ?>
-<div id="content">
-    <?php echo $content_top; ?>
-    <?php include('additional_links.tpl'); ?>
-    <div class="container">
-        <div class="sixteen columns alpha all_slider_wrapper">
-            <?php echo $content_bottom; ?>
-        </div>
-    </div>
-</div>
+<?php echo $header; ?>
+<?php echo $column_left; ?>
+<?php echo $column_right; ?>
+<div id="content">
+    <?php echo $content_top; ?>
+    <?php include('additional_links.tpl'); ?>
+    <div class="container">
+        <div class="sixteen columns alpha all_slider_wrapper">
+            <?php echo $content_bottom; ?>
+        </div>
+    </div>
+</div>
 <?php echo $footer; ?>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/custom_menu.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/custom_menu.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/custom_menu.tpl	(revision 6)
@@ -1,3 +1,3 @@
-<?php foreach ($modules as $module) { ?>
-<?php echo $module; ?>
+<?php foreach ($modules as $module) { ?>
+<?php echo $module; ?>
 <?php } ?>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/footer.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/footer.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/footer.tpl	(revision 6)
@@ -1,98 +1,98 @@
-</div>
-<div class="container">
-    <div id="footer_higher">
-        <div id="footer_higher_content">
-            <div class="eight columns alpha">
-                <?php echo $content_footer; ?>
-                <?php include('footer_contact.tpl'); ?>
-            </div>
-            <div class="eight columns">
-                <?php include('twitter.tpl'); ?>
-                <?php include('facebook.tpl'); ?>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="footer_bg_color">
-<div id="footer_container_w">
-    <div class="container">
-        <div class="sixteen columns">
-            <div id="footer_button" class="footer_button_down" title="see more"></div>
-        </div>
-    </div>
-</div>
-
-
-
-<div id="back-top"><a href="#top"></a></div>
-
-<div id="footer">
-    <div class="container">
-
-        <?php if ($informations) { ?>
-            <div class="four columns footer_information alpha">
-                <h3><?php echo $text_information; ?></h3>
-                <nav>
-                    <ul>
-                        <?php foreach ($informations as $information) { ?>
-                            <li><a href="<?php echo $information['href']; ?>"><?php echo $information['title']; ?></a></li>
-                        <?php } ?>
-                    </ul>
-                </nav>
-            </div>
-        <?php } ?>
-
-        <div class="four columns footer_customer_service">
-            <h3><?php echo $text_service; ?></h3>
-            <nav>
-                <ul>
-                    <li><a href="<?php echo $contact; ?>"><?php echo $text_contact; ?></a></li>
-                    <li><a href="<?php echo $return; ?>"><?php echo $text_return; ?></a></li>
-                    <li><a href="<?php echo $sitemap; ?>"><?php echo $text_sitemap; ?></a></li>
-                </ul>
-            </nav>
-        </div>
-        <div class="four columns footer_my_account">
-            <h3><?php echo $text_account; ?></h3>
-            <nav>
-                <ul>
-                    <li><a href="<?php echo $account; ?>"><?php echo $text_account; ?></a></li>
-                    <li><a href="<?php echo $order; ?>"><?php echo $text_order; ?></a></li>
-                    <li><a href="<?php echo $wishlist; ?>"><?php echo $text_wishlist; ?></a></li>
-                    <li><a href="<?php echo $newsletter; ?>"><?php echo $text_newsletter; ?></a></li>
-                </ul>
-            </nav>
-        </div>
-        <div class="four columns">
-            <?php include('footer_socials.tpl'); ?>
-            <div class="newsletter_footer">
-                <?php echo $content_slider; ?>
-            </div>
-            <div id="powered"><?php echo $powered_dresscode; ?></div>
-            <div id="payment_services"><?php include('footer_payment_service.tpl'); ?></div>
-        </div>
-
-        <!--
-        OpenCart is open source software and you are free to remove the powered by OpenCart if you want, but its generally accepted practise to make a small donation.
-        Please donate via PayPal to donate@opencart.com
-        //-->
-
-
-    </div>
-
-</div>
-</div>
-<!--
-OpenCart is open source software and you are free to remove the powered by OpenCart if you want, but its generally accepted practise to make a small donation.
-Please donate via PayPal to donate@opencart.com
-//-->
-</div>
-
-<?php if(!empty($this->request->get['route']) && $this->request->get['route'] != 'common/home') { ?>
-</div>
-<?php } ?>
-
-
-</body>
+</div>
+<div class="container">
+    <div id="footer_higher">
+        <div id="footer_higher_content">
+            <div class="eight columns alpha">
+                <?php echo $content_footer; ?>
+                <?php include('footer_contact.tpl'); ?>
+            </div>
+            <div class="eight columns">
+                <?php include('twitter.tpl'); ?>
+                <?php include('facebook.tpl'); ?>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="footer_bg_color">
+<div id="footer_container_w">
+    <div class="container">
+        <div class="sixteen columns">
+            <div id="footer_button" class="footer_button_down" title="see more"></div>
+        </div>
+    </div>
+</div>
+
+
+
+<div id="back-top"><a href="#top"></a></div>
+
+<div id="footer">
+    <div class="container">
+
+        <?php if ($informations) { ?>
+            <div class="four columns footer_information alpha">
+                <h3><?php echo $text_information; ?></h3>
+                <nav>
+                    <ul>
+                        <?php foreach ($informations as $information) { ?>
+                            <li><a href="<?php echo $information['href']; ?>"><?php echo $information['title']; ?></a></li>
+                        <?php } ?>
+                    </ul>
+                </nav>
+            </div>
+        <?php } ?>
+
+        <div class="four columns footer_customer_service">
+            <h3><?php echo $text_service; ?></h3>
+            <nav>
+                <ul>
+                    <li><a href="<?php echo $contact; ?>"><?php echo $text_contact; ?></a></li>
+                    <li><a href="<?php echo $return; ?>"><?php echo $text_return; ?></a></li>
+                    <li><a href="<?php echo $sitemap; ?>"><?php echo $text_sitemap; ?></a></li>
+                </ul>
+            </nav>
+        </div>
+        <div class="four columns footer_my_account">
+            <h3><?php echo $text_account; ?></h3>
+            <nav>
+                <ul>
+                    <li><a href="<?php echo $account; ?>"><?php echo $text_account; ?></a></li>
+                    <li><a href="<?php echo $order; ?>"><?php echo $text_order; ?></a></li>
+                    <li><a href="<?php echo $wishlist; ?>"><?php echo $text_wishlist; ?></a></li>
+                    <li><a href="<?php echo $newsletter; ?>"><?php echo $text_newsletter; ?></a></li>
+                </ul>
+            </nav>
+        </div>
+        <div class="four columns">
+            <?php include('footer_socials.tpl'); ?>
+            <div class="newsletter_footer">
+                <?php echo $content_slider; ?>
+            </div>
+            <div id="powered"><?php echo $powered_dresscode; ?></div>
+            <div id="payment_services"><?php include('footer_payment_service.tpl'); ?></div>
+        </div>
+
+        <!--
+        OpenCart is open source software and you are free to remove the powered by OpenCart if you want, but its generally accepted practise to make a small donation.
+        Please donate via PayPal to donate@opencart.com
+        //-->
+
+
+    </div>
+
+</div>
+</div>
+<!--
+OpenCart is open source software and you are free to remove the powered by OpenCart if you want, but its generally accepted practise to make a small donation.
+Please donate via PayPal to donate@opencart.com
+//-->
+</div>
+
+<?php if(!empty($this->request->get['route']) && $this->request->get['route'] != 'common/home') { ?>
+</div>
+<?php } ?>
+
+
+</body>
 </html>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/twitter.class.php
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/twitter.class.php	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/twitter.class.php	(revision 6)
@@ -1,3010 +1,3010 @@
-﻿<?php
-/**
- * @version   1.0 14.08.2012
- * @author    TonyEcommerce http://www.TonyEcommerce.com <support@TonyEcommerce.com>
- * @copyright Copyright (c) 2012 TonyEcommerce
- */
-
-/**
- * Twitter class
- *
- * This source file can be used to communicate with Twitter (http://twitter.com)
- *
- * The class is documented in the file itself. If you find any bugs help me out and report them. Reporting can be done by sending an email to php-twitter-bugs[at]verkoyen[dot]eu.
- * If you report a bug, make sure you give me enough information (include your code).
- *
- * Changelog since 2.1.1
- * - code styling
- * - no more converting to integer for the cursor (thx to Jamaica)
- *
- * Changelog since 2.1.0
- * - fixed issue with generation of basestring
- * - added a new method: http://dev.twitter.com/doc/post/:user/:list_id/create_all
- *
- * Changelog since 2.0.3
- * - made a lot of changes to reflect the current API, some of the methods aren't backwards compatible, so be carefull before upgrading
- *
- * Changelog since 2.0.2
- * - tested geo*
- * - implemented accountUpdateProfileImage
- * - implemented accountUpdateProfileBackgroundImage
- * - fixed issue with GET and POST (thx to Luiz Felipe)
- * - added a way to detect open_basedir (thx to Lee Kindness)
- *
- * Changelog since 2.0.1
- * - Fixed some documentation
- * - Added a new method: usersProfileImage
- * - Fixed trendsLocation
- * - Added new GEO-methods: geoSearch, geoSimilarPlaces, geoPlaceCreate (not tested because geo-services were disabled.)
- * - Added legalToS
- * - Added legalPrivacy
- * - Fixed helpTest
- *
- * Changelog since 2.0.0
- * - no more fatal if twitter is over capacity
- * - fix for calculating the header-string (thx to Dextro)
- * - fix for userListsIdStatuses (thx to Josh)
- *
- * License
- * Copyright (c) 2010, Tijs Verkoyen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.
- *
- * This software is provided by the author "as is" and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the author be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage.
- *
- * @author		Tijs Verkoyen <php-twitter@verkoyen.eu>
- * @version		2.1.2
- *
- * @copyright	Copyright (c) 2010, Tijs Verkoyen. All rights reserved.
- * @license		BSD License
- */
-class Twitter
-{
-	// internal constant to enable/disable debugging
-	const DEBUG = false;
-
-	// url for the twitter-api
-	const API_URL = 'https://api.twitter.com/1';
-	const SEARCH_API_URL = 'https://search.twitter.com';
-	const SECURE_API_URL = 'https://api.twitter.com';
-
-	// port for the twitter-api
-	const API_PORT = 443;
-	const SEARCH_API_PORT = 443;
-	const SECURE_API_PORT = 443;
-
-	// current version
-	const VERSION = '2.1.2';
-
-
-	/**
-	 * A cURL instance
-	 *
-	 * @var	resource
-	 */
-	private $curl;
-
-
-	/**
-	 * The consumer key
-	 *
-	 * @var	string
-	 */
-	private $consumerKey;
-
-
-	/**
-	 * The consumer secret
-	 *
-	 * @var	string
-	 */
-	private $consumerSecret;
-
-
-	/**
-	 * The oAuth-token
-	 *
-	 * @var	string
-	 */
-	private $oAuthToken = '';
-
-
-	/**
-	 * The oAuth-token-secret
-	 *
-	 * @var	string
-	 */
-	private $oAuthTokenSecret = '';
-
-
-	/**
-	 * The timeout
-	 *
-	 * @var	int
-	 */
-	private $timeOut = 60;
-
-
-	/**
-	 * The user agent
-	 *
-	 * @var	string
-	 */
-	private $userAgent;
-
-
-// class methods
-	/**
-	 * Default constructor
-	 *
-	 * @return	void
-	 * @param	string $consumerKey		The consumer key to use.
-	 * @param	string $consumerSecret	The consumer secret to use.
-	 */
-	public function __construct($consumerKey, $consumerSecret)
-	{
-		$this->setConsumerKey($consumerKey);
-		$this->setConsumerSecret($consumerSecret);
-	}
-
-
-	/**
-	 * Default destructor
-	 *
-	 * @return	void
-	 */
-	public function __destruct()
-	{
-		if($this->curl != null) curl_close($this->curl);
-	}
-
-
-	/**
-	 * Format the parameters as a querystring
-	 *
-	 * @return	string
-	 * @param	array $parameters	The parameters.
-	 */
-	private function buildQuery(array $parameters)
-	{
-		// no parameters?
-		if(empty($parameters)) return '';
-
-		// encode the keys
-		$keys = self::urlencode_rfc3986(array_keys($parameters));
-
-		// encode the values
-		$values = self::urlencode_rfc3986(array_values($parameters));
-
-		// reset the parameters
-		$parameters = array_combine($keys, $values);
-
-		// sort parameters by key
-		uksort($parameters, 'strcmp');
-
-		// loop parameters
-		foreach($parameters as $key => $value)
-		{
-			// sort by value
-			if(is_array($value)) $parameters[$key] = natsort($value);
-		}
-
-		// process parameters
-		foreach($parameters as $key => $value) $chunks[] = $key . '=' . str_replace('%25', '%', $value);
-
-		// return
-		return implode('&', $chunks);
-	}
-
-
-	/**
-	 * All OAuth 1.0 requests use the same basic algorithm for creating a signature base string and a signature.
-	 * The signature base string is composed of the HTTP method being used, followed by an ampersand ("&") and then the URL-encoded base URL being accessed,
-	 * complete with path (but not query parameters), followed by an ampersand ("&").
-	 * Then, you take all query parameters and POST body parameters (when the POST body is of the URL-encoded type, otherwise the POST body is ignored),
-	 * including the OAuth parameters necessary for negotiation with the request at hand, and sort them in lexicographical order by first parameter name and
-	 * then parameter value (for duplicate parameters), all the while ensuring that both the key and the value for each parameter are URL encoded in isolation.
-	 * Instead of using the equals ("=") sign to mark the key/value relationship, you use the URL-encoded form of "%3D". Each parameter is then joined by the
-	 * URL-escaped ampersand sign, "%26".
-	 *
-	 * @return	string
-	 * @param	string $url			The URL.
-	 * @param	string $method		The method to use.
-	 * @param	array $parameters	The parameters.
-	 */
-	private function calculateBaseString($url, $method, array $parameters)
-	{
-		// redefine
-		$url = (string) $url;
-		$parameters = (array) $parameters;
-
-		// init var
-		$pairs = array();
-		$chunks = array();
-
-		// sort parameters by key
-		uksort($parameters, 'strcmp');
-
-		// loop parameters
-		foreach($parameters as $key => $value)
-		{
-			// sort by value
-			if(is_array($value)) $parameters[$key] = natsort($value);
-		}
-
-		// process queries
-		foreach($parameters as $key => $value)
-		{
-			// only add if not already in the url
-			if(substr_count($url, $key . '=' . $value) == 0) $chunks[] = self::urlencode_rfc3986($key) . '%3D' . self::urlencode_rfc3986($value);
-		}
-
-		// buils base
-		$base = $method . '&';
-		$base .= urlencode($url);
-		$base .= (substr_count($url, '?')) ? '%26' : '&';
-		$base .= implode('%26', $chunks);
-		$base = str_replace('%3F', '&', $base);
-
-		// return
-		return $base;
-	}
-
-
-	/**
-	 * Build the Authorization header
-	 * @later: fix me
-	 *
-	 * @return	string
-	 * @param	array $parameters	The parameters.
-	 * @param	string $url			The URL.
-	 */
-	private function calculateHeader(array $parameters, $url)
-	{
-		// redefine
-		$url = (string) $url;
-
-		// divide into parts
-		$parts = parse_url($url);
-
-		// init var
-		$chunks = array();
-
-		// process queries
-		foreach($parameters as $key => $value) $chunks[] = str_replace('%25', '%', self::urlencode_rfc3986($key) . '="' . self::urlencode_rfc3986($value) . '"');
-
-		// build return
-		$return = 'Authorization: OAuth realm="' . $parts['scheme'] . '://' . $parts['host'] . $parts['path'] . '", ';
-		$return .= implode(',', $chunks);
-
-		// prepend name and OAuth part
-		return $return;
-	}
-
-
-	/**
-	 * Make an call to the oAuth
-	 * @todo	refactor me
-	 *
-	 * @return	array
-	 * @param	string $method					The method.
-	 * @param	array[optional] $parameters		The parameters.
-	 */
-	private function doOAuthCall($method, array $parameters = null)
-	{
-		// redefine
-		$method = (string) $method;
-
-		// append default parameters
-		$parameters['oauth_consumer_key'] = $this->getConsumerKey();
-		$parameters['oauth_nonce'] = md5(microtime() . rand());
-		$parameters['oauth_timestamp'] = time();
-		$parameters['oauth_signature_method'] = 'HMAC-SHA1';
-		$parameters['oauth_version'] = '1.0';
-
-		// calculate the base string
-		$base = $this->calculateBaseString(self::SECURE_API_URL . '/oauth/' . $method, 'POST', $parameters);
-
-		// add sign into the parameters
-		$parameters['oauth_signature'] = $this->hmacsha1($this->getConsumerSecret() . '&' . $this->getOAuthTokenSecret(), $base);
-
-		// calculate header
-		$header = $this->calculateHeader($parameters, self::SECURE_API_URL . '/oauth/' . $method);
-
-		// set options
-		$options[CURLOPT_URL] = self::SECURE_API_URL . '/oauth/' . $method;
-		$options[CURLOPT_PORT] = self::SECURE_API_PORT;
-		$options[CURLOPT_USERAGENT] = $this->getUserAgent();
-		if(ini_get('open_basedir') == '' && ini_get('safe_mode' == 'Off')) $options[CURLOPT_FOLLOWLOCATION] = true;
-		$options[CURLOPT_RETURNTRANSFER] = true;
-		$options[CURLOPT_TIMEOUT] = (int) $this->getTimeOut();
-		$options[CURLOPT_SSL_VERIFYPEER] = false;
-		$options[CURLOPT_SSL_VERIFYHOST] = false;
-		$options[CURLOPT_HTTPHEADER] = array('Expect:');
-		$options[CURLOPT_POST] = true;
-		$options[CURLOPT_POSTFIELDS] = $this->buildQuery($parameters);
-
-		// init
-		$this->curl = curl_init();
-
-		// set options
-		curl_setopt_array($this->curl, $options);
-
-		// execute
-		$response = curl_exec($this->curl);
-		$headers = curl_getinfo($this->curl);
-
-		// fetch errors
-		$errorNumber = curl_errno($this->curl);
-		$errorMessage = curl_error($this->curl);
-
-		// error?
-		if($errorNumber != '') throw new TwitterException($errorMessage, $errorNumber);
-
-		// init var
-		$return = array();
-
-		// parse the string
-		parse_str($response, $return);
-
-		// return
-		return $return;
-	}
-
-
-	/**
-	 * Make the call
-	 *
-	 * @return	string
-	 * @param	string $url						The url to call.
-	 * @param	array[optional] $parameters		Optional parameters.
-	 * @param	bool[optional] $authenticate	Should we authenticate.
-	 * @param	bool[optional] $method			The method to use. Possible values are GET, POST.
-	 * @param	string[optional] $filePath		The path to the file to upload.
-	 * @param	bool[optional] $expectJSON		Do we expect JSON.
-	 * @param	bool[optional] $returnHeaders	Should the headers be returned?
-	 */
-	private function doCall($url, array $parameters = null, $authenticate = false, $method = 'GET', $filePath = null, $expectJSON = true, $returnHeaders = false)
-	{
-		// allowed methods
-		$allowedMethods = array('GET', 'POST');
-
-		// redefine
-		$url = (string) $url;
-		$parameters = (array) $parameters;
-		$authenticate = (bool) $authenticate;
-		$method = (string) $method;
-		$expectJSON = (bool) $expectJSON;
-
-		// validate method
-		if(!in_array($method, $allowedMethods)) throw new TwitterException('Unknown method (' . $method . '). Allowed methods are: ' . implode(', ', $allowedMethods));
-
-		// append default parameters
-		$oauth['oauth_consumer_key'] = $this->getConsumerKey();
-		$oauth['oauth_nonce'] = md5(microtime() . rand());
-		$oauth['oauth_timestamp'] = time();
-		$oauth['oauth_token'] = $this->getOAuthToken();
-		$oauth['oauth_signature_method'] = 'HMAC-SHA1';
-		$oauth['oauth_version'] = '1.0';
-
-		// set data
-		$data = $oauth;
-		if(!empty($parameters)) $data = array_merge($data, $parameters);
-
-		// calculate the base string
-		$base = $this->calculateBaseString(self::API_URL . '/' . $url, $method, $data);
-
-		// based on the method, we should handle the parameters in a different way
-		if($method == 'POST')
-		{
-			// file provided?
-			if($filePath != null)
-			{
-				// build a boundary
-				$boundary = md5(time());
-
-				// process file
-				$fileInfo = pathinfo($filePath);
-
-				// set mimeType
-				$mimeType = 'application/octet-stream';
-				if($fileInfo['extension'] == 'jpg' || $fileInfo['extension'] == 'jpeg') $mimeType = 'image/jpeg';
-				elseif($fileInfo['extension'] == 'gif') $mimeType = 'image/gif';
-				elseif($fileInfo['extension'] == 'png') $mimeType = 'image/png';
-
-				// init var
-				$content = '--' . $boundary . "\r\n";
-
-				// set file
-				$content .= 'Content-Disposition: form-data; name=image; filename="' . $fileInfo['basename'] . '"' . "\r\n";
-				$content .= 'Content-Type: ' . $mimeType . "\r\n";
-				$content .= "\r\n";
-				$content .= file_get_contents($filePath);
-				$content .= "\r\n";
-				$content .= "--" . $boundary . '--';
-
-				// build headers
-				$headers[] = 'Content-Type: multipart/form-data; boundary=' . $boundary;
-				$headers[] = 'Content-Length: ' . strlen($content);
-
-				// set content
-				$options[CURLOPT_POSTFIELDS] = $content;
-			}
-
-			// no file
-			else $options[CURLOPT_POSTFIELDS] = $this->buildQuery($parameters);
-
-			// enable post
-			$options[CURLOPT_POST] = true;
-		}
-
-		else
-		{
-			// add the parameters into the querystring
-			if(!empty($parameters)) $url .= '?' . $this->buildQuery($parameters);
-
-			$options[CURLOPT_POST] = false;
-		}
-
-		// add sign into the parameters
-		$oauth['oauth_signature'] = $this->hmacsha1($this->getConsumerSecret() . '&' . $this->getOAuthTokenSecret(), $base);
-
-		$headers[] = $this->calculateHeader($oauth, self::API_URL . '/' . $url);
-		$headers[] = 'Expect:';
-
-		// set options
-		$options[CURLOPT_URL] = self::API_URL . '/' . $url;
-		$options[CURLOPT_PORT] = self::API_PORT;
-		$options[CURLOPT_USERAGENT] = $this->getUserAgent();
-		if(ini_get('open_basedir') == '' && ini_get('safe_mode' == 'Off')) $options[CURLOPT_FOLLOWLOCATION] = true;
-		$options[CURLOPT_RETURNTRANSFER] = true;
-		$options[CURLOPT_TIMEOUT] = (int) $this->getTimeOut();
-		$options[CURLOPT_SSL_VERIFYPEER] = false;
-		$options[CURLOPT_SSL_VERIFYHOST] = false;
-		$options[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
-		$options[CURLOPT_HTTPHEADER] = $headers;
-
-		// init
-		if($this->curl == null) $this->curl = curl_init();
-
-		// set options
-		curl_setopt_array($this->curl, $options);
-
-		// execute
-		$response = curl_exec($this->curl);
-		$headers = curl_getinfo($this->curl);
-
-		// fetch errors
-		$errorNumber = curl_errno($this->curl);
-		$errorMessage = curl_error($this->curl);
-
-		// return the headers
-		if($returnHeaders) return $headers;
-
-		// we don't expext JSON, return the response
-		if(!$expectJSON) return $response;
-
-		// replace ids with their string values, added because of some PHP-version can't handle these large values
-		$response = preg_replace('/id":(\d+)/', 'id":"\1"', $response);
-
-		// we expect JSON, so decode it
-		$json = @json_decode($response, true);
-
-		// validate JSON
-		if($json === null)
-		{
-			// should we provide debug information
-			if(self::DEBUG)
-			{
-				// make it output proper
-				echo '<pre>';
-
-				// dump the header-information
-				var_dump($headers);
-
-				// dump the error
-				var_dump($errorMessage);
-
-				// dump the raw response
-				var_dump($response);
-
-				// end proper format
-				echo '</pre>';
-			}
-
-			// throw exception
-			throw new TwitterException('Invalid response.');
-		}
-
-
-		// any errors
-		if(isset($json['errors']))
-		{
-			// should we provide debug information
-			if(self::DEBUG)
-			{
-				// make it output proper
-				echo '<pre>';
-
-				// dump the header-information
-				var_dump($headers);
-
-				// dump the error
-				var_dump($errorMessage);
-
-				// dump the raw response
-				var_dump($response);
-
-				// end proper format
-				echo '</pre>';
-			}
-
-			// throw exception
-			if(isset($json['errors'][0]['message'])) throw new TwitterException($json['errors'][0]['message']);
-			elseif(isset($json['errors']) && is_string($json['errors'])) throw new TwitterException($json['errors']);
-			else throw new TwitterException('Invalid response.');
-		}
-
-
-		// any error
-		if(isset($json['error']))
-		{
-			// should we provide debug information
-			if(self::DEBUG)
-			{
-				// make it output proper
-				echo '<pre>';
-
-				// dump the header-information
-				var_dump($headers);
-
-				// dump the raw response
-				var_dump($response);
-
-				// end proper format
-				echo '</pre>';
-			}
-
-			// throw exception
-			throw new TwitterException($json['error']);
-		}
-
-		// return
-		return $json;
-	}
-
-
-	/**
-	 * Make the call
-	 *
-	 * @return	string
-	 * @param	string $url						The url to call.
-	 * @param	array[optional] $parameters		Optional parameters.
-	 */
-	private function doSearchCall($url, array $parameters = null)
-	{
-		// redefine
-		$url = (string) $url;
-		$parameters = (array) $parameters;
-
-		// add the parameters into the querystring
-		if(!empty($parameters)) $url .= '?' . $this->buildQuery($parameters);
-
-		// set options
-		$options[CURLOPT_URL] = self::SEARCH_API_URL . '/' . $url;
-		$options[CURLOPT_PORT] = self::SEARCH_API_PORT;
-		$options[CURLOPT_USERAGENT] = $this->getUserAgent();
-		if(ini_get('open_basedir') == '' && ini_get('safe_mode' == 'Off')) $options[CURLOPT_FOLLOWLOCATION] = true;
-		$options[CURLOPT_RETURNTRANSFER] = true;
-		$options[CURLOPT_TIMEOUT] = (int) $this->getTimeOut();
-		$options[CURLOPT_SSL_VERIFYPEER] = false;
-		$options[CURLOPT_SSL_VERIFYHOST] = false;
-		$options[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
-
-		// init
-		if($this->curl == null) $this->curl = curl_init();
-
-		// set options
-		curl_setopt_array($this->curl, $options);
-
-		// execute
-		$response = curl_exec($this->curl);
-		$headers = curl_getinfo($this->curl);
-
-		// fetch errors
-		$errorNumber = curl_errno($this->curl);
-		$errorMessage = curl_error($this->curl);
-
-		// replace ids with their string values, added because of some PHP-version can't handle these large values
-		$response = preg_replace('/id":(\d+)/', 'id":"\1"', $response);
-
-		// we expect JSON, so decode it
-		$json = @json_decode($response, true);
-
-		// validate JSON
-		if($json === null)
-		{
-			// should we provide debug information
-			if(self::DEBUG)
-			{
-				// make it output proper
-				echo '<pre>';
-
-				// dump the header-information
-				var_dump($headers);
-
-				// dump the error
-				var_dump($errorMessage);
-
-				// dump the raw response
-				var_dump($response);
-
-				// end proper format
-				echo '</pre>';
-			}
-
-			// throw exception
-			throw new TwitterException('Invalid response.');
-		}
-
-
-		// any errors
-		if(isset($json['errors']))
-		{
-			// should we provide debug information
-			if(self::DEBUG)
-			{
-				// make it output proper
-				echo '<pre>';
-
-				// dump the header-information
-				var_dump($headers);
-
-				// dump the error
-				var_dump($errorMessage);
-
-				// dump the raw response
-				var_dump($response);
-
-				// end proper format
-				echo '</pre>';
-			}
-
-			// throw exception
-			if(isset($json['errors'][0]['message'])) throw new TwitterException($json['errors'][0]['message']);
-			else throw new TwitterException('Invalid response.');
-		}
-
-
-		// any error
-		if(isset($json['error']))
-		{
-			// should we provide debug information
-			if(self::DEBUG)
-			{
-				// make it output proper
-				echo '<pre>';
-
-				// dump the header-information
-				var_dump($headers);
-
-				// dump the raw response
-				var_dump($response);
-
-				// end proper format
-				echo '</pre>';
-			}
-
-			// throw exception
-			throw new TwitterException($json['error']);
-		}
-
-		// return
-		return $json;
-	}
-
-
-	/**
-	 * Get the consumer key
-	 *
-	 * @return	string
-	 */
-	private function getConsumerKey()
-	{
-		return $this->consumerKey;
-	}
-
-
-	/**
-	 * Get the consumer secret
-	 *
-	 * @return	string
-	 */
-	private function getConsumerSecret()
-	{
-		return $this->consumerSecret;
-	}
-
-
-	/**
-	 * Get the oAuth-token
-	 *
-	 * @return	string
-	 */
-	private function getOAuthToken()
-	{
-		return $this->oAuthToken;
-	}
-
-
-	/**
-	 * Get the oAuth-token-secret
-	 *
-	 * @return	string
-	 */
-	private function getOAuthTokenSecret()
-	{
-		return $this->oAuthTokenSecret;
-	}
-
-
-	/**
-	 * Get the timeout
-	 *
-	 * @return	int
-	 */
-	public function getTimeOut()
-	{
-		return (int) $this->timeOut;
-	}
-
-
-	/**
-	 * Get the useragent that will be used. Our version will be prepended to yours.
-	 * It will look like: "PHP Twitter/<version> <your-user-agent>"
-	 *
-	 * @return	string
-	 */
-	public function getUserAgent()
-	{
-		return (string) 'PHP Twitter/' . self::VERSION . ' ' . $this->userAgent;
-	}
-
-
-	/**
-	 * Set the consumer key
-	 *
-	 * @return	void
-	 * @param	string $key		The consumer key to use.
-	 */
-	private function setConsumerKey($key)
-	{
-		$this->consumerKey = (string) $key;
-	}
-
-
-	/**
-	 * Set the consumer secret
-	 *
-	 * @return	void
-	 * @param	string $secret	The consumer secret to use.
-	 */
-	private function setConsumerSecret($secret)
-	{
-		$this->consumerSecret = (string) $secret;
-	}
-
-
-	/**
-	 * Set the oAuth-token
-	 *
-	 * @return	void
-	 * @param	string $token	The token to use.
-	 */
-	public function setOAuthToken($token)
-	{
-		$this->oAuthToken = (string) $token;
-	}
-
-
-	/**
-	 * Set the oAuth-secret
-	 *
-	 * @return	void
-	 * @param	string $secret	The secret to use.
-	 */
-	public function setOAuthTokenSecret($secret)
-	{
-		$this->oAuthTokenSecret = (string) $secret;
-	}
-
-
-	/**
-	 * Set the timeout
-	 *
-	 * @return	void
-	 * @param	int $seconds	The timeout in seconds.
-	 */
-	public function setTimeOut($seconds)
-	{
-		$this->timeOut = (int) $seconds;
-	}
-
-
-	/**
-	 * Get the useragent that will be used. Our version will be prepended to yours.
-	 * It will look like: "PHP Twitter/<version> <your-user-agent>"
-	 *
-	 * @return	void
-	 * @param	string $userAgent	Your user-agent, it should look like <app-name>/<app-version>.
-	 */
-	public function setUserAgent($userAgent)
-	{
-		$this->userAgent = (string) $userAgent;
-	}
-
-
-	/**
-	 * Build the signature for the data
-	 *
-	 * @return	string
-	 * @param	string $key		The key to use for signing.
-	 * @param	string $data	The data that has to be signed.
-	 */
-	private function hmacsha1($key, $data)
-	{
-		return base64_encode(hash_hmac('SHA1', $data, $key, true));
-	}
-
-
-	/**
-	 * URL-encode method for internal use
-	 *
-	 * @return	string
-	 * @param	mixed $value	The value to encode.
-	 */
-	private static function urlencode_rfc3986($value)
-	{
-		if(is_array($value)) return array_map(array('Twitter', 'urlencode_rfc3986'), $value);
-		else
-		{
-			$search = array('+', ' ', '%7E', '%');
-			$replace = array('%20', '%20', '~', '%25');
-
-			return str_replace($search, $replace, urlencode($value));
-		}
-	}
-
-
-// Timeline resources
-	/**
-	 * Returns the 20 most recent statuses from non-protected users who have set a custom user icon.
-	 * The public timeline is cached for 60 seconds and requesting it more often than that is unproductive and a waste of resources.
-	 *
-	 * @return	array
-	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function statusesPublicTimeline($trimUser = false, $includeEntities = false)
-	{
-		// redefine
-		$trimUser = (bool) $trimUser;
-		$includeEntities = (bool) $includeEntities;
-
-		// build parameters
-		$parameters = array();
-		if($trimUser) $parameters['trim_user'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/public_timeline.json', $parameters);
-	}
-
-
-	/**
-	 * Returns the 20 most recent statuses, including retweets if they exist, posted by the authenticating user and the user's they follow. This is the same timeline seen by a user when they login to twitter.com.
-	 * This method is identical to statusesFriendsTimeline, except that this method always includes retweets.
-	 *
-	 * @return	array
-	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
-	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
-	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
-	 * @param	int[optional] $page					Specifies the page of results to retrieve.
-	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function statusesHomeTimeline($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeEntities = false)
-	{
-		// build parameters
-		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($trimUser) $parameters['trim_user'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/home_timeline.json', $parameters, true);
-	}
-
-
-	/**
-	 * Returns the 20 most recent statuses posted by the authenticating user and the user's they follow. This is the same timeline seen by a user when they login to twitter.com.
-	 * This method is identical to statuses/home_timeline, except that this method will only include retweets if the includeRts parameter is set.
-	 *
-	 * @return	array
-	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
-	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
-	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
-	 * @param	int[optional] $page					Specifies the page of results to retrieve.
-	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeRts			When set to true the timeline will contain native retweets (if they exist) in addition to the standard stream of tweets. The output format of retweeted tweets is identical to the representation you see in home_timeline. Note: If you're using the trim_user parameter in conjunction with include_rts, the retweets will still contain a full user object.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function statusesFriendsTimeline($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeRts = false, $includeEntities = false)
-	{
-		// build parameters
-		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($trimUser) $parameters['trim_user'] = 'true';
-		if($includeRts) $parameters['include_rts'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/friends_timeline.json', $parameters, true);
-	}
-
-
-	/**
-	 * Returns the 20 most recent statuses posted by the authenticating user. It is also possible to request another user's timeline by using the screen_name or user_id parameter. The other users timeline will only be visible if they are not protected, or if the authenticating user's follow request was accepted by the protected user.
-	 * The timeline returned is the equivalent of the one seen when you view a user's profile on twitter.com.
-	 *
-	 * @return	array
-	 * @param	string[optional] $userId			Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-	 * @param	string[optional] $screenName		Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
-	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
-	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
-	 * @param	int[optional] $page					Specifies the page of results to retrieve.
-	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeRts			When set to true the timeline will contain native retweets (if they exist) in addition to the standard stream of tweets. The output format of retweeted tweets is identical to the representation you see in home_timeline. Note: If you're using the trim_user parameter in conjunction with include_rts, the retweets will still contain a full user object.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function statusesUserTimeline($userId = null, $screenName = null, $sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeRts = false, $includeEntities = false)
-	{
-		// build parameters
-		$parameters = array();
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($trimUser) $parameters['trim_user'] = 'true';
-		if($includeRts) $parameters['include_rts'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/user_timeline.json', $parameters);
-
-
-	}
-
-
-	/**
-	 * Returns the 20 most recent mentions (status containing @username) for the authenticating user.
-	 * The timeline returned is the equivalent of the one seen when you view your mentions on twitter.com.
-	 *
-	 * @return	array
-	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
-	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
-	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
-	 * @param	int[optional] $page					Specifies the page of results to retrieve.
-	 * @param	bool[optional] $trimUser			When set to either true, each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeRts			When set to either true, the timeline will contain native retweets (if they exist) in addition to the standard stream of tweets. The output format of retweeted tweets is identical to the representation you see in home_timeline. Note: If you're using the trim_user parameter in conjunction with include_rts, the retweets will still contain a full user object.
-	 * @param	bool[optional] $includeEntities		When set to either true, each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags. While entities are opt-in on timelines at present, they will be made a default component of output in the future.
-	 */
-	public function statusesMentions($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeRts = false, $includeEntities = false)
-	{
-		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
-
-		// build parameters
-		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($trimUser) $parameters['trim_user'] = 'true';
-		if($includeRts) $parameters['include_rts'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/mentions.json', $parameters, true);
-	}
-
-
-	/**
-	 * Returns the 20 most recent retweets posted by the authenticating user.
-	 *
-	 * @return	array
-	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
-	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
-	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
-	 * @param	int[optional] $page					Specifies the page of results to retrieve.
-	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function statusesRetweetedByMe($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeEntities = false)
-	{
-		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
-
-		// build parameters
-		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($trimUser) $parameters['trim_user'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/retweeted_by_me.json', $parameters, true);
-	}
-
-
-	/**
-	 * Returns the 20 most recent retweets posted by users the authenticating user follow.
-	 *
-	 * @return	array
-	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
-	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
-	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
-	 * @param	int[optional] $page					Specifies the page of results to retrieve.
-	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function statusesRetweetedToMe($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeEntities = false)
-	{
-		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
-
-		// build parameters
-		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($trimUser) $parameters['trim_user'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/retweeted_by_me.json', $parameters, true);
-	}
-
-
-	/**
-	 * Returns the 20 most recent tweets of the authenticated user that have been retweeted by others.
-	 *
-	 * @return	array
-	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
-	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
-	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
-	 * @param	int[optional] $page					Specifies the page of results to retrieve.
-	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function statusesReweetsOfMe($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeEntities = false)
-	{
-		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
-
-		// build parameters
-		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($trimUser) $parameters['trim_user'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/retweets_of_me.json', $parameters, true);
-	}
-
-
-// Tweets resources
-	/**
-	 * Returns a single status, specified by the id parameter below. The status's author will be returned inline.
-	 *
-	 * @return	array
-	 * @param	string $id							The numerical ID of the desired status.
-	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function statusesShow($id, $trimUser = false, $includeEntities = false)
-	{
-		// build parameters
-		$parameters['id'] = (string) $id;
-		if($trimUser) $parameters['trim_user'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/show.json', $parameters, true);
-	}
-
-
-	/**
-	 * Updates the authenticating user's status. A status update with text identical to the authenticating user's text identical to the authenticating user's current status will be ignored to prevent duplicates.
-	 *
-	 * @return	array
-	 * @param	string $status							The text of your status update, up to 140 characters. URL encode as necessary.
-	 * @param	string[optional] $inReplyToStatusId		The ID of an existing status that the update is in reply to.
-	 * @param	float[optional] $lat					The location's latitude that this tweet refers to.
-	 * @param	float[optional] $long					The location's longitude that this tweet refers to.
-	 * @param	string[optional] $placeId				A place in the world. These IDs can be retrieved from geo/reverse_geocode.
-	 * @param	bool[optional] $displayCoordinates		Whether or not to put a pin on the exact coordinates a tweet has been sent from.
-	 * @param	bool[optional] $trimUser				When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeEntities			When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function statusesUpdate($status, $inReplyToStatusId = null, $lat = null, $long = null, $placeId = null, $displayCoordinates = false, $trimUser = false, $includeEntities = false)
-	{
-		// build parameters
-		$parameters['status'] = (string) $status;
-		if($inReplyToStatusId != null) $parameters['in_reply_to_status_id'] = (string) $inReplyToStatusId;
-		if($lat != null) $parameters['lat'] = (float) $lat;
-		if($long != null) $parameters['long'] = (float) $long;
-		if($placeId != null) $parameters['place_id'] = (string) $placeId;
-		if($displayCoordinates) $parameters['display_coordinates'] = 'true';
-		if($trimUser) $parameters['trim_user'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/update.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Destroys the status specified by the required ID parameter.
-	 * Usage note: The authenticating user must be the author of the specified status.
-	 *
-	 * @return	bool
-	 * @param	string $id							The numerical ID of the desired status.
-	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function statusesDestroy($id, $trimUser = false, $includeEntities = false)
-	{
-		// build parameters
-		$parameters['id'] = (string) $id;
-		if($trimUser) $parameters['trim_user'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/destroy.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Retweets a tweet. Returns the original tweet with retweet details embedded.
-	 *
-	 * @return	array
-	 * @param	string $id							The numerical ID of the desired status.
-	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function statusesRetweet($id, $trimUser = false, $includeEntities = false)
-	{
-		$parameters = null;
-		if($trimUser) $parameters['trim_user'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/retweet/' . $id . '.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Returns up to 100 of the first retweets of a given tweet.
-	 *
-	 * @return	array
-	 * @param	string $id							The numerical ID of the desired status.
-	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 100.
-	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function statusesRetweets($id, $count = null, $trimUser = false, $includeEntities = false)
-	{
-		// validate
-		if($count != null && $count > 100) throw new TwitterException('Count may not be greater than 100.');
-
-		// build parameters
-		$parameters = null;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($trimUser) $parameters['trim_user'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/retweets/' . $id . '.json', $parameters);
-	}
-
-
-	/**
-	 * Show user objects of up to 100 members who retweeted the status.
-	 *
-	 * @return	array
-	 * @param	string $id							The numerical ID of the desired status.
-	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
-	 * @param	int[optional] $page					Specifies the page of results to retrieve.
-	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function statusesIdRetweetedBy($id, $count = null, $page = null, $trimUser = false, $includeEntities = false)
-	{
-		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
-
-		// build parameters
-		$parameters = null;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($trimUser) $parameters['trim_user'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/' . (string) $id . '/retweeted_by.json', $parameters, true);
-	}
-
-
-	/**
-	 * Show user ids of up to 100 users who retweeted the status.
-	 *
-	 * @return	array
-	 * @param	string $id							The numerical ID of the desired status.
-	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
-	 * @param	int[optional] $page					Specifies the page of results to retrieve.
-	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function statusesIdRetweetedByIds($id, $count = null, $page = null, $trimUser = false, $includeEntities = false)
-	{
-		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
-
-		// build parameters
-		$parameters = null;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($trimUser) $parameters['trim_user'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/' . (string) $id . '/retweeted_by/ids.json', $parameters, true);
-	}
-
-
-// User resources
-	/**
-	 * Returns extended information of a given user, specified by ID or screen name as per the required id parameter.
-	 * The author's most recent status will be returned inline.
-	 *
-	 * @return	array
-	 * @param	string[optional] $userId			Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-	 * @param	string[optional] $screenName		Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function usersShow($userId = null, $screenName = null, $includeEntities = false)
-	{
-		// validate
-		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
-
-		// build parameters
-		$parameters = null;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('users/show.json', $parameters);
-	}
-
-
-	/**
-	 * Return up to 100 users worth of extended information, specified by either ID, screen name, or combination of the two.
-	 * The author's most recent status (if the authenticating user has permission) will be returned inline.
-	 *
-	 * @return	array
-	 * @param	mixed[optional] $userIds			An array of user IDs, up to 100 in total.
-	 * @param	mixed[optional] $screenNames		An array of screen names, up to 100 in total.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function usersLookup($userIds = null, $screenNames = null, $includeEntities = false)
-	{
-		// redefine
-		$userIds = (array) $userIds;
-		$screenNames = (array) $screenNames;
-
-		// validate
-		if(empty($userIds) && empty($screenNames)) throw new TwitterException('Specify an userId or a screenName.');
-
-		// build parameters
-		$parameters = null;
-		if(!empty($userIds)) $parameters['user_id'] = implode(',', $userIds);
-		if(!empty($screenNames)) $parameters['screen_name'] = implode(',', $screenNames);
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('users/lookup.json', $parameters, true);
-
-	}
-
-
-	/**
-	 * Run a search for users similar to the Find People button on Twitter.com; the same results returned by people search on Twitter.com will be returned by using this API.
-	 * Usage note: It is only possible to retrieve the first 1000 matches from this API.
-	 *
-	 * @return	array
-	 * @param	string $q							The search query term.
-	 * @param	int[optional] $perPage				Specifies the number of results to retrieve.
-	 * @param	int[optional] $page					Specifies the page of results to retrieve.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function usersSearch($q, $perPage = null, $page = null, $includeEntities = false)
-	{
-		// build parameters
-		$parameters['q'] = (string) $q;
-		if($perPage != null) $parameters['per_page'] = (int) $perPage;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('users/search.json', $parameters, true);
-	}
-
-
-	/**
-	 * Access to Twitter's suggested user list. This returns the list of suggested user categories. The category can be used in the users/suggestions/category  endpoint to get the users in that category.
-	 *
-	 * @return	array
-	 */
-	public function usersSuggestions()
-	{
-		return (array) $this->doCall('users/suggestions.json');
-	}
-
-
-	/**
-	 * Access the users in a given category of the Twitter suggested user list.
-	 * It is recommended that end clients cache this data for no more than one hour.
-	 *
-	 * @return	array
-	 * @param	string $slug	The short name of list or a category.
-	 */
-	public function usersSuggestionsSlug($slug)
-	{
-		return (array) $this->doCall('users/suggestions/' . (string) $slug . '.json');
-	}
-
-
-	/**
-	 * Access the profile image in various sizes for the user with the indicated screen_name. If no size is provided the normal image is returned.
-	 * This method return an URL to the actual image resource.
-	 * This method should only be used by application developers to lookup or check the profile image URL for a user.
-	 * This method must not be used as the image source URL presented to users of your application.
-	 *
-	 * @return	string
-	 * @param	string $screenName			The screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	string[optional] $size		Specifies the size of image to fetch. Not specifying a size will give the default, normal size of 48px by 48px. Valid options include: bigger (73x73px), normal (48x48px), mini (24x24px).
-	 */
-	public function usersProfileImage($screenName, $size = 'normal')
-	{
-		// possible modes
-		$allowedSizes = array('normal', 'bigger', 'mini');
-
-		// validate
-		if($size != null && !in_array($size, $allowedSizes)) throw new TwitterException('Invalid size (' . $size . '), possible values are: ' . implode($allowedSizes) . '.');
-
-		// build parameters
-		$parameters['size'] = (string) $size;
-
-		$headers = $this->doCall('users/profile_image/' . (string) $screenName . '.json', $parameters, false, 'GET', null, false, true);
-
-		// return the URL
-		if(isset($headers['url'])) return $headers['url'];
-
-		// fallback
-		return false;
-	}
-
-
-	/**
-	 * Returns a user's friends, each with current status inline. They are ordered by the order in which the user followed them, most recently followed first, 100 at a time.
-	 * (Please note that the result set isn't guaranteed to be 100 every time as suspended users will be filtered out.)
-	 *
-	 * Use the cursor option to access older friends.
-	 * With no user specified, request defaults to the authenticated user's friends.
-	 * It's also possible to request another user's friends list via the id, screen_name or user_id parameter.
-	 *
-	 * @return	array
-	 * @param	string[optional] $userId			Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-	 * @param	string[optional] $screenName		Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	int[optional] $cursor				Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function statusesFriends($userId = null, $screenName = null, $cursor = null, $includeEntities = false)
-	{
-		// build parameters
-		$parameters = array();
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($cursor != null) $parameters['cursor'] = $cursor;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/friends.json', $parameters, true);
-	}
-
-
-	/**
-	 * Returns the authenticating user's followers, each with current status inline. They are ordered by the order in which they followed the user, 100 at a time. (Please note that the result set isn't guaranteed to be 100 every time as suspended users will be filtered out.)
-	 * Use the cursor parameter to access earlier followers.
-	 *
-	 * @return	array
-	 * @param	string[optional] $userId			Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-	 * @param	string[optional] $screenName		Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	int[optional] $cursor				Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function statusesFollowers($userId = null, $screenName = null, $cursor = null, $includeEntities = false)
-	{
-		// build parameters
-		$parameters = array();
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($cursor != null) $parameters['cursor'] = $cursor;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('statuses/followers.json', $parameters, true);
-	}
-
-
-// Trends resources
-	/**
-	 * Returns the top ten topics that are currently trending on Twitter.
-	 * The response includes the time of the request, the name of each trend, and the url to the Twitter Search results page for that topic.
-	 *
-	 * @return	array
-	 */
-	public function trends()
-	{
-		return (array) $this->doCall('trends.json');
-	}
-
-
-	/**
-	 * Returns the current top 10 trending topics on Twitter. The response includes the time of the request, the name of each trending topic, and query used on Twitter Search results page for that topic.
-	 *
-	 * @return	array
-	 * @param	string[optional] $exclude	Setting this equal to hashtags will remove all hashtags from the trends list.
-	 */
-	public function trendsCurrent($exclude = null)
-	{
-		// build parameters
-		$parameters = null;
-		if($exclude != null) $parameters['exclude'] = (string) $exclude;
-
-		// make the call
-		return (array) $this->doCall('trends/current.json', $parameters);
-	}
-
-
-	/**
-	 * Returns the top 20 trending topics for each hour in a given day.
-	 *
-	 * @return	array
-	 * @param	string[optional] $date		Permits specifying a start date for the report. The date should be formatted YYYY-MM-DD.
-	 * @param	string[optional] $exclude	Setting this equal to hashtags will remove all hashtags from the trends list.
-	 */
-	public function trendsDaily($date = null, $exclude = null)
-	{
-		// build parameters
-		$parameters = null;
-		if($date != null) $parameters['date'] = (string) $date;
-		if($exclude != null) $parameters['exclude'] = (string) $exclude;
-
-		// make the call
-		return (array) $this->doCall('trends/daily.json', $parameters);
-	}
-
-
-	/**
-	 * Returns the top 30 trending topics for each day in a given week.
-	 *
-	 * @return	array
-	 * @param	string[optional] $date		Permits specifying a start date for the report. The date should be formatted YYYY-MM-DD.
-	 * @param	string[optional] $exclude	Setting this equal to hashtags will remove all hashtags from the trends list.
-	 */
-	public function trendsWeekly($date = null, $exclude = null)
-	{
-		// build parameters
-		$parameters = null;
-		if($date != null) $parameters['date'] = (string) $date;
-		if($exclude != null) $parameters['exclude'] = (string) $exclude;
-
-		// make the call
-		return (array) $this->doCall('trends/weekly.json', $parameters);
-	}
-
-
-// List resources
-	/**
-	 * Creates a new list for the authenticated user. Accounts are limited to 20 lists.
-	 *
-	 * @return	array
-	 * @param	string $user					The user.
-	 * @param	string $name					The name of the list you are creating.
-	 * @param	string[optional] $mode			Whether your list is public or private. Values can be public or private. Lists are public by default if no mode is specified.
-	 * @param	string[optional] $description	The description of the list you are creating.
-	 */
-	public function userListsCreate($user, $name, $mode = null, $description = null)
-	{
-		// possible modes
-		$allowedModes = array('public', 'private');
-
-		// validate
-		if($mode != null && !in_array($mode, $allowedModes)) throw new TwitterException('Invalid mode (), possible values are: ' . implode($allowedModes) . '.');
-
-		// build parameters
-		$parameters['name'] = (string) $name;
-		if($mode != null) $parameters['mode'] = (string) $mode;
-		if($description != null) $parameters['description'] = (string) $description;
-
-		// make the call
-		return (array) $this->doCall((string) $user . '/lists.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * List the lists of the specified user. Private lists will be included if the authenticated users is the same as the user who's lists are being returned.
-	 *
-	 * @return	array
-	 * @param	string $user				The user.
-	 * @param	string[optional] $cursor	Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-	 */
-	public function userLists($user, $cursor = null)
-	{
-		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
-
-		// make the call
-		return (array) $this->doCall((string) $user . '/lists.json', $parameters, true);
-	}
-
-
-	/**
-	 * Show the specified list. Private lists will only be shown if the authenticated user owns the specified list.
-	 *
-	 * @return	array
-	 * @param	string $user	The user.
-	 * @param	string $id		The id of the list.
-	 */
-	public function userListsId($user, $id)
-	{
-		// make the call
-		return (array) $this->doCall((string) $user . '/lists/' . (string) $id . '.json', null, true);
-	}
-
-
-	/**
-	 * Updates the specified list.
-	 *
-	 * @return	array
-	 * @param	string $user					The user.
-	 * @param	string $id						The id of the list.
-	 * @param	string[optional] $name			The name of the list you are creating.
-	 * @param	string[optional] $mode			Whether your list is public or private. Values can be public or private. Lists are public by default if no mode is specified.
-	 * @param	string[optional] $description	The description of the list you are creating.
-	 */
-	public function userListsIdUpdate($user, $id, $name = null, $mode = null, $description = null)
-	{
-		// possible modes
-		$allowedModes = array('public', 'private');
-
-		// validate
-		if($mode != null && !in_array($mode, $allowedModes)) throw new TwitterException('Invalid mode (), possible values are: ' . implode($allowedModes) . '.');
-
-		// build parameters
-		if($name != null) $parameters['name'] = (string) $name;
-		if($mode != null) $parameters['mode'] = (string) $mode;
-		if($description != null) $parameters['description'] = (string) $description;
-
-		// make the call
-		return (array) $this->doCall((string) $user . '/lists/' . (string) $id . '.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Show tweet timeline for members of the specified list.
-	 *
-	 * @return	array
-	 * @param	string $user						The user.
-	 * @param	string $id							The id of the list.
-	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
-	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
-	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
-	 * @param	int[optional] $page					Specifies the page of results to retrieve.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function userListsIdStatuses($user, $id, $sinceId = null, $maxId = null, $count = null, $page = null, $includeEntities = false)
-	{
-		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
-
-		// build parameters
-		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['per_page'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall((string) $user . '/lists/' . (string) $id . '/statuses.json', $parameters);
-	}
-
-
-	/**
-	 * List the lists the specified user has been added to.
-	 *
-	 * @return	array
-	 * @param	string $user				The user.
-	 * @param	string[optional] $cursor	Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-	 */
-	public function userListsMemberships($user, $cursor = null)
-	{
-		// build parameters
-		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
-
-		// make the call
-		return (array) $this->doCall((string) $user . '/lists/memberships.json', $parameters, true);
-	}
-
-
-	/**
-	 * List the lists the specified user follows.
-	 *
-	 * @return	array
-	 * @param	string $user				The user.
-	 * @param	string[optional] $cursor	Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-	 */
-	public function userListsSubscriptions($user, $cursor = null)
-	{
-		// build parameters
-		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
-
-		// make the call
-		return (array) $this->doCall((string) $user . '/lists/subscriptions.json', $parameters, true);
-	}
-
-
-// List Members resources
-	/**
-	 * Returns the members of the specified list.
-	 *
-	 * @return	array
-	 * @param	string $user						The user.
-	 * @param	string $id							The id of the list.
-	 * @param	string[optional] $cursor			Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function userListMembers($user, $id, $cursor = null, $includeEntities = false)
-	{
-		// build parameters
-		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall((string) $user . '/' . (string) $id . '/members.json', $parameters, true);
-	}
-
-
-	/**
-	 * Add a member to a list. The authenticated user must own the list to be able to add members to it. Lists are limited to having 500 members.
-	 *
-	 * @return	array
-	 * @param	string $user	The user.
-	 * @param	string $id		The id of the list.
-	 * @param	string $userId	The id or screen name of the user to add as a member of the list.
-	 */
-	public function userListMembersCreate($user, $id, $userId)
-	{
-		// build parameters
-		$parameters['id'] = (string) $userId;
-
-		// make the call
-		return (array) $this->doCall((string) $user . '/' . (string) $id . '/members.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Adds multiple members to a list, by specifying a comma-separated list of member ids or screen names. The authenticated user must own the list to be able to add members to it. Lists are limited to having 500 members, and you are limited to adding up to 100 members to a list at a time with this method.
-	 *
-	 * @return	array
-	 * @param	string $user					The user.
-	 * @param	string $id						The id of the list.
-	 * @param	mixed[optional] $userIds		An array of user IDs, up to 100 in total.
-	 * @param	mixed[optional] $screenNames	An array of screen names, up to 100 in total.
-	 */
-	public function userListMembersCreateAll($user, $id, $userIds = null, $screenNames = null)
-	{
-		// redefine
-		$userIds = (array) $userIds;
-		$screenNames = (array) $screenNames;
-
-		// validate
-		if(empty($userIds) && empty($screenNames)) throw new TwitterException('Specify an userId or a screenName.');
-
-		// build parameters
-		$parameters = null;
-		if(!empty($userIds)) $parameters['user_id'] = implode(',', $userIds);
-		if(!empty($screenNames)) $parameters['screen_name'] = implode(',', $screenNames);
-
-		// make the call
-		return (array) $this->doCall((string) $user . '/' . (string) $id . '/create_all.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Removes the specified member from the list. The authenticated user must be the list's owner to remove members from the list.
-	 *
-	 * @return	mixed
-	 * @param	string $user	The user.
-	 * @param	string $id		The id of the list.
-	 * @param	string $userId	Specfies the ID of the user for whom to return results for.
-	 */
-	public function userListMembersDelete($user, $id, $userId)
-	{
-		// build parameters
-		$parameters['id'] = (string) $userId;
-		$parameters['_method'] = 'DELETE';
-
-		// make the call
-		return (array) $this->doCall((string) $user . '/' . (string) $id . '/members.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Check if a user is a member of the specified list.
-	 *
-	 * @return	mixed
-	 * @param	string $user						The user.
-	 * @param	string $id							The id of the list.
-	 * @param	string $userId						Specfies the ID of the user for whom to return results for.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function userListMembersId($user, $id, $userId, $includeEntities = false)
-	{
-		try
-		{
-			// build parameters
-			$parameters = null;
-			if($includeEntities) $parameters['include_entities'] = 'true';
-
-			// make the call
-			return (array) $this->doCall((string) $user . '/' . (string) $id . '/members/' . (string) $userId . '.json', $parameters, true);
-		}
-
-		// catch exceptions
-		catch(TwitterException $e)
-		{
-			if($e->getMessage() == 'The specified user is not a member of this list') return false;
-			else throw $e;
-		}
-	}
-
-
-// List Subscribers resources
-	/**
-	 * Returns the subscribers of the specified list.
-	 *
-	 * @return	array
-	 * @param	string $user						The user.
-	 * @param	string $id							The id of the list.
-	 * @param	string[optional] $cursor			Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function userListSubscribers($user, $id, $cursor = null, $includeEntities = false)
-	{
-		// build parameters
-		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall((string) $user . '/' . (string) $id . '/subscribers.json', $parameters, true);
-	}
-
-
-	/**
-	 * Make the authenticated user follow the specified list.
-	 *
-	 * @return	array
-	 * @param	string $user	The user.
-	 * @param	string $id		The id of the list.
-	 */
-	public function userListSubscribersCreate($user, $id)
-	{
-		// make the call
-		return (array) $this->doCall((string) $user . '/' . (string) $id . '/subscribers.json', null, true, 'POST');
-	}
-
-
-	/**
-	 * Unsubscribes the authenticated user form the specified list.
-	 *
-	 * @return	array
-	 * @param	string $user	The user.
-	 * @param	string $id		The id of the list.
-	 */
-	public function userListSubscribersDelete($user, $id)
-	{
-		// build parameters
-		$parameters['_method'] = 'DELETE';
-
-		// make the call
-		return (array) $this->doCall((string) $user . '/' . (string) $id . '/subscribers.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Check if the specified user is a subscriber of the specified list.
-	 *
-	 * @return	mixed
-	 * @param	string $user						The user.
-	 * @param	string $id							The id of the list.
-	 * @param	string $userId						Specfies the ID of the user for whom to return results for.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function userListSubscribersId($user, $id, $userId, $includeEntities = false)
-	{
-		try
-		{
-			// build parameters
-			$parameters = null;
-			if($includeEntities) $parameters['include_entities'] = 'true';
-
-			// make the call
-			return (array) $this->doCall((string) $user . '/' . (string) $id . '/subscribers/' . (string) $userId . '.json', $parameters, true);
-		}
-
-		// catch exceptions
-		catch(TwitterException $e)
-		{
-			if($e->getMessage() == 'The specified user is not a subscriber of this list') return false;
-			else throw $e;
-		}
-
-	}
-
-
-// Direct Messages resources
-	/**
-	 * Returns a list of the 20 most recent direct messages sent to the authenticating user.
-	 *
-	 * @return	array
-	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
-	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
-	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
-	 * @param	int[optional] $page					Specifies the page of results to retrieve.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function directMessages($sinceId = null, $maxId = null, $count = null, $page = null, $includeEntities = false)
-	{
-		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
-
-		// build parameters
-		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('direct_messages.json', $parameters, true);
-	}
-
-
-	/**
-	 * Returns a list of the 20 most recent direct messages sent by the authenticating user.
-	 *
-	 * @return	array
-	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
-	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
-	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
-	 * @param	int[optional] $page					Specifies the page of results to retrieve.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function directMessagesSent($sinceId = null, $maxId = null, $count = null, $page = null, $includeEntities = false)
-	{
-		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
-
-		// build parameters
-		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('direct_messages/sent.json', $parameters, true);
-	}
-
-
-	/**
-	 * Sends a new direct message to the specified user from the authenticating user.
-	 * Requires both the user and text parameters. Returns the sent message in the requested format when successful.
-	 *
-	 * @return	array
-	 * @param	string $text						The text of your direct message. Be sure to URL encode as necessary, and keep it under 140 characters.
-	 * @param 	string[optional] $userId			Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	string[optional] $screenName		Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function directMessagesNew($text, $userId = null, $screenName = null, $includeEntities = false)
-	{
-		// validate
-		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
-
-		// build parameters
-		$parameters['text'] = (string) $text;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('direct_messages/new.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Destroys the direct message specified in the required ID parameter. The authenticating user must be the recipient of the specified direct message.
-	 *
-	 * @return	array
-	 * @param	string $id							The ID of the desired direct message.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function directMessagesDestroy($id, $includeEntities = false)
-	{
-		// build parameters
-		$parameters['id'] = (string) $id;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('direct_messages/destroy.json', $parameters, true, 'POST');
-	}
-
-
-// Friendship resources
-	/**
-	 * Allows the authenticating users to follow the user specified in the ID parameter.
-	 * Returns the befriended user in the requested format when successful.
-	 * Returns a string describing the failure condition when unsuccessful.
-	 *
-	 * @return	mixed
-	 * @param 	string[optional] $userId			Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	string[optional] $screenName		Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-	 * @param	bool[optional] $follow				Returns public statuses that reference the given set of users.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function friendshipsCreate($userId = null, $screenName = null, $follow = false, $includeEntities = false)
-	{
-		// validate
-		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
-
-		// build parameters
-		$parameters = null;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		$parameters['follow'] = ($follow) ? 'true' : 'false';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('friendships/create.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Allows the authenticating users to unfollow the user specified in the ID parameter.
-	 * Returns the unfollowed user in the requested format when successful. Returns a string describing the failure condition when unsuccessful.
-	 *
-	 * @return	array
-	 * @param 	string[optional] $userId			Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	string[optional] $screenName		Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function friendshipsDestroy($userId = null, $screenName = null, $includeEntities = false)
-	{
-		// validate
-		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
-
-		// build parameters
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('friendships/destroy.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Tests for the existence of friendship between two users. Will return true if user_a follows user_b, otherwise will return false.
-	 *
-	 * @return	bool
-	 * @param	string $userA	The ID or screen_name of the subject user.
-	 * @param	string $userB	The ID or screen_name of the user to test for following.
-	 */
-	public function friendshipsExists($userA, $userB)
-	{
-		// build parameters
-		$parameters['user_a'] = (string) $userA;
-		$parameters['user_b'] = (string) $userB;
-
-		// make the call
-		return (bool) $this->doCall('friendships/exists.json', $parameters);
-	}
-
-
-	/**
-	 * Returns detailed information about the relationship between two users.
-	 *
-	 * @return	array
-	 * @param 	string[optional] $sourceId				The user_id of the subject user.
-	 * @param 	string[optional] $sourceScreenName		The screen_name of the subject user.
-	 * @param 	string[optional] $targetId				The screen_name of the subject user.
-	 * @param 	string[optional] $targetScreenName		The screen_name of the target user.
-	 */
-	public function friendshipsShow($sourceId = null, $sourceScreenName = null, $targetId = null, $targetScreenName = null)
-	{
-		// validate
-		if($sourceId == '' && $sourceScreenName == '') throw new TwitterException('Specify an sourceId or a sourceScreenName.');
-		if($targetId == '' && $targetScreenName == '') throw new TwitterException('Specify an targetId or a targetScreenName.');
-
-		// build parameters
-		if($sourceId != null) $parameters['source_id'] = (string) $sourceId;
-		if($sourceScreenName != null) $parameters['source_screen_name'] = (string) $sourceScreenName;
-		if($targetId != null) $parameters['target_id'] = (string) $targetId;
-		if($targetScreenName != null) $parameters['target_screen_name'] = (string) $targetScreenName;
-
-		// make the call
-		return (array) $this->doCall('friendships/show.json', $parameters);
-	}
-
-
-	/**
-	 * Returns an array of numeric IDs for every user who has a pending request to follow the authenticating user.
-	 *
-	 * @return	array
-	 * @param	string[optional] $cursor	Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-	 */
-	public function friendshipsIncoming($cursor = null)
-	{
-		// build parameters
-		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
-
-		// make the call
-		return (array) $this->doCall('friendships/incoming.json', $parameters, true);
-	}
-
-
-	/**
-	 * Returns an array of numeric IDs for every protected user for whom the authenticating user has a pending follow request.
-	 *
-	 * @return	array
-	 * @param	string[optional] $cursor	Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-	 */
-	public function friendshipsOutgoing($cursor = null)
-	{
-		// build parameters
-		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
-
-		// make the call
-		return (array) $this->doCall('friendships/outgoing.json', $parameters, true);
-	}
-
-
-// Friends and Followers resources
-	/**
-	 * Returns an array of numeric IDs for every user the specified user is following.
-	 *
-	 * @return	array
-	 * @param 	string[optional] $userId		Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	string[optional] $screenName	Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-	 * @param	string[optional] $cursor	Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-	 */
-	public function friendsIds($userId = null, $screenName = null, $cursor = null)
-	{
-		// validate
-		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
-
-		// build parameters
-		$parameters = null;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
-
-		// make the call
-		return (array) $this->doCall('friends/ids.json', $parameters, true);
-	}
-
-
-	/**
-	 * Returns an array of numeric IDs for every user following the specified user.
-	 *
-	 * @return	array
-	 * @param 	string[optional] $userId		Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	string[optional] $screenName	Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-	 * @param	string[optional] $cursor	Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-	 */
-	public function followersIds($userId = null, $screenName = null, $cursor = null)
-	{
-		// validate
-		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
-
-		// build parameters
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
-
-		// make the call
-		return (array) $this->doCall('followers/ids.json', $parameters, true);
-	}
-
-
-// Account resources
-	/**
-	 * Returns an HTTP 200 OK response code and a representation of the requesting user if authentication was successful; returns a 401 status code and an error message if not. Use this method to test if supplied user credentials are valid.
-	 *
-	 * @return	array
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function accountVerifyCredentials($includeEntities = false)
-	{
-		// build parameters
-		$parameters = null;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('account/verify_credentials.json', $parameters, true);
-	}
-
-
-	/**
-	 * Returns the remaining number of API requests available to the requesting user before the API limit is reached for the current hour. Calls to rate_limit_status do not count against the rate limit.
-	 * If authentication credentials are provided, the rate limit status for the authenticating user is returned. Otherwise, the rate limit status for the requester's IP address is returned.
-	 *
-	 * @return	array
-	 */
-	public function accountRateLimitStatus()
-	{
-		// make the call
-		return (array) $this->doCall('account/rate_limit_status.json', null);
-	}
-
-
-	/**
-	 * Ends the session of the authenticating user, returning a null cookie. Use this method to sign users out of client-facing applications like widgets.
-	 *
-	 * @return	bool
-	 */
-	public function accountEndSession()
-	{
-		try
-		{
-			// make the call
-			$this->doCall('account/end_session.json', null, true, 'POST');
-		}
-
-		// catch exceptions
-		catch(TwitterException $e)
-		{
-			if($e->getMessage() == 'Logged out.') return true;
-			else throw $e;
-		}
-	}
-
-
-	/**
-	 * Sets which device Twitter delivers updates to for the authenticating user. Sending none as the device parameter will disable IM or SMS updates.
-	 *
-	 * @return	array
-	 * @param	string $device						Delivery device type to send updates to.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function accountUpdateDeliveryDevices($device, $includeEntities = false)
-	{
-		// build parameters
-		$parameters['device'] = (string) $device;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('account/update_delivery_device.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Sets one or more hex values that control the color scheme of the authenticating user's profile page on twitter.com.
-	 * Each parameter's value must be a valid hexidecimal value, and may be either three or six characters (ex: #fff or #ffffff).
-	 *
-	 * @return	array
-	 * @param	string[optional] $profileBackgroundColor		Profile background color.
-	 * @param	string[optional] $profileTextColor				Profile text color.
-	 * @param	string[optional] $profileLinkColor				Profile link color.
-	 * @param	string[optional] $profileSidebarFillColor		Profile sidebar's background color.
-	 * @param	string[optional] $profileSidebarBorderColor		Profile sidebar's border color.
-	 * @param	bool[optional] $includeEntities					When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function accountUpdateProfileColors($profileBackgroundColor = null, $profileTextColor = null, $profileLinkColor = null, $profileSidebarFillColor = null, $profileSidebarBorderColor = null, $includeEntities = false)
-	{
-		// validate
-		if($profileBackgroundColor == '' && $profileTextColor == '' && $profileLinkColor == '' && $profileSidebarFillColor == '' && $profileSidebarBorderColor == '') throw new TwitterException('Specify a profileBackgroundColor, profileTextColor, profileLinkColor, profileSidebarFillColor or a profileSidebarBorderColor.');
-
-		// build parameters
-		if($profileBackgroundColor != null) $parameters['profile_background_color'] = (string) $profileBackgroundColor;
-		if($profileTextColor != null) $parameters['profile_text_color'] = (string) $profileTextColor;
-		if($profileLinkColor != null) $parameters['profile_link_color'] = (string) $profileLinkColor;
-		if($profileSidebarFillColor != null) $parameters['profile_sidebar_fill_color'] = (string) $profileSidebarFillColor;
-		if($profileSidebarBorderColor != null) $parameters['profile_sidebar_border_color'] = (string) $profileSidebarBorderColor;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('account/update_profile_colors.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Updates the authenticating user's profile image.
-	 *
-	 * @return	array
-	 * @param	string $image						The path to the avatar image for the profile. Must be a valid GIF, JPG, or PNG image of less than 700 kilobytes in size. Images with width larger than 500 pixels will be scaled down.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function accountUpdateProfileImage($image, $includeEntities = false)
-	{
-		// validate
-		if(!file_exists($image)) throw new TwitterException('Image (' . $image . ') doesn\'t exists.');
-
-		// build parameters
-		$parameters = null;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('account/update_profile_image.json', $parameters, true, 'POST', $image);
-	}
-
-
-	/**
-	 * Updates the authenticating user's profile background image.
-	 *
-	 * @return	array
-	 * @param	string $image						The path to the background image for the profile. Must be a valid GIF, JPG, or PNG image of less than 800 kilobytes in size. Images with width larger than 2048 pixels will be forceably scaled down.
-	 * @param	bool[optional] $tile				Whether or not to tile the background image. If set to true the background image will be displayed tiled. The image will not be tiled otherwise.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function accountUpdateProfileBackgroundImage($image, $tile = false, $includeEntities = false)
-	{
-		// validate
-		if(!file_exists($image)) throw new TwitterException('Image (' . $image . ') doesn\'t exists.');
-
-		// build parameters
-		$parameters = null;
-		if($tile) $parameters['tile'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('account/update_profile_background_image.json', $parameters, true, 'POST', $image);
-	}
-
-
-	/**
-	 * Sets values that users are able to set under the "Account" tab of their settings page. Only the parameters specified will be updated.
-	 *
-	 * @return	array
-	 * @param	string[optional] $name			Full name associated with the profile. Maximum of 20 characters.
-	 * @param	string[optional] $url			URL associated with the profile. Will be prepended with "http://" if not present. Maximum of 100 characters.
-	 * @param	string[optional] $location		The city or country describing where the user of the account is located. The contents are not normalized or geocoded in any way. Maximum of 30 characters.
-	 * @param	string[optional] $description	A description of the user owning the account. Maximum of 160 characters.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function accountUpdateProfile($name = null, $url = null, $location = null, $description = null, $includeEntities = false)
-	{
-		// build parameters
-		$parameters = null;
-		if($name != null) $parameters['name'] = (string) $name;
-		if($url != null) $parameters['url'] = (string) $url;
-		if($location != null) $parameters['location'] = (string) $location;
-		if($description != null) $parameters['description'] = (string) $description;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('account/update_profile.json', $parameters, true, 'POST');
-	}
-
-
-// Favorites resources
-	/**
-	 * Returns the 20 most recent favorite statuses for the authenticating user or user specified by the ID parameter in the requested format.
-	 *
-	 * @return	array
-	 * @param	string[optional] $id				Specifies the ID or screen name of the user for whom to return results for.
-	 * @param	int[optional] $page					Specifies the page of results to retrieve.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function favorites($id = null, $page = null, $includeEntities = false)
-	{
-		// build parameters
-		$parameters = null;
-		if($id != null) $parameters['id'] = (string) $id;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('favorites.json', $parameters, true);
-	}
-
-
-	/**
-	 * Favorites the status specified in the ID parameter as the authenticating user. Returns the favorite status when successful.
-	 *
-	 * @return	array
-	 * @param	string $id							The numerical ID of the desired status.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function favoritesCreate($id, $includeEntities = false)
-	{
-		// build parameters
-		$parameters = null;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('favorites/create/' . $id . '.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Un-favorites the status specified in the ID parameter as the authenticating user. Returns the un-favorited status in the requested format when successful.
-	 *
-	 * @return	array
-	 * @param	string $id							The numerical ID of the desired status.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function favoritesDestroy($id, $includeEntities = false)
-	{
-		// build parameters
-		$parameters = null;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('favorites/destroy/' . $id . '.json', $parameters, true, 'POST');
-	}
-
-
-// Notification resources
-	/**
-	 * Enables device notifications for updates from the specified user. Returns the specified user when successful.
-	 *
-	 * @return	array
-	 * @param 	string[optional] $userId			Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	string[optional] $screenName		Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function notificationsFollow($userId = null, $screenName = null, $includeEntities = false)
-	{
-		// validate
-		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
-
-		// build parameters
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('notifications/follow.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Disables notifications for updates from the specified user to the authenticating user. Returns the specified user when successful.
-	 *
-	 * @return	array
-	 * @param 	string[optional] $userId			Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	string[optional] $screenName		Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function notificationsLeave($userId = null, $screenName = null, $includeEntities = false)
-	{
-		// validate
-		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
-
-		// build parameters
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('notifications/leave.json', $parameters, true, 'POST');
-	}
-
-
-// Block resources
-	/**
-	 * Blocks the user specified in the ID parameter as the authenticating user. Destroys a friendship to the blocked user if it exists. Returns the blocked user in the requested format when successful.
-	 *
-	 * @return	array
-	 * @param 	string[optional] $userId			Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	string[optional] $screenName		Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function blocksCreate($userId = null, $screenName = null, $includeEntities = false)
-	{
-		// validate
-		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
-
-		// build parameters
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('blocks/create.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Un-blocks the user specified in the ID parameter for the authenticating user. Returns the un-blocked user in the requested format when successful.
-	 *
-	 * @return	array
-	 * @param 	string[optional] $userId			Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	string[optional] $screenName		Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function blocksDestroy($userId = null, $screenName = null, $includeEntities = false)
-	{
-		// validate
-		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
-
-		// build parameters
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('blocks/destroy.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Un-blocks the user specified in the ID parameter for the authenticating user. Returns the un-blocked user in the requested format when successful.
-	 *
-	 * @return	mixed
-	 * @param 	string[optional] $userId			Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	string[optional] $screenName		Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function blocksExists($userId = null, $screenName = null, $includeEntities = false)
-	{
-		// validate
-		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
-
-		// build parameters
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		try
-		{
-			// make the call
-			return (array) $this->doCall('blocks/exists.json', $parameters, true);
-		}
-		// catch exceptions
-		catch(TwitterException $e)
-		{
-			if($e->getMessage() == 'You are not blocking this user.') return false;
-			else throw $e;
-		}
-	}
-
-
-	/**
-	 * Returns an array of user objects that the authenticating user is blocking.
-	 *
-	 * @return	array
-	 * @param	int[optional] $page					Specifies the page of results to retrieve. Note: there are pagination limits. See the FAQ for details.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function blocksBlocking($page = null, $includeEntities = false)
-	{
-		// build parameters
-		$parameters = null;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('blocks/blocking.json', $parameters, true);
-	}
-
-
-	/**
-	 * Returns an array of numeric user ids the authenticating user is blocking.
-	 *
-	 * @return	array
-	 */
-	public function blocksBlockingIds()
-	{
-		// make the call
-		return (array) $this->doCall('blocks/blocking/ids.json', null, true);
-	}
-
-
-// Spam Reporting resources
-	/**
-	 * The user specified in the id is blocked by the authenticated user and reported as a spammer.
-	 *
-	 * @return	array
-	 * @param 	string[optional] $userId		Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	string[optional] $screenName	Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
-	public function reportSpam($userId = null, $screenName = null, $includeEntities = false)
-	{
-		// validate
-		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
-
-		// build parameters
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($includeEntities) $parameters['include_entities'] = 'true';
-
-		// make the call
-		return (array) $this->doCall('report_spam.json', $parameters, true, 'POST');
-	}
-
-
-// Search resources
-	/**
-	 * Returns tweets that match a specified query.
-	 *
-	 * @return	array
-	 * @param	string $q						Search query. Should be URL encoded. Queries will be limited by complexity.
-	 * @param 	string[optional] $lang			Restricts tweets to the given language, given by an ISO 639-1 code.
-	 * @param 	string[optional] $locale		Specify the language of the query you are sending (only ja is currently effective). This is intended for language-specific clients and the default should work in the majority of cases.
-	 * @param 	int[optional] $rpp				The number of tweets to return per page, up to a max of 100.
-	 * @param 	int[optional] $page				The page number (starting at 1) to return, up to a max of roughly 1500 results (based on rpp * page).
-	 * @param 	string[optional] $sinceId		Returns results with an ID greater than (that is, more recent than) the specified ID. There are limits to the number of Tweets which can be accessed through the API. If the limit of Tweets has occured since the since_id, the since_id will be forced to the oldest ID available.
-	 * @param 	string[optional] $until			Returns tweets generated before the given date. Date should be formatted as YYYY-MM-DD.
-	 * @param 	string[optional] $geocode		Returns tweets by users located within a given radius of the given latitude/longitude. The location is preferentially taking from the Geotagging API, but will fall back to their Twitter profile. The parameter value is specified by "latitude,longitude,radius", where radius units must be specified as either "mi" (miles) or "km" (kilometers). Note that you cannot use the near operator via the API to geocode arbitrary locations; however you can use this geocode parameter to search near geocodes directly.
-	 * @param 	bool[optional] $showUser		When true, prepends ":" to the beginning of the tweet. This is useful for readers that do not display Atom's author field. The default is false.
-	 * @param 	string[optional] $resultType	Specifies what type of search results you would prefer to receive. The current default is "mixed." Valid values include: mixed, recent, popular.
-	 */
-	public function search($q, $lang = null, $locale = null, $rpp = null, $page = null, $sinceId = null, $until = null, $geocode = null, $showUser = false, $resultType = null)
-	{
-		$parameters['q'] = (string) $q;
-		if($lang !== null) $parameters['lang'] = (string) $lang;
-		if($locale !== null) $parameters['locale'] = (string) $locale;
-		if($rpp !== null) $parameters['rpp'] = (int) $rpp;
-		if($page !== null) $parameters['page'] = (int) $page;
-		if($sinceId !== null) $parameters['since_id'] = (string) $sinceId;
-		if($until !== null) $parameters['until'] = (string) $until;
-		if($geocode !== null) $parameters['geocode'] = (string) $geocode;
-		if($showUser === true) $parameters['show_user'] = 'true';
-		if($resultType !== null) $parameters['result_type'] = (string) $resultType;
-
-		return (array) $this->doSearchCall('search.json', $parameters);
-	}
-
-
-// Saved Searches resources
-	/**
-	 * Returns the authenticated user's saved search queries.
-	 *
-	 * @return	array
-	 */
-	public function savedSearches()
-	{
-		// make the call
-		return (array) $this->doCall('saved_searches.json', null, true);
-	}
-
-
-	/**
-	 * Retrieve the data for a saved search owned by the authenticating user specified by the given id.
-	 *
-	 * @return	array
-	 * @param	string $id	The ID of the desired saved search.
-	 */
-	public function savedSearchesShow($id)
-	{
-		// make the call
-		return (array) $this->doCall('saved_searches/show/' . (string) $id . '.json', null, true);
-	}
-
-
-	/**
-	 * Creates a saved search for the authenticated user.
-	 *
-	 * @return	array
-	 * @param	string $query	The query of the search the user would like to save.
-	 */
-	public function savedSearchesCreate($query)
-	{
-		// build parameters
-		$parameters['query'] = (string) $query;
-
-		// make the call
-		return (array) $this->doCall('saved_searches/create.json', $parameters, true, 'POST');
-	}
-
-
-	/**
-	 * Destroys a saved search for the authenticated user. The search specified by id must be owned by the authenticating user.
-	 *
-	 * @return	array
-	 * @param	string $id	The ID of the desired saved search.
-	 */
-	public function savedSearchesDestroy($id)
-	{
-		return (array) $this->doCall('saved_searches/destroy/' . (string) $id . '.json', null, true, 'POST');
-	}
-
-
-// OAuth resources
-	/**
-	 * Allows a Consumer application to obtain an OAuth Request Token to request user authorization.
-	 * This method fulfills Secion 6.1 of the OAuth 1.0 authentication flow.
-	 *
-	 * @return	array							An array containg the token and the secret
-	 * @param	string[optional] $callbackURL	The callback URL.
-	 */
-	public function oAuthRequestToken($callbackURL = null)
-	{
-		// init var
-		$parameters = null;
-
-		// set callback
-		if($callbackURL != null) $parameters['oauth_callback'] = (string) $callbackURL;
-
-		// make the call
-		$response = $this->doOAuthCall('request_token', $parameters);
-
-		// validate
-		if(!isset($response['oauth_token'], $response['oauth_token_secret'])) throw new TwitterException(implode(', ', array_keys($response)));
-
-		// set some properties
-		if(isset($response['oauth_token'])) $this->setOAuthToken($response['oauth_token']);
-		if(isset($response['oauth_token_secret'])) $this->setOAuthTokenSecret($response['oauth_token_secret']);
-
-		// return
-		return $response;
-	}
-
-
-	/**
-	 * Allows a Consumer application to exchange the OAuth Request Token for an OAuth Access Token.
-	 * This method fulfills Secion 6.3 of the OAuth 1.0 authentication flow.
-	 *
-	 * @return	array
-	 * @param	string $token		The token to use.
-	 * @param	string $verifier	The verifier.
-	 */
-	public function oAuthAccessToken($token, $verifier)
-	{
-		// init var
-		$parameters = array();
-		$parameters['oauth_token'] = (string) $token;
-		$parameters['oauth_verifier'] = (string) $verifier;
-
-		// make the call
-		$response = $this->doOAuthCall('access_token', $parameters);
-
-		// set some properties
-		if(isset($response['oauth_token'])) $this->setOAuthToken($response['oauth_token']);
-		if(isset($response['oauth_token_secret'])) $this->setOAuthTokenSecret($response['oauth_token_secret']);
-
-		// return
-		return $response;
-	}
-
-
-	/**
-	 * Will redirect to the page to authorize the applicatione
-	 *
-	 * @return	void
-	 * @param	string	$token		The token.
-	 */
-	public function oAuthAuthorize($token)
-	{
-		header('Location: ' . self::SECURE_API_URL . '/oauth/authorize?oauth_token=' . $token);
-	}
-
-
-	/**
-	 * Allows a Consumer application to use an OAuth request_token to request user authorization. This method is a replacement fulfills Secion 6.2 of the OAuth 1.0 authentication flow for applications using the Sign in with Twitter authentication flow. The method will use the currently logged in user as the account to for access authorization unless the force_login parameter is set to true
-	 * REMARK: This method seems not to work	@later
-	 *
-	 * @return	void
-	 * @param	bool[optional] $force	Force the authentication.
-	 */
-	public function oAuthAuthenticate($force = false)
-	{
-		throw new TwitterException('Not implemented');
-
-		// build parameters
-		$parameters = null;
-		if((bool) $force) $parameters['force_login'] = 'true';
-
-		// make the call
-		return $this->doCall('/oauth/authenticate.oauth', $parameters);
-	}
-
-
-// Local Trends resources
-	/**
-	 * Returns the locations that Twitter has trending topic information for.
-	 * The response is an array of "locations" that encode the location's WOEID (a Yahoo! Where On Earth ID) and some other human-readable information such as a canonical name and country the location belongs in.
-	 * The WOEID that is returned in the location object is to be used when querying for a specific trend.
-	 *
-	 * @return	array
-	 * @param	float[optional] $lat	If passed in conjunction with long, then the available trend locations will be sorted by distance to the lat  and long passed in. The sort is nearest to furthest.
-	 * @param	float[optional] $long	If passed in conjunction with lat, then the available trend locations will be sorted by distance to the lat  and long passed in. The sort is nearest to furthest.
-	 */
-	public function trendsAvailable($lat = null, $long = null)
-	{
-		// build parameters
-		$parameters = null;
-		if($lat != null) $parameters['lat_for_trends'] = (float) $lat;
-		if($long != null) $parameters['long_for_trends'] = (float) $long;
-
-		// make the call
-		return (array) $this->doCall('trends/available.json', $parameters);
-	}
-
-
-	/**
-	 * Returns the top 10 trending topics for a specific location Twitter has trending topic information for.
-	 * The response is an array of "trend" objects that encode the name of the trending topic, the query parameter that can be used to search for the topic on Search, and the direct URL that can be issued against Search.
-	 * This information is cached for five minutes, and therefore users are discouraged from querying these endpoints faster than once every five minutes. Global trends information is also available from this API by using a WOEID of 1.
-	 *
-	 * @return	array
-	 * @param	string $woeid	The WOEID of the location to be querying for.
-	 */
-	public function trendsLocation($woeid)
-	{
-		// make the call
-		return (array) $this->doCall('trends/' . (string) $woeid . '.json');
-	}
-
-
-// Geo resources
-	/**
-	 * Search for places that can be attached to a statuses/update. Given a latitude and a longitude pair, an IP address, or a name, this request will return a list of all the valid places that can be used as the place_id when updating a status.
-	 * Conceptually, a query can be made from the user's location, retrieve a list of places, have the user validate the location he or she is at, and then send the ID of this location with a call to statuses/update.
-	 * This is the recommended method to use find places that can be attached to statuses/update. Unlike geo/reverse_geocode which provides raw data access, this endpoint can potentially re-order places with regards to the user who is authenticated. This approach is also preferred for interactive place matching with the user.
-	 *
-	 * @return	array
-	 * @param	float[optional] $lat				The latitude to search around. This parameter will be ignored unless it is inside the range -90.0 to +90.0 (North is positive) inclusive. It will also be ignored if there isn't a corresponding long parameter.
-	 * @param	float[optional] $long				The longitude to search around. The valid ranges for longitude is -180.0 to +180.0 (East is positive) inclusive. This parameter will be ignored if outside that range, if it is not a number, if geo_enabled is disabled, or if there not a corresponding lat parameter.
-	 * @param	string[optional] $query				Free-form text to match against while executing a geo-based query, best suited for finding nearby locations by name.
-	 * @param	string[optional] $ip				An IP address. Used when attempting to fix geolocation based off of the user's IP address.
-	 * @param	string[optional] $accuracy			A hint on the "region" in which to search. If a number, then this is a radius in meters, but it can also take a string that is suffixed with ft to specify feet. If this is not passed in, then it is assumed to be 0m. If coming from a device, in practice, this value is whatever accuracy the device has measuring its location (whether it be coming from a GPS, WiFi triangulation, etc.).
-	 * @param	string[optional] $granularity		The minimal granularity of data to return. If this is not passed in, then neighborhood is assumed. city can also be passed.
-	 * @param	int[optional] $maxResults			A hint as to the number of results to return. This does not guarantee that the number of results returned will equal max_results, but instead informs how many "nearby" results to return. Ideally, only pass in the number of places you intend to display to the user here.
-	 * @param	string[optional] $containedWithin	This is the place_id which you would like to restrict the search results to. Setting this value means only places within the given place_id will be found.
-	 * @param	array[optional] $attributes			This parameter searches for places which have this given. This should be an key-value-pair-array.
-	 */
-	public function geoSearch($lat = null, $long = null, $query = null, $ip = null, $accuracy = null, $granularity = null, $maxResults = null, $containedWithin = null, array $attributes = null)
-	{
-		// build parameters
-		if($lat != null) $parameters['lat'] = (float) $lat;
-		if($long != null) $parameters['long'] = (float) $long;
-		if($query != null) $parameters['query'] = (string) $query;
-		if($ip != null) $parameters['ip'] = (string) $ip;
-		if($accuracy != null) $parameters['accuracy'] = (string) $accuracy;
-		if($granularity != null) $parameters['granularity'] = (string) $granularity;
-		if($maxResults != null) $parameters['max_results'] = (int) $maxResults;
-		if($containedWithin != null) $parameters['contained_within'] = (string) $containedWithin;
-		if($attributes != null)
-		{
-			// loop
-			foreach($attributes as $key => $value) $parameters['attribute:' . $key] = (string) $value;
-		}
-
-		// make the call
-		return (array) $this->doCall('geo/search.json', $parameters);
-	}
-
-
-	/**
-	 * Locates places near the given coordinates which are similar in name.
-	 * Conceptually you would use this method to get a list of known places to choose from first. Then, if the desired place doesn't exist, make a request to post/geo/place to create a new one.
-	 * The token contained in the response is the token needed to be able to create a new place.
-	 *
-	 * @return	array
-	 * @param	float $lat							The location's latitude that this tweet refers to.
-	 * @param	float $long							The location's longitude that this tweet refers to.
-	 * @param	string $name						The name a place is known as.
-	 * @param	string[optional] $containedWithin	This is the place_id which you would like to restrict the search results to. Setting this value means only places within the given place_id will be found.
-	 * @param	array[optional] $attributes			This parameter searches for places which have this given. This should be an key-value-pair-array.
-	 */
-	public function geoSimilarPlaces($lat, $long, $name, $containedWithin = null, array $attributes = null)
-	{
-		// build parameters
-		$parameters['lat'] = (float) $lat;
-		$parameters['long'] = (float) $long;
-		$parameters['name'] = (string) $name;
-		if($containedWithin != null) $parameters['contained_within'] = (string) $containedWithin;
-		if($attributes != null)
-		{
-			// loop
-			foreach($attributes as $key => $value) $parameters['attribute:' . $key] = (string) $value;
-		}
-
-		// make the call
-		return (array) $this->doCall('geo/similar_places.json', $parameters);
-	}
-
-
-	/**
-	 * Search for places (cities and neighborhoods) that can be attached to a statuses/update. Given a latitude and a longitude, return a list of all the valid places that can be used as a place_id when updating a status.
-	 * Conceptually, a query can be made from the user's location, retrieve a list of places, have the user validate the location he or she is at, and then send the ID of this location up with a call to statuses/update.
-	 * There are multiple granularities of places that can be returned -- "neighborhoods", "cities", etc. At this time, only United States data is available through this method.
-	 * This API call is meant to be an informative call and will deliver generalized results about geography.
-	 *
-	 * @return	array
-	 * @param	float $lat						The location's latitude that this tweet refers to.
-	 * @param	float $long						The location's longitude that this tweet refers to.
-	 * @param	string[optional] $accuracy		A hint on the "region" in which to search. If a number, then this is a radius in meters, but it can also take a string that is suffixed with ft to specify feet. If this is not passed in, then it is assumed to be 0m. If coming from a device, in practice, this value is whatever accuracy the device has measuring its location (whether it be coming from a GPS, WiFi triangulation, etc.).
-	 * @param	string[optional] $granularity	The minimal granularity of data to return. If this is not passed in, then neighborhood is assumed. city can also be passed.
-	 * @param	int[optional] $maxResults		A hint as to the number of results to return. This does not guarantee that the number of results returned will equal max_results, but instead informs how many "nearby" results to return. Ideally, only pass in the number of places you intend to display to the user here.
-	 */
-	public function geoReverseGeoCode($lat, $long, $accuracy = null, $granularity = null, $maxResults = null)
-	{
-		// build parameters
-		$parameters['lat'] = (float) $lat;
-		$parameters['long'] = (float) $long;
-		if($accuracy != null) $parameters['accuracy'] = (string) $accuracy;
-		if($granularity != null) $parameters['granularity'] = (string) $granularity;
-		if($maxResults != null) $parameters['max_results'] = (int) $maxResults;
-
-		// make the call
-		return (array) $this->doCall('geo/reverse_geocode.json', $parameters);
-	}
-
-
-	/**
-	 * Find out more details of a place that was returned from the geo/reverse_geocode method.
-	 *
-	 * @return	array
-	 * @param	string $id					The id of the place.
-	 * @param	string[optional] $placeId	A place in the world. These IDs can be retrieved from geo/reverse_geocode.
-	 */
-	public function geoId($id, $placeId = null)
-	{
-		// build parameters
-		$parameters = null;
-		if($placeId != null) $parameters['place_id'] = (string) $placeId;
-
-		// make the call
-		return (array) $this->doCall('geo/id/' . (string) $id . '.json', $parameters);
-	}
-
-
-	/**
-	 * Creates a new place at the given latitude and longitude.
-	 *
-	 * @return	array
-	 * @param	string $name					The name a place is known as.
-	 * @param	string $containedWithin			This is the place_id which you would like to restrict the search results to. Setting this value means only places within the given place_id will be found.
-	 * @param	string $token					The token found in the response from geo/similar_places.
-	 * @param	float $lat						The latitude the place is located at. This parameter will be ignored unless it is inside the range -90.0 to +90.0 (North is positive) inclusive. It will also be ignored if there isn't a corresponding long parameter.
-	 * @param	float $long						The longitude the place is located at. The valid ranges for longitude is -180.0 to +180.0 (East is positive) inclusive. This parameter will be ignored if outside that range, if it is not a number, if geo_enabled is disabled, or if there not a corresponding lat parameter.
-	 * @param	array[optional] $attributes		This parameter searches for places which have this given. This should be an key-value-pair-array.
-	 */
-	public function geoPlaceCreate($name, $containedWithin, $token, $lat, $long, array $attributes = null)
-	{
-		// build parameters
-		$parameters['name'] = (string) $name;
-		$parameters['contained_within'] = (string) $containedWithin;
-		$parameters['token'] = (string) $token;
-		$parameters['lat'] = (float) $lat;
-		$parameters['long'] = (float) $long;
-		if($attributes != null)
-		{
-			// loop
-			foreach($attributes as $key => $value) $parameters['attribute:' . $key] = (string) $value;
-		}
-
-		// make the call
-		return (array) $this->doCall('geo/place.json', $parameters, true, 'POST');
-	}
-
-
-// legal resources
-	/**
-	 * Returns Twitter's' Terms of Service in the requested format. These are not the same as the Developer Terms of Service.
-	 *
-	 * @return	string
-	 */
-	public function legalToS()
-	{
-		// make the call
-		$response = $this->doCall('legal/tos.json');
-
-		// validate and return
-		if(isset($response['tos'])) return $response['tos'];
-
-		// fallback
-		return false;
-	}
-
-
-	/**
-	 * Returns Twitter's Privacy Policy
-	 *
-	 * @return	string
-	 */
-	public function legalPrivacy()
-	{
-		// make the call
-		$response = $this->doCall('legal/privacy.json');
-
-		// validate and return
-		if(isset($response['privacy'])) return $response['privacy'];
-
-		// fallback
-		return false;
-	}
-
-
-// Help resources
-	/**
-	 * Test
-	 *
-	 * @return	bool
-	 */
-	public function helpTest()
-	{
-		// make the call
-		return ($this->doCall('help/test.json', null, null, 'GET', null, false) == '"ok"');
-	}
-}
-
-
-/**
- * Twitter Exception class
- *
- * @author	Tijs Verkoyen <php-twitter@verkoyen.eu>
- */
-class TwitterException extends Exception
-{
-}
-
+<?php
+/**
+ * @version   1.0 14.08.2012
+ * @author    TonyEcommerce http://www.TonyEcommerce.com <support@TonyEcommerce.com>
+ * @copyright Copyright (c) 2012 TonyEcommerce
+ */
+
+/**
+ * Twitter class
+ *
+ * This source file can be used to communicate with Twitter (http://twitter.com)
+ *
+ * The class is documented in the file itself. If you find any bugs help me out and report them. Reporting can be done by sending an email to php-twitter-bugs[at]verkoyen[dot]eu.
+ * If you report a bug, make sure you give me enough information (include your code).
+ *
+ * Changelog since 2.1.1
+ * - code styling
+ * - no more converting to integer for the cursor (thx to Jamaica)
+ *
+ * Changelog since 2.1.0
+ * - fixed issue with generation of basestring
+ * - added a new method: http://dev.twitter.com/doc/post/:user/:list_id/create_all
+ *
+ * Changelog since 2.0.3
+ * - made a lot of changes to reflect the current API, some of the methods aren't backwards compatible, so be carefull before upgrading
+ *
+ * Changelog since 2.0.2
+ * - tested geo*
+ * - implemented accountUpdateProfileImage
+ * - implemented accountUpdateProfileBackgroundImage
+ * - fixed issue with GET and POST (thx to Luiz Felipe)
+ * - added a way to detect open_basedir (thx to Lee Kindness)
+ *
+ * Changelog since 2.0.1
+ * - Fixed some documentation
+ * - Added a new method: usersProfileImage
+ * - Fixed trendsLocation
+ * - Added new GEO-methods: geoSearch, geoSimilarPlaces, geoPlaceCreate (not tested because geo-services were disabled.)
+ * - Added legalToS
+ * - Added legalPrivacy
+ * - Fixed helpTest
+ *
+ * Changelog since 2.0.0
+ * - no more fatal if twitter is over capacity
+ * - fix for calculating the header-string (thx to Dextro)
+ * - fix for userListsIdStatuses (thx to Josh)
+ *
+ * License
+ * Copyright (c) 2010, Tijs Verkoyen. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.
+ *
+ * This software is provided by the author "as is" and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the author be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage.
+ *
+ * @author		Tijs Verkoyen <php-twitter@verkoyen.eu>
+ * @version		2.1.2
+ *
+ * @copyright	Copyright (c) 2010, Tijs Verkoyen. All rights reserved.
+ * @license		BSD License
+ */
+class Twitter
+{
+	// internal constant to enable/disable debugging
+	const DEBUG = false;
+
+	// url for the twitter-api
+	const API_URL = 'https://api.twitter.com/1';
+	const SEARCH_API_URL = 'https://search.twitter.com';
+	const SECURE_API_URL = 'https://api.twitter.com';
+
+	// port for the twitter-api
+	const API_PORT = 443;
+	const SEARCH_API_PORT = 443;
+	const SECURE_API_PORT = 443;
+
+	// current version
+	const VERSION = '2.1.2';
+
+
+	/**
+	 * A cURL instance
+	 *
+	 * @var	resource
+	 */
+	private $curl;
+
+
+	/**
+	 * The consumer key
+	 *
+	 * @var	string
+	 */
+	private $consumerKey;
+
+
+	/**
+	 * The consumer secret
+	 *
+	 * @var	string
+	 */
+	private $consumerSecret;
+
+
+	/**
+	 * The oAuth-token
+	 *
+	 * @var	string
+	 */
+	private $oAuthToken = '';
+
+
+	/**
+	 * The oAuth-token-secret
+	 *
+	 * @var	string
+	 */
+	private $oAuthTokenSecret = '';
+
+
+	/**
+	 * The timeout
+	 *
+	 * @var	int
+	 */
+	private $timeOut = 60;
+
+
+	/**
+	 * The user agent
+	 *
+	 * @var	string
+	 */
+	private $userAgent;
+
+
+// class methods
+	/**
+	 * Default constructor
+	 *
+	 * @return	void
+	 * @param	string $consumerKey		The consumer key to use.
+	 * @param	string $consumerSecret	The consumer secret to use.
+	 */
+	public function __construct($consumerKey, $consumerSecret)
+	{
+		$this->setConsumerKey($consumerKey);
+		$this->setConsumerSecret($consumerSecret);
+	}
+
+
+	/**
+	 * Default destructor
+	 *
+	 * @return	void
+	 */
+	public function __destruct()
+	{
+		if($this->curl != null) curl_close($this->curl);
+	}
+
+
+	/**
+	 * Format the parameters as a querystring
+	 *
+	 * @return	string
+	 * @param	array $parameters	The parameters.
+	 */
+	private function buildQuery(array $parameters)
+	{
+		// no parameters?
+		if(empty($parameters)) return '';
+
+		// encode the keys
+		$keys = self::urlencode_rfc3986(array_keys($parameters));
+
+		// encode the values
+		$values = self::urlencode_rfc3986(array_values($parameters));
+
+		// reset the parameters
+		$parameters = array_combine($keys, $values);
+
+		// sort parameters by key
+		uksort($parameters, 'strcmp');
+
+		// loop parameters
+		foreach($parameters as $key => $value)
+		{
+			// sort by value
+			if(is_array($value)) $parameters[$key] = natsort($value);
+		}
+
+		// process parameters
+		foreach($parameters as $key => $value) $chunks[] = $key . '=' . str_replace('%25', '%', $value);
+
+		// return
+		return implode('&', $chunks);
+	}
+
+
+	/**
+	 * All OAuth 1.0 requests use the same basic algorithm for creating a signature base string and a signature.
+	 * The signature base string is composed of the HTTP method being used, followed by an ampersand ("&") and then the URL-encoded base URL being accessed,
+	 * complete with path (but not query parameters), followed by an ampersand ("&").
+	 * Then, you take all query parameters and POST body parameters (when the POST body is of the URL-encoded type, otherwise the POST body is ignored),
+	 * including the OAuth parameters necessary for negotiation with the request at hand, and sort them in lexicographical order by first parameter name and
+	 * then parameter value (for duplicate parameters), all the while ensuring that both the key and the value for each parameter are URL encoded in isolation.
+	 * Instead of using the equals ("=") sign to mark the key/value relationship, you use the URL-encoded form of "%3D". Each parameter is then joined by the
+	 * URL-escaped ampersand sign, "%26".
+	 *
+	 * @return	string
+	 * @param	string $url			The URL.
+	 * @param	string $method		The method to use.
+	 * @param	array $parameters	The parameters.
+	 */
+	private function calculateBaseString($url, $method, array $parameters)
+	{
+		// redefine
+		$url = (string) $url;
+		$parameters = (array) $parameters;
+
+		// init var
+		$pairs = array();
+		$chunks = array();
+
+		// sort parameters by key
+		uksort($parameters, 'strcmp');
+
+		// loop parameters
+		foreach($parameters as $key => $value)
+		{
+			// sort by value
+			if(is_array($value)) $parameters[$key] = natsort($value);
+		}
+
+		// process queries
+		foreach($parameters as $key => $value)
+		{
+			// only add if not already in the url
+			if(substr_count($url, $key . '=' . $value) == 0) $chunks[] = self::urlencode_rfc3986($key) . '%3D' . self::urlencode_rfc3986($value);
+		}
+
+		// buils base
+		$base = $method . '&';
+		$base .= urlencode($url);
+		$base .= (substr_count($url, '?')) ? '%26' : '&';
+		$base .= implode('%26', $chunks);
+		$base = str_replace('%3F', '&', $base);
+
+		// return
+		return $base;
+	}
+
+
+	/**
+	 * Build the Authorization header
+	 * @later: fix me
+	 *
+	 * @return	string
+	 * @param	array $parameters	The parameters.
+	 * @param	string $url			The URL.
+	 */
+	private function calculateHeader(array $parameters, $url)
+	{
+		// redefine
+		$url = (string) $url;
+
+		// divide into parts
+		$parts = parse_url($url);
+
+		// init var
+		$chunks = array();
+
+		// process queries
+		foreach($parameters as $key => $value) $chunks[] = str_replace('%25', '%', self::urlencode_rfc3986($key) . '="' . self::urlencode_rfc3986($value) . '"');
+
+		// build return
+		$return = 'Authorization: OAuth realm="' . $parts['scheme'] . '://' . $parts['host'] . $parts['path'] . '", ';
+		$return .= implode(',', $chunks);
+
+		// prepend name and OAuth part
+		return $return;
+	}
+
+
+	/**
+	 * Make an call to the oAuth
+	 * @todo	refactor me
+	 *
+	 * @return	array
+	 * @param	string $method					The method.
+	 * @param	array[optional] $parameters		The parameters.
+	 */
+	private function doOAuthCall($method, array $parameters = null)
+	{
+		// redefine
+		$method = (string) $method;
+
+		// append default parameters
+		$parameters['oauth_consumer_key'] = $this->getConsumerKey();
+		$parameters['oauth_nonce'] = md5(microtime() . rand());
+		$parameters['oauth_timestamp'] = time();
+		$parameters['oauth_signature_method'] = 'HMAC-SHA1';
+		$parameters['oauth_version'] = '1.0';
+
+		// calculate the base string
+		$base = $this->calculateBaseString(self::SECURE_API_URL . '/oauth/' . $method, 'POST', $parameters);
+
+		// add sign into the parameters
+		$parameters['oauth_signature'] = $this->hmacsha1($this->getConsumerSecret() . '&' . $this->getOAuthTokenSecret(), $base);
+
+		// calculate header
+		$header = $this->calculateHeader($parameters, self::SECURE_API_URL . '/oauth/' . $method);
+
+		// set options
+		$options[CURLOPT_URL] = self::SECURE_API_URL . '/oauth/' . $method;
+		$options[CURLOPT_PORT] = self::SECURE_API_PORT;
+		$options[CURLOPT_USERAGENT] = $this->getUserAgent();
+		if(ini_get('open_basedir') == '' && ini_get('safe_mode' == 'Off')) $options[CURLOPT_FOLLOWLOCATION] = true;
+		$options[CURLOPT_RETURNTRANSFER] = true;
+		$options[CURLOPT_TIMEOUT] = (int) $this->getTimeOut();
+		$options[CURLOPT_SSL_VERIFYPEER] = false;
+		$options[CURLOPT_SSL_VERIFYHOST] = false;
+		$options[CURLOPT_HTTPHEADER] = array('Expect:');
+		$options[CURLOPT_POST] = true;
+		$options[CURLOPT_POSTFIELDS] = $this->buildQuery($parameters);
+
+		// init
+		$this->curl = curl_init();
+
+		// set options
+		curl_setopt_array($this->curl, $options);
+
+		// execute
+		$response = curl_exec($this->curl);
+		$headers = curl_getinfo($this->curl);
+
+		// fetch errors
+		$errorNumber = curl_errno($this->curl);
+		$errorMessage = curl_error($this->curl);
+
+		// error?
+		if($errorNumber != '') throw new TwitterException($errorMessage, $errorNumber);
+
+		// init var
+		$return = array();
+
+		// parse the string
+		parse_str($response, $return);
+
+		// return
+		return $return;
+	}
+
+
+	/**
+	 * Make the call
+	 *
+	 * @return	string
+	 * @param	string $url						The url to call.
+	 * @param	array[optional] $parameters		Optional parameters.
+	 * @param	bool[optional] $authenticate	Should we authenticate.
+	 * @param	bool[optional] $method			The method to use. Possible values are GET, POST.
+	 * @param	string[optional] $filePath		The path to the file to upload.
+	 * @param	bool[optional] $expectJSON		Do we expect JSON.
+	 * @param	bool[optional] $returnHeaders	Should the headers be returned?
+	 */
+	private function doCall($url, array $parameters = null, $authenticate = false, $method = 'GET', $filePath = null, $expectJSON = true, $returnHeaders = false)
+	{
+		// allowed methods
+		$allowedMethods = array('GET', 'POST');
+
+		// redefine
+		$url = (string) $url;
+		$parameters = (array) $parameters;
+		$authenticate = (bool) $authenticate;
+		$method = (string) $method;
+		$expectJSON = (bool) $expectJSON;
+
+		// validate method
+		if(!in_array($method, $allowedMethods)) throw new TwitterException('Unknown method (' . $method . '). Allowed methods are: ' . implode(', ', $allowedMethods));
+
+		// append default parameters
+		$oauth['oauth_consumer_key'] = $this->getConsumerKey();
+		$oauth['oauth_nonce'] = md5(microtime() . rand());
+		$oauth['oauth_timestamp'] = time();
+		$oauth['oauth_token'] = $this->getOAuthToken();
+		$oauth['oauth_signature_method'] = 'HMAC-SHA1';
+		$oauth['oauth_version'] = '1.0';
+
+		// set data
+		$data = $oauth;
+		if(!empty($parameters)) $data = array_merge($data, $parameters);
+
+		// calculate the base string
+		$base = $this->calculateBaseString(self::API_URL . '/' . $url, $method, $data);
+
+		// based on the method, we should handle the parameters in a different way
+		if($method == 'POST')
+		{
+			// file provided?
+			if($filePath != null)
+			{
+				// build a boundary
+				$boundary = md5(time());
+
+				// process file
+				$fileInfo = pathinfo($filePath);
+
+				// set mimeType
+				$mimeType = 'application/octet-stream';
+				if($fileInfo['extension'] == 'jpg' || $fileInfo['extension'] == 'jpeg') $mimeType = 'image/jpeg';
+				elseif($fileInfo['extension'] == 'gif') $mimeType = 'image/gif';
+				elseif($fileInfo['extension'] == 'png') $mimeType = 'image/png';
+
+				// init var
+				$content = '--' . $boundary . "\r\n";
+
+				// set file
+				$content .= 'Content-Disposition: form-data; name=image; filename="' . $fileInfo['basename'] . '"' . "\r\n";
+				$content .= 'Content-Type: ' . $mimeType . "\r\n";
+				$content .= "\r\n";
+				$content .= file_get_contents($filePath);
+				$content .= "\r\n";
+				$content .= "--" . $boundary . '--';
+
+				// build headers
+				$headers[] = 'Content-Type: multipart/form-data; boundary=' . $boundary;
+				$headers[] = 'Content-Length: ' . strlen($content);
+
+				// set content
+				$options[CURLOPT_POSTFIELDS] = $content;
+			}
+
+			// no file
+			else $options[CURLOPT_POSTFIELDS] = $this->buildQuery($parameters);
+
+			// enable post
+			$options[CURLOPT_POST] = true;
+		}
+
+		else
+		{
+			// add the parameters into the querystring
+			if(!empty($parameters)) $url .= '?' . $this->buildQuery($parameters);
+
+			$options[CURLOPT_POST] = false;
+		}
+
+		// add sign into the parameters
+		$oauth['oauth_signature'] = $this->hmacsha1($this->getConsumerSecret() . '&' . $this->getOAuthTokenSecret(), $base);
+
+		$headers[] = $this->calculateHeader($oauth, self::API_URL . '/' . $url);
+		$headers[] = 'Expect:';
+
+		// set options
+		$options[CURLOPT_URL] = self::API_URL . '/' . $url;
+		$options[CURLOPT_PORT] = self::API_PORT;
+		$options[CURLOPT_USERAGENT] = $this->getUserAgent();
+		if(ini_get('open_basedir') == '' && ini_get('safe_mode' == 'Off')) $options[CURLOPT_FOLLOWLOCATION] = true;
+		$options[CURLOPT_RETURNTRANSFER] = true;
+		$options[CURLOPT_TIMEOUT] = (int) $this->getTimeOut();
+		$options[CURLOPT_SSL_VERIFYPEER] = false;
+		$options[CURLOPT_SSL_VERIFYHOST] = false;
+		$options[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
+		$options[CURLOPT_HTTPHEADER] = $headers;
+
+		// init
+		if($this->curl == null) $this->curl = curl_init();
+
+		// set options
+		curl_setopt_array($this->curl, $options);
+
+		// execute
+		$response = curl_exec($this->curl);
+		$headers = curl_getinfo($this->curl);
+
+		// fetch errors
+		$errorNumber = curl_errno($this->curl);
+		$errorMessage = curl_error($this->curl);
+
+		// return the headers
+		if($returnHeaders) return $headers;
+
+		// we don't expext JSON, return the response
+		if(!$expectJSON) return $response;
+
+		// replace ids with their string values, added because of some PHP-version can't handle these large values
+		$response = preg_replace('/id":(\d+)/', 'id":"\1"', $response);
+
+		// we expect JSON, so decode it
+		$json = @json_decode($response, true);
+
+		// validate JSON
+		if($json === null)
+		{
+			// should we provide debug information
+			if(self::DEBUG)
+			{
+				// make it output proper
+				echo '<pre>';
+
+				// dump the header-information
+				var_dump($headers);
+
+				// dump the error
+				var_dump($errorMessage);
+
+				// dump the raw response
+				var_dump($response);
+
+				// end proper format
+				echo '</pre>';
+			}
+
+			// throw exception
+			throw new TwitterException('Invalid response.');
+		}
+
+
+		// any errors
+		if(isset($json['errors']))
+		{
+			// should we provide debug information
+			if(self::DEBUG)
+			{
+				// make it output proper
+				echo '<pre>';
+
+				// dump the header-information
+				var_dump($headers);
+
+				// dump the error
+				var_dump($errorMessage);
+
+				// dump the raw response
+				var_dump($response);
+
+				// end proper format
+				echo '</pre>';
+			}
+
+			// throw exception
+			if(isset($json['errors'][0]['message'])) throw new TwitterException($json['errors'][0]['message']);
+			elseif(isset($json['errors']) && is_string($json['errors'])) throw new TwitterException($json['errors']);
+			else throw new TwitterException('Invalid response.');
+		}
+
+
+		// any error
+		if(isset($json['error']))
+		{
+			// should we provide debug information
+			if(self::DEBUG)
+			{
+				// make it output proper
+				echo '<pre>';
+
+				// dump the header-information
+				var_dump($headers);
+
+				// dump the raw response
+				var_dump($response);
+
+				// end proper format
+				echo '</pre>';
+			}
+
+			// throw exception
+			throw new TwitterException($json['error']);
+		}
+
+		// return
+		return $json;
+	}
+
+
+	/**
+	 * Make the call
+	 *
+	 * @return	string
+	 * @param	string $url						The url to call.
+	 * @param	array[optional] $parameters		Optional parameters.
+	 */
+	private function doSearchCall($url, array $parameters = null)
+	{
+		// redefine
+		$url = (string) $url;
+		$parameters = (array) $parameters;
+
+		// add the parameters into the querystring
+		if(!empty($parameters)) $url .= '?' . $this->buildQuery($parameters);
+
+		// set options
+		$options[CURLOPT_URL] = self::SEARCH_API_URL . '/' . $url;
+		$options[CURLOPT_PORT] = self::SEARCH_API_PORT;
+		$options[CURLOPT_USERAGENT] = $this->getUserAgent();
+		if(ini_get('open_basedir') == '' && ini_get('safe_mode' == 'Off')) $options[CURLOPT_FOLLOWLOCATION] = true;
+		$options[CURLOPT_RETURNTRANSFER] = true;
+		$options[CURLOPT_TIMEOUT] = (int) $this->getTimeOut();
+		$options[CURLOPT_SSL_VERIFYPEER] = false;
+		$options[CURLOPT_SSL_VERIFYHOST] = false;
+		$options[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
+
+		// init
+		if($this->curl == null) $this->curl = curl_init();
+
+		// set options
+		curl_setopt_array($this->curl, $options);
+
+		// execute
+		$response = curl_exec($this->curl);
+		$headers = curl_getinfo($this->curl);
+
+		// fetch errors
+		$errorNumber = curl_errno($this->curl);
+		$errorMessage = curl_error($this->curl);
+
+		// replace ids with their string values, added because of some PHP-version can't handle these large values
+		$response = preg_replace('/id":(\d+)/', 'id":"\1"', $response);
+
+		// we expect JSON, so decode it
+		$json = @json_decode($response, true);
+
+		// validate JSON
+		if($json === null)
+		{
+			// should we provide debug information
+			if(self::DEBUG)
+			{
+				// make it output proper
+				echo '<pre>';
+
+				// dump the header-information
+				var_dump($headers);
+
+				// dump the error
+				var_dump($errorMessage);
+
+				// dump the raw response
+				var_dump($response);
+
+				// end proper format
+				echo '</pre>';
+			}
+
+			// throw exception
+			throw new TwitterException('Invalid response.');
+		}
+
+
+		// any errors
+		if(isset($json['errors']))
+		{
+			// should we provide debug information
+			if(self::DEBUG)
+			{
+				// make it output proper
+				echo '<pre>';
+
+				// dump the header-information
+				var_dump($headers);
+
+				// dump the error
+				var_dump($errorMessage);
+
+				// dump the raw response
+				var_dump($response);
+
+				// end proper format
+				echo '</pre>';
+			}
+
+			// throw exception
+			if(isset($json['errors'][0]['message'])) throw new TwitterException($json['errors'][0]['message']);
+			else throw new TwitterException('Invalid response.');
+		}
+
+
+		// any error
+		if(isset($json['error']))
+		{
+			// should we provide debug information
+			if(self::DEBUG)
+			{
+				// make it output proper
+				echo '<pre>';
+
+				// dump the header-information
+				var_dump($headers);
+
+				// dump the raw response
+				var_dump($response);
+
+				// end proper format
+				echo '</pre>';
+			}
+
+			// throw exception
+			throw new TwitterException($json['error']);
+		}
+
+		// return
+		return $json;
+	}
+
+
+	/**
+	 * Get the consumer key
+	 *
+	 * @return	string
+	 */
+	private function getConsumerKey()
+	{
+		return $this->consumerKey;
+	}
+
+
+	/**
+	 * Get the consumer secret
+	 *
+	 * @return	string
+	 */
+	private function getConsumerSecret()
+	{
+		return $this->consumerSecret;
+	}
+
+
+	/**
+	 * Get the oAuth-token
+	 *
+	 * @return	string
+	 */
+	private function getOAuthToken()
+	{
+		return $this->oAuthToken;
+	}
+
+
+	/**
+	 * Get the oAuth-token-secret
+	 *
+	 * @return	string
+	 */
+	private function getOAuthTokenSecret()
+	{
+		return $this->oAuthTokenSecret;
+	}
+
+
+	/**
+	 * Get the timeout
+	 *
+	 * @return	int
+	 */
+	public function getTimeOut()
+	{
+		return (int) $this->timeOut;
+	}
+
+
+	/**
+	 * Get the useragent that will be used. Our version will be prepended to yours.
+	 * It will look like: "PHP Twitter/<version> <your-user-agent>"
+	 *
+	 * @return	string
+	 */
+	public function getUserAgent()
+	{
+		return (string) 'PHP Twitter/' . self::VERSION . ' ' . $this->userAgent;
+	}
+
+
+	/**
+	 * Set the consumer key
+	 *
+	 * @return	void
+	 * @param	string $key		The consumer key to use.
+	 */
+	private function setConsumerKey($key)
+	{
+		$this->consumerKey = (string) $key;
+	}
+
+
+	/**
+	 * Set the consumer secret
+	 *
+	 * @return	void
+	 * @param	string $secret	The consumer secret to use.
+	 */
+	private function setConsumerSecret($secret)
+	{
+		$this->consumerSecret = (string) $secret;
+	}
+
+
+	/**
+	 * Set the oAuth-token
+	 *
+	 * @return	void
+	 * @param	string $token	The token to use.
+	 */
+	public function setOAuthToken($token)
+	{
+		$this->oAuthToken = (string) $token;
+	}
+
+
+	/**
+	 * Set the oAuth-secret
+	 *
+	 * @return	void
+	 * @param	string $secret	The secret to use.
+	 */
+	public function setOAuthTokenSecret($secret)
+	{
+		$this->oAuthTokenSecret = (string) $secret;
+	}
+
+
+	/**
+	 * Set the timeout
+	 *
+	 * @return	void
+	 * @param	int $seconds	The timeout in seconds.
+	 */
+	public function setTimeOut($seconds)
+	{
+		$this->timeOut = (int) $seconds;
+	}
+
+
+	/**
+	 * Get the useragent that will be used. Our version will be prepended to yours.
+	 * It will look like: "PHP Twitter/<version> <your-user-agent>"
+	 *
+	 * @return	void
+	 * @param	string $userAgent	Your user-agent, it should look like <app-name>/<app-version>.
+	 */
+	public function setUserAgent($userAgent)
+	{
+		$this->userAgent = (string) $userAgent;
+	}
+
+
+	/**
+	 * Build the signature for the data
+	 *
+	 * @return	string
+	 * @param	string $key		The key to use for signing.
+	 * @param	string $data	The data that has to be signed.
+	 */
+	private function hmacsha1($key, $data)
+	{
+		return base64_encode(hash_hmac('SHA1', $data, $key, true));
+	}
+
+
+	/**
+	 * URL-encode method for internal use
+	 *
+	 * @return	string
+	 * @param	mixed $value	The value to encode.
+	 */
+	private static function urlencode_rfc3986($value)
+	{
+		if(is_array($value)) return array_map(array('Twitter', 'urlencode_rfc3986'), $value);
+		else
+		{
+			$search = array('+', ' ', '%7E', '%');
+			$replace = array('%20', '%20', '~', '%25');
+
+			return str_replace($search, $replace, urlencode($value));
+		}
+	}
+
+
+// Timeline resources
+	/**
+	 * Returns the 20 most recent statuses from non-protected users who have set a custom user icon.
+	 * The public timeline is cached for 60 seconds and requesting it more often than that is unproductive and a waste of resources.
+	 *
+	 * @return	array
+	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function statusesPublicTimeline($trimUser = false, $includeEntities = false)
+	{
+		// redefine
+		$trimUser = (bool) $trimUser;
+		$includeEntities = (bool) $includeEntities;
+
+		// build parameters
+		$parameters = array();
+		if($trimUser) $parameters['trim_user'] = 'true';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/public_timeline.json', $parameters);
+	}
+
+
+	/**
+	 * Returns the 20 most recent statuses, including retweets if they exist, posted by the authenticating user and the user's they follow. This is the same timeline seen by a user when they login to twitter.com.
+	 * This method is identical to statusesFriendsTimeline, except that this method always includes retweets.
+	 *
+	 * @return	array
+	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
+	 * @param	int[optional] $page					Specifies the page of results to retrieve.
+	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function statusesHomeTimeline($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeEntities = false)
+	{
+		// build parameters
+		$parameters = array();
+		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if($count != null) $parameters['count'] = (int) $count;
+		if($page != null) $parameters['page'] = (int) $page;
+		if($trimUser) $parameters['trim_user'] = 'true';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/home_timeline.json', $parameters, true);
+	}
+
+
+	/**
+	 * Returns the 20 most recent statuses posted by the authenticating user and the user's they follow. This is the same timeline seen by a user when they login to twitter.com.
+	 * This method is identical to statuses/home_timeline, except that this method will only include retweets if the includeRts parameter is set.
+	 *
+	 * @return	array
+	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
+	 * @param	int[optional] $page					Specifies the page of results to retrieve.
+	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+	 * @param	bool[optional] $includeRts			When set to true the timeline will contain native retweets (if they exist) in addition to the standard stream of tweets. The output format of retweeted tweets is identical to the representation you see in home_timeline. Note: If you're using the trim_user parameter in conjunction with include_rts, the retweets will still contain a full user object.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function statusesFriendsTimeline($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeRts = false, $includeEntities = false)
+	{
+		// build parameters
+		$parameters = array();
+		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if($count != null) $parameters['count'] = (int) $count;
+		if($page != null) $parameters['page'] = (int) $page;
+		if($trimUser) $parameters['trim_user'] = 'true';
+		if($includeRts) $parameters['include_rts'] = 'true';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/friends_timeline.json', $parameters, true);
+	}
+
+
+	/**
+	 * Returns the 20 most recent statuses posted by the authenticating user. It is also possible to request another user's timeline by using the screen_name or user_id parameter. The other users timeline will only be visible if they are not protected, or if the authenticating user's follow request was accepted by the protected user.
+	 * The timeline returned is the equivalent of the one seen when you view a user's profile on twitter.com.
+	 *
+	 * @return	array
+	 * @param	string[optional] $userId			Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param	string[optional] $screenName		Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
+	 * @param	int[optional] $page					Specifies the page of results to retrieve.
+	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+	 * @param	bool[optional] $includeRts			When set to true the timeline will contain native retweets (if they exist) in addition to the standard stream of tweets. The output format of retweeted tweets is identical to the representation you see in home_timeline. Note: If you're using the trim_user parameter in conjunction with include_rts, the retweets will still contain a full user object.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function statusesUserTimeline($userId = null, $screenName = null, $sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeRts = false, $includeEntities = false)
+	{
+		// build parameters
+		$parameters = array();
+		if($userId != null) $parameters['user_id'] = (string) $userId;
+		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if($count != null) $parameters['count'] = (int) $count;
+		if($page != null) $parameters['page'] = (int) $page;
+		if($trimUser) $parameters['trim_user'] = 'true';
+		if($includeRts) $parameters['include_rts'] = 'true';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/user_timeline.json', $parameters);
+
+
+	}
+
+
+	/**
+	 * Returns the 20 most recent mentions (status containing @username) for the authenticating user.
+	 * The timeline returned is the equivalent of the one seen when you view your mentions on twitter.com.
+	 *
+	 * @return	array
+	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
+	 * @param	int[optional] $page					Specifies the page of results to retrieve.
+	 * @param	bool[optional] $trimUser			When set to either true, each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+	 * @param	bool[optional] $includeRts			When set to either true, the timeline will contain native retweets (if they exist) in addition to the standard stream of tweets. The output format of retweeted tweets is identical to the representation you see in home_timeline. Note: If you're using the trim_user parameter in conjunction with include_rts, the retweets will still contain a full user object.
+	 * @param	bool[optional] $includeEntities		When set to either true, each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags. While entities are opt-in on timelines at present, they will be made a default component of output in the future.
+	 */
+	public function statusesMentions($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeRts = false, $includeEntities = false)
+	{
+		// validate
+		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+
+		// build parameters
+		$parameters = array();
+		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if($count != null) $parameters['count'] = (int) $count;
+		if($page != null) $parameters['page'] = (int) $page;
+		if($trimUser) $parameters['trim_user'] = 'true';
+		if($includeRts) $parameters['include_rts'] = 'true';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/mentions.json', $parameters, true);
+	}
+
+
+	/**
+	 * Returns the 20 most recent retweets posted by the authenticating user.
+	 *
+	 * @return	array
+	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
+	 * @param	int[optional] $page					Specifies the page of results to retrieve.
+	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function statusesRetweetedByMe($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeEntities = false)
+	{
+		// validate
+		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+
+		// build parameters
+		$parameters = array();
+		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if($count != null) $parameters['count'] = (int) $count;
+		if($page != null) $parameters['page'] = (int) $page;
+		if($trimUser) $parameters['trim_user'] = 'true';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/retweeted_by_me.json', $parameters, true);
+	}
+
+
+	/**
+	 * Returns the 20 most recent retweets posted by users the authenticating user follow.
+	 *
+	 * @return	array
+	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
+	 * @param	int[optional] $page					Specifies the page of results to retrieve.
+	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function statusesRetweetedToMe($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeEntities = false)
+	{
+		// validate
+		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+
+		// build parameters
+		$parameters = array();
+		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if($count != null) $parameters['count'] = (int) $count;
+		if($page != null) $parameters['page'] = (int) $page;
+		if($trimUser) $parameters['trim_user'] = 'true';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/retweeted_by_me.json', $parameters, true);
+	}
+
+
+	/**
+	 * Returns the 20 most recent tweets of the authenticated user that have been retweeted by others.
+	 *
+	 * @return	array
+	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
+	 * @param	int[optional] $page					Specifies the page of results to retrieve.
+	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function statusesReweetsOfMe($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeEntities = false)
+	{
+		// validate
+		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+
+		// build parameters
+		$parameters = array();
+		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if($count != null) $parameters['count'] = (int) $count;
+		if($page != null) $parameters['page'] = (int) $page;
+		if($trimUser) $parameters['trim_user'] = 'true';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/retweets_of_me.json', $parameters, true);
+	}
+
+
+// Tweets resources
+	/**
+	 * Returns a single status, specified by the id parameter below. The status's author will be returned inline.
+	 *
+	 * @return	array
+	 * @param	string $id							The numerical ID of the desired status.
+	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function statusesShow($id, $trimUser = false, $includeEntities = false)
+	{
+		// build parameters
+		$parameters['id'] = (string) $id;
+		if($trimUser) $parameters['trim_user'] = 'true';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/show.json', $parameters, true);
+	}
+
+
+	/**
+	 * Updates the authenticating user's status. A status update with text identical to the authenticating user's text identical to the authenticating user's current status will be ignored to prevent duplicates.
+	 *
+	 * @return	array
+	 * @param	string $status							The text of your status update, up to 140 characters. URL encode as necessary.
+	 * @param	string[optional] $inReplyToStatusId		The ID of an existing status that the update is in reply to.
+	 * @param	float[optional] $lat					The location's latitude that this tweet refers to.
+	 * @param	float[optional] $long					The location's longitude that this tweet refers to.
+	 * @param	string[optional] $placeId				A place in the world. These IDs can be retrieved from geo/reverse_geocode.
+	 * @param	bool[optional] $displayCoordinates		Whether or not to put a pin on the exact coordinates a tweet has been sent from.
+	 * @param	bool[optional] $trimUser				When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+	 * @param	bool[optional] $includeEntities			When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function statusesUpdate($status, $inReplyToStatusId = null, $lat = null, $long = null, $placeId = null, $displayCoordinates = false, $trimUser = false, $includeEntities = false)
+	{
+		// build parameters
+		$parameters['status'] = (string) $status;
+		if($inReplyToStatusId != null) $parameters['in_reply_to_status_id'] = (string) $inReplyToStatusId;
+		if($lat != null) $parameters['lat'] = (float) $lat;
+		if($long != null) $parameters['long'] = (float) $long;
+		if($placeId != null) $parameters['place_id'] = (string) $placeId;
+		if($displayCoordinates) $parameters['display_coordinates'] = 'true';
+		if($trimUser) $parameters['trim_user'] = 'true';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/update.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Destroys the status specified by the required ID parameter.
+	 * Usage note: The authenticating user must be the author of the specified status.
+	 *
+	 * @return	bool
+	 * @param	string $id							The numerical ID of the desired status.
+	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function statusesDestroy($id, $trimUser = false, $includeEntities = false)
+	{
+		// build parameters
+		$parameters['id'] = (string) $id;
+		if($trimUser) $parameters['trim_user'] = 'true';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/destroy.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Retweets a tweet. Returns the original tweet with retweet details embedded.
+	 *
+	 * @return	array
+	 * @param	string $id							The numerical ID of the desired status.
+	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function statusesRetweet($id, $trimUser = false, $includeEntities = false)
+	{
+		$parameters = null;
+		if($trimUser) $parameters['trim_user'] = 'true';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/retweet/' . $id . '.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Returns up to 100 of the first retweets of a given tweet.
+	 *
+	 * @return	array
+	 * @param	string $id							The numerical ID of the desired status.
+	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 100.
+	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function statusesRetweets($id, $count = null, $trimUser = false, $includeEntities = false)
+	{
+		// validate
+		if($count != null && $count > 100) throw new TwitterException('Count may not be greater than 100.');
+
+		// build parameters
+		$parameters = null;
+		if($count != null) $parameters['count'] = (int) $count;
+		if($trimUser) $parameters['trim_user'] = 'true';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/retweets/' . $id . '.json', $parameters);
+	}
+
+
+	/**
+	 * Show user objects of up to 100 members who retweeted the status.
+	 *
+	 * @return	array
+	 * @param	string $id							The numerical ID of the desired status.
+	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
+	 * @param	int[optional] $page					Specifies the page of results to retrieve.
+	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function statusesIdRetweetedBy($id, $count = null, $page = null, $trimUser = false, $includeEntities = false)
+	{
+		// validate
+		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+
+		// build parameters
+		$parameters = null;
+		if($count != null) $parameters['count'] = (int) $count;
+		if($page != null) $parameters['page'] = (int) $page;
+		if($trimUser) $parameters['trim_user'] = 'true';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/' . (string) $id . '/retweeted_by.json', $parameters, true);
+	}
+
+
+	/**
+	 * Show user ids of up to 100 users who retweeted the status.
+	 *
+	 * @return	array
+	 * @param	string $id							The numerical ID of the desired status.
+	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
+	 * @param	int[optional] $page					Specifies the page of results to retrieve.
+	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function statusesIdRetweetedByIds($id, $count = null, $page = null, $trimUser = false, $includeEntities = false)
+	{
+		// validate
+		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+
+		// build parameters
+		$parameters = null;
+		if($count != null) $parameters['count'] = (int) $count;
+		if($page != null) $parameters['page'] = (int) $page;
+		if($trimUser) $parameters['trim_user'] = 'true';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/' . (string) $id . '/retweeted_by/ids.json', $parameters, true);
+	}
+
+
+// User resources
+	/**
+	 * Returns extended information of a given user, specified by ID or screen name as per the required id parameter.
+	 * The author's most recent status will be returned inline.
+	 *
+	 * @return	array
+	 * @param	string[optional] $userId			Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param	string[optional] $screenName		Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function usersShow($userId = null, $screenName = null, $includeEntities = false)
+	{
+		// validate
+		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
+
+		// build parameters
+		$parameters = null;
+		if($userId != null) $parameters['user_id'] = (string) $userId;
+		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('users/show.json', $parameters);
+	}
+
+
+	/**
+	 * Return up to 100 users worth of extended information, specified by either ID, screen name, or combination of the two.
+	 * The author's most recent status (if the authenticating user has permission) will be returned inline.
+	 *
+	 * @return	array
+	 * @param	mixed[optional] $userIds			An array of user IDs, up to 100 in total.
+	 * @param	mixed[optional] $screenNames		An array of screen names, up to 100 in total.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function usersLookup($userIds = null, $screenNames = null, $includeEntities = false)
+	{
+		// redefine
+		$userIds = (array) $userIds;
+		$screenNames = (array) $screenNames;
+
+		// validate
+		if(empty($userIds) && empty($screenNames)) throw new TwitterException('Specify an userId or a screenName.');
+
+		// build parameters
+		$parameters = null;
+		if(!empty($userIds)) $parameters['user_id'] = implode(',', $userIds);
+		if(!empty($screenNames)) $parameters['screen_name'] = implode(',', $screenNames);
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('users/lookup.json', $parameters, true);
+
+	}
+
+
+	/**
+	 * Run a search for users similar to the Find People button on Twitter.com; the same results returned by people search on Twitter.com will be returned by using this API.
+	 * Usage note: It is only possible to retrieve the first 1000 matches from this API.
+	 *
+	 * @return	array
+	 * @param	string $q							The search query term.
+	 * @param	int[optional] $perPage				Specifies the number of results to retrieve.
+	 * @param	int[optional] $page					Specifies the page of results to retrieve.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function usersSearch($q, $perPage = null, $page = null, $includeEntities = false)
+	{
+		// build parameters
+		$parameters['q'] = (string) $q;
+		if($perPage != null) $parameters['per_page'] = (int) $perPage;
+		if($page != null) $parameters['page'] = (int) $page;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('users/search.json', $parameters, true);
+	}
+
+
+	/**
+	 * Access to Twitter's suggested user list. This returns the list of suggested user categories. The category can be used in the users/suggestions/category  endpoint to get the users in that category.
+	 *
+	 * @return	array
+	 */
+	public function usersSuggestions()
+	{
+		return (array) $this->doCall('users/suggestions.json');
+	}
+
+
+	/**
+	 * Access the users in a given category of the Twitter suggested user list.
+	 * It is recommended that end clients cache this data for no more than one hour.
+	 *
+	 * @return	array
+	 * @param	string $slug	The short name of list or a category.
+	 */
+	public function usersSuggestionsSlug($slug)
+	{
+		return (array) $this->doCall('users/suggestions/' . (string) $slug . '.json');
+	}
+
+
+	/**
+	 * Access the profile image in various sizes for the user with the indicated screen_name. If no size is provided the normal image is returned.
+	 * This method return an URL to the actual image resource.
+	 * This method should only be used by application developers to lookup or check the profile image URL for a user.
+	 * This method must not be used as the image source URL presented to users of your application.
+	 *
+	 * @return	string
+	 * @param	string $screenName			The screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param	string[optional] $size		Specifies the size of image to fetch. Not specifying a size will give the default, normal size of 48px by 48px. Valid options include: bigger (73x73px), normal (48x48px), mini (24x24px).
+	 */
+	public function usersProfileImage($screenName, $size = 'normal')
+	{
+		// possible modes
+		$allowedSizes = array('normal', 'bigger', 'mini');
+
+		// validate
+		if($size != null && !in_array($size, $allowedSizes)) throw new TwitterException('Invalid size (' . $size . '), possible values are: ' . implode($allowedSizes) . '.');
+
+		// build parameters
+		$parameters['size'] = (string) $size;
+
+		$headers = $this->doCall('users/profile_image/' . (string) $screenName . '.json', $parameters, false, 'GET', null, false, true);
+
+		// return the URL
+		if(isset($headers['url'])) return $headers['url'];
+
+		// fallback
+		return false;
+	}
+
+
+	/**
+	 * Returns a user's friends, each with current status inline. They are ordered by the order in which the user followed them, most recently followed first, 100 at a time.
+	 * (Please note that the result set isn't guaranteed to be 100 every time as suspended users will be filtered out.)
+	 *
+	 * Use the cursor option to access older friends.
+	 * With no user specified, request defaults to the authenticated user's friends.
+	 * It's also possible to request another user's friends list via the id, screen_name or user_id parameter.
+	 *
+	 * @return	array
+	 * @param	string[optional] $userId			Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param	string[optional] $screenName		Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param	int[optional] $cursor				Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function statusesFriends($userId = null, $screenName = null, $cursor = null, $includeEntities = false)
+	{
+		// build parameters
+		$parameters = array();
+		if($userId != null) $parameters['user_id'] = (string) $userId;
+		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($cursor != null) $parameters['cursor'] = $cursor;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/friends.json', $parameters, true);
+	}
+
+
+	/**
+	 * Returns the authenticating user's followers, each with current status inline. They are ordered by the order in which they followed the user, 100 at a time. (Please note that the result set isn't guaranteed to be 100 every time as suspended users will be filtered out.)
+	 * Use the cursor parameter to access earlier followers.
+	 *
+	 * @return	array
+	 * @param	string[optional] $userId			Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param	string[optional] $screenName		Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param	int[optional] $cursor				Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function statusesFollowers($userId = null, $screenName = null, $cursor = null, $includeEntities = false)
+	{
+		// build parameters
+		$parameters = array();
+		if($userId != null) $parameters['user_id'] = (string) $userId;
+		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($cursor != null) $parameters['cursor'] = $cursor;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('statuses/followers.json', $parameters, true);
+	}
+
+
+// Trends resources
+	/**
+	 * Returns the top ten topics that are currently trending on Twitter.
+	 * The response includes the time of the request, the name of each trend, and the url to the Twitter Search results page for that topic.
+	 *
+	 * @return	array
+	 */
+	public function trends()
+	{
+		return (array) $this->doCall('trends.json');
+	}
+
+
+	/**
+	 * Returns the current top 10 trending topics on Twitter. The response includes the time of the request, the name of each trending topic, and query used on Twitter Search results page for that topic.
+	 *
+	 * @return	array
+	 * @param	string[optional] $exclude	Setting this equal to hashtags will remove all hashtags from the trends list.
+	 */
+	public function trendsCurrent($exclude = null)
+	{
+		// build parameters
+		$parameters = null;
+		if($exclude != null) $parameters['exclude'] = (string) $exclude;
+
+		// make the call
+		return (array) $this->doCall('trends/current.json', $parameters);
+	}
+
+
+	/**
+	 * Returns the top 20 trending topics for each hour in a given day.
+	 *
+	 * @return	array
+	 * @param	string[optional] $date		Permits specifying a start date for the report. The date should be formatted YYYY-MM-DD.
+	 * @param	string[optional] $exclude	Setting this equal to hashtags will remove all hashtags from the trends list.
+	 */
+	public function trendsDaily($date = null, $exclude = null)
+	{
+		// build parameters
+		$parameters = null;
+		if($date != null) $parameters['date'] = (string) $date;
+		if($exclude != null) $parameters['exclude'] = (string) $exclude;
+
+		// make the call
+		return (array) $this->doCall('trends/daily.json', $parameters);
+	}
+
+
+	/**
+	 * Returns the top 30 trending topics for each day in a given week.
+	 *
+	 * @return	array
+	 * @param	string[optional] $date		Permits specifying a start date for the report. The date should be formatted YYYY-MM-DD.
+	 * @param	string[optional] $exclude	Setting this equal to hashtags will remove all hashtags from the trends list.
+	 */
+	public function trendsWeekly($date = null, $exclude = null)
+	{
+		// build parameters
+		$parameters = null;
+		if($date != null) $parameters['date'] = (string) $date;
+		if($exclude != null) $parameters['exclude'] = (string) $exclude;
+
+		// make the call
+		return (array) $this->doCall('trends/weekly.json', $parameters);
+	}
+
+
+// List resources
+	/**
+	 * Creates a new list for the authenticated user. Accounts are limited to 20 lists.
+	 *
+	 * @return	array
+	 * @param	string $user					The user.
+	 * @param	string $name					The name of the list you are creating.
+	 * @param	string[optional] $mode			Whether your list is public or private. Values can be public or private. Lists are public by default if no mode is specified.
+	 * @param	string[optional] $description	The description of the list you are creating.
+	 */
+	public function userListsCreate($user, $name, $mode = null, $description = null)
+	{
+		// possible modes
+		$allowedModes = array('public', 'private');
+
+		// validate
+		if($mode != null && !in_array($mode, $allowedModes)) throw new TwitterException('Invalid mode (), possible values are: ' . implode($allowedModes) . '.');
+
+		// build parameters
+		$parameters['name'] = (string) $name;
+		if($mode != null) $parameters['mode'] = (string) $mode;
+		if($description != null) $parameters['description'] = (string) $description;
+
+		// make the call
+		return (array) $this->doCall((string) $user . '/lists.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * List the lists of the specified user. Private lists will be included if the authenticated users is the same as the user who's lists are being returned.
+	 *
+	 * @return	array
+	 * @param	string $user				The user.
+	 * @param	string[optional] $cursor	Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	public function userLists($user, $cursor = null)
+	{
+		$parameters = null;
+		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+
+		// make the call
+		return (array) $this->doCall((string) $user . '/lists.json', $parameters, true);
+	}
+
+
+	/**
+	 * Show the specified list. Private lists will only be shown if the authenticated user owns the specified list.
+	 *
+	 * @return	array
+	 * @param	string $user	The user.
+	 * @param	string $id		The id of the list.
+	 */
+	public function userListsId($user, $id)
+	{
+		// make the call
+		return (array) $this->doCall((string) $user . '/lists/' . (string) $id . '.json', null, true);
+	}
+
+
+	/**
+	 * Updates the specified list.
+	 *
+	 * @return	array
+	 * @param	string $user					The user.
+	 * @param	string $id						The id of the list.
+	 * @param	string[optional] $name			The name of the list you are creating.
+	 * @param	string[optional] $mode			Whether your list is public or private. Values can be public or private. Lists are public by default if no mode is specified.
+	 * @param	string[optional] $description	The description of the list you are creating.
+	 */
+	public function userListsIdUpdate($user, $id, $name = null, $mode = null, $description = null)
+	{
+		// possible modes
+		$allowedModes = array('public', 'private');
+
+		// validate
+		if($mode != null && !in_array($mode, $allowedModes)) throw new TwitterException('Invalid mode (), possible values are: ' . implode($allowedModes) . '.');
+
+		// build parameters
+		if($name != null) $parameters['name'] = (string) $name;
+		if($mode != null) $parameters['mode'] = (string) $mode;
+		if($description != null) $parameters['description'] = (string) $description;
+
+		// make the call
+		return (array) $this->doCall((string) $user . '/lists/' . (string) $id . '.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Show tweet timeline for members of the specified list.
+	 *
+	 * @return	array
+	 * @param	string $user						The user.
+	 * @param	string $id							The id of the list.
+	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
+	 * @param	int[optional] $page					Specifies the page of results to retrieve.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function userListsIdStatuses($user, $id, $sinceId = null, $maxId = null, $count = null, $page = null, $includeEntities = false)
+	{
+		// validate
+		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+
+		// build parameters
+		$parameters = array();
+		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if($count != null) $parameters['per_page'] = (int) $count;
+		if($page != null) $parameters['page'] = (int) $page;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall((string) $user . '/lists/' . (string) $id . '/statuses.json', $parameters);
+	}
+
+
+	/**
+	 * List the lists the specified user has been added to.
+	 *
+	 * @return	array
+	 * @param	string $user				The user.
+	 * @param	string[optional] $cursor	Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	public function userListsMemberships($user, $cursor = null)
+	{
+		// build parameters
+		$parameters = null;
+		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+
+		// make the call
+		return (array) $this->doCall((string) $user . '/lists/memberships.json', $parameters, true);
+	}
+
+
+	/**
+	 * List the lists the specified user follows.
+	 *
+	 * @return	array
+	 * @param	string $user				The user.
+	 * @param	string[optional] $cursor	Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	public function userListsSubscriptions($user, $cursor = null)
+	{
+		// build parameters
+		$parameters = null;
+		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+
+		// make the call
+		return (array) $this->doCall((string) $user . '/lists/subscriptions.json', $parameters, true);
+	}
+
+
+// List Members resources
+	/**
+	 * Returns the members of the specified list.
+	 *
+	 * @return	array
+	 * @param	string $user						The user.
+	 * @param	string $id							The id of the list.
+	 * @param	string[optional] $cursor			Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function userListMembers($user, $id, $cursor = null, $includeEntities = false)
+	{
+		// build parameters
+		$parameters = null;
+		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall((string) $user . '/' . (string) $id . '/members.json', $parameters, true);
+	}
+
+
+	/**
+	 * Add a member to a list. The authenticated user must own the list to be able to add members to it. Lists are limited to having 500 members.
+	 *
+	 * @return	array
+	 * @param	string $user	The user.
+	 * @param	string $id		The id of the list.
+	 * @param	string $userId	The id or screen name of the user to add as a member of the list.
+	 */
+	public function userListMembersCreate($user, $id, $userId)
+	{
+		// build parameters
+		$parameters['id'] = (string) $userId;
+
+		// make the call
+		return (array) $this->doCall((string) $user . '/' . (string) $id . '/members.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Adds multiple members to a list, by specifying a comma-separated list of member ids or screen names. The authenticated user must own the list to be able to add members to it. Lists are limited to having 500 members, and you are limited to adding up to 100 members to a list at a time with this method.
+	 *
+	 * @return	array
+	 * @param	string $user					The user.
+	 * @param	string $id						The id of the list.
+	 * @param	mixed[optional] $userIds		An array of user IDs, up to 100 in total.
+	 * @param	mixed[optional] $screenNames	An array of screen names, up to 100 in total.
+	 */
+	public function userListMembersCreateAll($user, $id, $userIds = null, $screenNames = null)
+	{
+		// redefine
+		$userIds = (array) $userIds;
+		$screenNames = (array) $screenNames;
+
+		// validate
+		if(empty($userIds) && empty($screenNames)) throw new TwitterException('Specify an userId or a screenName.');
+
+		// build parameters
+		$parameters = null;
+		if(!empty($userIds)) $parameters['user_id'] = implode(',', $userIds);
+		if(!empty($screenNames)) $parameters['screen_name'] = implode(',', $screenNames);
+
+		// make the call
+		return (array) $this->doCall((string) $user . '/' . (string) $id . '/create_all.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Removes the specified member from the list. The authenticated user must be the list's owner to remove members from the list.
+	 *
+	 * @return	mixed
+	 * @param	string $user	The user.
+	 * @param	string $id		The id of the list.
+	 * @param	string $userId	Specfies the ID of the user for whom to return results for.
+	 */
+	public function userListMembersDelete($user, $id, $userId)
+	{
+		// build parameters
+		$parameters['id'] = (string) $userId;
+		$parameters['_method'] = 'DELETE';
+
+		// make the call
+		return (array) $this->doCall((string) $user . '/' . (string) $id . '/members.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Check if a user is a member of the specified list.
+	 *
+	 * @return	mixed
+	 * @param	string $user						The user.
+	 * @param	string $id							The id of the list.
+	 * @param	string $userId						Specfies the ID of the user for whom to return results for.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function userListMembersId($user, $id, $userId, $includeEntities = false)
+	{
+		try
+		{
+			// build parameters
+			$parameters = null;
+			if($includeEntities) $parameters['include_entities'] = 'true';
+
+			// make the call
+			return (array) $this->doCall((string) $user . '/' . (string) $id . '/members/' . (string) $userId . '.json', $parameters, true);
+		}
+
+		// catch exceptions
+		catch(TwitterException $e)
+		{
+			if($e->getMessage() == 'The specified user is not a member of this list') return false;
+			else throw $e;
+		}
+	}
+
+
+// List Subscribers resources
+	/**
+	 * Returns the subscribers of the specified list.
+	 *
+	 * @return	array
+	 * @param	string $user						The user.
+	 * @param	string $id							The id of the list.
+	 * @param	string[optional] $cursor			Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function userListSubscribers($user, $id, $cursor = null, $includeEntities = false)
+	{
+		// build parameters
+		$parameters = null;
+		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall((string) $user . '/' . (string) $id . '/subscribers.json', $parameters, true);
+	}
+
+
+	/**
+	 * Make the authenticated user follow the specified list.
+	 *
+	 * @return	array
+	 * @param	string $user	The user.
+	 * @param	string $id		The id of the list.
+	 */
+	public function userListSubscribersCreate($user, $id)
+	{
+		// make the call
+		return (array) $this->doCall((string) $user . '/' . (string) $id . '/subscribers.json', null, true, 'POST');
+	}
+
+
+	/**
+	 * Unsubscribes the authenticated user form the specified list.
+	 *
+	 * @return	array
+	 * @param	string $user	The user.
+	 * @param	string $id		The id of the list.
+	 */
+	public function userListSubscribersDelete($user, $id)
+	{
+		// build parameters
+		$parameters['_method'] = 'DELETE';
+
+		// make the call
+		return (array) $this->doCall((string) $user . '/' . (string) $id . '/subscribers.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Check if the specified user is a subscriber of the specified list.
+	 *
+	 * @return	mixed
+	 * @param	string $user						The user.
+	 * @param	string $id							The id of the list.
+	 * @param	string $userId						Specfies the ID of the user for whom to return results for.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function userListSubscribersId($user, $id, $userId, $includeEntities = false)
+	{
+		try
+		{
+			// build parameters
+			$parameters = null;
+			if($includeEntities) $parameters['include_entities'] = 'true';
+
+			// make the call
+			return (array) $this->doCall((string) $user . '/' . (string) $id . '/subscribers/' . (string) $userId . '.json', $parameters, true);
+		}
+
+		// catch exceptions
+		catch(TwitterException $e)
+		{
+			if($e->getMessage() == 'The specified user is not a subscriber of this list') return false;
+			else throw $e;
+		}
+
+	}
+
+
+// Direct Messages resources
+	/**
+	 * Returns a list of the 20 most recent direct messages sent to the authenticating user.
+	 *
+	 * @return	array
+	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
+	 * @param	int[optional] $page					Specifies the page of results to retrieve.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function directMessages($sinceId = null, $maxId = null, $count = null, $page = null, $includeEntities = false)
+	{
+		// validate
+		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+
+		// build parameters
+		$parameters = array();
+		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if($count != null) $parameters['count'] = (int) $count;
+		if($page != null) $parameters['page'] = (int) $page;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('direct_messages.json', $parameters, true);
+	}
+
+
+	/**
+	 * Returns a list of the 20 most recent direct messages sent by the authenticating user.
+	 *
+	 * @return	array
+	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
+	 * @param	int[optional] $page					Specifies the page of results to retrieve.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function directMessagesSent($sinceId = null, $maxId = null, $count = null, $page = null, $includeEntities = false)
+	{
+		// validate
+		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+
+		// build parameters
+		$parameters = array();
+		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if($count != null) $parameters['count'] = (int) $count;
+		if($page != null) $parameters['page'] = (int) $page;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('direct_messages/sent.json', $parameters, true);
+	}
+
+
+	/**
+	 * Sends a new direct message to the specified user from the authenticating user.
+	 * Requires both the user and text parameters. Returns the sent message in the requested format when successful.
+	 *
+	 * @return	array
+	 * @param	string $text						The text of your direct message. Be sure to URL encode as necessary, and keep it under 140 characters.
+	 * @param 	string[optional] $userId			Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param	string[optional] $screenName		Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function directMessagesNew($text, $userId = null, $screenName = null, $includeEntities = false)
+	{
+		// validate
+		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
+
+		// build parameters
+		$parameters['text'] = (string) $text;
+		if($userId != null) $parameters['user_id'] = (string) $userId;
+		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('direct_messages/new.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Destroys the direct message specified in the required ID parameter. The authenticating user must be the recipient of the specified direct message.
+	 *
+	 * @return	array
+	 * @param	string $id							The ID of the desired direct message.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function directMessagesDestroy($id, $includeEntities = false)
+	{
+		// build parameters
+		$parameters['id'] = (string) $id;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('direct_messages/destroy.json', $parameters, true, 'POST');
+	}
+
+
+// Friendship resources
+	/**
+	 * Allows the authenticating users to follow the user specified in the ID parameter.
+	 * Returns the befriended user in the requested format when successful.
+	 * Returns a string describing the failure condition when unsuccessful.
+	 *
+	 * @return	mixed
+	 * @param 	string[optional] $userId			Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param	string[optional] $screenName		Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param	bool[optional] $follow				Returns public statuses that reference the given set of users.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function friendshipsCreate($userId = null, $screenName = null, $follow = false, $includeEntities = false)
+	{
+		// validate
+		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
+
+		// build parameters
+		$parameters = null;
+		if($userId != null) $parameters['user_id'] = (string) $userId;
+		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		$parameters['follow'] = ($follow) ? 'true' : 'false';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('friendships/create.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Allows the authenticating users to unfollow the user specified in the ID parameter.
+	 * Returns the unfollowed user in the requested format when successful. Returns a string describing the failure condition when unsuccessful.
+	 *
+	 * @return	array
+	 * @param 	string[optional] $userId			Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param	string[optional] $screenName		Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function friendshipsDestroy($userId = null, $screenName = null, $includeEntities = false)
+	{
+		// validate
+		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
+
+		// build parameters
+		if($userId != null) $parameters['user_id'] = (string) $userId;
+		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('friendships/destroy.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Tests for the existence of friendship between two users. Will return true if user_a follows user_b, otherwise will return false.
+	 *
+	 * @return	bool
+	 * @param	string $userA	The ID or screen_name of the subject user.
+	 * @param	string $userB	The ID or screen_name of the user to test for following.
+	 */
+	public function friendshipsExists($userA, $userB)
+	{
+		// build parameters
+		$parameters['user_a'] = (string) $userA;
+		$parameters['user_b'] = (string) $userB;
+
+		// make the call
+		return (bool) $this->doCall('friendships/exists.json', $parameters);
+	}
+
+
+	/**
+	 * Returns detailed information about the relationship between two users.
+	 *
+	 * @return	array
+	 * @param 	string[optional] $sourceId				The user_id of the subject user.
+	 * @param 	string[optional] $sourceScreenName		The screen_name of the subject user.
+	 * @param 	string[optional] $targetId				The screen_name of the subject user.
+	 * @param 	string[optional] $targetScreenName		The screen_name of the target user.
+	 */
+	public function friendshipsShow($sourceId = null, $sourceScreenName = null, $targetId = null, $targetScreenName = null)
+	{
+		// validate
+		if($sourceId == '' && $sourceScreenName == '') throw new TwitterException('Specify an sourceId or a sourceScreenName.');
+		if($targetId == '' && $targetScreenName == '') throw new TwitterException('Specify an targetId or a targetScreenName.');
+
+		// build parameters
+		if($sourceId != null) $parameters['source_id'] = (string) $sourceId;
+		if($sourceScreenName != null) $parameters['source_screen_name'] = (string) $sourceScreenName;
+		if($targetId != null) $parameters['target_id'] = (string) $targetId;
+		if($targetScreenName != null) $parameters['target_screen_name'] = (string) $targetScreenName;
+
+		// make the call
+		return (array) $this->doCall('friendships/show.json', $parameters);
+	}
+
+
+	/**
+	 * Returns an array of numeric IDs for every user who has a pending request to follow the authenticating user.
+	 *
+	 * @return	array
+	 * @param	string[optional] $cursor	Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	public function friendshipsIncoming($cursor = null)
+	{
+		// build parameters
+		$parameters = null;
+		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+
+		// make the call
+		return (array) $this->doCall('friendships/incoming.json', $parameters, true);
+	}
+
+
+	/**
+	 * Returns an array of numeric IDs for every protected user for whom the authenticating user has a pending follow request.
+	 *
+	 * @return	array
+	 * @param	string[optional] $cursor	Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	public function friendshipsOutgoing($cursor = null)
+	{
+		// build parameters
+		$parameters = null;
+		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+
+		// make the call
+		return (array) $this->doCall('friendships/outgoing.json', $parameters, true);
+	}
+
+
+// Friends and Followers resources
+	/**
+	 * Returns an array of numeric IDs for every user the specified user is following.
+	 *
+	 * @return	array
+	 * @param 	string[optional] $userId		Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param	string[optional] $screenName	Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param	string[optional] $cursor	Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	public function friendsIds($userId = null, $screenName = null, $cursor = null)
+	{
+		// validate
+		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
+
+		// build parameters
+		$parameters = null;
+		if($userId != null) $parameters['user_id'] = (string) $userId;
+		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+
+		// make the call
+		return (array) $this->doCall('friends/ids.json', $parameters, true);
+	}
+
+
+	/**
+	 * Returns an array of numeric IDs for every user following the specified user.
+	 *
+	 * @return	array
+	 * @param 	string[optional] $userId		Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param	string[optional] $screenName	Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param	string[optional] $cursor	Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	public function followersIds($userId = null, $screenName = null, $cursor = null)
+	{
+		// validate
+		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
+
+		// build parameters
+		if($userId != null) $parameters['user_id'] = (string) $userId;
+		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+
+		// make the call
+		return (array) $this->doCall('followers/ids.json', $parameters, true);
+	}
+
+
+// Account resources
+	/**
+	 * Returns an HTTP 200 OK response code and a representation of the requesting user if authentication was successful; returns a 401 status code and an error message if not. Use this method to test if supplied user credentials are valid.
+	 *
+	 * @return	array
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function accountVerifyCredentials($includeEntities = false)
+	{
+		// build parameters
+		$parameters = null;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('account/verify_credentials.json', $parameters, true);
+	}
+
+
+	/**
+	 * Returns the remaining number of API requests available to the requesting user before the API limit is reached for the current hour. Calls to rate_limit_status do not count against the rate limit.
+	 * If authentication credentials are provided, the rate limit status for the authenticating user is returned. Otherwise, the rate limit status for the requester's IP address is returned.
+	 *
+	 * @return	array
+	 */
+	public function accountRateLimitStatus()
+	{
+		// make the call
+		return (array) $this->doCall('account/rate_limit_status.json', null);
+	}
+
+
+	/**
+	 * Ends the session of the authenticating user, returning a null cookie. Use this method to sign users out of client-facing applications like widgets.
+	 *
+	 * @return	bool
+	 */
+	public function accountEndSession()
+	{
+		try
+		{
+			// make the call
+			$this->doCall('account/end_session.json', null, true, 'POST');
+		}
+
+		// catch exceptions
+		catch(TwitterException $e)
+		{
+			if($e->getMessage() == 'Logged out.') return true;
+			else throw $e;
+		}
+	}
+
+
+	/**
+	 * Sets which device Twitter delivers updates to for the authenticating user. Sending none as the device parameter will disable IM or SMS updates.
+	 *
+	 * @return	array
+	 * @param	string $device						Delivery device type to send updates to.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function accountUpdateDeliveryDevices($device, $includeEntities = false)
+	{
+		// build parameters
+		$parameters['device'] = (string) $device;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('account/update_delivery_device.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Sets one or more hex values that control the color scheme of the authenticating user's profile page on twitter.com.
+	 * Each parameter's value must be a valid hexidecimal value, and may be either three or six characters (ex: #fff or #ffffff).
+	 *
+	 * @return	array
+	 * @param	string[optional] $profileBackgroundColor		Profile background color.
+	 * @param	string[optional] $profileTextColor				Profile text color.
+	 * @param	string[optional] $profileLinkColor				Profile link color.
+	 * @param	string[optional] $profileSidebarFillColor		Profile sidebar's background color.
+	 * @param	string[optional] $profileSidebarBorderColor		Profile sidebar's border color.
+	 * @param	bool[optional] $includeEntities					When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function accountUpdateProfileColors($profileBackgroundColor = null, $profileTextColor = null, $profileLinkColor = null, $profileSidebarFillColor = null, $profileSidebarBorderColor = null, $includeEntities = false)
+	{
+		// validate
+		if($profileBackgroundColor == '' && $profileTextColor == '' && $profileLinkColor == '' && $profileSidebarFillColor == '' && $profileSidebarBorderColor == '') throw new TwitterException('Specify a profileBackgroundColor, profileTextColor, profileLinkColor, profileSidebarFillColor or a profileSidebarBorderColor.');
+
+		// build parameters
+		if($profileBackgroundColor != null) $parameters['profile_background_color'] = (string) $profileBackgroundColor;
+		if($profileTextColor != null) $parameters['profile_text_color'] = (string) $profileTextColor;
+		if($profileLinkColor != null) $parameters['profile_link_color'] = (string) $profileLinkColor;
+		if($profileSidebarFillColor != null) $parameters['profile_sidebar_fill_color'] = (string) $profileSidebarFillColor;
+		if($profileSidebarBorderColor != null) $parameters['profile_sidebar_border_color'] = (string) $profileSidebarBorderColor;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('account/update_profile_colors.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Updates the authenticating user's profile image.
+	 *
+	 * @return	array
+	 * @param	string $image						The path to the avatar image for the profile. Must be a valid GIF, JPG, or PNG image of less than 700 kilobytes in size. Images with width larger than 500 pixels will be scaled down.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function accountUpdateProfileImage($image, $includeEntities = false)
+	{
+		// validate
+		if(!file_exists($image)) throw new TwitterException('Image (' . $image . ') doesn\'t exists.');
+
+		// build parameters
+		$parameters = null;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('account/update_profile_image.json', $parameters, true, 'POST', $image);
+	}
+
+
+	/**
+	 * Updates the authenticating user's profile background image.
+	 *
+	 * @return	array
+	 * @param	string $image						The path to the background image for the profile. Must be a valid GIF, JPG, or PNG image of less than 800 kilobytes in size. Images with width larger than 2048 pixels will be forceably scaled down.
+	 * @param	bool[optional] $tile				Whether or not to tile the background image. If set to true the background image will be displayed tiled. The image will not be tiled otherwise.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function accountUpdateProfileBackgroundImage($image, $tile = false, $includeEntities = false)
+	{
+		// validate
+		if(!file_exists($image)) throw new TwitterException('Image (' . $image . ') doesn\'t exists.');
+
+		// build parameters
+		$parameters = null;
+		if($tile) $parameters['tile'] = 'true';
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('account/update_profile_background_image.json', $parameters, true, 'POST', $image);
+	}
+
+
+	/**
+	 * Sets values that users are able to set under the "Account" tab of their settings page. Only the parameters specified will be updated.
+	 *
+	 * @return	array
+	 * @param	string[optional] $name			Full name associated with the profile. Maximum of 20 characters.
+	 * @param	string[optional] $url			URL associated with the profile. Will be prepended with "http://" if not present. Maximum of 100 characters.
+	 * @param	string[optional] $location		The city or country describing where the user of the account is located. The contents are not normalized or geocoded in any way. Maximum of 30 characters.
+	 * @param	string[optional] $description	A description of the user owning the account. Maximum of 160 characters.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function accountUpdateProfile($name = null, $url = null, $location = null, $description = null, $includeEntities = false)
+	{
+		// build parameters
+		$parameters = null;
+		if($name != null) $parameters['name'] = (string) $name;
+		if($url != null) $parameters['url'] = (string) $url;
+		if($location != null) $parameters['location'] = (string) $location;
+		if($description != null) $parameters['description'] = (string) $description;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('account/update_profile.json', $parameters, true, 'POST');
+	}
+
+
+// Favorites resources
+	/**
+	 * Returns the 20 most recent favorite statuses for the authenticating user or user specified by the ID parameter in the requested format.
+	 *
+	 * @return	array
+	 * @param	string[optional] $id				Specifies the ID or screen name of the user for whom to return results for.
+	 * @param	int[optional] $page					Specifies the page of results to retrieve.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function favorites($id = null, $page = null, $includeEntities = false)
+	{
+		// build parameters
+		$parameters = null;
+		if($id != null) $parameters['id'] = (string) $id;
+		if($page != null) $parameters['page'] = (int) $page;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('favorites.json', $parameters, true);
+	}
+
+
+	/**
+	 * Favorites the status specified in the ID parameter as the authenticating user. Returns the favorite status when successful.
+	 *
+	 * @return	array
+	 * @param	string $id							The numerical ID of the desired status.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function favoritesCreate($id, $includeEntities = false)
+	{
+		// build parameters
+		$parameters = null;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('favorites/create/' . $id . '.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Un-favorites the status specified in the ID parameter as the authenticating user. Returns the un-favorited status in the requested format when successful.
+	 *
+	 * @return	array
+	 * @param	string $id							The numerical ID of the desired status.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function favoritesDestroy($id, $includeEntities = false)
+	{
+		// build parameters
+		$parameters = null;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('favorites/destroy/' . $id . '.json', $parameters, true, 'POST');
+	}
+
+
+// Notification resources
+	/**
+	 * Enables device notifications for updates from the specified user. Returns the specified user when successful.
+	 *
+	 * @return	array
+	 * @param 	string[optional] $userId			Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param	string[optional] $screenName		Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function notificationsFollow($userId = null, $screenName = null, $includeEntities = false)
+	{
+		// validate
+		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
+
+		// build parameters
+		if($userId != null) $parameters['user_id'] = (string) $userId;
+		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('notifications/follow.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Disables notifications for updates from the specified user to the authenticating user. Returns the specified user when successful.
+	 *
+	 * @return	array
+	 * @param 	string[optional] $userId			Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param	string[optional] $screenName		Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function notificationsLeave($userId = null, $screenName = null, $includeEntities = false)
+	{
+		// validate
+		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
+
+		// build parameters
+		if($userId != null) $parameters['user_id'] = (string) $userId;
+		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('notifications/leave.json', $parameters, true, 'POST');
+	}
+
+
+// Block resources
+	/**
+	 * Blocks the user specified in the ID parameter as the authenticating user. Destroys a friendship to the blocked user if it exists. Returns the blocked user in the requested format when successful.
+	 *
+	 * @return	array
+	 * @param 	string[optional] $userId			Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param	string[optional] $screenName		Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function blocksCreate($userId = null, $screenName = null, $includeEntities = false)
+	{
+		// validate
+		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
+
+		// build parameters
+		if($userId != null) $parameters['user_id'] = (string) $userId;
+		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('blocks/create.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Un-blocks the user specified in the ID parameter for the authenticating user. Returns the un-blocked user in the requested format when successful.
+	 *
+	 * @return	array
+	 * @param 	string[optional] $userId			Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param	string[optional] $screenName		Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function blocksDestroy($userId = null, $screenName = null, $includeEntities = false)
+	{
+		// validate
+		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
+
+		// build parameters
+		if($userId != null) $parameters['user_id'] = (string) $userId;
+		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('blocks/destroy.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Un-blocks the user specified in the ID parameter for the authenticating user. Returns the un-blocked user in the requested format when successful.
+	 *
+	 * @return	mixed
+	 * @param 	string[optional] $userId			Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param	string[optional] $screenName		Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function blocksExists($userId = null, $screenName = null, $includeEntities = false)
+	{
+		// validate
+		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
+
+		// build parameters
+		if($userId != null) $parameters['user_id'] = (string) $userId;
+		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		try
+		{
+			// make the call
+			return (array) $this->doCall('blocks/exists.json', $parameters, true);
+		}
+		// catch exceptions
+		catch(TwitterException $e)
+		{
+			if($e->getMessage() == 'You are not blocking this user.') return false;
+			else throw $e;
+		}
+	}
+
+
+	/**
+	 * Returns an array of user objects that the authenticating user is blocking.
+	 *
+	 * @return	array
+	 * @param	int[optional] $page					Specifies the page of results to retrieve. Note: there are pagination limits. See the FAQ for details.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function blocksBlocking($page = null, $includeEntities = false)
+	{
+		// build parameters
+		$parameters = null;
+		if($page != null) $parameters['page'] = (int) $page;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('blocks/blocking.json', $parameters, true);
+	}
+
+
+	/**
+	 * Returns an array of numeric user ids the authenticating user is blocking.
+	 *
+	 * @return	array
+	 */
+	public function blocksBlockingIds()
+	{
+		// make the call
+		return (array) $this->doCall('blocks/blocking/ids.json', null, true);
+	}
+
+
+// Spam Reporting resources
+	/**
+	 * The user specified in the id is blocked by the authenticated user and reported as a spammer.
+	 *
+	 * @return	array
+	 * @param 	string[optional] $userId		Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param	string[optional] $screenName	Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 */
+	public function reportSpam($userId = null, $screenName = null, $includeEntities = false)
+	{
+		// validate
+		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
+
+		// build parameters
+		if($userId != null) $parameters['user_id'] = (string) $userId;
+		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($includeEntities) $parameters['include_entities'] = 'true';
+
+		// make the call
+		return (array) $this->doCall('report_spam.json', $parameters, true, 'POST');
+	}
+
+
+// Search resources
+	/**
+	 * Returns tweets that match a specified query.
+	 *
+	 * @return	array
+	 * @param	string $q						Search query. Should be URL encoded. Queries will be limited by complexity.
+	 * @param 	string[optional] $lang			Restricts tweets to the given language, given by an ISO 639-1 code.
+	 * @param 	string[optional] $locale		Specify the language of the query you are sending (only ja is currently effective). This is intended for language-specific clients and the default should work in the majority of cases.
+	 * @param 	int[optional] $rpp				The number of tweets to return per page, up to a max of 100.
+	 * @param 	int[optional] $page				The page number (starting at 1) to return, up to a max of roughly 1500 results (based on rpp * page).
+	 * @param 	string[optional] $sinceId		Returns results with an ID greater than (that is, more recent than) the specified ID. There are limits to the number of Tweets which can be accessed through the API. If the limit of Tweets has occured since the since_id, the since_id will be forced to the oldest ID available.
+	 * @param 	string[optional] $until			Returns tweets generated before the given date. Date should be formatted as YYYY-MM-DD.
+	 * @param 	string[optional] $geocode		Returns tweets by users located within a given radius of the given latitude/longitude. The location is preferentially taking from the Geotagging API, but will fall back to their Twitter profile. The parameter value is specified by "latitude,longitude,radius", where radius units must be specified as either "mi" (miles) or "km" (kilometers). Note that you cannot use the near operator via the API to geocode arbitrary locations; however you can use this geocode parameter to search near geocodes directly.
+	 * @param 	bool[optional] $showUser		When true, prepends ":" to the beginning of the tweet. This is useful for readers that do not display Atom's author field. The default is false.
+	 * @param 	string[optional] $resultType	Specifies what type of search results you would prefer to receive. The current default is "mixed." Valid values include: mixed, recent, popular.
+	 */
+	public function search($q, $lang = null, $locale = null, $rpp = null, $page = null, $sinceId = null, $until = null, $geocode = null, $showUser = false, $resultType = null)
+	{
+		$parameters['q'] = (string) $q;
+		if($lang !== null) $parameters['lang'] = (string) $lang;
+		if($locale !== null) $parameters['locale'] = (string) $locale;
+		if($rpp !== null) $parameters['rpp'] = (int) $rpp;
+		if($page !== null) $parameters['page'] = (int) $page;
+		if($sinceId !== null) $parameters['since_id'] = (string) $sinceId;
+		if($until !== null) $parameters['until'] = (string) $until;
+		if($geocode !== null) $parameters['geocode'] = (string) $geocode;
+		if($showUser === true) $parameters['show_user'] = 'true';
+		if($resultType !== null) $parameters['result_type'] = (string) $resultType;
+
+		return (array) $this->doSearchCall('search.json', $parameters);
+	}
+
+
+// Saved Searches resources
+	/**
+	 * Returns the authenticated user's saved search queries.
+	 *
+	 * @return	array
+	 */
+	public function savedSearches()
+	{
+		// make the call
+		return (array) $this->doCall('saved_searches.json', null, true);
+	}
+
+
+	/**
+	 * Retrieve the data for a saved search owned by the authenticating user specified by the given id.
+	 *
+	 * @return	array
+	 * @param	string $id	The ID of the desired saved search.
+	 */
+	public function savedSearchesShow($id)
+	{
+		// make the call
+		return (array) $this->doCall('saved_searches/show/' . (string) $id . '.json', null, true);
+	}
+
+
+	/**
+	 * Creates a saved search for the authenticated user.
+	 *
+	 * @return	array
+	 * @param	string $query	The query of the search the user would like to save.
+	 */
+	public function savedSearchesCreate($query)
+	{
+		// build parameters
+		$parameters['query'] = (string) $query;
+
+		// make the call
+		return (array) $this->doCall('saved_searches/create.json', $parameters, true, 'POST');
+	}
+
+
+	/**
+	 * Destroys a saved search for the authenticated user. The search specified by id must be owned by the authenticating user.
+	 *
+	 * @return	array
+	 * @param	string $id	The ID of the desired saved search.
+	 */
+	public function savedSearchesDestroy($id)
+	{
+		return (array) $this->doCall('saved_searches/destroy/' . (string) $id . '.json', null, true, 'POST');
+	}
+
+
+// OAuth resources
+	/**
+	 * Allows a Consumer application to obtain an OAuth Request Token to request user authorization.
+	 * This method fulfills Secion 6.1 of the OAuth 1.0 authentication flow.
+	 *
+	 * @return	array							An array containg the token and the secret
+	 * @param	string[optional] $callbackURL	The callback URL.
+	 */
+	public function oAuthRequestToken($callbackURL = null)
+	{
+		// init var
+		$parameters = null;
+
+		// set callback
+		if($callbackURL != null) $parameters['oauth_callback'] = (string) $callbackURL;
+
+		// make the call
+		$response = $this->doOAuthCall('request_token', $parameters);
+
+		// validate
+		if(!isset($response['oauth_token'], $response['oauth_token_secret'])) throw new TwitterException(implode(', ', array_keys($response)));
+
+		// set some properties
+		if(isset($response['oauth_token'])) $this->setOAuthToken($response['oauth_token']);
+		if(isset($response['oauth_token_secret'])) $this->setOAuthTokenSecret($response['oauth_token_secret']);
+
+		// return
+		return $response;
+	}
+
+
+	/**
+	 * Allows a Consumer application to exchange the OAuth Request Token for an OAuth Access Token.
+	 * This method fulfills Secion 6.3 of the OAuth 1.0 authentication flow.
+	 *
+	 * @return	array
+	 * @param	string $token		The token to use.
+	 * @param	string $verifier	The verifier.
+	 */
+	public function oAuthAccessToken($token, $verifier)
+	{
+		// init var
+		$parameters = array();
+		$parameters['oauth_token'] = (string) $token;
+		$parameters['oauth_verifier'] = (string) $verifier;
+
+		// make the call
+		$response = $this->doOAuthCall('access_token', $parameters);
+
+		// set some properties
+		if(isset($response['oauth_token'])) $this->setOAuthToken($response['oauth_token']);
+		if(isset($response['oauth_token_secret'])) $this->setOAuthTokenSecret($response['oauth_token_secret']);
+
+		// return
+		return $response;
+	}
+
+
+	/**
+	 * Will redirect to the page to authorize the applicatione
+	 *
+	 * @return	void
+	 * @param	string	$token		The token.
+	 */
+	public function oAuthAuthorize($token)
+	{
+		header('Location: ' . self::SECURE_API_URL . '/oauth/authorize?oauth_token=' . $token);
+	}
+
+
+	/**
+	 * Allows a Consumer application to use an OAuth request_token to request user authorization. This method is a replacement fulfills Secion 6.2 of the OAuth 1.0 authentication flow for applications using the Sign in with Twitter authentication flow. The method will use the currently logged in user as the account to for access authorization unless the force_login parameter is set to true
+	 * REMARK: This method seems not to work	@later
+	 *
+	 * @return	void
+	 * @param	bool[optional] $force	Force the authentication.
+	 */
+	public function oAuthAuthenticate($force = false)
+	{
+		throw new TwitterException('Not implemented');
+
+		// build parameters
+		$parameters = null;
+		if((bool) $force) $parameters['force_login'] = 'true';
+
+		// make the call
+		return $this->doCall('/oauth/authenticate.oauth', $parameters);
+	}
+
+
+// Local Trends resources
+	/**
+	 * Returns the locations that Twitter has trending topic information for.
+	 * The response is an array of "locations" that encode the location's WOEID (a Yahoo! Where On Earth ID) and some other human-readable information such as a canonical name and country the location belongs in.
+	 * The WOEID that is returned in the location object is to be used when querying for a specific trend.
+	 *
+	 * @return	array
+	 * @param	float[optional] $lat	If passed in conjunction with long, then the available trend locations will be sorted by distance to the lat  and long passed in. The sort is nearest to furthest.
+	 * @param	float[optional] $long	If passed in conjunction with lat, then the available trend locations will be sorted by distance to the lat  and long passed in. The sort is nearest to furthest.
+	 */
+	public function trendsAvailable($lat = null, $long = null)
+	{
+		// build parameters
+		$parameters = null;
+		if($lat != null) $parameters['lat_for_trends'] = (float) $lat;
+		if($long != null) $parameters['long_for_trends'] = (float) $long;
+
+		// make the call
+		return (array) $this->doCall('trends/available.json', $parameters);
+	}
+
+
+	/**
+	 * Returns the top 10 trending topics for a specific location Twitter has trending topic information for.
+	 * The response is an array of "trend" objects that encode the name of the trending topic, the query parameter that can be used to search for the topic on Search, and the direct URL that can be issued against Search.
+	 * This information is cached for five minutes, and therefore users are discouraged from querying these endpoints faster than once every five minutes. Global trends information is also available from this API by using a WOEID of 1.
+	 *
+	 * @return	array
+	 * @param	string $woeid	The WOEID of the location to be querying for.
+	 */
+	public function trendsLocation($woeid)
+	{
+		// make the call
+		return (array) $this->doCall('trends/' . (string) $woeid . '.json');
+	}
+
+
+// Geo resources
+	/**
+	 * Search for places that can be attached to a statuses/update. Given a latitude and a longitude pair, an IP address, or a name, this request will return a list of all the valid places that can be used as the place_id when updating a status.
+	 * Conceptually, a query can be made from the user's location, retrieve a list of places, have the user validate the location he or she is at, and then send the ID of this location with a call to statuses/update.
+	 * This is the recommended method to use find places that can be attached to statuses/update. Unlike geo/reverse_geocode which provides raw data access, this endpoint can potentially re-order places with regards to the user who is authenticated. This approach is also preferred for interactive place matching with the user.
+	 *
+	 * @return	array
+	 * @param	float[optional] $lat				The latitude to search around. This parameter will be ignored unless it is inside the range -90.0 to +90.0 (North is positive) inclusive. It will also be ignored if there isn't a corresponding long parameter.
+	 * @param	float[optional] $long				The longitude to search around. The valid ranges for longitude is -180.0 to +180.0 (East is positive) inclusive. This parameter will be ignored if outside that range, if it is not a number, if geo_enabled is disabled, or if there not a corresponding lat parameter.
+	 * @param	string[optional] $query				Free-form text to match against while executing a geo-based query, best suited for finding nearby locations by name.
+	 * @param	string[optional] $ip				An IP address. Used when attempting to fix geolocation based off of the user's IP address.
+	 * @param	string[optional] $accuracy			A hint on the "region" in which to search. If a number, then this is a radius in meters, but it can also take a string that is suffixed with ft to specify feet. If this is not passed in, then it is assumed to be 0m. If coming from a device, in practice, this value is whatever accuracy the device has measuring its location (whether it be coming from a GPS, WiFi triangulation, etc.).
+	 * @param	string[optional] $granularity		The minimal granularity of data to return. If this is not passed in, then neighborhood is assumed. city can also be passed.
+	 * @param	int[optional] $maxResults			A hint as to the number of results to return. This does not guarantee that the number of results returned will equal max_results, but instead informs how many "nearby" results to return. Ideally, only pass in the number of places you intend to display to the user here.
+	 * @param	string[optional] $containedWithin	This is the place_id which you would like to restrict the search results to. Setting this value means only places within the given place_id will be found.
+	 * @param	array[optional] $attributes			This parameter searches for places which have this given. This should be an key-value-pair-array.
+	 */
+	public function geoSearch($lat = null, $long = null, $query = null, $ip = null, $accuracy = null, $granularity = null, $maxResults = null, $containedWithin = null, array $attributes = null)
+	{
+		// build parameters
+		if($lat != null) $parameters['lat'] = (float) $lat;
+		if($long != null) $parameters['long'] = (float) $long;
+		if($query != null) $parameters['query'] = (string) $query;
+		if($ip != null) $parameters['ip'] = (string) $ip;
+		if($accuracy != null) $parameters['accuracy'] = (string) $accuracy;
+		if($granularity != null) $parameters['granularity'] = (string) $granularity;
+		if($maxResults != null) $parameters['max_results'] = (int) $maxResults;
+		if($containedWithin != null) $parameters['contained_within'] = (string) $containedWithin;
+		if($attributes != null)
+		{
+			// loop
+			foreach($attributes as $key => $value) $parameters['attribute:' . $key] = (string) $value;
+		}
+
+		// make the call
+		return (array) $this->doCall('geo/search.json', $parameters);
+	}
+
+
+	/**
+	 * Locates places near the given coordinates which are similar in name.
+	 * Conceptually you would use this method to get a list of known places to choose from first. Then, if the desired place doesn't exist, make a request to post/geo/place to create a new one.
+	 * The token contained in the response is the token needed to be able to create a new place.
+	 *
+	 * @return	array
+	 * @param	float $lat							The location's latitude that this tweet refers to.
+	 * @param	float $long							The location's longitude that this tweet refers to.
+	 * @param	string $name						The name a place is known as.
+	 * @param	string[optional] $containedWithin	This is the place_id which you would like to restrict the search results to. Setting this value means only places within the given place_id will be found.
+	 * @param	array[optional] $attributes			This parameter searches for places which have this given. This should be an key-value-pair-array.
+	 */
+	public function geoSimilarPlaces($lat, $long, $name, $containedWithin = null, array $attributes = null)
+	{
+		// build parameters
+		$parameters['lat'] = (float) $lat;
+		$parameters['long'] = (float) $long;
+		$parameters['name'] = (string) $name;
+		if($containedWithin != null) $parameters['contained_within'] = (string) $containedWithin;
+		if($attributes != null)
+		{
+			// loop
+			foreach($attributes as $key => $value) $parameters['attribute:' . $key] = (string) $value;
+		}
+
+		// make the call
+		return (array) $this->doCall('geo/similar_places.json', $parameters);
+	}
+
+
+	/**
+	 * Search for places (cities and neighborhoods) that can be attached to a statuses/update. Given a latitude and a longitude, return a list of all the valid places that can be used as a place_id when updating a status.
+	 * Conceptually, a query can be made from the user's location, retrieve a list of places, have the user validate the location he or she is at, and then send the ID of this location up with a call to statuses/update.
+	 * There are multiple granularities of places that can be returned -- "neighborhoods", "cities", etc. At this time, only United States data is available through this method.
+	 * This API call is meant to be an informative call and will deliver generalized results about geography.
+	 *
+	 * @return	array
+	 * @param	float $lat						The location's latitude that this tweet refers to.
+	 * @param	float $long						The location's longitude that this tweet refers to.
+	 * @param	string[optional] $accuracy		A hint on the "region" in which to search. If a number, then this is a radius in meters, but it can also take a string that is suffixed with ft to specify feet. If this is not passed in, then it is assumed to be 0m. If coming from a device, in practice, this value is whatever accuracy the device has measuring its location (whether it be coming from a GPS, WiFi triangulation, etc.).
+	 * @param	string[optional] $granularity	The minimal granularity of data to return. If this is not passed in, then neighborhood is assumed. city can also be passed.
+	 * @param	int[optional] $maxResults		A hint as to the number of results to return. This does not guarantee that the number of results returned will equal max_results, but instead informs how many "nearby" results to return. Ideally, only pass in the number of places you intend to display to the user here.
+	 */
+	public function geoReverseGeoCode($lat, $long, $accuracy = null, $granularity = null, $maxResults = null)
+	{
+		// build parameters
+		$parameters['lat'] = (float) $lat;
+		$parameters['long'] = (float) $long;
+		if($accuracy != null) $parameters['accuracy'] = (string) $accuracy;
+		if($granularity != null) $parameters['granularity'] = (string) $granularity;
+		if($maxResults != null) $parameters['max_results'] = (int) $maxResults;
+
+		// make the call
+		return (array) $this->doCall('geo/reverse_geocode.json', $parameters);
+	}
+
+
+	/**
+	 * Find out more details of a place that was returned from the geo/reverse_geocode method.
+	 *
+	 * @return	array
+	 * @param	string $id					The id of the place.
+	 * @param	string[optional] $placeId	A place in the world. These IDs can be retrieved from geo/reverse_geocode.
+	 */
+	public function geoId($id, $placeId = null)
+	{
+		// build parameters
+		$parameters = null;
+		if($placeId != null) $parameters['place_id'] = (string) $placeId;
+
+		// make the call
+		return (array) $this->doCall('geo/id/' . (string) $id . '.json', $parameters);
+	}
+
+
+	/**
+	 * Creates a new place at the given latitude and longitude.
+	 *
+	 * @return	array
+	 * @param	string $name					The name a place is known as.
+	 * @param	string $containedWithin			This is the place_id which you would like to restrict the search results to. Setting this value means only places within the given place_id will be found.
+	 * @param	string $token					The token found in the response from geo/similar_places.
+	 * @param	float $lat						The latitude the place is located at. This parameter will be ignored unless it is inside the range -90.0 to +90.0 (North is positive) inclusive. It will also be ignored if there isn't a corresponding long parameter.
+	 * @param	float $long						The longitude the place is located at. The valid ranges for longitude is -180.0 to +180.0 (East is positive) inclusive. This parameter will be ignored if outside that range, if it is not a number, if geo_enabled is disabled, or if there not a corresponding lat parameter.
+	 * @param	array[optional] $attributes		This parameter searches for places which have this given. This should be an key-value-pair-array.
+	 */
+	public function geoPlaceCreate($name, $containedWithin, $token, $lat, $long, array $attributes = null)
+	{
+		// build parameters
+		$parameters['name'] = (string) $name;
+		$parameters['contained_within'] = (string) $containedWithin;
+		$parameters['token'] = (string) $token;
+		$parameters['lat'] = (float) $lat;
+		$parameters['long'] = (float) $long;
+		if($attributes != null)
+		{
+			// loop
+			foreach($attributes as $key => $value) $parameters['attribute:' . $key] = (string) $value;
+		}
+
+		// make the call
+		return (array) $this->doCall('geo/place.json', $parameters, true, 'POST');
+	}
+
+
+// legal resources
+	/**
+	 * Returns Twitter's' Terms of Service in the requested format. These are not the same as the Developer Terms of Service.
+	 *
+	 * @return	string
+	 */
+	public function legalToS()
+	{
+		// make the call
+		$response = $this->doCall('legal/tos.json');
+
+		// validate and return
+		if(isset($response['tos'])) return $response['tos'];
+
+		// fallback
+		return false;
+	}
+
+
+	/**
+	 * Returns Twitter's Privacy Policy
+	 *
+	 * @return	string
+	 */
+	public function legalPrivacy()
+	{
+		// make the call
+		$response = $this->doCall('legal/privacy.json');
+
+		// validate and return
+		if(isset($response['privacy'])) return $response['privacy'];
+
+		// fallback
+		return false;
+	}
+
+
+// Help resources
+	/**
+	 * Test
+	 *
+	 * @return	bool
+	 */
+	public function helpTest()
+	{
+		// make the call
+		return ($this->doCall('help/test.json', null, null, 'GET', null, false) == '"ok"');
+	}
+}
+
+
+/**
+ * Twitter Exception class
+ *
+ * @author	Tijs Verkoyen <php-twitter@verkoyen.eu>
+ */
+class TwitterException extends Exception
+{
+}
+
 ?>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/twitter.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/twitter.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/twitter.tpl	(revision 6)
@@ -1,46 +1,46 @@
-<div id="twitter" class="four columns alpha">
-    <h3><?php echo $text_twitter_feeds; ?></h3>
-
-<?php
-
-    include ("twitter.class.php");
-
-    function getTwitts($twitter_account_name) {
-        $twitterr = $twitter_account_name;
-        $twitter = new Twitter('mHLVU8JL8MqOFAOiTf4kkw','iXCNt0bvXT6CJxmHOaEdnG3XBK8i0yQkxLQGrmz2GzM');
-        $twitter->setOAuthToken('245875355-m6yVpzk90R6f0sKayGUFlP8Zlt81PTRMBDObtTeZ');
-        $twitter->setOAuthTokenSecret('VjrBFJDspC3mOAq1KSqHWzwlLfwr9OUrPw8eNkoTpcs');
-        $output = $twitter->statusesUserTimeline('', '@'.$twitterr);
-
-        return $output;
-    }
-
-    try {
-        $twitts = getTwitts($twitter_account_name);
-
-    ?>
-    <div class="box-twitter">
-
-        <ul id="mycarousel" class="jcarousel jcarousel-skin-tango">
-            <?php foreach (array_slice($twitts,0,4) as $twitt): ?>
-            <li>
-                <div class="twitter-marker" style="padding-bottom:30px">
-                    <p><a target="_blank" href="https://twitter.com/#!/<?=$twitt['user']['screen_name']?>">
-                        <?=mb_substr($twitt['text'],0,80)?></a></p>
-                    <span><?=$twitt['created_at']?></span>
-                </div>
-            </li>
-            <?php endforeach; ?>
-        </ul>
-
-    </div>
-    <?php
-
-    } catch (Exception $e) {
-        echo $e->getMessage();
-    }
-    ?>
-
-
-
+<div id="twitter" class="four columns alpha">
+    <h3><?php echo $text_twitter_feeds; ?></h3>
+
+<?php
+
+    include ("twitter.class.php");
+
+    function getTwitts($twitter_account_name) {
+        $twitterr = $twitter_account_name;
+        $twitter = new Twitter('mHLVU8JL8MqOFAOiTf4kkw','iXCNt0bvXT6CJxmHOaEdnG3XBK8i0yQkxLQGrmz2GzM');
+        $twitter->setOAuthToken('245875355-m6yVpzk90R6f0sKayGUFlP8Zlt81PTRMBDObtTeZ');
+        $twitter->setOAuthTokenSecret('VjrBFJDspC3mOAq1KSqHWzwlLfwr9OUrPw8eNkoTpcs');
+        $output = $twitter->statusesUserTimeline('', '@'.$twitterr);
+
+        return $output;
+    }
+
+    try {
+        $twitts = getTwitts($twitter_account_name);
+
+    ?>
+    <div class="box-twitter">
+
+        <ul id="mycarousel" class="jcarousel jcarousel-skin-tango">
+            <?php foreach (array_slice($twitts,0,4) as $twitt): ?>
+            <li>
+                <div class="twitter-marker" style="padding-bottom:30px">
+                    <p><a target="_blank" href="https://twitter.com/#!/<?=$twitt['user']['screen_name']?>">
+                        <?=mb_substr($twitt['text'],0,80)?></a></p>
+                    <span><?=$twitt['created_at']?></span>
+                </div>
+            </li>
+            <?php endforeach; ?>
+        </ul>
+
+    </div>
+    <?php
+
+    } catch (Exception $e) {
+        echo $e->getMessage();
+    }
+    ?>
+
+
+
 </div>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/tags_output.php
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/tags_output.php	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/tags_output.php	(revision 6)
@@ -1,15 +1,15 @@
-<?php echo $flash_title; ?>
-<tags>
-	<a href="index?route=product/category&path=34;" class="tag-link-200" rel="tag" style="font-size: 20pt;" color="0x000000">Clothes</a>
-    <a href="index?route=product/category&path=24;" class="tag-link-200" rel="tag" style="font-size: 20pt;" color="0x000000">Jackets</a>
-    <a href="index?route=product/category&path=33;" class="tag-link-200" rel="tag" style="font-size: 20pt;" color="0x000000">Dresses</a>
-    <a href="index?route=product/category&path=17;" class="tag-link-200" rel="tag" style="font-size: 20pt;" color="0x000000">Skirts</a>
-    <a href="index?route=product/category&path=34;" class="tag-link-200" rel="tag" style="font-size: 20pt;" color="0x000000">Shorts</a>
-    <a href="index?route=product/category&path=57;" class="tag-link-200" rel="tag" style="font-size: 20pt;" color="0x000000">Bras</a>
-    <a href="index?route=product/category&path=25;" class="tag-link-200" rel="tag" style="font-size: 20pt;" color="0x000000">Coats</a>
-    <a href="index?route=product/category&path=18;" class="tag-link-200" rel="tag" style="font-size: 20pt;" color="0x000000">Jeans</a>
-</tags>
-
-
-
-
+<?php echo $flash_title; ?>
+<tags>
+	<a href="index?route=product/category&path=34;" class="tag-link-200" rel="tag" style="font-size: 20pt;" color="0x000000">Clothes</a>
+    <a href="index?route=product/category&path=24;" class="tag-link-200" rel="tag" style="font-size: 20pt;" color="0x000000">Jackets</a>
+    <a href="index?route=product/category&path=33;" class="tag-link-200" rel="tag" style="font-size: 20pt;" color="0x000000">Dresses</a>
+    <a href="index?route=product/category&path=17;" class="tag-link-200" rel="tag" style="font-size: 20pt;" color="0x000000">Skirts</a>
+    <a href="index?route=product/category&path=34;" class="tag-link-200" rel="tag" style="font-size: 20pt;" color="0x000000">Shorts</a>
+    <a href="index?route=product/category&path=57;" class="tag-link-200" rel="tag" style="font-size: 20pt;" color="0x000000">Bras</a>
+    <a href="index?route=product/category&path=25;" class="tag-link-200" rel="tag" style="font-size: 20pt;" color="0x000000">Coats</a>
+    <a href="index?route=product/category&path=18;" class="tag-link-200" rel="tag" style="font-size: 20pt;" color="0x000000">Jeans</a>
+</tags>
+
+
+
+
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/column_left.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/column_left.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/column_left.tpl	(revision 6)
@@ -1,10 +1,10 @@
-<?php if ($modules) { ?>
-<div class="col-left sidebar four columns left_column">
-    <div id="column-left">
-      <?php foreach ($modules as $module) { ?>
-      <?php echo $module; ?>
-      <?php } ?>
-      <?php //include('tags_flash.tpl'); ?>
-    </div>
-</div>
-<?php } ?>
+<?php if ($modules) { ?>
+<div class="col-left sidebar four columns left_column">
+    <div id="column-left">
+      <?php foreach ($modules as $module) { ?>
+      <?php echo $module; ?>
+      <?php } ?>
+      <?php //include('tags_flash.tpl'); ?>
+    </div>
+</div>
+<?php } ?>
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/additional_links.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/additional_links.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/additional_links.tpl	(revision 6)
@@ -1,75 +1,150 @@
-<div id="slogan">
-            <ul>
-                <li class="links_orig_products">
-                    <a href="<?php echo $original_products; ?>">
-                        <?php echo $text_original_products; ?>
-                    </a>
-                </li>
-                <li class="links_free_shipping">
-                    <a href="<?php echo $free_shipping; ?>">
-                        <?php echo $text_free_shipping; ?>
-                    </a>
-                </li>
-                <li class="links_cash">
-                    <a href="<?php echo $cash_delivery; ?>">
-                        <?php echo $text_cash_delivery; ?>
-                    </a>
-                </li>
-                <li class="links_returns">
-                    <a href="<?php echo $day_returns; ?>">
-                        <?php echo $text_day_returns; ?>
-                    </a>
-                </li>
-            </ul>
-
-</div>
-
-<div class="container">
-    <div class="sixteen columns">
-
-        <div class="clearfix tabs">
-            <div>
-                        <a id="newproducts_activate" class="null">
-                            <table class="slider_table_style">
-                                <tr class="slider_tr_style">
-                                    <td class="slider_td_style">
-                                        <?php echo $text_new_products; ?>
-                                    </td>
-                                </tr>
-                            </table>
-
-                        </a>
-
-
-            </div>
-            <div>
-                <span>/</span>
-
-                <a id="specials_activate" class="null">
-                    <table class="slider_table_style">
-                        <tr class="slider_tr_style">
-                            <td class="slider_td_style">
-                                <?php echo $text_sale; ?>
-                            </td>
-                        </tr>
-                </table>
-
-                </a>
-
-            </div>
-            <div>
-                <span>/</span>
-                <a id="bestsellers_activate" class="null">
-                    <table class="slider_table_style">
-                        <tr class="slider_tr_style">
-                            <td class="slider_td_style">
-                                <?php echo $text_bestsellers; ?>
-                            </td>
-                        </tr>
-                    </table>
-                </a>
-            </div>
-        </div>
-
-    </div>
-</div>
+<div id="slogan">
+            <ul>
+                <li class="links_orig_products">
+                    <a href="<?php echo $original_products; ?>">
+                        <?php echo $text_original_products; ?>
+                    </a>
+                </li>
+                <li class="links_free_shipping">
+                    <a href="<?php echo $free_shipping; ?>">
+                        <?php echo $text_free_shipping; ?>
+                    </a>
+                </li>
+                <li class="links_cash">
+                    <a href="<?php echo $cash_delivery; ?>">
+                        <?php echo $text_cash_delivery; ?>
+                    </a>
+                </li>
+                <li class="links_returns">
+                    <a href="<?php echo $day_returns; ?>">
+                        <?php echo $text_day_returns; ?>
+                    </a>
+                </li>
+            </ul>
+
+</div>
+
+<div class="container">
+    <div class="sixteen columns">
+
+        <div class="clearfix tabs">
+            <div>
+                        <a id="newproducts_activate" class="null">
+                            <table class="slider_table_style">
+                                <tr class="slider_tr_style">
+                                    <td class="slider_td_style">
+                                        <?php echo $text_new_products; ?>
+                                    </td>
+                                </tr>
+                            </table>
+
+                        </a>
+
+
+            </div>
+            <div>
+                <span>/</span>
+
+                <a id="specials_activate" class="null">
+                    <table class="slider_table_style">
+                        <tr class="slider_tr_style">
+                            <td class="slider_td_style">
+                                <?php echo $text_sale; ?>
+                            </td>
+                        </tr>
+                </table>
+
+                </a>
+
+            </div>
+            <div>
+                <span>/</span>
+                <a id="bestsellers_activate" class="null">
+                    <table class="slider_table_style">
+                        <tr class="slider_tr_style">
+                            <td class="slider_td_style">
+                                <?php echo $text_bestsellers; ?>
+                            </td>
+                        </tr>
+                    </table>
+                </a>
+            </div>
+        </div>
+
+    </div>
+</div>
+<div id="slogan">
+            <ul>
+                <li class="links_orig_products">
+                    <a href="<?php echo $original_products; ?>">
+                        <?php echo $text_original_products; ?>
+                    </a>
+                </li>
+                <li class="links_free_shipping">
+                    <a href="<?php echo $free_shipping; ?>">
+                        <?php echo $text_free_shipping; ?>
+                    </a>
+                </li>
+                <li class="links_cash">
+                    <a href="<?php echo $cash_delivery; ?>">
+                        <?php echo $text_cash_delivery; ?>
+                    </a>
+                </li>
+                <li class="links_returns">
+                    <a href="<?php echo $day_returns; ?>">
+                        <?php echo $text_day_returns; ?>
+                    </a>
+                </li>
+            </ul>
+
+</div>
+
+<div class="container">
+    <div class="sixteen columns">
+
+        <div class="clearfix tabs">
+            <div>
+                        <a id="newproducts_activate" class="null">
+                            <table class="slider_table_style">
+                                <tr class="slider_tr_style">
+                                    <td class="slider_td_style">
+                                        <?php echo $text_new_products; ?>
+                                    </td>
+                                </tr>
+                            </table>
+
+                        </a>
+
+
+            </div>
+            <div>
+                <span>/</span>
+
+                <a id="specials_activate" class="null">
+                    <table class="slider_table_style">
+                        <tr class="slider_tr_style">
+                            <td class="slider_td_style">
+                                <?php echo $text_sale; ?>
+                            </td>
+                        </tr>
+                </table>
+
+                </a>
+
+            </div>
+            <div>
+                <span>/</span>
+                <a id="bestsellers_activate" class="null">
+                    <table class="slider_table_style">
+                        <tr class="slider_tr_style">
+                            <td class="slider_td_style">
+                                <?php echo $text_bestsellers; ?>
+                            </td>
+                        </tr>
+                    </table>
+                </a>
+            </div>
+        </div>
+
+    </div>
+</div>
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/facebook.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/facebook.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/facebook.tpl	(revision 6)
@@ -1,9 +1,9 @@
-<div id="facebook" class="four columns omega">
-    <h3><?php echo $text_facebook; ?></h3>
-    <script type="text/javascript" src="http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php/en_US"></script>
-    <script src="http://connect.facebook.net/en_US/all.js#xfbml=1"></script>
-    <fb:fan profile_id="<?php echo $facebook; ?>" stream="0" connections="9" logobar="0" width="" height="285" css="http://dev3.tonytemplates.com/www/_olgatest/fb.css"></fb:fan>
-</div>
-
-
-
+<div id="facebook" class="four columns omega">
+    <h3><?php echo $text_facebook; ?></h3>
+    <script type="text/javascript" src="http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php/en_US"></script>
+    <script src="http://connect.facebook.net/en_US/all.js#xfbml=1"></script>
+    <fb:fan profile_id="<?php echo $facebook; ?>" stream="0" connections="9" logobar="0" width="" height="285" css="http://dev3.tonytemplates.com/www/_olgatest/fb.css"></fb:fan>
+</div>
+
+
+
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/footer_contact.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/footer_contact.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/footer_contact.tpl	(revision 6)
@@ -1,20 +1,20 @@
-<div class="four columns omega" id="contact">
-    <h3><?php echo $contact_info; ?></h3>
-    <p class="clearfix contact_phone">
-        <strong><?php echo $contact_phone; ?></strong><br>
-        <?php echo $phone_numbers; ?>
-    </p>
-    <p class="clearfix contact_cell_phone">
-        <strong><?php echo $cell_phone; ?></strong><br>
-        <?php echo $phone_numbers; ?>
-    </p>
-    <p class="clearfix contact_addresses">
-        <strong><?php echo $mail_addresses; ?></strong><br>
-        <a href="mailto:<?php echo $mail_sails; ?>"><?php echo $mail_sails; ?></a><br>
-        <a href="mailto:<?php echo $mail_info; ?>"><?php echo $mail_info; ?></a>
-    </p>
-    <p class="clearfix contact_skype">
-        <strong><?php echo $skype_title; ?></strong><br>
-        <?php echo $skype_accounts; ?>
-    </p>
+<div class="four columns omega" id="contact">
+    <h3><?php echo $contact_info; ?></h3>
+    <p class="clearfix contact_phone">
+        <strong><?php echo $contact_phone; ?></strong><br>
+        <?php echo $phone_numbers; ?>
+    </p>
+    <p class="clearfix contact_cell_phone">
+        <strong><?php echo $cell_phone; ?></strong><br>
+        <?php echo $phone_numbers; ?>
+    </p>
+    <p class="clearfix contact_addresses">
+        <strong><?php echo $mail_addresses; ?></strong><br>
+        <a href="mailto:<?php echo $mail_sails; ?>"><?php echo $mail_sails; ?></a><br>
+        <a href="mailto:<?php echo $mail_info; ?>"><?php echo $mail_info; ?></a>
+    </p>
+    <p class="clearfix contact_skype">
+        <strong><?php echo $skype_title; ?></strong><br>
+        <?php echo $skype_accounts; ?>
+    </p>
 </div>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/footer_payment_service.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/footer_payment_service.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/footer_payment_service.tpl	(revision 6)
@@ -1,7 +1,7 @@
-<div class="wrapper">
-    <span class="icon_5"> </span>
-    <span class="icon_4"> </span>
-    <span class="icon_3"> </span>
-    <span class="icon_2"> </span>
-    <span class="icon_1"> </span>
+<div class="wrapper">
+    <span class="icon_5"> </span>
+    <span class="icon_4"> </span>
+    <span class="icon_3"> </span>
+    <span class="icon_2"> </span>
+    <span class="icon_1"> </span>
 </div>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/footer_socials.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/footer_socials.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/footer_socials.tpl	(revision 6)
@@ -1,10 +1,10 @@
-<div id="social_icons">
-    <div class="wrapper">
-        <a class="icon_6" target="_blank" title="<?php echo $socials_title_6; ?>" href="<?php echo $socials_link_6; ?>"> </a>
-        <a class="icon_5" target="_blank" title="<?php echo $socials_title_5; ?>" href="<?php echo $socials_link_5; ?>"> </a>
-        <a class="icon_4" target="_blank" title="<?php echo $socials_title_4; ?>" href="<?php echo $socials_link_4; ?>"> </a>
-        <a class="icon_3" target="_blank" title="<?php echo $socials_title_3; ?>" href="<?php echo $socials_link_3; ?>"> </a>
-        <a class="icon_2" target="_blank" title="<?php echo $socials_title_2; ?>" href="<?php echo $socials_link_2; ?>"> </a>
-        <a class="icon_1" target="_blank" title="<?php echo $socials_title_1; ?>" href="<?php echo $socials_link_1; ?>"> </a>
-    </div>
+<div id="social_icons">
+    <div class="wrapper">
+        <a class="icon_6" target="_blank" title="<?php echo $socials_title_6; ?>" href="<?php echo $socials_link_6; ?>"> </a>
+        <a class="icon_5" target="_blank" title="<?php echo $socials_title_5; ?>" href="<?php echo $socials_link_5; ?>"> </a>
+        <a class="icon_4" target="_blank" title="<?php echo $socials_title_4; ?>" href="<?php echo $socials_link_4; ?>"> </a>
+        <a class="icon_3" target="_blank" title="<?php echo $socials_title_3; ?>" href="<?php echo $socials_link_3; ?>"> </a>
+        <a class="icon_2" target="_blank" title="<?php echo $socials_title_2; ?>" href="<?php echo $socials_link_2; ?>"> </a>
+        <a class="icon_1" target="_blank" title="<?php echo $socials_title_1; ?>" href="<?php echo $socials_link_1; ?>"> </a>
+    </div>
 </div>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/tags_flash.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/tags_flash.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/tags_flash.tpl	(revision 6)
@@ -1,6 +1,6 @@
-<div class="box box-flash">
-    <div class="box-heading"><?php echo $flash_title; ?></div>
-    <div class="box-content">
-        <script type="text/javascript">AC_FL_RunContent( 'codebase','http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0','width','172','height','150','title','','src','tagcloud','quality','high', 'wmode', 'transparent', 'pluginspage','http://www.adobe.com/shockwave/download/download.cgi?P1_Prod_Version=ShockwaveFlash','movie','tagcloud','FlashVars', 'url=catalog/view/theme/<?php echo $this->config->get("config_template"); ?>/template/common/tags_output.php');</script>
-    </div>
+<div class="box box-flash">
+    <div class="box-heading"><?php echo $flash_title; ?></div>
+    <div class="box-content">
+        <script type="text/javascript">AC_FL_RunContent( 'codebase','http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0','width','172','height','150','title','','src','tagcloud','quality','high', 'wmode', 'transparent', 'pluginspage','http://www.adobe.com/shockwave/download/download.cgi?P1_Prod_Version=ShockwaveFlash','movie','tagcloud','FlashVars', 'url=catalog/view/theme/<?php echo $this->config->get("config_template"); ?>/template/common/tags_output.php');</script>
+    </div>
 </div>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/content_slider.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/content_slider.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/content_slider.tpl	(revision 6)
@@ -1,3 +1,3 @@
-<?php foreach ($modules as $module) { ?>
-<?php echo $module; ?>
+<?php foreach ($modules as $module) { ?>
+<?php echo $module; ?>
 <?php } ?>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/account/register.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/account/register.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/account/register.tpl	(revision 6)
@@ -1,289 +1,289 @@
-<?php echo $header; ?>
-<?php if ($error_warning) { ?>
-<div class="warning"><?php echo $error_warning; ?></div>
-<?php } ?>
-<?php echo $column_left; ?><?php echo $column_right; ?>
-<div id="content"><?php echo $content_top; ?>
-  <div class="breadcrumb">
-    <?php foreach ($breadcrumbs as $breadcrumb) { ?>
-    <?php echo $breadcrumb['separator']; ?><a href="<?php echo $breadcrumb['href']; ?>"><?php echo $breadcrumb['text']; ?></a>
-    <?php } ?>
-  </div>
-  <h1><?php echo $heading_title; ?></h1>
-  <p><?php echo $text_account_already; ?></p>
-  <form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
-    <h2><?php echo $text_your_details; ?></h2>
-    <div class="content">
-      <table class="form">
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_firstname; ?></td>
-          <td><input type="text" name="firstname" value="<?php echo $firstname; ?>" />
-            <?php if ($error_firstname) { ?>
-            <span class="error"><?php echo $error_firstname; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_lastname; ?></td>
-          <td><input type="text" name="lastname" value="<?php echo $lastname; ?>" />
-            <?php if ($error_lastname) { ?>
-            <span class="error"><?php echo $error_lastname; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_email; ?></td>
-          <td><input type="text" name="email" value="<?php echo $email; ?>" />
-            <?php if ($error_email) { ?>
-            <span class="error"><?php echo $error_email; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_telephone; ?></td>
-          <td><input type="text" name="telephone" value="<?php echo $telephone; ?>" />
-            <?php if ($error_telephone) { ?>
-            <span class="error"><?php echo $error_telephone; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><?php echo $entry_fax; ?></td>
-          <td><input type="text" name="fax" value="<?php echo $fax; ?>" /></td>
-        </tr>
-      </table>
-    </div>
-    <h2><?php echo $text_your_address; ?></h2>
-    <div class="content">
-      <table class="form">
-        <tr>
-          <td><?php echo $entry_company; ?></td>
-          <td><input type="text" name="company" value="<?php echo $company; ?>" /></td>
-        </tr>        
-        <tr style="display: <?php echo (count($customer_groups) > 1 ? 'table-row' : 'none'); ?>;">
-          <td><?php echo $entry_customer_group; ?></td>
-          <td><?php foreach ($customer_groups as $customer_group) { ?>
-            <?php if ($customer_group['customer_group_id'] == $customer_group_id) { ?>
-            <input type="radio" name="customer_group_id" value="<?php echo $customer_group['customer_group_id']; ?>" id="customer_group_id<?php echo $customer_group['customer_group_id']; ?>" checked="checked" />
-            <label for="customer_group_id<?php echo $customer_group['customer_group_id']; ?>"><?php echo $customer_group['name']; ?></label>
-            <br />
-            <?php } else { ?>
-            <input type="radio" name="customer_group_id" value="<?php echo $customer_group['customer_group_id']; ?>" id="customer_group_id<?php echo $customer_group['customer_group_id']; ?>" />
-            <label for="customer_group_id<?php echo $customer_group['customer_group_id']; ?>"><?php echo $customer_group['name']; ?></label>
-            <br />
-            <?php } ?>
-            <?php } ?></td>
-        </tr>      
-        <tr id="company-id-display">
-          <td><span id="company-id-required" class="required">*</span> <?php echo $entry_company_id; ?></td>
-          <td><input type="text" name="company_id" value="<?php echo $company_id; ?>" />
-            <?php if ($error_company_id) { ?>
-            <span class="error"><?php echo $error_company_id; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr id="tax-id-display">
-          <td><span id="tax-id-required" class="required">*</span> <?php echo $entry_tax_id; ?></td>
-          <td><input type="text" name="tax_id" value="<?php echo $tax_id; ?>" />
-            <?php if ($error_tax_id) { ?>
-            <span class="error"><?php echo $error_tax_id; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_address_1; ?></td>
-          <td><input type="text" name="address_1" value="<?php echo $address_1; ?>" />
-            <?php if ($error_address_1) { ?>
-            <span class="error"><?php echo $error_address_1; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><?php echo $entry_address_2; ?></td>
-          <td><input type="text" name="address_2" value="<?php echo $address_2; ?>" /></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_city; ?></td>
-          <td><input type="text" name="city" value="<?php echo $city; ?>" />
-            <?php if ($error_city) { ?>
-            <span class="error"><?php echo $error_city; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><span id="postcode-required" class="required">*</span> <?php echo $entry_postcode; ?></td>
-          <td><input type="text" name="postcode" value="<?php echo $postcode; ?>" />
-            <?php if ($error_postcode) { ?>
-            <span class="error"><?php echo $error_postcode; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_country; ?></td>
-          <td><select name="country_id">
-              <option value=""><?php echo $text_select; ?></option>
-              <?php foreach ($countries as $country) { ?>
-              <?php if ($country['country_id'] == $country_id) { ?>
-              <option value="<?php echo $country['country_id']; ?>" selected="selected"><?php echo $country['name']; ?></option>
-              <?php } else { ?>
-              <option value="<?php echo $country['country_id']; ?>"><?php echo $country['name']; ?></option>
-              <?php } ?>
-              <?php } ?>
-            </select>
-            <?php if ($error_country) { ?>
-            <span class="error"><?php echo $error_country; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_zone; ?></td>
-          <td><select name="zone_id">
-            </select>
-            <?php if ($error_zone) { ?>
-            <span class="error"><?php echo $error_zone; ?></span>
-            <?php } ?></td>
-        </tr>
-      </table>
-    </div>
-    <h2><?php echo $text_your_password; ?></h2>
-    <div class="content">
-      <table class="form">
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_password; ?></td>
-          <td><input type="password" name="password" value="<?php echo $password; ?>" />
-            <?php if ($error_password) { ?>
-            <span class="error"><?php echo $error_password; ?></span>
-            <?php } ?></td>
-        </tr>
-        <tr>
-          <td><span class="required">*</span> <?php echo $entry_confirm; ?></td>
-          <td><input type="password" name="confirm" value="<?php echo $confirm; ?>" />
-            <?php if ($error_confirm) { ?>
-            <span class="error"><?php echo $error_confirm; ?></span>
-            <?php } ?></td>
-        </tr>
-      </table>
-    </div>
-    <h2><?php echo $text_newsletter; ?></h2>
-    <div class="content">
-      <table class="form">
-        <tr>
-          <td><?php echo $entry_newsletter; ?></td>
-          <td><?php if ($newsletter) { ?>
-            <input type="radio" name="newsletter" value="1" checked="checked" />
-            <?php echo $text_yes; ?>
-            <input type="radio" name="newsletter" value="0" />
-            <?php echo $text_no; ?>
-            <?php } else { ?>
-            <input type="radio" name="newsletter" value="1" />
-            <?php echo $text_yes; ?>
-            <input type="radio" name="newsletter" value="0" checked="checked" />
-            <?php echo $text_no; ?>
-            <?php } ?></td>
-        </tr>
-      </table>
-    </div>
-    <?php if ($text_agree) { ?>
-    <div class="buttons">
-      <div class="right"><?php echo $text_agree; ?>
-        <?php if ($agree) { ?>
-        <input type="checkbox" name="agree" value="1" checked="checked" />
-        <?php } else { ?>
-        <input type="checkbox" name="agree" value="1" />
-        <?php } ?>
-        <input type="submit" value="<?php echo $button_continue; ?>" class="button" />
-      </div>
-    </div>
-    <?php } else { ?>
-    <div class="buttons">
-      <div class="right">
-        <input type="submit" value="<?php echo $button_continue; ?>" class="button" />
-      </div>
-    </div>
-    <?php } ?>
-  </form>
-  <?php echo $content_bottom; ?></div>
-<script type="text/javascript"><!--
-$('input[name=\'customer_group_id\']:checked').live('change', function() {
-	var customer_group = [];
-	
-<?php foreach ($customer_groups as $customer_group) { ?>
-	customer_group[<?php echo $customer_group['customer_group_id']; ?>] = [];
-	customer_group[<?php echo $customer_group['customer_group_id']; ?>]['company_id_display'] = '<?php echo $customer_group['company_id_display']; ?>';
-	customer_group[<?php echo $customer_group['customer_group_id']; ?>]['company_id_required'] = '<?php echo $customer_group['company_id_required']; ?>';
-	customer_group[<?php echo $customer_group['customer_group_id']; ?>]['tax_id_display'] = '<?php echo $customer_group['tax_id_display']; ?>';
-	customer_group[<?php echo $customer_group['customer_group_id']; ?>]['tax_id_required'] = '<?php echo $customer_group['tax_id_required']; ?>';
-<?php } ?>	
-
-	if (customer_group[this.value]) {
-		if (customer_group[this.value]['company_id_display'] == '1') {
-			$('#company-id-display').show();
-		} else {
-			$('#company-id-display').hide();
-		}
-		
-		if (customer_group[this.value]['company_id_required'] == '1') {
-			$('#company-id-required').show();
-		} else {
-			$('#company-id-required').hide();
-		}
-		
-		if (customer_group[this.value]['tax_id_display'] == '1') {
-			$('#tax-id-display').show();
-		} else {
-			$('#tax-id-display').hide();
-		}
-		
-		if (customer_group[this.value]['tax_id_required'] == '1') {
-			$('#tax-id-required').show();
-		} else {
-			$('#tax-id-required').hide();
-		}	
-	}
-});
-
-$('input[name=\'customer_group_id\']:checked').trigger('change');
-//--></script> 
-<script type="text/javascript"><!--
-$('select[name=\'country_id\']').bind('change', function() {
-	$.ajax({
-		url: 'index.php?route=account/register/country&country_id=' + this.value,
-		dataType: 'json',
-		beforeSend: function() {
-			$('select[name=\'country_id\']').after('<span class="wait">&nbsp;<img src="catalog/view/theme/default/image/loading.gif" alt="" /></span>');
-		},
-		complete: function() {
-			$('.wait').remove();
-		},			
-		success: function(json) {
-			if (json['postcode_required'] == '1') {
-				$('#postcode-required').show();
-			} else {
-				$('#postcode-required').hide();
-			}
-			
-			html = '<option value=""><?php echo $text_select; ?></option>';
-			
-			if (json['zone'] != '') {
-				for (i = 0; i < json['zone'].length; i++) {
-        			html += '<option value="' + json['zone'][i]['zone_id'] + '"';
-	    			
-					if (json['zone'][i]['zone_id'] == '<?php echo $zone_id; ?>') {
-	      				html += ' selected="selected"';
-	    			}
-	
-	    			html += '>' + json['zone'][i]['name'] + '</option>';
-				}
-			} else {
-				html += '<option value="0" selected="selected"><?php echo $text_none; ?></option>';
-			}
-			
-			$('select[name=\'zone_id\']').html(html);
-		},
-		error: function(xhr, ajaxOptions, thrownError) {
-			alert(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
-		}
-	});
-});
-
-$('select[name=\'country_id\']').trigger('change');
-//--></script> 
-<script type="text/javascript"><!--
-$(document).ready(function() {
-$('.colorbox').colorbox({
-	width:280,
-	height: 480
-});
-});
-//--></script> 
+<?php echo $header; ?>
+<?php if ($error_warning) { ?>
+<div class="warning"><?php echo $error_warning; ?></div>
+<?php } ?>
+<?php echo $column_left; ?><?php echo $column_right; ?>
+<div id="content"><?php echo $content_top; ?>
+  <div class="breadcrumb">
+    <?php foreach ($breadcrumbs as $breadcrumb) { ?>
+    <?php echo $breadcrumb['separator']; ?><a href="<?php echo $breadcrumb['href']; ?>"><?php echo $breadcrumb['text']; ?></a>
+    <?php } ?>
+  </div>
+  <h1><?php echo $heading_title; ?></h1>
+  <p><?php echo $text_account_already; ?></p>
+  <form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
+    <h2><?php echo $text_your_details; ?></h2>
+    <div class="content">
+      <table class="form">
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_firstname; ?></td>
+          <td><input type="text" name="firstname" value="<?php echo $firstname; ?>" />
+            <?php if ($error_firstname) { ?>
+            <span class="error"><?php echo $error_firstname; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_lastname; ?></td>
+          <td><input type="text" name="lastname" value="<?php echo $lastname; ?>" />
+            <?php if ($error_lastname) { ?>
+            <span class="error"><?php echo $error_lastname; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_email; ?></td>
+          <td><input type="text" name="email" value="<?php echo $email; ?>" />
+            <?php if ($error_email) { ?>
+            <span class="error"><?php echo $error_email; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_telephone; ?></td>
+          <td><input type="text" name="telephone" value="<?php echo $telephone; ?>" />
+            <?php if ($error_telephone) { ?>
+            <span class="error"><?php echo $error_telephone; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><?php echo $entry_fax; ?></td>
+          <td><input type="text" name="fax" value="<?php echo $fax; ?>" /></td>
+        </tr>
+      </table>
+    </div>
+    <h2><?php echo $text_your_address; ?></h2>
+    <div class="content">
+      <table class="form">
+        <tr>
+          <td><?php echo $entry_company; ?></td>
+          <td><input type="text" name="company" value="<?php echo $company; ?>" /></td>
+        </tr>        
+        <tr style="display: <?php echo (count($customer_groups) > 1 ? 'table-row' : 'none'); ?>;">
+          <td><?php echo $entry_customer_group; ?></td>
+          <td><?php foreach ($customer_groups as $customer_group) { ?>
+            <?php if ($customer_group['customer_group_id'] == $customer_group_id) { ?>
+            <input type="radio" name="customer_group_id" value="<?php echo $customer_group['customer_group_id']; ?>" id="customer_group_id<?php echo $customer_group['customer_group_id']; ?>" checked="checked" />
+            <label for="customer_group_id<?php echo $customer_group['customer_group_id']; ?>"><?php echo $customer_group['name']; ?></label>
+            <br />
+            <?php } else { ?>
+            <input type="radio" name="customer_group_id" value="<?php echo $customer_group['customer_group_id']; ?>" id="customer_group_id<?php echo $customer_group['customer_group_id']; ?>" />
+            <label for="customer_group_id<?php echo $customer_group['customer_group_id']; ?>"><?php echo $customer_group['name']; ?></label>
+            <br />
+            <?php } ?>
+            <?php } ?></td>
+        </tr>      
+        <tr id="company-id-display">
+          <td><span id="company-id-required" class="required">*</span> <?php echo $entry_company_id; ?></td>
+          <td><input type="text" name="company_id" value="<?php echo $company_id; ?>" />
+            <?php if ($error_company_id) { ?>
+            <span class="error"><?php echo $error_company_id; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr id="tax-id-display">
+          <td><span id="tax-id-required" class="required">*</span> <?php echo $entry_tax_id; ?></td>
+          <td><input type="text" name="tax_id" value="<?php echo $tax_id; ?>" />
+            <?php if ($error_tax_id) { ?>
+            <span class="error"><?php echo $error_tax_id; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_address_1; ?></td>
+          <td><input type="text" name="address_1" value="<?php echo $address_1; ?>" />
+            <?php if ($error_address_1) { ?>
+            <span class="error"><?php echo $error_address_1; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><?php echo $entry_address_2; ?></td>
+          <td><input type="text" name="address_2" value="<?php echo $address_2; ?>" /></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_city; ?></td>
+          <td><input type="text" name="city" value="<?php echo $city; ?>" />
+            <?php if ($error_city) { ?>
+            <span class="error"><?php echo $error_city; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><span id="postcode-required" class="required">*</span> <?php echo $entry_postcode; ?></td>
+          <td><input type="text" name="postcode" value="<?php echo $postcode; ?>" />
+            <?php if ($error_postcode) { ?>
+            <span class="error"><?php echo $error_postcode; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_country; ?></td>
+          <td><select name="country_id">
+              <option value=""><?php echo $text_select; ?></option>
+              <?php foreach ($countries as $country) { ?>
+              <?php if ($country['country_id'] == $country_id) { ?>
+              <option value="<?php echo $country['country_id']; ?>" selected="selected"><?php echo $country['name']; ?></option>
+              <?php } else { ?>
+              <option value="<?php echo $country['country_id']; ?>"><?php echo $country['name']; ?></option>
+              <?php } ?>
+              <?php } ?>
+            </select>
+            <?php if ($error_country) { ?>
+            <span class="error"><?php echo $error_country; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_zone; ?></td>
+          <td><select name="zone_id">
+            </select>
+            <?php if ($error_zone) { ?>
+            <span class="error"><?php echo $error_zone; ?></span>
+            <?php } ?></td>
+        </tr>
+      </table>
+    </div>
+    <h2><?php echo $text_your_password; ?></h2>
+    <div class="content">
+      <table class="form">
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_password; ?></td>
+          <td><input type="password" name="password" value="<?php echo $password; ?>" />
+            <?php if ($error_password) { ?>
+            <span class="error"><?php echo $error_password; ?></span>
+            <?php } ?></td>
+        </tr>
+        <tr>
+          <td><span class="required">*</span> <?php echo $entry_confirm; ?></td>
+          <td><input type="password" name="confirm" value="<?php echo $confirm; ?>" />
+            <?php if ($error_confirm) { ?>
+            <span class="error"><?php echo $error_confirm; ?></span>
+            <?php } ?></td>
+        </tr>
+      </table>
+    </div>
+    <h2><?php echo $text_newsletter; ?></h2>
+    <div class="content">
+      <table class="form">
+        <tr>
+          <td><?php echo $entry_newsletter; ?></td>
+          <td><?php if ($newsletter) { ?>
+            <input type="radio" name="newsletter" value="1" checked="checked" />
+            <?php echo $text_yes; ?>
+            <input type="radio" name="newsletter" value="0" />
+            <?php echo $text_no; ?>
+            <?php } else { ?>
+            <input type="radio" name="newsletter" value="1" />
+            <?php echo $text_yes; ?>
+            <input type="radio" name="newsletter" value="0" checked="checked" />
+            <?php echo $text_no; ?>
+            <?php } ?></td>
+        </tr>
+      </table>
+    </div>
+    <?php if ($text_agree) { ?>
+    <div class="buttons">
+      <div class="right"><?php echo $text_agree; ?>
+        <?php if ($agree) { ?>
+        <input type="checkbox" name="agree" value="1" checked="checked" />
+        <?php } else { ?>
+        <input type="checkbox" name="agree" value="1" />
+        <?php } ?>
+        <input type="submit" value="<?php echo $button_continue; ?>" class="button" />
+      </div>
+    </div>
+    <?php } else { ?>
+    <div class="buttons">
+      <div class="right">
+        <input type="submit" value="<?php echo $button_continue; ?>" class="button" />
+      </div>
+    </div>
+    <?php } ?>
+  </form>
+  <?php echo $content_bottom; ?></div>
+<script type="text/javascript"><!--
+$('input[name=\'customer_group_id\']:checked').live('change', function() {
+	var customer_group = [];
+	
+<?php foreach ($customer_groups as $customer_group) { ?>
+	customer_group[<?php echo $customer_group['customer_group_id']; ?>] = [];
+	customer_group[<?php echo $customer_group['customer_group_id']; ?>]['company_id_display'] = '<?php echo $customer_group['company_id_display']; ?>';
+	customer_group[<?php echo $customer_group['customer_group_id']; ?>]['company_id_required'] = '<?php echo $customer_group['company_id_required']; ?>';
+	customer_group[<?php echo $customer_group['customer_group_id']; ?>]['tax_id_display'] = '<?php echo $customer_group['tax_id_display']; ?>';
+	customer_group[<?php echo $customer_group['customer_group_id']; ?>]['tax_id_required'] = '<?php echo $customer_group['tax_id_required']; ?>';
+<?php } ?>	
+
+	if (customer_group[this.value]) {
+		if (customer_group[this.value]['company_id_display'] == '1') {
+			$('#company-id-display').show();
+		} else {
+			$('#company-id-display').hide();
+		}
+		
+		if (customer_group[this.value]['company_id_required'] == '1') {
+			$('#company-id-required').show();
+		} else {
+			$('#company-id-required').hide();
+		}
+		
+		if (customer_group[this.value]['tax_id_display'] == '1') {
+			$('#tax-id-display').show();
+		} else {
+			$('#tax-id-display').hide();
+		}
+		
+		if (customer_group[this.value]['tax_id_required'] == '1') {
+			$('#tax-id-required').show();
+		} else {
+			$('#tax-id-required').hide();
+		}	
+	}
+});
+
+$('input[name=\'customer_group_id\']:checked').trigger('change');
+//--></script> 
+<script type="text/javascript"><!--
+$('select[name=\'country_id\']').bind('change', function() {
+	$.ajax({
+		url: 'index.php?route=account/register/country&country_id=' + this.value,
+		dataType: 'json',
+		beforeSend: function() {
+			$('select[name=\'country_id\']').after('<span class="wait">&nbsp;<img src="catalog/view/theme/default/image/loading.gif" alt="" /></span>');
+		},
+		complete: function() {
+			$('.wait').remove();
+		},			
+		success: function(json) {
+			if (json['postcode_required'] == '1') {
+				$('#postcode-required').show();
+			} else {
+				$('#postcode-required').hide();
+			}
+			
+			html = '<option value=""><?php echo $text_select; ?></option>';
+			
+			if (json['zone'] != '') {
+				for (i = 0; i < json['zone'].length; i++) {
+        			html += '<option value="' + json['zone'][i]['zone_id'] + '"';
+	    			
+					if (json['zone'][i]['zone_id'] == '<?php echo $zone_id; ?>') {
+	      				html += ' selected="selected"';
+	    			}
+	
+	    			html += '>' + json['zone'][i]['name'] + '</option>';
+				}
+			} else {
+				html += '<option value="0" selected="selected"><?php echo $text_none; ?></option>';
+			}
+			
+			$('select[name=\'zone_id\']').html(html);
+		},
+		error: function(xhr, ajaxOptions, thrownError) {
+			alert(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
+		}
+	});
+});
+
+$('select[name=\'country_id\']').trigger('change');
+//--></script> 
+<script type="text/javascript"><!--
+$(document).ready(function() {
+$('.colorbox').colorbox({
+	width:280,
+	height: 480
+});
+});
+//--></script> 
 <?php echo $footer; ?>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/account/wishlist.tpl
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/account/wishlist.tpl	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/account/wishlist.tpl	(revision 6)
@@ -1,60 +1,60 @@
-<?php echo $header; ?>
-<?php if ($success) { ?>
-<div class="success"><?php echo $success; ?><img src="catalog/view/theme/default/image/close.png" alt="" class="close" /></div>
-<?php } ?>
-<?php echo $column_left; ?><?php echo $column_right; ?>
-<div id="content"><?php echo $content_top; ?>
-  <div class="breadcrumb">
-    <?php foreach ($breadcrumbs as $breadcrumb) { ?>
-    <?php echo $breadcrumb['separator']; ?><a href="<?php echo $breadcrumb['href']; ?>"><?php echo $breadcrumb['text']; ?></a>
-    <?php } ?>
-  </div>
-  <h1><?php echo $heading_title; ?></h1>
-  <?php if ($products) { ?>
-  <div class="wishlist-info">
-    <table>
-      <thead>
-        <tr>
-          <td class="image"><?php echo $column_image; ?></td>
-          <td class="name"><?php echo $column_name; ?></td>
-          <td class="model"><?php echo $column_model; ?></td>
-          <td class="stock"><?php echo $column_stock; ?></td>
-          <td class="price"><?php echo $column_price; ?></td>
-          <td class="action"><?php echo $column_action; ?></td>
-        </tr>
-      </thead>
-      <?php foreach ($products as $product) { ?>
-      <tbody id="wishlist-row<?php echo $product['product_id']; ?>">
-        <tr>
-          <td class="image"><?php if ($product['thumb']) { ?>
-            <a href="<?php echo $product['href']; ?>"><img src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" title="<?php echo $product['name']; ?>" /></a>
-            <?php } ?></td>
-          <td class="name"><a href="<?php echo $product['href']; ?>"><?php echo $product['name']; ?></a></td>
-          <td class="model"><?php echo $product['model']; ?></td>
-          <td class="stock"><?php echo $product['stock']; ?></td>
-          <td class="price"><?php if ($product['price']) { ?>
-            <div class="price">
-              <?php if (!$product['special']) { ?>
-              <?php echo $product['price']; ?>
-              <?php } else { ?>
-              <s><?php echo $product['price']; ?></s> <b><?php echo $product['special']; ?></b>
-              <?php } ?>
-            </div>
-            <?php } ?></td>
-          <td class="action"><img src="catalog/view/theme/default/image/cart-add.png" alt="<?php echo $button_cart; ?>" title="<?php echo $button_cart; ?>" onclick="addToCart('<?php echo $product['product_id']; ?>');" />&nbsp;&nbsp;<a href="<?php echo $product['remove']; ?>"><img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/dresscode_images/shopping_cart_mini_delete_button.png" alt="<?php echo $button_remove; ?>" title="<?php echo $button_remove; ?>" /></a></td>
-        </tr>
-      </tbody>
-      <?php } ?>
-    </table>
-  </div>
-  <div class="buttons">
-    <div class="right"><a href="<?php echo $continue; ?>" class="button"><?php echo $button_continue; ?></a></div>
-  </div>
-  <?php } else { ?>
-  <div class="content"><?php echo $text_empty; ?></div>
-  <div class="buttons">
-    <div class="right"><a href="<?php echo $continue; ?>" class="button"><?php echo $button_continue; ?></a></div>
-  </div>
-  <?php } ?>
-  <?php echo $content_bottom; ?></div>
+<?php echo $header; ?>
+<?php if ($success) { ?>
+<div class="success"><?php echo $success; ?><img src="catalog/view/theme/default/image/close.png" alt="" class="close" /></div>
+<?php } ?>
+<?php echo $column_left; ?><?php echo $column_right; ?>
+<div id="content"><?php echo $content_top; ?>
+  <div class="breadcrumb">
+    <?php foreach ($breadcrumbs as $breadcrumb) { ?>
+    <?php echo $breadcrumb['separator']; ?><a href="<?php echo $breadcrumb['href']; ?>"><?php echo $breadcrumb['text']; ?></a>
+    <?php } ?>
+  </div>
+  <h1><?php echo $heading_title; ?></h1>
+  <?php if ($products) { ?>
+  <div class="wishlist-info">
+    <table>
+      <thead>
+        <tr>
+          <td class="image"><?php echo $column_image; ?></td>
+          <td class="name"><?php echo $column_name; ?></td>
+          <td class="model"><?php echo $column_model; ?></td>
+          <td class="stock"><?php echo $column_stock; ?></td>
+          <td class="price"><?php echo $column_price; ?></td>
+          <td class="action"><?php echo $column_action; ?></td>
+        </tr>
+      </thead>
+      <?php foreach ($products as $product) { ?>
+      <tbody id="wishlist-row<?php echo $product['product_id']; ?>">
+        <tr>
+          <td class="image"><?php if ($product['thumb']) { ?>
+            <a href="<?php echo $product['href']; ?>"><img src="<?php echo $product['thumb']; ?>" alt="<?php echo $product['name']; ?>" title="<?php echo $product['name']; ?>" /></a>
+            <?php } ?></td>
+          <td class="name"><a href="<?php echo $product['href']; ?>"><?php echo $product['name']; ?></a></td>
+          <td class="model"><?php echo $product['model']; ?></td>
+          <td class="stock"><?php echo $product['stock']; ?></td>
+          <td class="price"><?php if ($product['price']) { ?>
+            <div class="price">
+              <?php if (!$product['special']) { ?>
+              <?php echo $product['price']; ?>
+              <?php } else { ?>
+              <s><?php echo $product['price']; ?></s> <b><?php echo $product['special']; ?></b>
+              <?php } ?>
+            </div>
+            <?php } ?></td>
+          <td class="action"><img src="catalog/view/theme/default/image/cart-add.png" alt="<?php echo $button_cart; ?>" title="<?php echo $button_cart; ?>" onclick="addToCart('<?php echo $product['product_id']; ?>');" />&nbsp;&nbsp;<a href="<?php echo $product['remove']; ?>"><img src="catalog/view/theme/<?php echo $this->config->get('config_template'); ?>/image/dresscode_images/shopping_cart_mini_delete_button.png" alt="<?php echo $button_remove; ?>" title="<?php echo $button_remove; ?>" /></a></td>
+        </tr>
+      </tbody>
+      <?php } ?>
+    </table>
+  </div>
+  <div class="buttons">
+    <div class="right"><a href="<?php echo $continue; ?>" class="button"><?php echo $button_continue; ?></a></div>
+  </div>
+  <?php } else { ?>
+  <div class="content"><?php echo $text_empty; ?></div>
+  <div class="buttons">
+    <div class="right"><a href="<?php echo $continue; ?>" class="button"><?php echo $button_continue; ?></a></div>
+  </div>
+  <?php } ?>
+  <?php echo $content_bottom; ?></div>
 <?php echo $footer; ?>
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/js/AC_RunActiveContent.js
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/js/AC_RunActiveContent.js	(revision 5)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/js/AC_RunActiveContent.js	(revision 6)
@@ -1,292 +0,0 @@
-//v1.7
-// Flash Player Version Detection
-// Detect Client Browser type
-// Copyright 2005-2007 Adobe Systems Incorporated.  All rights reserved.
-var isIE  = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
-var isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
-var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
-
-function ControlVersion()
-{
-	var version;
-	var axo;
-	var e;
-
-	// NOTE : new ActiveXObject(strFoo) throws an exception if strFoo isn't in the registry
-
-	try {
-		// version will be set for 7.X or greater players
-		axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
-		version = axo.GetVariable("$version");
-	} catch (e) {
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 6.X players only
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
-			
-			// installed player is some revision of 6.0
-			// GetVariable("$version") crashes for versions 6.0.22 through 6.0.29,
-			// so we have to be careful. 
-			
-			// default to the first public version
-			version = "WIN 6,0,21,0";
-
-			// throws if AllowScripAccess does not exist (introduced in 6.0r47)		
-			axo.AllowScriptAccess = "always";
-
-			// safe to call for 6.0r47 or greater
-			version = axo.GetVariable("$version");
-
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 4.X or 5.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-			version = axo.GetVariable("$version");
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 3.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-			version = "WIN 3,0,18,0";
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 2.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
-			version = "WIN 2,0,0,11";
-		} catch (e) {
-			version = -1;
-		}
-	}
-	
-	return version;
-}
-
-// JavaScript helper required to detect Flash Player PlugIn version information
-function GetSwfVer(){
-	// NS/Opera version >= 3 check for Flash plugin in plugin array
-	var flashVer = -1;
-	
-	if (navigator.plugins != null && navigator.plugins.length > 0) {
-		if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
-			var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
-			var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
-			var descArray = flashDescription.split(" ");
-			var tempArrayMajor = descArray[2].split(".");			
-			var versionMajor = tempArrayMajor[0];
-			var versionMinor = tempArrayMajor[1];
-			var versionRevision = descArray[3];
-			if (versionRevision == "") {
-				versionRevision = descArray[4];
-			}
-			if (versionRevision[0] == "d") {
-				versionRevision = versionRevision.substring(1);
-			} else if (versionRevision[0] == "r") {
-				versionRevision = versionRevision.substring(1);
-				if (versionRevision.indexOf("d") > 0) {
-					versionRevision = versionRevision.substring(0, versionRevision.indexOf("d"));
-				}
-			}
-			var flashVer = versionMajor + "." + versionMinor + "." + versionRevision;
-		}
-	}
-	// MSN/WebTV 2.6 supports Flash 4
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4;
-	// WebTV 2.5 supports Flash 3
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3;
-	// older WebTV supports Flash 2
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2;
-	else if ( isIE && isWin && !isOpera ) {
-		flashVer = ControlVersion();
-	}	
-	return flashVer;
-}
-
-// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
-function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
-{
-	versionStr = GetSwfVer();
-	if (versionStr == -1 ) {
-		return false;
-	} else if (versionStr != 0) {
-		if(isIE && isWin && !isOpera) {
-			// Given "WIN 2,0,0,11"
-			tempArray         = versionStr.split(" "); 	// ["WIN", "2,0,0,11"]
-			tempString        = tempArray[1];			// "2,0,0,11"
-			versionArray      = tempString.split(",");	// ['2', '0', '0', '11']
-		} else {
-			versionArray      = versionStr.split(".");
-		}
-		var versionMajor      = versionArray[0];
-		var versionMinor      = versionArray[1];
-		var versionRevision   = versionArray[2];
-
-        	// is the major.revision >= requested major.revision AND the minor version >= requested minor
-		if (versionMajor > parseFloat(reqMajorVer)) {
-			return true;
-		} else if (versionMajor == parseFloat(reqMajorVer)) {
-			if (versionMinor > parseFloat(reqMinorVer))
-				return true;
-			else if (versionMinor == parseFloat(reqMinorVer)) {
-				if (versionRevision >= parseFloat(reqRevision))
-					return true;
-			}
-		}
-		return false;
-	}
-}
-
-function AC_AddExtension(src, ext)
-{
-  if (src.indexOf('?') != -1)
-    return src.replace(/\?/, ext+'?'); 
-  else
-    return src + ext;
-}
-
-function AC_Generateobj(objAttrs, params, embedAttrs) 
-{ 
-  var str = '';
-  if (isIE && isWin && !isOpera)
-  {
-    str += '<object ';
-    for (var i in objAttrs)
-    {
-      str += i + '="' + objAttrs[i] + '" ';
-    }
-    str += '>';
-    for (var i in params)
-    {
-      str += '<param name="' + i + '" value="' + params[i] + '" /> ';
-    }
-    str += '</object>';
-  }
-  else
-  {
-    str += '<embed ';
-    for (var i in embedAttrs)
-    {
-      str += i + '="' + embedAttrs[i] + '" ';
-    }
-    str += '> </embed>';
-  }
-
-  document.write(str);
-}
-
-function AC_FL_RunContent(){
-  var ret = 
-    AC_GetArgs
-    (  arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
-     , "application/x-shockwave-flash"
-    );
-  AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
-}
-
-function AC_SW_RunContent(){
-  var ret = 
-    AC_GetArgs
-    (  arguments, ".dcr", "src", "clsid:166B1BCA-3F9C-11CF-8075-444553540000"
-     , null
-    );
-  AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
-}
-
-function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
-  var ret = new Object();
-  ret.embedAttrs = new Object();
-  ret.params = new Object();
-  ret.objAttrs = new Object();
-  for (var i=0; i < args.length; i=i+2){
-    var currArg = args[i].toLowerCase();    
-
-    switch (currArg){	
-      case "classid":
-        break;
-      case "pluginspage":
-        ret.embedAttrs[args[i]] = args[i+1];
-        break;
-      case "src":
-      case "movie":	
-        args[i+1] = AC_AddExtension(args[i+1], ext);
-        ret.embedAttrs["src"] = args[i+1];
-        ret.params[srcParamName] = args[i+1];
-        break;
-      case "onafterupdate":
-      case "onbeforeupdate":
-      case "onblur":
-      case "oncellchange":
-      case "onclick":
-      case "ondblClick":
-      case "ondrag":
-      case "ondragend":
-      case "ondragenter":
-      case "ondragleave":
-      case "ondragover":
-      case "ondrop":
-      case "onfinish":
-      case "onfocus":
-      case "onhelp":
-      case "onmousedown":
-      case "onmouseup":
-      case "onmouseover":
-      case "onmousemove":
-      case "onmouseout":
-      case "onkeypress":
-      case "onkeydown":
-      case "onkeyup":
-      case "onload":
-      case "onlosecapture":
-      case "onpropertychange":
-      case "onreadystatechange":
-      case "onrowsdelete":
-      case "onrowenter":
-      case "onrowexit":
-      case "onrowsinserted":
-      case "onstart":
-      case "onscroll":
-      case "onbeforeeditfocus":
-      case "onactivate":
-      case "onbeforedeactivate":
-      case "ondeactivate":
-      case "type":
-      case "codebase":
-      case "id":
-        ret.objAttrs[args[i]] = args[i+1];
-        break;
-      case "width":
-      case "height":
-      case "align":
-      case "vspace": 
-      case "hspace":
-      case "class":
-      case "title":
-      case "accesskey":
-      case "name":
-      case "tabindex":
-        ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
-        break;
-      default:
-        ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
-    }
-  }
-  ret.objAttrs["classid"] = classid;
-  if (mimeType) ret.embedAttrs["type"] = mimeType;
-  return ret;
-}
