[Vtigercrm-commits] [vtiger-commits] r9956 - in /vtigercrm/branches/5.0.3: Smarty/templates/Settings/ modules/Settings/ modules/Users/

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Tue Dec 12 01:01:41 2006
New Revision: 9956

Log:
Notification Scheduler moved to Settings module

Added:
    vtigercrm/branches/5.0.3/modules/Settings/CreateSharingRule.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/EditNotification.php
    vtigercrm/branches/5.0.3/modules/Settings/SaveNotification.php   (with props)
    vtigercrm/branches/5.0.3/modules/Settings/listnotificationschedulers.php
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailNotification.tpl
    vtigercrm/branches/5.0.3/modules/Settings/SettingsAjax.php
    vtigercrm/branches/5.0.3/modules/Users/UsersAjax.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailNotification.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailNotification.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailNotification.tpl Tue Dec 12 01:01:41 2006
@@ -47,7 +47,7 @@
 			<!-- DISPLAY -->
 			<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
 			<tr>
-				<td width="50" rowspan="2" valign="top"><img src="{$IMAGE_PATH}notification.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+				<td width="50" rowspan="2" valign="top"><img src="{$IMAGE_PATH}notification.gif" alt="Settings" width="48" height="48" border=0 title="Settings"></td>
 				<td colspan="2" class="heading2" valign=bottom align="left"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.NOTIFICATIONSCHEDULERS} </b></td>
 				<td rowspan=2 class="small" align=right>&nbsp;</td>
 			</tr>
@@ -110,7 +110,7 @@
                 'index.php',
                 {queue: {position: 'end', scope: 'command'},
                         method: 'post',
-                        postBody: 'action=UsersAjax&module=Users&file=SaveNotification&active='+active+'&notifysubject='+subject+'&notifybody='+body+'&record='+id,
+                        postBody: 'action=SettingsAjax&module=Settings&file=SaveNotification&active='+active+'&notifysubject='+subject+'&notifybody='+body+'&record='+id,
                         onComplete: function(response) {
                                 $("status").style.display="none";
 				$("notifycontents").innerHTML=response.responseText;
@@ -126,7 +126,7 @@
                 'index.php',
                 {queue: {position: 'end', scope: 'command'},
                         method: 'post',
-                        postBody:'action=UsersAjax&module=Users&file=EditNotification&record='+id,
+                        postBody:'action=SettingsAjax&module=Settings&file=EditNotification&record='+id,
                         onComplete: function(response) {
                                 $("status").style.display="none";
                                 $("editdiv").innerHTML=response.responseText;

Modified: vtigercrm/branches/5.0.3/modules/Settings/SettingsAjax.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/SettingsAjax.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/SettingsAjax.php Tue Dec 12 01:01:41 2006
@@ -13,5 +13,22 @@
 {
 	require_once('modules/Settings/'.$_REQUEST['file'].'.php');
 }
-
+if(isset($_REQUEST['orgajax']) && ($_REQUEST['orgajax'] !=''))
+{
+        require_once('modules/Settings/CreateSharingRule.php');
+}
+elseif(isset($_REQUEST['announce_save']) && ($_REQUEST['announce_save'] != ''))
+{
+        $date_var = date('YmdHis');
+        $announcement = $_REQUEST['announcement'];
+        $title = $_REQUEST['title_announcement'];
+        $sql="select * from vtiger_announcement where creatorid=".$current_user->id;
+        $is_announce=$adb->query($sql);
+        if($adb->num_rows($is_announce) > 0)
+                $query="update vtiger_announcement set announcement=".$adb->formatString("vtiger_announcement","announcement",$announcement).",time=".$adb->formatString("vtiger_announcement","time",$date_var).",title='announcement' where creatorid=".$current_user->id;
+        else
+                $query="insert into vtiger_announcement values (".$current_user->id.",".$adb->formatString("vtiger_announcement","announcement",$announcement).",'announcement',".$adb->formatString("vtiger_announcement","time",$date_var).")";
+        $result=$adb->query($query);
+        echo $announcement;
+}
 ?>

Modified: vtigercrm/branches/5.0.3/modules/Users/UsersAjax.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/UsersAjax.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/UsersAjax.php Tue Dec 12 01:01:41 2006
@@ -11,27 +11,8 @@
 
 global $current_user;
 global $adb;
-
 if(isset($_REQUEST['file']) && ($_REQUEST['file'] !=''))
 {
 	require_once('modules/Users/'.$_REQUEST['file'].'.php');
 }
-if(isset($_REQUEST['orgajax']) && ($_REQUEST['orgajax'] !=''))
-{
-	require_once('modules/Users/CreateSharingRule.php');	
-}
-elseif(isset($_REQUEST['announce_save']) && ($_REQUEST['announce_save'] != ''))
-{
-	$date_var = date('YmdHis');
-	$announcement = $_REQUEST['announcement'];
-	$title = $_REQUEST['title_announcement'];
-	$sql="select * from vtiger_announcement where creatorid=".$current_user->id;
-	$is_announce=$adb->query($sql);
-	if($adb->num_rows($is_announce) > 0)
-		$query="update vtiger_announcement set announcement=".$adb->formatString("vtiger_announcement","announcement",$announcement).",time=".$adb->formatString("vtiger_announcement","time",$date_var).",title='announcement' where creatorid=".$current_user->id;
-	else
-		$query="insert into vtiger_announcement values (".$current_user->id.",".$adb->formatString("vtiger_announcement","announcement",$announcement).",'announcement',".$adb->formatString("vtiger_announcement","time",$date_var).")";
-	$result=$adb->query($query);
-	echo $announcement;
-}
 ?>