[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13903] felamimail: rename constructor
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [13903] felamimail: rename constructor |
|
Date: |
Tue, 15 Sep 2015 10:32:02 +0000 |
Revision: 13903
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13903
Author: sigurdne
Date: 2015-09-15 10:32:01 +0000 (Tue, 15 Sep 2015)
Log Message:
-----------
felamimail: rename constructor
Modified Paths:
--------------
trunk/felamimail/inc/class.Script.inc.php
trunk/felamimail/inc/class.ajax_contacts.inc.php
trunk/felamimail/inc/class.ajaxfelamimail.inc.php
trunk/felamimail/inc/class.bocaching.inc.php
trunk/felamimail/inc/class.bocompose.inc.php
trunk/felamimail/inc/class.bofelamimail.inc.php
trunk/felamimail/inc/class.bofilter.inc.php
trunk/felamimail/inc/class.bopreferences.inc.php
trunk/felamimail/inc/class.bosieve.inc.php
trunk/felamimail/inc/class.felamimail_bosignatures.inc.php
trunk/felamimail/inc/class.felamimail_signatures.inc.php
trunk/felamimail/inc/class.htmlfilter.inc.php
trunk/felamimail/inc/class.kses.inc.php
trunk/felamimail/inc/class.socaching.inc.php
trunk/felamimail/inc/class.sofelamimail.inc.php
trunk/felamimail/inc/class.sofilter.inc.php
trunk/felamimail/inc/class.sopreferences.inc.php
trunk/felamimail/inc/class.transformdate.inc.php
trunk/felamimail/inc/class.uibaseclass.inc.php
trunk/felamimail/inc/class.uicompose.inc.php
trunk/felamimail/inc/class.uidisplay.inc.php
trunk/felamimail/inc/class.uifelamimail.inc.php
trunk/felamimail/inc/class.uifilter.inc.php
trunk/felamimail/inc/class.uipreferences.inc.php
trunk/felamimail/inc/class.uisieve.inc.php
trunk/felamimail/inc/class.uiwidgets.inc.php
trunk/felamimail/inc/xajax.inc.php
trunk/felamimail/inc/xajaxResponse.inc.php
Modified: trunk/felamimail/inc/class.Script.inc.php
===================================================================
--- trunk/felamimail/inc/class.Script.inc.php 2015-09-15 10:21:26 UTC (rev
13902)
+++ trunk/felamimail/inc/class.Script.inc.php 2015-09-15 10:32:01 UTC (rev
13903)
@@ -28,7 +28,7 @@
var $debug=false;
// class constructor
- function Script ($scriptname) {
+ function __construct ($scriptname) {
$this->name = $scriptname;
$this->script = '';
$this->size = 0;
Modified: trunk/felamimail/inc/class.ajax_contacts.inc.php
===================================================================
--- trunk/felamimail/inc/class.ajax_contacts.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.ajax_contacts.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -16,7 +16,7 @@
phpgw::import_class('phpgwapi.sql_criteria');
class ajax_contacts {
- function ajax_contacts() {
+ function __construct() {
$GLOBALS['phpgw']->session->commit_session();
$this->charset = 'utf-8';
$this->translation =
createObject('felamimail.translation');
Modified: trunk/felamimail/inc/class.ajaxfelamimail.inc.php
===================================================================
--- trunk/felamimail/inc/class.ajaxfelamimail.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.ajaxfelamimail.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -28,7 +28,7 @@
// boolean if openConnection was successfull or not
var $_connectionStatus;
- function ajaxfelamimail()
+ function __construct()
{
if($this->_debug)
error_log("ajaxfelamimail::ajaxfelamimail");
$this->charset = 'utf-8';
@@ -1061,4 +1061,4 @@
}
}
-?>
+
Modified: trunk/felamimail/inc/class.bocaching.inc.php
===================================================================
--- trunk/felamimail/inc/class.bocaching.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.bocaching.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -31,7 +31,7 @@
var $uidnext; // the next uid to be used in the
mailbox
var $uidvalidity; // the next uid to be used in the
mailbox
- function bocaching($_hostname, $_accountname, $_foldername)
+ function __construct($_hostname, $_accountname, $_foldername)
{
$this->hostname = $_hostname;
$this->accountname = $_accountname;
@@ -153,4 +153,3 @@
}
-?>
Modified: trunk/felamimail/inc/class.bocompose.inc.php
===================================================================
--- trunk/felamimail/inc/class.bocompose.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.bocompose.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -23,7 +23,7 @@
var $attachments; // Array of attachments
var $preferences; // the prefenrences(emailserver,
username, ...)
- function bocompose($_composeID = '', $_charSet = 'utf-8')
+ function __construct($_composeID = '', $_charSet = 'utf-8')
{
$this->displayCharset = strtolower($_charSet);
$this->bopreferences =&
CreateObject('felamimail.bopreferences');
Modified: trunk/felamimail/inc/class.bofelamimail.inc.php
===================================================================
--- trunk/felamimail/inc/class.bofelamimail.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.bofelamimail.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -58,7 +58,7 @@
*/
var $autoFolders = array('Drafts', 'Junk', 'Sent', 'Trash',
'Templates');
- function bofelamimail($_displayCharset='utf-8')
+ function __construct($_displayCharset='utf-8')
{
$this->restoreSessionData();
Modified: trunk/felamimail/inc/class.bofilter.inc.php
===================================================================
--- trunk/felamimail/inc/class.bofilter.inc.php 2015-09-15 10:21:26 UTC (rev
13902)
+++ trunk/felamimail/inc/class.bofilter.inc.php 2015-09-15 10:32:01 UTC (rev
13903)
@@ -21,7 +21,7 @@
'flagMessages' => True
);
- function bofilter()
+ function __construct()
{
$this->accountid =
$GLOBALS['phpgw_info']['user']['account_id'];
@@ -168,4 +168,3 @@
}
}
-?>
Modified: trunk/felamimail/inc/class.bopreferences.inc.php
===================================================================
--- trunk/felamimail/inc/class.bopreferences.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.bopreferences.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -25,7 +25,7 @@
// stores the users profile
var $profileData;
- function bopreferences()
+ function __construct()
{
parent::sopreferences();
$this->boemailadmin =
CreateObject('emailadmin.emailadmin_bo');
@@ -295,4 +295,4 @@
parent::setProfileActive($GLOBALS['phpgw_info']['user']['account_id'],
$_status, $_identity);
}
}
-?>
+
Modified: trunk/felamimail/inc/class.bosieve.inc.php
===================================================================
--- trunk/felamimail/inc/class.bosieve.inc.php 2015-09-15 10:21:26 UTC (rev
13902)
+++ trunk/felamimail/inc/class.bosieve.inc.php 2015-09-15 10:32:01 UTC (rev
13903)
@@ -37,7 +37,7 @@
*/
var $debug = false;
- function bosieve($_icServer=null)
+ function __construct($_icServer=null)
{
parent::Net_Sieve();
@@ -186,5 +186,4 @@
return false;
}
- }
-?>
+ }
\ No newline at end of file
Modified: trunk/felamimail/inc/class.felamimail_bosignatures.inc.php
===================================================================
--- trunk/felamimail/inc/class.felamimail_bosignatures.inc.php 2015-09-15
10:21:26 UTC (rev 13902)
+++ trunk/felamimail/inc/class.felamimail_bosignatures.inc.php 2015-09-15
10:32:01 UTC (rev 13903)
@@ -17,7 +17,7 @@
class felamimail_bosignatures
{
- function felamimail_bosignatures() {
+ function __construct() {
$boemailadmin = new emailadmin_bo();
$this->profileData =
$boemailadmin->getUserProfile('felamimail');
}
@@ -145,4 +145,3 @@
}
}
-?>
Modified: trunk/felamimail/inc/class.felamimail_signatures.inc.php
===================================================================
--- trunk/felamimail/inc/class.felamimail_signatures.inc.php 2015-09-15
10:21:26 UTC (rev 13902)
+++ trunk/felamimail/inc/class.felamimail_signatures.inc.php 2015-09-15
10:32:01 UTC (rev 13903)
@@ -24,7 +24,7 @@
var $fm_defaultsignature = NULL;
- function felamimail_signatures($_signatureID = NULL) {
+ function __construct($_signatureID = NULL) {
$this->accountID =
$GLOBALS['phpgw_info']['user']['account_id'];
if($_signatureID !== NULL) {
@@ -166,4 +166,3 @@
return $signatures;
}
}
-?>
Modified: trunk/felamimail/inc/class.htmlfilter.inc.php
===================================================================
--- trunk/felamimail/inc/class.htmlfilter.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.htmlfilter.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -991,4 +991,3 @@
}
// class end
}
-?>
Modified: trunk/felamimail/inc/class.kses.inc.php
===================================================================
--- trunk/felamimail/inc/class.kses.inc.php 2015-09-15 10:21:26 UTC (rev
13902)
+++ trunk/felamimail/inc/class.kses.inc.php 2015-09-15 10:32:01 UTC (rev
13903)
@@ -47,7 +47,7 @@
var $allowed_protocols = array('http', 'https', 'ftp', 'news',
'nntp', 'telnet', 'gopher', 'mailto');
var $allowed_html = array();
- function kses()
+ function __construct()
{
}
@@ -683,4 +683,4 @@
return '0.0.2 (OOP fork of kses 0.2.1)';
} # function _version
}
-?>
+
Modified: trunk/felamimail/inc/class.socaching.inc.php
===================================================================
--- trunk/felamimail/inc/class.socaching.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.socaching.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -24,7 +24,7 @@
var $folder_table = 'egw_felamimail_folderstatus';
var
$hostname,$accountname,$foldername,$accountid,$host_account_folder; // set by
the constructor
- function socaching($_hostname, $_accountname, $_foldername,
$_accountid)
+ function __construct($_hostname, $_accountname, $_foldername,
$_accountid)
{
$this->hostname = $_hostname;
$this->accountname = $_accountname;
@@ -278,4 +278,4 @@
$this->db->insert($this->folder_table,$data,$this->host_account_folder,__LINE__,__FILE__);
}
}
-?>
+
Modified: trunk/felamimail/inc/class.sofelamimail.inc.php
===================================================================
--- trunk/felamimail/inc/class.sofelamimail.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.sofelamimail.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -15,7 +15,7 @@
class sofelamimail
{
- function sofelamimail()
+ function __construct()
{
#$this->bopreferences =&
CreateObject('felamimail.bopreferences');
}
@@ -34,5 +34,3 @@
return $retValue;
}
}
-
-?>
Modified: trunk/felamimail/inc/class.sofilter.inc.php
===================================================================
--- trunk/felamimail/inc/class.sofilter.inc.php 2015-09-15 10:21:26 UTC (rev
13902)
+++ trunk/felamimail/inc/class.sofilter.inc.php 2015-09-15 10:32:01 UTC (rev
13903)
@@ -24,7 +24,7 @@
*/
var $filter_table = 'egw_felamimail_displayfilter'; // only
reference to table-prefix
- function sofilter()
+ function __construct()
{
$this->accountid =
$GLOBALS['phpgw_info']['user']['account_id'];
// $this->db = clone($GLOBALS['phpgw']->db);
@@ -56,4 +56,4 @@
}
}
}
-?>
+
Modified: trunk/felamimail/inc/class.sopreferences.inc.php
===================================================================
--- trunk/felamimail/inc/class.sopreferences.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.sopreferences.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -23,7 +23,7 @@
*/
var $db;
- function sopreferences()
+ function __construct()
{
// $this->db = clone($GLOBALS['phpgw']->db);
$this->db = CreateObject('felamimail.egw_db');
@@ -127,4 +127,4 @@
), $where,__LINE__,__FILE__,'felamimail');
}
}
-?>
+
Modified: trunk/felamimail/inc/class.transformdate.inc.php
===================================================================
--- trunk/felamimail/inc/class.transformdate.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.transformdate.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -160,4 +160,3 @@
return ($mtime);
}
}
-?>
Modified: trunk/felamimail/inc/class.uibaseclass.inc.php
===================================================================
--- trunk/felamimail/inc/class.uibaseclass.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.uibaseclass.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -74,4 +74,3 @@
}
}
-?>
Modified: trunk/felamimail/inc/class.uicompose.inc.php
===================================================================
--- trunk/felamimail/inc/class.uicompose.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.uicompose.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -39,7 +39,7 @@
'folder' => 'folder'
);
- function uicompose()
+ function __construct()
{
$GLOBALS['phpgw_info']['flags']['noframework'] = true;
require_once(PHPGW_SERVER_ROOT.'/felamimail/inc/xajax.inc.php');
@@ -574,5 +574,3 @@
}
}
-
-?>
Modified: trunk/felamimail/inc/class.uidisplay.inc.php
===================================================================
--- trunk/felamimail/inc/class.uidisplay.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.uidisplay.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -56,7 +56,7 @@
// the permanent id of the message
var $uid;
- function uidisplay()
+ function __construct()
{
$GLOBALS['phpgw_info']['flags']['noframework'] = true;
$GLOBALS['phpgw']->js->validate_file('jsapi', 'jsapi',
'felamimail');
@@ -1372,4 +1372,3 @@
}
}
-?>
Modified: trunk/felamimail/inc/class.uifelamimail.inc.php
===================================================================
--- trunk/felamimail/inc/class.uifelamimail.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.uifelamimail.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -42,7 +42,7 @@
// the object storing the data about the incoming imap server
var $icServerID=0;
- function uifelamimail()
+ function __construct()
{
require_once(PHPGW_SERVER_ROOT.'/felamimail/inc/xajax.inc.php');
@@ -885,4 +885,3 @@
$this->t->set_var('lang_updating_view',lang('updating
view'));
}
}
-?>
Modified: trunk/felamimail/inc/class.uifilter.inc.php
===================================================================
--- trunk/felamimail/inc/class.uifilter.inc.php 2015-09-15 10:21:26 UTC (rev
13902)
+++ trunk/felamimail/inc/class.uifilter.inc.php 2015-09-15 10:32:01 UTC (rev
13903)
@@ -22,7 +22,7 @@
'saveFilter' => 'True'
);
- function uifilter()
+ function __construct()
{
// get posted variables
Modified: trunk/felamimail/inc/class.uipreferences.inc.php
===================================================================
--- trunk/felamimail/inc/class.uipreferences.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.uipreferences.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -33,7 +33,7 @@
'getAttachment' => 'True'
);
- function uipreferences()
+ function __construct()
{
require_once(PHPGW_SERVER_ROOT.'/felamimail/inc/xajax.inc.php');
@@ -743,5 +743,3 @@
$this->t->set_var("bg03",$GLOBALS['phpgw_info']["theme"]["bg03"]);
}
}
-
-?>
Modified: trunk/felamimail/inc/class.uisieve.inc.php
===================================================================
--- trunk/felamimail/inc/class.uisieve.inc.php 2015-09-15 10:21:26 UTC (rev
13902)
+++ trunk/felamimail/inc/class.uisieve.inc.php 2015-09-15 10:32:01 UTC (rev
13903)
@@ -50,7 +50,7 @@
var $errorStack;
- function uisieve()
+ function __construct()
{
if(empty($GLOBALS['phpgw_info']['user']['preferences']['felamimail']['sieveScriptName']))
{
$GLOBALS['phpgw']->preferences->add('felamimail','sieveScriptName','felamimail',
'forced');
@@ -1071,4 +1071,3 @@
}
}
}
-?>
Modified: trunk/felamimail/inc/class.uiwidgets.inc.php
===================================================================
--- trunk/felamimail/inc/class.uiwidgets.inc.php 2015-09-15 10:21:26 UTC
(rev 13902)
+++ trunk/felamimail/inc/class.uiwidgets.inc.php 2015-09-15 10:32:01 UTC
(rev 13903)
@@ -51,7 +51,7 @@
* the contructor
*
*/
- function uiwidgets()
+ function __construct()
{
$template =&
CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
$this->template = $template;
@@ -645,4 +645,3 @@
return $this->t->get('out','quota_block');
}
}
-?>
Modified: trunk/felamimail/inc/xajax.inc.php
===================================================================
--- trunk/felamimail/inc/xajax.inc.php 2015-09-15 10:21:26 UTC (rev 13902)
+++ trunk/felamimail/inc/xajax.inc.php 2015-09-15 10:32:01 UTC (rev 13903)
@@ -174,7 +174,7 @@
*/
// RalfBecker: using the not yet defined constant XAJAX_DEFAULT_CHAR_ENCODING,
results in a warning, which messes up the xml
// function
xajax($sRequestURI="",$sWrapperPrefix="xajax_",$sEncoding=XAJAX_DEFAULT_CHAR_ENCODING,$bDebug=false)
- function
xajax($sRequestURI="",$sWrapperPrefix="xajax_",$sEncoding='utf-8',$bDebug=false)
+ function
__construct($sRequestURI="",$sWrapperPrefix="xajax_",$sEncoding='utf-8',$bDebug=false)
{
$this->aFunctions = array();
$this->aObjects = array();
Modified: trunk/felamimail/inc/xajaxResponse.inc.php
===================================================================
--- trunk/felamimail/inc/xajaxResponse.inc.php 2015-09-15 10:21:26 UTC (rev
13902)
+++ trunk/felamimail/inc/xajaxResponse.inc.php 2015-09-15 10:32:01 UTC (rev
13903)
@@ -99,7 +99,7 @@
* converted to HTML entities
*
*/
- function xajaxResponse($sEncoding=XAJAX_DEFAULT_CHAR_ENCODING,
$bOutputEntities=false)
+ function __construct($sEncoding=XAJAX_DEFAULT_CHAR_ENCODING,
$bOutputEntities=false)
{
$this->setCharEncoding($sEncoding);
$this->bOutputEntities = $bOutputEntities;
@@ -576,5 +576,4 @@
}
}
-}// end class xajaxResponse
-?>
+}// end class xajaxResponse
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13903] felamimail: rename constructor,
Sigurd Nes <=