[BF] logic fixes

inex · Oct 27, 2017 · be4548a · be4548a
1 parent 7d0bd03
commit be4548a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/application/controllers/PeeringManagerController.php b/application/controllers/PeeringManagerController.php
@@ -81,7 +81,7 @@ public function indexAction()
         {
             // days since last peering request email sent
             if( !$p['email_last_sent'] )
-                $peers[ $i ]['email_days'] = 0;
+                $peers[ $i ]['email_days'] = -1;
             else
                 $peers[ $i ]['email_days'] = floor( ( time() - $p['email_last_sent']->getTimestamp() ) / 86400 );
         }
@@ -310,16 +310,16 @@ public function peeringRequestAction()
                             // get this customer/peer peering manager table entry
                             $pm = $this->_loadPeeringManagerEntry( $this->getCustomer(), $peer );
 
-                            if( isset( $this->_options['peeringmanager']['testmode'] ) && $this->_options['peeringmanager']['testmode']
-                                    && isset( $this->_options['peeringmanager']['testdate'] ) && $this->_options['peeringmanager']['testdate'] )
+                            if( !( isset( $this->_options['peeringmanager']['testmode'] ) && $this->_options['peeringmanager']['testmode'] )
+                                    || isset( $this->_options['peeringmanager']['testdate'] ) && $this->_options['peeringmanager']['testdate'] )
                             {
                                 $pm->setEmailLastSent( new DateTime() );
                                 $pm->setEmailsSent( $pm->getEmailsSent() + 1 );
                                 $pm->setUpdated( new DateTime() );
                             }
 
-                            if( isset( $this->_options['peeringmanager']['testmode'] ) && $this->_options['peeringmanager']['testmode']
-                                    && isset( $this->_options['peeringmanager']['testnote'] ) && $this->_options['peeringmanager']['testnote'] )
+                            if( !( isset( $this->_options['peeringmanager']['testmode'] ) && $this->_options['peeringmanager']['testmode'] )
+                                    || isset( $this->_options['peeringmanager']['testnote'] ) && $this->_options['peeringmanager']['testnote'] )
                             {
                                 $pm->setNotes(
                                     date( 'Y-m-d' ) . " [{$this->getUser()->getUsername()}]: peering request " . ( $marksent ? 'marked ' : '' ) . "sent\n\n" . $pm->getNotes()

diff --git a/application/views/peering-manager/js/index.js b/application/views/peering-manager/js/index.js
@@ -103,7 +103,7 @@ $(document).ready( function() {
 
 		var days = $( '#' + event.currentTarget.id ).attr( 'data-days' );
 		if( days >= 0 && days < 30 ) {
-			bootbox.confirm( "Are you sure you want to send a peering request to this member? You already sent one only " + days + " days ago.", 
+			bootbox.confirm( "Are you sure you want to send a peering request to this member? You already sent one " + ( days == 0 ? "today" : ( days == 1 ? "yesterday" : days + " days ago" ) ) + ".",
 				function( result ) {
 				    if( result ) {
 				    	return ixpOpenPeeringRequestDialog( custid );