BY-472 Gmail>no permite configurar cuando se repiten dos usuarios
- Add validation with user only active fix validation with email user
This commit is contained in:
@@ -6,12 +6,11 @@
|
|||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class pmGmail extends Controller
|
class pmGmail extends Controller
|
||||||
{
|
{
|
||||||
public function saveConfigPmGmail($httpData)
|
public function saveConfigPmGmail($httpData)
|
||||||
{
|
{
|
||||||
G::LoadClass( "pmGoogleApi" );
|
G::LoadClass("pmGoogleApi");
|
||||||
$pmGoogle = new PMGoogleApi();
|
$pmGoogle = new PMGoogleApi();
|
||||||
$result = new StdClass();
|
$result = new StdClass();
|
||||||
$result->success = true;
|
$result->success = true;
|
||||||
@@ -101,7 +100,7 @@ class pmGmail extends Controller
|
|||||||
*/
|
*/
|
||||||
public function testConfigPmGmail($httpData)
|
public function testConfigPmGmail($httpData)
|
||||||
{
|
{
|
||||||
G::LoadClass( "pmGoogleApi" );
|
G::LoadClass("pmGoogleApi");
|
||||||
$pmGoogle = new PMGoogleApi();
|
$pmGoogle = new PMGoogleApi();
|
||||||
|
|
||||||
$result = new stdClass();
|
$result = new stdClass();
|
||||||
@@ -113,31 +112,50 @@ class pmGmail extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* Search users with same email
|
||||||
*/
|
*/
|
||||||
public function testUserGmail()
|
public function testUserGmail()
|
||||||
{
|
{
|
||||||
$criteria = new Criteria();
|
$criteria = new Criteria();
|
||||||
$criteria->clearSelectColumns();
|
$criteria->clearSelectColumns();
|
||||||
$criteria->addSelectColumn('COUNT(*) AS NUM_EMAIL');
|
$criteria->addSelectColumn('COUNT(*) AS NUM_EMAIL');
|
||||||
$criteria->addSelectColumn(UsersPeer::USR_UID);
|
|
||||||
$criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
|
|
||||||
$criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
|
|
||||||
$criteria->addSelectColumn(UsersPeer::USR_EMAIL);
|
$criteria->addSelectColumn(UsersPeer::USR_EMAIL);
|
||||||
$criteria->addGroupByColumn(UsersPeer::USR_EMAIL);
|
$criteria->addGroupByColumn(UsersPeer::USR_EMAIL);
|
||||||
|
|
||||||
|
$criteria->add(UsersPeer::USR_STATUS, 'ACTIVE');
|
||||||
|
|
||||||
$rs = UsersPeer::doSelectRS($criteria);
|
$rs = UsersPeer::doSelectRS($criteria);
|
||||||
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||||
|
|
||||||
$userRepeat = array();
|
$userRepeat = [];
|
||||||
while ($rs->next()) {
|
while ($rs->next()) {
|
||||||
$row = $rs->getRow();
|
$row = $rs->getRow();
|
||||||
if ($row['NUM_EMAIL'] > 1) {
|
if ($row['NUM_EMAIL'] > 1) {
|
||||||
$userRepeat[] = array(
|
$criteriaUsers = new Criteria();
|
||||||
'USR_UID' => $row['USR_UID'],
|
$criteriaUsers->clearSelectColumns();
|
||||||
'FULL_NAME' => $row['USR_FIRSTNAME'] . ' ' . $row['USR_LASTNAME'],
|
$criteriaUsers->addSelectColumn(UsersPeer::USR_UID);
|
||||||
'EMAIL' => $row['USR_EMAIL']
|
$criteriaUsers->addSelectColumn(UsersPeer::USR_FIRSTNAME);
|
||||||
);
|
$criteriaUsers->addSelectColumn(UsersPeer::USR_LASTNAME);
|
||||||
|
$criteriaUsers->addSelectColumn(UsersPeer::USR_EMAIL);
|
||||||
|
|
||||||
|
$criteriaUsers->add(UsersPeer::USR_EMAIL, $row['USR_EMAIL']);
|
||||||
|
$criteriaUsers->add(UsersPeer::USR_STATUS, 'ACTIVE');
|
||||||
|
|
||||||
|
$rsUsers = UsersPeer::doSelectRS($criteriaUsers);
|
||||||
|
$rsUsers->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||||
|
while ($rsUsers->next()) {
|
||||||
|
$rowUser = $rsUsers->getRow();
|
||||||
|
|
||||||
|
array_push(
|
||||||
|
$userRepeat,
|
||||||
|
[
|
||||||
|
'USR_UID' => $rowUser['USR_UID'],
|
||||||
|
'FULL_NAME' => $rowUser['USR_FIRSTNAME'] . ' ' . $rowUser['USR_LASTNAME'],
|
||||||
|
'EMAIL' => $rowUser['USR_EMAIL']
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user