Skip to content

Commit

Permalink
fixed groups
Browse files Browse the repository at this point in the history
  • Loading branch information
@DouglasSherk
DouglasSherk committed Mar 28, 2012
1 parent b385878 commit 7f18239
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 28 deletions.
11 changes: 11 additions & 0 deletions activity.php
View file
Expand Up @@ -258,6 +258,17 @@ function toggleHint() {
} }
?> ?>


<?php
if (isset($_SESSION['group_name_filled'])) {
?>
<div id="FlashMessage">
<p>You have joined a group to do <?php echo $_SESSION['group_name_filled']; ?>. You will receive an email shortly with this group's contact info.</p>
</div>
<?php
unset($_SESSION['group_name_filled']);
}
?>

<script type="text/javascript"> <script type="text/javascript">
var memo = {}; var memo = {};
$('.ui-menu-item').live('click', function() { $('.ui-menu-item').live('click', function() {
Expand Down
33 changes: 13 additions & 20 deletions email/group.html
View file
@@ -1,41 +1,34 @@
<html> <html>
<body style="font-family: &quot;Verdana&quot;, Arial, sans-serif; font-size: 20px;"> <body style="font-family: &quot;Verdana&quot;, Arial, sans-serif; font-size: 20px;">
<table <table
background="http://dev.recmeet.apollorp.org/res/images/email-background.png" width="660" style="margin: auto; padding: 30px;">
height="460" width="660" style="margin: auto; padding: 30px;">
<tr height="72" width="200"> <tr height="72" width="200">
<td style="text-align: center;" colspan=2> <td style="text-align: center;" colspan=2>
<img src="http://dev.recmeet.apollorp.org/res/images/logo.png" /> <img src="http://dev.recmeet.apollorp.org/res/images/logo.png" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan=2> <td colspan=2>
Somebody has requested you as a <?php echo $activity; ?> partner!<br/> You have been matched with a group to do <?php echo $activity; ?>!<br/><br/>


Click 'accept' to accept or just ignore this email if Just hit "reply-all" to start communicating with your new partners!
you're not interested.<br/>

<a href="http://somebody.nu/acceptmatch?token=<?php echo $token ?>">
Accept
</a>
</td> </td>
</tr> </tr>
<?php <?php
foreach ($users as $member) { foreach ($users as $member) {
$uid = $member['uid']; $uid = $member['uid'];
$name = $member['uid']; $name = $member['name'];
$html = <<<EOH $html = '<tr>' .
<tr> '<td width="100%" style="text-align: center;">' .
<td width="100%" style="text-align: center;"> '<a href="http://www.facebook.com/profile.php?id=' . $uid . '">' .
<a href="http://www.facebook.com/profile.php?id=$uid"> '<p style="font-weight: bold;">' . $name . '</p>' .
<p style="font-weight: bold;">$name</p> '<img src="https://graph.facebook.com/' . $uid . '/picture?type=square" alt="Profile Picture" />' .
<img src="https://graph.facebook.com/$uid/picture?type=square" alt="Profile Picture" /> '</a>' .
</a> '</td>' .
</td> '</tr>';
</tr>
<<<EOH;
echo $html; echo $html;
} }
?>
<tr style="font-size: 12px;"> <tr style="font-size: 12px;">
<td colspan=2> <td colspan=2>
<table width="100%" style="margin-bottom: -15px;"> <table width="100%" style="margin-bottom: -15px;">
Expand Down
3 changes: 2 additions & 1 deletion email/send-group.php
View file
@@ -1,4 +1,4 @@
<? <?php
include_once('email/postageapp.php'); include_once('email/postageapp.php');
$siteFrom = "no-reply@somebody.nu"; $siteFrom = "no-reply@somebody.nu";


Expand All @@ -22,4 +22,5 @@
"From" => $siteFrom, "From" => $siteFrom,
"Reply-to" => $replyTo, "Reply-to" => $replyTo,
); );

PostageApp::mail($replyTo, $subject, $content, $headers); PostageApp::mail($replyTo, $subject, $content, $headers);
2 changes: 2 additions & 0 deletions groupResults.php
View file
Expand Up @@ -139,8 +139,10 @@ function format_rel_ts($secs) {
<a href="groupmatch?group_id=$group_id&activity_id=$activity_id"> <a href="groupmatch?group_id=$group_id&activity_id=$activity_id">
<div name="result[]" class="Result"> <div name="result[]" class="Result">
EOH; EOH;
echo $html;
} }
} }
$previous_group_id = $group_id;


$html = <<<EOH $html = <<<EOH
<img class="ProfilePic" alt="Profile Picture" <img class="ProfilePic" alt="Profile Picture"
Expand Down
24 changes: 18 additions & 6 deletions groupmatch.php
View file
Expand Up @@ -19,18 +19,20 @@
} }


$query = "SELECT activities.*," . $query = "SELECT activities.*," .
"groups.size - (SELECT COUNT(*) FROM group_members WHERE group_id=(SELECT group_id FROM group_members WHERE user_id=$user->id)) AS remaining " . "groups.size - (SELECT COUNT(*) FROM group_members WHERE group_id=$group_id) AS remaining " .
"LEFT JOIN activities ON activities.id = groups.activity_id, " "FROM groups " .
"FROM groups;"; "LEFT JOIN activities ON activities.id = groups.activity_id";
$result = mysql_query($query) or die(mysql_error()); $result = mysql_query($query) or die(mysql_error());


if ($row = mysql_fetch_assoc($result)) { if ($row = mysql_fetch_assoc($result)) {
if ($row['remaining'] == 1) { if ($row['remaining'] == 1) {
$users = array(); $users = array();


$activity = $row['name'];

$query = "SELECT group_members.*, users.* FROM group_members " . $query = "SELECT group_members.*, users.* FROM group_members " .
"LEFT JOIN users ON users.id = group_members.user_id " . "LEFT JOIN users ON users.id = group_members.user_id " .
"WHERE group_id = $group_id;" "WHERE group_id = $group_id;";
$result = mysql_query($query) or die(mysql_error()); $result = mysql_query($query) or die(mysql_error());


while ($row2 = mysql_fetch_assoc($result)) { while ($row2 = mysql_fetch_assoc($result)) {
Expand All @@ -41,21 +43,31 @@
)); ));
} }


array_push($users, array(
'email' => $user->email,
'name' => $user->name,
'uid' => $user->uid
));

$query = "DELETE FROM group_members WHERE group_id = $group_id;"; $query = "DELETE FROM group_members WHERE group_id = $group_id;";
mysql_query($query) or die(mysql_error()); mysql_query($query) or die(mysql_error());


$query = "DELETE FROM groups WHERE group_id = $group_id;"; $query = "DELETE FROM groups WHERE id = $group_id;";
mysql_query($query) or die(mysql_error()); mysql_query($query) or die(mysql_error());


$tmpl = 'group'; $tmpl = 'group';
$subject = 'You have been matched with a group!'; $subject = 'You have been matched with a group!';


include_once('email/send-group.php'); include_once('email/send-group.php');

$_SESSION['group_name_filled'] = $row['name'];
} else { } else {
$query = "INSERT INTO group_members (id, user_id, group_id) " . $query = "INSERT INTO group_members (id, user_id, group_id) " .
"VALUES(null, $user->id, $group_id);"; "VALUES(null, $user->id, $group_id);";
mysql_query($query) or die(mysql_error()); mysql_query($query) or die(mysql_error());

$_SESSION['group_name'] = $row['name'];
} }


$_SESSION['group_name'] = $row['name']; header('Location: /');
} }
2 changes: 1 addition & 1 deletion match.php
View file
Expand Up @@ -62,7 +62,7 @@
} else { } else {
$query = "SELECT group_members.*, groups.*, users.*, " . $query = "SELECT group_members.*, groups.*, users.*, " .
"groups.id = (SELECT group_id FROM group_members WHERE user_id=$user->id) AS userInGroup, " . "groups.id = (SELECT group_id FROM group_members WHERE user_id=$user->id) AS userInGroup, " .
"groups.size - (SELECT COUNT(*) FROM group_members WHERE group_id=(SELECT group_id FROM group_members WHERE user_id=$user->id)) AS remaining " . "groups.size - (SELECT COUNT(*) FROM group_members WHERE group_id=groups.id) AS remaining " .
"FROM group_members " . "FROM group_members " .
"LEFT JOIN groups ON groups.id = group_members.group_id " . "LEFT JOIN groups ON groups.id = group_members.group_id " .
"LEFT JOIN users ON users.id = group_members.user_id " . "LEFT JOIN users ON users.id = group_members.user_id " .
Expand Down

0 comments on commit 7f18239

Please sign in to comment.