[xoops-svn] SF.net SVN: xoops:[8815] XoopsModules/smallworld/trunk/smallworld

[<dj...@us...>]

Revision: 8815
          http://xoops.svn.sourceforge.net/xoops/?rev=8815&view=rev
Author:   djculex
Date:     2012-01-26 15:33:48 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
Check for send email is configured to 'no' else send mail

Modified Paths:
--------------
    XoopsModules/smallworld/trunk/smallworld/comment_ajax.php
    XoopsModules/smallworld/trunk/smallworld/complaint.php
    XoopsModules/smallworld/trunk/smallworld/friendinvite.php
    XoopsModules/smallworld/trunk/smallworld/index.php
    XoopsModules/smallworld/trunk/smallworld/submit.php

Modified: XoopsModules/smallworld/trunk/smallworld/comment_ajax.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/comment_ajax.php	2012-01-26 15:17:31 UTC (rev 8814)
+++ XoopsModules/smallworld/trunk/smallworld/comment_ajax.php	2012-01-26 15:33:48 UTC (rev 8815)
@@ -76,7 +76,9 @@
 			$emails = "";
 			foreach ($parts as $k=>$v) {
 				$owner = getOwnerFromComment ($data['msg_id_fk']);
-				$mail->sendMails ($data['uid_fk'], $v, 'commentToWM', $link=null, $wc); 
+				if(smallworld_GetModuleOption('smallworldusemailnotis', $repmodule='smallworld') != 0) {
+					$mail->sendMails ($data['uid_fk'], $v, 'commentToWM', $link=null, $wc); 
+				}
 			}			
 		}
 	}

Modified: XoopsModules/smallworld/trunk/smallworld/complaint.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/complaint.php	2012-01-26 15:17:31 UTC (rev 8814)
+++ XoopsModules/smallworld/trunk/smallworld/complaint.php	2012-01-26 15:33:48 UTC (rev 8815)
@@ -43,7 +43,9 @@
 		
 		if ($already != 1) {
 		 $mail = new smallworld_mail;
-		 $mail->sendMails($by_userid, '', 'complaint', $link=null, $data);	
+		 if(smallworld_GetModuleOption('smallworldusemailnotis', $repmodule='smallworld') != 0) {
+			$mail->sendMails($by_userid, '', 'complaint', $link=null, $data);	
+		 }
 		 $db->updateComplaint ($auserid);
 		 echo _SMALLWORLD_JS_COMPLAINTSENT;
 		} else {

Modified: XoopsModules/smallworld/trunk/smallworld/friendinvite.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/friendinvite.php	2012-01-26 15:17:31 UTC (rev 8814)
+++ XoopsModules/smallworld/trunk/smallworld/friendinvite.php	2012-01-26 15:33:48 UTC (rev 8815)
@@ -45,7 +45,9 @@
 			$friendshipExists = $check->friendcheck($myUid,$friend);
 				if ($friendshipExists[0] == 0) {	
 					$resultMsg = _SMALLWORLD_JSON_ADDFRIEND.$friendName._SMALLWORLD_JSON_REQUEST_PENDING;
-					$mail->sendMails ($friend, $friend, 'friendshipfollow', $link=null, array()); 
+					if(smallworld_GetModuleOption('smallworldusemailnotis', $repmodule='smallworld') != 0) {
+						$mail->sendMails ($friend, $friend, 'friendshipfollow', $link=null, array()); 
+					}
 					$db->toogleFriendInvite ($friendshipExists, $friend, $myUid);
 					echo json_encode(array('error' => 'no', 'msg' => $resultMsg, 'msgChange' => _SMALLWORLD_JSON_CANCELFR_TEXT));
 				}

Modified: XoopsModules/smallworld/trunk/smallworld/index.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/index.php	2012-01-26 15:17:31 UTC (rev 8814)
+++ XoopsModules/smallworld/trunk/smallworld/index.php	2012-01-26 15:33:48 UTC (rev 8815)
@@ -136,7 +136,7 @@
 		$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.bookmark.js');
 		$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/oembed.css');
 		$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.colorbox.js');
-		$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/colorbox.css');			
+		$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/colorbox.css');		
 	} else {
 		redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
 	}

Modified: XoopsModules/smallworld/trunk/smallworld/submit.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/submit.php	2012-01-26 15:17:31 UTC (rev 8814)
+++ XoopsModules/smallworld/trunk/smallworld/submit.php	2012-01-26 15:33:48 UTC (rev 8815)
@@ -33,6 +33,8 @@
 	$userID = $xoopsUser->getVar('uid');
 	if ($_POST['function'] != 'edit') {
 		$img->createAlbum ($userID);
-		$mail->sendMails ($userID, $userID, 'register', $link=null, array()); 
+		if(smallworld_GetModuleOption('smallworldusemailnotis', $repmodule='smallworld') != 0) {
+			$mail->sendMails ($userID, $userID, 'register', $link=null, array()); 
+		}
 	}
 ?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.