#295 -- Ajustar mecanismo de autenticação padrão

bireme · Nov 21, 2023 · 554e340 · 554e340
1 parent 757bf8c
commit 554e340
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/client/templates/default/more.tpl.php b/client/templates/default/more.tpl.php
@@ -21,11 +21,8 @@
 		<?php // elseif ( $_SESSION['avatar'] && !in_array($_SESSION['source'], array('google','facebook')) ) : ?>
 		<!-- <a href="#"><img class="circle" src="<?php echo RELATIVE_PATH; ?>/images/<?php echo $_SESSION["skin"]; ?>/uploads/<?php echo $_SESSION['avatar']; ?>" alt="avatar"></a> -->
 		<?php else : ?>
-			<?php if ($_SESSION["gender"] == "M") : ?>
-				<a href="#"><img class="circle" src="<?php echo RELATIVE_PATH; ?>/images/<?php echo $_SESSION["skin"]; ?>/male.svg" alt="avatar"></a>
-			<?php else : ?>
-				<a href="#"><img class="circle" src="<?php echo RELATIVE_PATH; ?>/images/<?php echo $_SESSION["skin"]; ?>/female.svg" alt="avatar"></a>
-			<?php endif; ?>
+			<?php $avatar = ( $_SESSION["gender"] == "M" ) ? 'male' : 'female'; ?>
+			<a href="#"><img class="circle" src="<?php echo RELATIVE_PATH; ?>/images/<?php echo $_SESSION["skin"]; ?>/<?php echo $avatar; ?>.svg" alt="avatar"></a>
 		<?php endif; ?>
 		<a href="#name"><span class="white-text name"><?php echo $_SESSION["userFirstName"] . ' ' . $_SESSION["userLastName"]; ?></span></a>
 		<a href="#email"><span class="white-text email"><?php echo $_SESSION["userID"]; ?></span></a>

diff --git a/server/classes/UserDAO.php b/server/classes/UserDAO.php
@@ -759,7 +759,7 @@ public static function changePassword($userID, $oldPassword, $newPassword){
 
             try{
                 $_db = new DBClass();
-                $res = $_db->databaseQuery($strsql);
+                $retStats = $_db->databaseQuery($strsql);
             }catch(DBClassException $e){
                 $logger = &Log::singleton('file', LOG_FILE, __CLASS__, $_conf);
                 $logger->log($e->getMessage(),PEAR_LOG_EMERG);

diff --git a/server/pub/changePassword.php b/server/pub/changePassword.php
@@ -17,6 +17,7 @@
 $newPassword = isset($_REQUEST['newPassword'])?$_REQUEST['newPassword']:false;
 $callerURL = !empty($_REQUEST['c'])?base64_decode($_REQUEST['c']):false;
 $source = $_SESSION['source'] ? $_SESSION['source'] : false;
+$avatar = ( $_SESSION["gender"] == "M" ) ? 'male' : 'female';
 
 if ( empty($_SESSION['userTK']) || ( $source && !in_array($source, array('default', 'ldap')) ) ) {
     header("Location: ".RELATIVE_PATH."/controller/authentication");
@@ -34,14 +35,15 @@
     if( $userID && filter_var($userID, FILTER_VALIDATE_EMAIL) ) {
         $retValue = UserDAO::changePassword($userID, $oldPassword, $newPassword);
 
-        if( $retValue === false )
+        if( $retValue === false ) {
             $sysMsg = NEWPASS_CHANGE_ERROR;
-        elseif( 'DomainNotPermitted' === $retValue )
+        } elseif( 'DomainNotPermitted' === $retValue ) {
             $sysMsg = NEWPASS_DOMAIN_NOT_PERMITTED;
-        elseif( 'invalidpass' === $retValue )
+        } elseif( 'invalidpass' === $retValue ) {
             $sysMsg = NEWPASS_INVALID_PASSWORD;
-        else
+        } else {
             $sysMsg = USER_PASSWORD_UPDATE;
+        }
     } else {
         $sysMsg = NEWPASS_CHANGE_ERROR;
     }
@@ -84,7 +86,7 @@
                         <input type="hidden" value="atualizar" name="acao" />
 						<div class="row">
 							<div class="input-field col s12 center-align">
-								<img src="<?php echo RELATIVE_PATH; ?>/images/<?php echo $_SESSION["skin"]; ?>/user.svg" class="circle" width="150" alt="Avatar User">
+								<img src="<?php echo RELATIVE_PATH; ?>/images/<?php echo $_SESSION["skin"]; ?>/<?php echo $avatar; ?>.svg" class="circle" width="150" alt="Avatar User">
 							</div>
 							<div class="input-field col s12">
 								<input id="oldPassword" name="oldPassword" type="password" class="bgInputs" autocomplete="off" required="">

diff --git a/server/pub/forgotPassword.php b/server/pub/forgotPassword.php
@@ -33,12 +33,13 @@
         if( filter_var($user, FILTER_VALIDATE_EMAIL) ) {
             $retValue = UserDAO::sendNewPassConfirm(trim($user), 'pass');
 
-            if( $retValue === false )
+            if( $retValue === false ) {
                 $sysMsg = NEWPASS_CREATE_ERROR;
-            elseif( 'DomainNotPermitted' === $retValue )
+            } elseif( 'DomainNotPermitted' === $retValue ) {
                 $sysMsg = NEWPASS_DOMAIN_NOT_PERMITTED;
-            else
+            } else {
                 $sysMsg = NEWPASS_SEND_CONFIRMATION;
+            }
         } else {
             $sysMsg = NEWPASS_CREATE_ERROR;
         }
@@ -50,12 +51,13 @@
         if($result === true){
             $retValue = UserDAO::createNewPassword($email);
 
-            if( $retValue === false )
+            if( $retValue === false ) {
                 $sysMsg = NEWPASS_CREATE_ERROR;
-            elseif( 'DomainNotPermitted' === $retValue )
+            } elseif( 'DomainNotPermitted' === $retValue ) {
                 $sysMsg = NEWPASS_DOMAIN_NOT_PERMITTED;
-            else
+            } else {
                 $sysMsg = NEWPASS_PASSWORD_SENT;
+            }
         }
 
         break;