From eaab5fac34b008bd9b4583711c36f559480477dc Mon Sep 17 00:00:00 2001
From: arzynik <github@arzynik.com>
Date: Wed, 27 Nov 2013 11:56:56 -0800
Subject: [PATCH 1/4] updated tumblr theme

---
 _assets/tumblr.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/_assets/tumblr.html b/_assets/tumblr.html
index 1fa837673..f075162e8 100644
--- a/_assets/tumblr.html
+++ b/_assets/tumblr.html
@@ -808,6 +808,13 @@ strong, .formspringmeFooter a {
     }
 }
 
+.author {
+    display: none;
+}
+.permalink .author {
+    display: block;
+}
+
 {CustomCSS}
 </style>
 {block:IfGoogleAnalyticsWebPropertyID}<script>
@@ -933,7 +940,7 @@ _gaq.push(['_trackPageview']);
 	{block:IfShowPostNotes}{block:NoteCount}<a href="{Permalink}" title="See post with notes">{NoteCountWithLabel}</a>{/block:NoteCount}{/block:IfShowPostNotes}
 	{block:Date}{block:IfDisqusShortname}<a href="{Permalink}#disqus_thread" class="comments">{lang:View comments}</a> {/block:IfDisqusShortname}{/block:Date}
 	{block:Reblog}(via <a href="{ReblogParentURL}" title="{ReblogParentTitle}">{ReblogParentName}</a>{block:RebloggedFromReblog} &amp; <a href="{ReblogRootURL}" title="{ReblogRootTitle}">{ReblogRootName}</a>{block:RebloggedFromReblog}){/block:Reblog}
-	{block:HasTags}<span class="tags">Tags: {block:Tags}<a href="{TagURL}">{Tag}</a> {/block:Tags}</span>{/block:HasTags}
+	{block:HasTags}<span class="tags">{block:Tags}#<a href="{TagURL}">{Tag}</a> {/block:Tags}</span>{/block:HasTags}
 </div>
 
 {block:IfShowPostNotes}{block:PostNotes}<div class="notecontainer">{PostNotes}</div>{/block:PostNotes}{/block:IfShowPostNotes}

From b22c5f51f765576e772b4b1567d77b9980c101aa Mon Sep 17 00:00:00 2001
From: pererinha <pererinha@gmail.com>
Date: Wed, 27 Nov 2013 19:33:23 -0200
Subject: [PATCH 2/4] partial #2183 - fix the problem that just one admin user
 was being returned

---
 include/library/Crunchbutton/Notification/Log.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/library/Crunchbutton/Notification/Log.php b/include/library/Crunchbutton/Notification/Log.php
index 3c530c205..e2649fa27 100644
--- a/include/library/Crunchbutton/Notification/Log.php
+++ b/include/library/Crunchbutton/Notification/Log.php
@@ -213,7 +213,7 @@ class Crunchbutton_Notification_Log extends Cana_Table {
 		$group_name = Config::getVal( Crunchbutton_Notification_Log::MAX_CALL_GROUP_KEY );
 		$group = Crunchbutton_Group::byName( $group_name );
 		if( $group->id_group ){
-			return $group->users();
+			return Crunchbutton_Admin_Group::q( "SELECT a.* FROM admin a INNER JOIN admin_group ag ON ag.id_admin = a.id_admin AND ag.id_group = {$group->id_group}" );	
 		}
 		return false;
 	}

From b6949f071723241e8c8c4fa994304cb24dca4e18 Mon Sep 17 00:00:00 2001
From: arzynik <github@arzynik.com>
Date: Wed, 27 Nov 2013 15:09:15 -0800
Subject: [PATCH 3/4] added ability to grab a users image, and got a count of
 how many there are with images available

---
 .../default/cockpit/test/userimage.php        | 32 +++++++++++++++++++
 include/library/Crunchbutton/User.php         | 22 +++++++++++++
 .../default/cockpit/test/userimage.phtml      | 22 +++++++++++++
 3 files changed, 76 insertions(+)
 create mode 100644 include/controllers/default/cockpit/test/userimage.php
 create mode 100644 include/views/default/cockpit/test/userimage.phtml

diff --git a/include/controllers/default/cockpit/test/userimage.php b/include/controllers/default/cockpit/test/userimage.php
new file mode 100644
index 000000000..cc2fa31d0
--- /dev/null
+++ b/include/controllers/default/cockpit/test/userimage.php
@@ -0,0 +1,32 @@
+<?php
+class Controller_test_userimage extends Crunchbutton_Controller_Account {
+	public function init() {
+		$users = User::q('
+			select `user`.* from `user` left join user_auth using(id_user)
+			where
+				user_auth.active=1
+				and user.active=1
+				and ((user_auth.type = "local" and user_auth.email LIKE "%@%") or (user_auth.type = "facebook"))
+				group by `user`.id_user
+				order by `user`.id_user
+		');
+		$c = 0;
+		foreach ($users as $user) {
+			if ($user->image()) {
+				$image = ['name' => $user->name, 'image' => $user->image()];
+				if (strpos($user->image(),'gravitar')) {
+					$image['type'] = 'gravitar';
+				} else {
+					$image['type'] = 'facebook';
+				}
+				$images[] = $image;
+				$c++;
+			}
+		}
+		
+		Cana::view()->images = $images;
+		Cana::view()->layout('layout/blank');
+		Cana::view()->useFilter(false);
+		Cana::view()->display('test/userimage');
+	}
+}
\ No newline at end of file
diff --git a/include/library/Crunchbutton/User.php b/include/library/Crunchbutton/User.php
index 830913c26..b5363d469 100644
--- a/include/library/Crunchbutton/User.php
+++ b/include/library/Crunchbutton/User.php
@@ -226,6 +226,28 @@ class Crunchbutton_User extends Cana_Table {
 	public function debits(){
 		return Crunchbutton_Credit::debitByUser( $this->id_user );
 	}
+	
+	public function image() {
+		if (!isset($this->_image)) {
+			$auths = $this->auths();
+			foreach ($auths as $auth) {
+				if ($auth->type == 'facebook') {
+					$image = 'http://graph.facebook.com/'.$auth->auth.'/picture?type=square&height=200&width=200';
+					break;
+				}
+			}
+			if (!$image) {
+				foreach ($auths as $auth) {
+					if ($auth->type == 'local') {
+						$image = 'http://www.gravatar.com/avatar/'.md5(strtolower($auth->email)).'?s=480&d=404';
+						break;
+					}
+				}
+			}
+			$this->_image = $image;
+		}
+		return $this->_image;
+	}
 
 	public function __construct($id = null) {
 		parent::__construct();
diff --git a/include/views/default/cockpit/test/userimage.phtml b/include/views/default/cockpit/test/userimage.phtml
new file mode 100644
index 000000000..ac84b66be
--- /dev/null
+++ b/include/views/default/cockpit/test/userimage.phtml
@@ -0,0 +1,22 @@
+
+<style>
+	.image {
+		height: 100px;
+		width: 100px;
+	}
+	.hidden {
+		display: none;
+	}
+</style>
+<? foreach ($this->images as $image) : ?>
+	<img src="<?=$image['image']?>" class="image <?=$image['type']?>">
+<? endforeach ; ?>
+<div class="count"></div>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+<script>
+$(document).ready(function() {
+	$('img').error(function () { 
+		$(this).addClass('hidden');
+	});
+});
+</script>
\ No newline at end of file

From 241cea4a0ad27810c11110e1fc69c0f5749748b1 Mon Sep 17 00:00:00 2001
From: Daniel Camargo <pererinha@gmail.com>
Date: Thu, 28 Nov 2013 09:25:09 -0200
Subject: [PATCH 4/4] gift card (printable) url changed from giftcard to gift

---
 .../cockpit/giftcards/print/brown.phtml       | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/include/views/default/cockpit/giftcards/print/brown.phtml b/include/views/default/cockpit/giftcards/print/brown.phtml
index c62f7bbc8..86feae87b 100644
--- a/include/views/default/cockpit/giftcards/print/brown.phtml
+++ b/include/views/default/cockpit/giftcards/print/brown.phtml
@@ -1,17 +1,3 @@
-<?php 
-	if( $_REQUEST[ 'asked' ] != '1' ){
-		?>
-		<script type="text/javascript">
-		if( confirm( 'Use url "gift/code"?' ) ){
-			document.location = document.location + '?asked=1&url=gift';
-		} else {
-			document.location = document.location + '?asked=1';
-		}
-		</script>
-		<?php
-		exit;
-	}
-?>
 <!DOCTYPE html>
 <html lang="en">
 	<head>
@@ -41,9 +27,7 @@
 			margin-top: 210px;
 		}
 		.info{
-			<?php if( $_REQUEST[ 'url' ] == 'gift' ) { ?>
-				font-size:34px;
-			<?php } ?>
+			font-size:34px;
 		}
 		</style>
 	</head>
@@ -74,7 +58,7 @@ if( sizeof( $giftcards ) > 0 ) {
 			<div class="page">
 			<?php
 		}
-	?><div class="giftcard"><div class="value <?php if( $giftcard->value > 9 ){ echo 'small'; } ?>"><?php echo $giftcard->value;?></div><div class="info">crunchbutton.com/<?php if( $_REQUEST[ 'url' ] == 'gift' ) { ?>gift<?php } else { ?>giftcard<?php } ?>/<?php echo $giftcard->code;?></div><div class="legal">Valid for $<?php echo $giftcard->value; ?> off one order on crunchbutton.com for new users only. One per user. Has no cash value and is not a jelly donut. Not valid for past orders. Will not be replaced if lost or stolen. May be canceled any time without notice.</div>
+	?><div class="giftcard"><div class="value <?php if( $giftcard->value > 9 ){ echo 'small'; } ?>"><?php echo $giftcard->value;?></div><div class="info">crunchbutton.com/gift/<?php echo $giftcard->code;?></div><div class="legal">Valid for $<?php echo $giftcard->value; ?> off one order on crunchbutton.com for new users only. One per user. Has no cash value and is not a jelly donut. Not valid for past orders. Will not be replaced if lost or stolen. May be canceled any time without notice.</div>
 	<div class="mobile">Or use our iPhone app and, in the Notes section of your order, enter: <?php echo $giftcard->code;?></div>
 	<img  style="width:816px;"  src="/assets/images/giftcard/print-brown.svg?<?php echo $imageCached; ?>"/></div>
 	<?php