Skip to content

trust & love features removal + /team and profile views tweaks #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kordero wants to merge 4 commits into
base: master
Choose a base branch
from
Open

trust & love features removal + /team and profile views tweaks #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e97b485
remove Total earnings, 30 day earnings and % bonus from Team Members …
kordero Feb 15, 2018
dcabc8e
User profile: hide earnings information
kordero Feb 15, 2018
315ca09
trustedBy/favorites feature gone
kordero Feb 15, 2018
d3ca36f
remove love from WL
kordero Feb 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 3 additions & 70 deletions api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@
Utils::validateAPIKey();
checkRemovableProjects();
break;
case 'setFavorite':
setFavorite();
break;
case 'getBonusHistory':
getBonusHistory();
break;
Expand Down Expand Up @@ -625,58 +622,6 @@ function dump_row_values($row) {
return $dump;
}

function setFavorite() {
if ( !isset($_REQUEST['favorite_user_id']) ||
!isset($_REQUEST['newVal']) ) {
echo json_encode(array( 'error' => "Invalid parameters!"));
}
$userId = Session::uid();
if ($userId > 0) {
Utils::initUserById($userId);
$user = new User();
$user->findUserById( $userId );

$favorite_user_id = (int) $_REQUEST['favorite_user_id'];
$newVal = (int) $_REQUEST['newVal'];
$users_favorites = new Users_Favorite();
$res = $users_favorites->setMyFavoriteForUser($userId, $favorite_user_id, $newVal);
if ($res == "") {
// send chat if user has been marked a favorite
$favorite_user = new User();
$favorite_user->findUserById($favorite_user_id);
if ($newVal == 1) {

$resetUrl = SECURE_SERVER_URL . 'user/' . $favorite_user_id ;
$resetUrl = '<a href="' . $resetUrl . '" title="Your profile">' . $resetUrl . '</a>';
$data = array();
$data['link'] = $resetUrl;
$nick = $favorite_user->getNickname();
if (! Utils::sendTemplateEmail($favorite_user->getUsername(), 'trusted', $data)) {
error_log("setFavorite: Utils::send_email failed on favorite notification");
}

// get favourite count
$count = $users_favorites->getUserFavoriteCount($favorite_user_id);
if ($count > 0) {
if ($count == 1) {
$message = "**{$count}** person";
} else {
$message = "**{$count}** people";
}
$journal_message = '@' . $nick . ' is now trusted by ' . $message . '!';
//sending journal notification
Utils::systemNotification(stripslashes($journal_message));
}
}
echo json_encode(array( 'return' => "Trusted saved."));
} else {
echo json_encode(array( 'error' => $res));
}
} else {
echo json_encode(array( 'error' => "You must be logged in!"));
}
}

function getBonusHistory() {
checkLogin();

Expand Down Expand Up @@ -820,7 +765,7 @@ function getUserList() {
$limit = 30;
$page = isset($_REQUEST["page"])?intval($_REQUEST["page"]) : 1;
$letter = isset($_REQUEST["letter"]) ? mysql_real_escape_string(trim($_REQUEST["letter"])) : "";
$order = !empty($_REQUEST["order"]) ? mysql_real_escape_string(trim($_REQUEST["order"])) : "earnings30";
$order = !empty($_REQUEST["order"]) ? mysql_real_escape_string(trim($_REQUEST["order"])) : "jobs_count";
$order_dir = isset($_REQUEST["order_dir"]) ? mysql_real_escape_string(trim($_REQUEST["order_dir"])) : "DESC";
$active = isset( $_REQUEST['active'] ) && $_REQUEST['active'] == 'TRUE' ? 'TRUE' : 'FALSE';
$myfavorite = isset( $_REQUEST['myfavorite'] ) && $_REQUEST['myfavorite'] == 'TRUE' ? 'TRUE' : 'FALSE';
Expand Down Expand Up @@ -861,32 +806,20 @@ function getUserList() {
if( $active == 'FALSE' ) {
$query = "
SELECT `id`, `nickname`,`added` AS `joined`, `budget`,
IFNULL(`creators`.`count`,0) + IFNULL(`mechanics`.`count`,0) AS `jobs_count`,
IFNULL(`earnings`.`sum`,0) AS `earnings`,
IFNULL(`earnings30`.`sum`,0) AS `earnings30`,
IFNULL(`rewarder`.`sum`,0)AS `rewarder`
IFNULL(`creators`.`count`,0) + IFNULL(`mechanics`.`count`,0) AS `jobs_count`
FROM `".USERS."`
LEFT JOIN (SELECT `mechanic_id`, COUNT(`mechanic_id`) AS `count` FROM `" . WORKLIST . "` WHERE (`status` IN ('In Progress', 'QA Ready', 'Review', 'Merged', 'Done')) GROUP BY `mechanic_id`) AS `mechanics` ON `".USERS."`.`id` = `mechanics`.`mechanic_id`
LEFT JOIN (SELECT `creator_id`, COUNT(`creator_id`) AS `count` FROM `" . WORKLIST . "` WHERE (`status` IN ('In Progress', 'QA Ready', 'Review', 'Merged', 'Done')) AND `creator_id` != `mechanic_id` GROUP BY `creator_id`) AS `creators` ON `".USERS."`.`id` = `creators`.`creator_id`
LEFT JOIN (SELECT `user_id`, SUM(amount) AS `sum` FROM `".FEES."` WHERE $sfilter AND `paid` = 1 AND `withdrawn`=0 AND (`rewarder`=1 OR `bonus`=1) GROUP BY `user_id`) AS `rewarder` ON `".USERS."`.`id` = `rewarder`.`user_id`
LEFT JOIN (SELECT `user_id`, SUM(amount) AS `sum` FROM `".FEES."` WHERE $sfilter AND `withdrawn`=0 AND `expense`=0 AND `paid` = 1 AND `paid_date` IS NOT NULL GROUP BY `user_id`) AS `earnings` ON `".USERS."`.`id` = `earnings`.`user_id`
LEFT JOIN (SELECT `user_id`, SUM(amount) AS `sum` FROM `".FEES."` WHERE `withdrawn`=0 AND `paid` = 1 AND `paid_date` IS NOT NULL AND `paid_date` > DATE_SUB(NOW(), INTERVAL 30 DAY) AND `expense`=0 GROUP BY `user_id`) AS `earnings30` ON `".USERS."`.`id` = `earnings30`.`user_id`
LEFT JOIN (SELECT `user_id`, SUM(amount) AS `sum` FROM `".FEES."` WHERE ($sfilter AND `withdrawn`=0 AND `paid` = 1) AND `expense`=1 GROUP BY `user_id`) AS `expenses_billed` ON `".USERS."`.`id` = `expenses_billed`.`user_id`
WHERE `nickname` REGEXP '^$letter' AND `is_active` = 1 $myfavorite_cond ORDER BY `$order` $order_dir LIMIT " . ($page-1)*$limit . ",$limit";
} else if( $active == 'TRUE' ) {
$query = "
SELECT `id`, `nickname`,`added` AS `joined`, `budget`,
IFNULL(`creators`.`count`,0) + IFNULL(`mechanics`.`count`,0) AS `jobs_count`,
IFNULL(`earnings`.`sum`,0) AS `earnings`,
IFNULL(`earnings30`.`sum`,0) AS `earnings30`,
IFNULL(`rewarder`.`sum`,0)AS `rewarder`
IFNULL(`creators`.`count`,0) + IFNULL(`mechanics`.`count`,0) AS `jobs_count`
FROM `".USERS."`
LEFT JOIN (SELECT `user_id`,MAX(`date`) AS `date` FROM `".FEES."` WHERE `paid` = 1 AND `amount` != 0 AND `withdrawn` = 0 AND `expense` = 0 GROUP BY `user_id`) AS `dates` ON `".USERS."`.id = `dates`.user_id
LEFT JOIN (SELECT `mechanic_id`, COUNT(`mechanic_id`) AS `count` FROM `" . WORKLIST . "` WHERE (`status` IN ('In Progress', 'QA Ready', 'Review', 'Merged', 'Done')) GROUP BY `mechanic_id`) AS `mechanics` ON `".USERS."`.`id` = `mechanics`.`mechanic_id`
LEFT JOIN (SELECT `creator_id`, COUNT(`creator_id`) AS `count` FROM `" . WORKLIST . "` WHERE (`status` IN ('In Progress', 'QA Ready', 'Review', 'Merged', 'Done')) AND `creator_id` != `mechanic_id` GROUP BY `creator_id`) AS `creators` ON `".USERS."`.`id` = `creators`.`creator_id`
LEFT JOIN (SELECT `user_id`, SUM(amount) AS `sum` FROM `".FEES."` WHERE $sfilter AND `paid` = 1 AND `withdrawn`=0 AND (`rewarder`=1 OR `bonus`= 1) GROUP BY `user_id`) AS `rewarder` ON `".USERS."`.`id` = `rewarder`.`user_id`
LEFT JOIN (SELECT `user_id`, SUM(amount) AS `sum` FROM `".FEES."` WHERE $sfilter AND `withdrawn`=0 AND `expense`=0 AND `paid` = 1 AND `paid_date` IS NOT NULL GROUP BY `user_id`) AS `earnings` ON `".USERS."`.`id` = `earnings`.`user_id`
LEFT JOIN (SELECT `user_id`, SUM(amount) AS `sum` FROM `".FEES."` WHERE `withdrawn`=0 AND `paid` = 1 AND `paid_date` IS NOT NULL AND `paid_date` > DATE_SUB(NOW(), INTERVAL 30 DAY) AND `expense`=0 GROUP BY `user_id`) AS `earnings30` ON `".USERS."`.`id` = `earnings30`.`user_id`
LEFT JOIN (SELECT `user_id`, SUM(amount) AS `sum` FROM `".FEES."` WHERE ($sfilter AND `withdrawn`=0 AND `paid` = 1) AND `expense`=1 GROUP BY `user_id`) AS `expenses_billed` ON `".USERS."`.`id` = `expenses_billed`.`user_id`
WHERE `date` > DATE_SUB(NOW(), INTERVAL $sfilter DAY) AND `nickname` REGEXP '^$letter' AND `is_active` = 1 $myfavorite_cond ORDER BY `$order` $order_dir LIMIT " . ($page-1)*$limit . ",$limit";
}
Expand Down
49 changes: 0 additions & 49 deletions controllers/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,55 +567,6 @@ public function budgetHistory($id, $page = 1, $itemsPerPage = 10) {
echo json_encode($user->budgetHistory($giver_id, $page, $itemsPerPage));
}

public function loves($id, $page = 1, $itemsPerPage = 5) {
$this->view = null;
$user = User::find($id);
$page = (is_numeric($page) ? $page : 1);
$itemsPerPage = (is_numeric($itemsPerPage) ? $itemsPerPage : 5);
echo json_encode($user->loves($page, $itemsPerPage));
}

public function sendLove($to) {
$this->view = null;
try {
if (!Session::uid()) {
throw new Exception('Must be logged in to Send Love!');
}
$from = User::find(Session::uid());

$to = User::find($to);
if (!$to->getId()) {
throw new Exception('Not a valid user');
}

$love_message = $_POST['love_message'];
if (empty($love_message)) {
throw new Exception('Message field is mandatory');
}

if (!$from->sendLove($to, $love_message)) {
throw new Exception('Could not send love');
}

$from_nickname = $from->getNickname();
$message = $_POST['love_message'];
Utils::sendTemplateEmail($to->getUsername(), 'love-received', array(
'from_nickname'=> $from_nickname,
'message' => $message
));

echo json_encode(array(
'success' => true,
'message' => 'Love sent'
));
} catch (Exception $e) {
echo json_encode(array(
'success' => false,
'message' => $e->getMessage()
));
}
}

public function isUSCitizen($id) {
$this->view = null;
try {
Expand Down
72 changes: 0 additions & 72 deletions css/favorites.css
View file
Open in desktop

This file was deleted.

Loading