brockf · josev814 · Oct 15, 2015 · Oct 15, 2015 · Oct 15, 2015 · Oct 15, 2015
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Hero Framework
 ====
 
-[Hero](http://www.heroframework.com) is a powerful Content Management System (CMS) and eCommerce framework built on CodeIgniter.
+Hero is a powerful Content Management System (CMS) and eCommerce framework built on CodeIgniter.
 
 ## Documentation
 
@@ -27,11 +27,11 @@ If you experience issues, please review the full Server Requirements article in
 
 ## Documentation
 
-* There is a full [user guide with designer, developer, and user documentation](http://www.heroframework.com/user_guide)
+* There is a full [user guide with designer, developer, and user documentation](https://web.archive.org/web/20140920204221/http://www.heroframework.com/user_guide/index.html)
 
 ## eCommerce
 
-[Hero eCommerce](http://www.github.com/electricfunction/hero-ecommerce) is a free, open-source collection of modules that drop right into your
+Hero eCommerce is a free, open-source collection of modules that drop right into your
 Hero installation and provide you with online store, subscription billing, paywall, and coupon functionality.
 
 ## History

diff --git a/app/config/default_routes.php b/app/config/default_routes.php
@@ -32,4 +32,7 @@
 $route['checkout'] = 'billing/checkout';
 $route['checkout/([a-zA-Z_-]+)'] = 'billing/checkout/$1';
 $route['subscriptions'] = 'billing/subscriptions';
-$route['subscriptions/(:any)'] = 'billing/subscriptions/$1';
+$route['subscriptions/(:any)'] = 'billing/subscriptions/$1';
+
+// 404 route
+$route['404_override'] = 'error/view';
diff --git a/app/controllers/admincp/dashboard.php b/app/controllers/admincp/dashboard.php
@@ -192,6 +192,20 @@ function activity () {
 			}
 		}
 
+		if (module_installed('twitter')) {
+			// ... published to twitter
+			$result = $this->db->select('tweet')
+							   ->select('sent_time')
+							   ->from('tweets_sent')
+							   ->order_by('sent_time','DESC')
+							   ->limit(10)
+							   ->get();
+
+			foreach ($result->result_array() as $tweets) {
+				$activity[strtotime($tweets['sent_time'])] = $tweets['tweet'] . ' was tweeted on <a href="' . site_url('admincp/twitter/tweet_logs') . '">Twitter</a>';
+			}
+		}
+
 		// ... published content
 		$result = $this->db->select('content.content_id')
 						   ->select('user_first_name')

diff --git a/app/libraries/smarty/debug.tpl b/app/libraries/smarty/debug.tpl
@@ -0,0 +1,137 @@
+{capture name='_smarty_debug' assign=debug_output}
+    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+    <head>
+        <title>Smarty Debug Console</title>
+        <style type="text/css">
+            {literal}
+            body, h1, h2, td, th, p {
+                font-family: sans-serif;
+                font-weight: normal;
+                font-size: 0.9em;
+                margin: 1px;
+                padding: 0;
+            }
+
+            h1 {
+                margin: 0;
+                text-align: left;
+                padding: 2px;
+                background-color: #f0c040;
+                color: black;
+                font-weight: bold;
+                font-size: 1.2em;
+            }
+
+            h2 {
+                background-color: #9B410E;
+                color: white;
+                text-align: left;
+                font-weight: bold;
+                padding: 2px;
+                border-top: 1px solid black;
+            }
+
+            body {
+                background: black;
+            }
+
+            p, table, div {
+                background: #f0ead8;
+            }
+
+            p {
+                margin: 0;
+                font-style: italic;
+                text-align: center;
+            }
+
+            table {
+                width: 100%;
+            }
+
+            th, td {
+                font-family: monospace;
+                vertical-align: top;
+                text-align: left;
+                width: 50%;
+            }
+
+            td {
+                color: green;
+            }
+
+            .odd {
+                background-color: #eeeeee;
+            }
+
+            .even {
+                background-color: #fafafa;
+            }
+
+            .exectime {
+                font-size: 0.8em;
+                font-style: italic;
+            }
+
+            #table_assigned_vars th {
+                color: blue;
+            }
+
+            #table_config_vars th {
+                color: maroon;
+            }
+
+            {/literal}
+        </style>
+    </head>
+    <body>
+
+    <h1>Smarty Debug Console
+        -  {if isset($template_name)}{$template_name|debug_print_var nofilter}{else}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
+
+    {if !empty($template_data)}
+        <h2>included templates &amp; config files (load time in seconds)</h2>
+        <div>
+            {foreach $template_data as $template}
+                <font color=brown>{$template.name}</font>
+                <span class="exectime">
+   (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"}
+                    )
+  </span>
+                <br>
+            {/foreach}
+        </div>
+    {/if}
+
+    <h2>assigned template variables</h2>
+
+    <table id="table_assigned_vars">
+        {foreach $assigned_vars as $vars}
+            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
+                <th>${$vars@key|escape:'html'}</th>
+                <td>{$vars|debug_print_var nofilter}</td>
+            </tr>
+        {/foreach}
+    </table>
+
+    <h2>assigned config file variables (outer template scope)</h2>
+
+    <table id="table_config_vars">
+        {foreach $config_vars as $vars}
+            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
+                <th>{$vars@key|escape:'html'}</th>
+                <td>{$vars|debug_print_var nofilter}</td>
+            </tr>
+        {/foreach}
+
+    </table>
+    </body>
+    </html>
+{/capture}
+<script type="text/javascript">
+    {$id = $template_name|default:''|md5}
+    _smarty_console = window.open("", "console{$id}", "width=680,height=600,resizable,scrollbars=yes");
+    _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
+    _smarty_console.document.close();
+</script>