Skip to content

Commit

Permalink
Refatoring code...
Browse files Browse the repository at this point in the history
  • Loading branch information
@wilsonmoura
wilsonmoura committed Jan 18, 2023
1 parent 0eac213 commit 18f3b41
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 74 deletions.
9 changes: 2 additions & 7 deletions client/business/authentication.php
View file
Expand Up @@ -26,7 +26,6 @@
$label = $trans->getTrans("mysearches", 'ORIGIN_SITE');

$token = false;
$send_cookie = false;

if ( strpos(base64_decode($iahx), VHL_SEARCH_PORTAL_DOMAIN) !== false ) {
$chunks = explode('/', base64_decode($iahx));
Expand Down Expand Up @@ -72,11 +71,9 @@
$response["status"] = true;
$response["values"] = $result;

// send cookie to .bvs.br
$send_cookie = true;
$remember_me = ( $_REQUEST['remember_me'] || $token ) ? time() + (10 * 365 * 24 * 60 * 60) : 0;
// send cookie to .bvsalud.org
$cookie = UserData::sendCookie($result["userTK"], true);
$cookie = UserData::getData($result["userTK"]);
$remember_me = ( $_REQUEST['remember_me'] || $token ) ? time() + (10 * 365 * 24 * 60 * 60) : 0;
setcookie("userData", $cookie, $remember_me, '/', COOKIE_DOMAIN_SCOPE);
setcookie("userTK", $result["userTK"], $remember_me, '/', COOKIE_DOMAIN_SCOPE);
setcookie("userID", $result["sysUID"], $remember_me, '/', COOKIE_DOMAIN_SCOPE);
Expand All @@ -91,8 +88,6 @@
else
$redirectCommand = $originURL."?spauth=true";

UserData::sendCookie($result["userTK"]); // send cookie to .bvs.br

echo '<script language="javascript">';
echo 'window.open("'.$redirectCommand.'","_parent")';
echo '</script>';
Expand Down
1 change: 0 additions & 1 deletion client/business/logout.php
View file
Expand Up @@ -23,7 +23,6 @@
setcookie('userID','',time() -3600,'/',COOKIE_DOMAIN_SCOPE);
setcookie('userTK','',time() -3600,'/',COOKIE_DOMAIN_SCOPE);
setcookie('userData','',time() -3600,'/',COOKIE_DOMAIN_SCOPE);
$send_cookie = 'logout'; // remove cookie from .bvs.br

session_start();
$_SESSION['lang'] = $tmplang;
Expand Down
16 changes: 3 additions & 13 deletions client/classes/Tools.php
View file
Expand Up @@ -204,8 +204,8 @@ public static function shortenedQueryString($query,$crop=true){

class UserData {

public static function sendCookie($userTK=null,$return=false){
$userData = '';
public static function getData($userTK=null){
$userData = false;

if ( isset($userTK) && !empty($userTK) ) {
$source = ( $_SESSION['source'] ) ? $_SESSION['source'] : '';
Expand All @@ -216,7 +216,6 @@ public static function sendCookie($userTK=null,$return=false){
$data = Token::unmakeUserTK($userTK);

if ( $data ) {
unset($userData);
$userData = array();
$userData['userTK'] = $userTK;
$userData['firstName'] = $_SESSION["userFirstName"];
Expand All @@ -236,16 +235,7 @@ public static function sendCookie($userTK=null,$return=false){
}
}

if ( $return ) return $userData;

$src = BVS_COOKIE_DOMAIN.'/cookies.php?userData='.$userData;

?>
<script type="text/javascript">
var element = document.createElement("img");
element.setAttribute('src', "<?php echo $src; ?>");
</script>
<?php
return $userData;
}

}
Expand Down
15 changes: 0 additions & 15 deletions client/templates/default/header.tpl.php
View file
Expand Up @@ -87,21 +87,6 @@
var PASSWORD_PAGE = "<?php echo $password_page; ?>";
</script>

<?php
if ( $send_cookie ) {
if ( 'logout' === $send_cookie ) {
UserData::sendCookie(); // remove cookie from .bvs.br
} else {
UserData::sendCookie($_SESSION["userTK"]); // send cookie to .bvs.br

echo '<script language="javascript">';
echo 'window.parent.location = window.parent.location.pathname;';
echo '</script>';
exit;
}
}
?>

<?php if ( ! empty(GOOGLE_ANALYTICS) || ! empty(APP_GOOGLE_ANALYTICS) ) : ?>
<script type="text/javascript">
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
Expand Down
15 changes: 0 additions & 15 deletions client/templates/myvhl/header.tpl.php
View file
Expand Up @@ -86,21 +86,6 @@
var PASSWORD_PAGE = "<?php echo $password_page; ?>";
</script>

<?php
if ( $send_cookie ) {
if ( 'logout' === $send_cookie ) {
UserData::sendCookie(); // remove cookie from .bvs.br
} else {
UserData::sendCookie($_SESSION["userTK"]); // send cookie to .bvs.br

echo '<script language="javascript">';
echo 'window.parent.location = window.parent.location.pathname;';
echo '</script>';
exit;
}
}
?>

<?php if ( ! empty(GOOGLE_ANALYTICS) || ! empty(APP_GOOGLE_ANALYTICS) ) : ?>
<script type="text/javascript">
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
Expand Down
2 changes: 0 additions & 2 deletions client/view.php
View file
Expand Up @@ -115,8 +115,6 @@
else
$redirectCommand = $origin."?splogout=true";

UserData::sendCookie(); // remove cookie from .bvs.br

echo '<script language="javascript">';
echo 'window.open("'.$redirectCommand.'","_parent")';
echo '</script>';
Expand Down
4 changes: 2 additions & 2 deletions connector/facebook/callback.php
View file
Expand Up @@ -69,8 +69,8 @@
$_SESSION["iahx"] = base64_decode($iahx);
//$response["status"] = true;
//$response["values"] = $result;
UserData::sendCookie($result["userTK"]);
$cookie = UserData::sendCookie($result["userTK"], true);

$cookie = UserData::getData($result["userTK"]);
setcookie("userData", $cookie, 0, '/', COOKIE_DOMAIN_SCOPE);
setcookie("userTK", $result["userTK"], 0, '/', COOKIE_DOMAIN_SCOPE);
setcookie("userID", $result["sysUID"], 0, '/', COOKIE_DOMAIN_SCOPE);
Expand Down
4 changes: 2 additions & 2 deletions connector/google/index.php
View file
Expand Up @@ -62,8 +62,8 @@
$_SESSION["iahx"] = base64_decode($iahx);
//$response["status"] = true;
//$response["values"] = $result;
UserData::sendCookie($result["userTK"]);
$cookie = UserData::sendCookie($result["userTK"], true);

$cookie = UserData::getData($result["userTK"]);
setcookie("userData", $result["userTK"], 0, '/', COOKIE_DOMAIN_SCOPE);
setcookie("userTK", $result["userTK"], 0, '/', COOKIE_DOMAIN_SCOPE);
setcookie("userID", $result["sysUID"], 0, '/', COOKIE_DOMAIN_SCOPE);
Expand Down
16 changes: 3 additions & 13 deletions server/classes/Tools.php
View file
Expand Up @@ -281,8 +281,8 @@ public static function validateObjUser($userObject) {

class UserData {

public static function sendCookie($userTK=null,$return=false){
$userData = '';
public static function getData($userTK=null){
$userData = false;

if ( isset($userTK) && !empty($userTK) ) {
$source = ( $_SESSION['source'] ) ? $_SESSION['source'] : '';
Expand All @@ -293,7 +293,6 @@ public static function sendCookie($userTK=null,$return=false){
$data = Token::unmakeUserTK($userTK);

if ( $data ) {
unset($userData);
$userData = array();
$userData['userTK'] = $userTK;
$userData['firstName'] = $_SESSION["userFirstName"];
Expand All @@ -313,16 +312,7 @@ public static function sendCookie($userTK=null,$return=false){
}
}

if ( $return ) return $userData;

$src = BVS_COOKIE_DOMAIN.'/cookies.php?userData='.$userData;

?>
<script type="text/javascript">
var element = document.createElement("img");
element.setAttribute('src', "<?php echo $src; ?>");
</script>
<?php
return $userData;
}

/**
Expand Down
3 changes: 1 addition & 2 deletions server/classes/ToolsAuthentication.php
View file
Expand Up @@ -122,8 +122,7 @@ public static function authenticateUser($userID, $userPass, $socialMedia, $userD
$gll = UserDAO::getLastLogin($userID);
$sll = UserDAO::setLastLogin($userID);

if ( $gll )
$result["visited"] = true;
if ( $gll ) $result["visited"] = true;
}

return $result;
Expand Down
1 change: 0 additions & 1 deletion server/classes/UserDAO.php
View file
Expand Up @@ -808,7 +808,6 @@ public static function changePassword($userID, $oldPassword, $newPassword){
$newToken = Token::makeUserTK($userID,$newPassword,'ldap');
$_SESSION['userTK'] = $newToken;
setcookie("userTK", $_SESSION["userTK"], 0, '/', COOKIE_DOMAIN_SCOPE);
// UserData::sendCookie($result["userTK"]);
}
} else {
$retValue = 'invalidpass';
Expand Down
1 change: 0 additions & 1 deletion server/pub/include/logout.php
View file
Expand Up @@ -22,7 +22,6 @@
setcookie('userID','',time() -3600,'/',COOKIE_DOMAIN_SCOPE);
setcookie('userTK','',time() -3600,'/',COOKIE_DOMAIN_SCOPE);
setcookie('userData','',time() -3600,'/',COOKIE_DOMAIN_SCOPE);
$send_cookie = 'logout'; // remove cookie from .bvs.br

session_start();
$_SESSION['lang'] = $tmplang;
Expand Down

0 comments on commit 18f3b41

Please sign in to comment.