[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] felamimail inc/class.uicompose.inc.php template...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] felamimail inc/class.uicompose.inc.php template... |
|
Date: |
Thu, 11 Oct 2007 13:36:19 +0000 |
CVSROOT: /sources/phpgroupware
Module name: felamimail
Changes by: Dave Hall <skwashd> 07/10/11 13:36:19
Modified files:
inc : class.uicompose.inc.php
templates/base : composeForm.tpl
Log message:
some visual and coding cleanups and fixes
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uicompose.inc.php?cvsroot=phpgroupware&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/composeForm.tpl?cvsroot=phpgroupware&r1=1.3&r2=1.4
Patches:
Index: inc/class.uicompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uicompose.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- inc/class.uicompose.inc.php 24 Feb 2007 21:42:10 -0000 1.13
+++ inc/class.uicompose.inc.php 11 Oct 2007 13:36:19 -0000 1.14
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.uicompose.inc.php,v 1.13 2007/02/24 21:42:10 sigurdne Exp
$ */
+ /* $Id: class.uicompose.inc.php,v 1.14 2007/10/11 13:36:19 skwashd Exp
$ */
class uicompose
{
@@ -27,7 +27,7 @@
function uicompose()
{
- if (!isset($GLOBALS['HTTP_POST_VARS']['composeid']) &&
!isset($GLOBALS['HTTP_GET_VARS']['composeid']))
+ if (!isset($_POST['composeid']) &&
!isset($_GET['composeid']))
{
// create new compose session
$this->bocompose =
CreateObject('felamimail.bocompose');
@@ -36,10 +36,10 @@
else
{
// reuse existing compose session
- if
(isset($GLOBALS['HTTP_POST_VARS']['composeid']))
- $this->composeID =
$GLOBALS['HTTP_POST_VARS']['composeid'];
+ if (isset($_POST['composeid']))
+ $this->composeID = $_POST['composeid'];
else
- $this->composeID =
$GLOBALS['HTTP_GET_VARS']['composeid'];
+ $this->composeID = $_GET['composeid'];
$this->bocompose =
CreateObject('felamimail.bocompose',$this->composeID);
}
@@ -68,25 +68,25 @@
function action()
{
- $formData['to'] =
$this->bocompose->stripSlashes($GLOBALS['HTTP_POST_VARS']['to']);
- $formData['cc'] =
$this->bocompose->stripSlashes($GLOBALS['HTTP_POST_VARS']['cc']);
- $formData['bcc'] =
$this->bocompose->stripSlashes($GLOBALS['HTTP_POST_VARS']['bcc']);
- $formData['reply_to'] =
$this->bocompose->stripSlashes($GLOBALS['HTTP_POST_VARS']['reply_to']);
- $formData['subject'] =
$this->bocompose->stripSlashes($GLOBALS['HTTP_POST_VARS']['subject']);
- $formData['body'] =
$this->bocompose->stripSlashes($GLOBALS['HTTP_POST_VARS']['body']);
- $formData['priority'] =
$this->bocompose->stripSlashes($GLOBALS['HTTP_POST_VARS']['priority']);
- $formData['signature'] =
$this->bocompose->stripSlashes($GLOBALS['HTTP_POST_VARS']['signature']);
- $formData['mailbox'] =
(isset($GLOBALS['HTTP_GET_VARS']['mailbox'])?$GLOBALS['HTTP_GET_VARS']['mailbox']:'');
+ $formData['to'] =
$this->bocompose->stripSlashes($_POST['to']);
+ $formData['cc'] =
$this->bocompose->stripSlashes($_POST['cc']);
+ $formData['bcc'] =
$this->bocompose->stripSlashes($_POST['bcc']);
+ $formData['reply_to'] =
$this->bocompose->stripSlashes($_POST['reply_to']);
+ $formData['subject'] =
$this->bocompose->stripSlashes($_POST['subject']);
+ $formData['body'] =
$this->bocompose->stripSlashes($_POST['body']);
+ $formData['priority'] =
$this->bocompose->stripSlashes($_POST['priority']);
+ $formData['signature'] =
$this->bocompose->stripSlashes($_POST['signature']);
+ $formData['mailbox'] =
(isset($_GET['mailbox'])?$_GET['mailbox']:'');
- if (isset($GLOBALS['HTTP_POST_VARS']['send']))
+ if (isset($_POST['send']))
{
$action="send";
}
- elseif (isset($GLOBALS['HTTP_POST_VARS']['addfile']))
+ elseif (isset($_POST['addfile']))
{
$action="addfile";
}
- elseif (isset($GLOBALS['HTTP_POST_VARS']['removefile']))
+ elseif (isset($_POST['removefile']))
{
$action="removefile";
}
@@ -103,7 +103,7 @@
break;
case "removefile":
- $formData['removeAttachments'] =
$GLOBALS['HTTP_POST_VARS']['attachment'];
+ $formData['removeAttachments'] =
$_POST['attachment'];
$this->bocompose->removeAttachment($formData);
$this->compose();
break;
@@ -118,7 +118,7 @@
$linkData = array
(
'menuaction'=>
'felamimail.uifelamimail.viewMainScreen',
- 'mailbox' =>
isset($GLOBALS['HTTP_GET_VARS']['mailbox']) ?
$GLOBALS['HTTP_GET_VARS']['mailbox'] : '',
+ 'mailbox' =>
isset($_GET['mailbox']) ? $_GET['mailbox'] : '',
'startMessage' => '1'
);
@@ -134,9 +134,9 @@
$sessionData = $this->bocompose->getSessionData();
// is the to address set already?
- if (!empty($GLOBALS['HTTP_GET_VARS']['send_to']))
+ if (!empty($_GET['send_to']))
{
- $sessionData['to'] =
stripslashes(urldecode($GLOBALS['HTTP_GET_VARS']['send_to']));
+ $sessionData['to'] =
stripslashes(urldecode($_GET['send_to']));
}
$this->display_app_header();
@@ -226,7 +226,7 @@
function forward()
{
- $replyID = $GLOBALS['HTTP_GET_VARS']['reply_id'];
+ $replyID = $_GET['reply_id'];
if (!empty($replyID))
{
// this fill the session data with the values
from the original email
@@ -237,7 +237,7 @@
function reply()
{
- $replyID = $GLOBALS['HTTP_GET_VARS']['reply_id'];
+ $replyID = $_GET['reply_id'];
if (!empty($replyID))
{
// this fill the session data with the values
from the original email
@@ -248,7 +248,7 @@
function replyAll()
{
- $replyID = $GLOBALS['HTTP_GET_VARS']['reply_id'];
+ $replyID = $_GET['reply_id'];
if (!empty($replyID))
{
// this fill the session data with the values
from the original email
@@ -278,10 +278,6 @@
$this->t->set_var("lang_high",lang('high'));
$this->t->set_var("lang_low",lang('low'));
$this->t->set_var("lang_signature",lang('signature'));
-
-
$this->t->set_var("bg01",$GLOBALS['phpgw_info']["theme"]["bg01"]);
-
$this->t->set_var("bg02",$GLOBALS['phpgw_info']["theme"]["bg02"]);
-
$this->t->set_var("bg03",$GLOBALS['phpgw_info']["theme"]["bg03"]);
}
}
Index: templates/base/composeForm.tpl
===================================================================
RCS file: /sources/phpgroupware/felamimail/templates/base/composeForm.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- templates/base/composeForm.tpl 22 Dec 2006 10:36:52 -0000 1.3
+++ templates/base/composeForm.tpl 11 Oct 2007 13:36:19 -0000 1.4
@@ -25,7 +25,7 @@
<input class="text" type="submit" value="{lang_send}"
name="send">
</td>
</tr>
-<tr bgcolor="{bg02}">
+<tr class="row_on">
<td class="body" width="10%">
<b>{lang_from}:</b>
</td>
@@ -36,7 +36,7 @@
<input class="text" type="button" value="{lang_addressbook}"
onclick="addybook();">
</td>
</tr>
-<tr bgcolor="{bg01}">
+<tr class="row_off">
<td width="10%">
<b>{lang_to}:</b>
</td>
@@ -44,7 +44,7 @@
<input class="text" type=text size="60" name="to" value="{to}">
</td>
</tr>
-<tr bgcolor="{bg02}">
+<tr class="row_on">
<td>
{lang_cc}:
</td>
@@ -52,7 +52,7 @@
<input class="text" type=text size="60" name="cc" value='{cc}'>
</td>
</tr>
-<tr bgcolor="{bg01}">
+<tr class="row_off">
<td>
{lang_bcc}:
</td>
@@ -60,7 +60,7 @@
<input class="text" type=text size="60" name="bcc"
value='{bcc}'>
</td>
</tr>
-<tr bgcolor="{bg02}">
+<tr class="row_on">
<td>
{lang_reply_to}:
</td>
@@ -68,7 +68,7 @@
<input class="text" type=text size="60" name="reply_to"
value='{reply_to}'>
</td>
</tr>
-<tr bgcolor="{bg01}">
+<tr class="row_off">
<td>
<b>{lang_subject}:</b>
</td>
@@ -97,7 +97,7 @@
<!-- BEGIN body_input -->
<table width="98%" border="0" cellspacing="0" cellpading="0">
-<tr bgcolor="{bg02}">
+<tr class="row_on">
<td>
<br>
</td>
@@ -105,7 +105,7 @@
{errorInfo}<br>
</td>
</tr>
-<tr bgcolor="{bg02}">
+<tr class="row_off">
<td width="10%">
</td>
@@ -113,7 +113,7 @@
<TEXTAREA class="text" NAME=body ROWS=20 COLS="76"
WRAP=HARD>{body}</TEXTAREA>
</td>
</tr>
-<tr bgcolor="{bg02}">
+<tr class="row_on">
<td width="10%" valign="top">
{lang_signature}
</td>
@@ -121,7 +121,7 @@
<TEXTAREA class="text" NAME=signature ROWS=5 COLS="76"
WRAP=HARD>{signature}</TEXTAREA>
</td>
</tr>
-<tr bgcolor="{bg02}">
+<tr class="row_off">
<td colspan="2">
<br>
</td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] felamimail inc/class.uicompose.inc.php template...,
Dave Hall <=