[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13891] API: rename constructor, preparing for PHP 7
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [13891] API: rename constructor, preparing for PHP 7 |
|
Date: |
Mon, 14 Sep 2015 19:31:32 +0000 |
Revision: 13891
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13891
Author: sigurdne
Date: 2015-09-14 19:31:31 +0000 (Mon, 14 Sep 2015)
Log Message:
-----------
API: rename constructor, preparing for PHP 7
Modified Paths:
--------------
trunk/phpgwapi/inc/class.Mail_mimeDecode.inc.php
trunk/phpgwapi/inc/class.Services_JSON.inc.php
trunk/phpgwapi/inc/class.Template.inc.php
trunk/phpgwapi/inc/class.Template_experimental.inc.php
trunk/phpgwapi/inc/class.arrayfunctions.inc.php
trunk/phpgwapi/inc/class.bojsaddressbook.inc.php
trunk/phpgwapi/inc/class.calendar_holidays.inc.php
trunk/phpgwapi/inc/class.clientsniffer.inc.php
trunk/phpgwapi/inc/class.contact_accounts.inc.php
trunk/phpgwapi/inc/class.contact_addr.inc.php
trunk/phpgwapi/inc/class.contact_addr_type.inc.php
trunk/phpgwapi/inc/class.contact_categories.inc.php
trunk/phpgwapi/inc/class.contact_central.inc.php
trunk/phpgwapi/inc/class.contact_comm.inc.php
trunk/phpgwapi/inc/class.contact_comm_descr.inc.php
trunk/phpgwapi/inc/class.contact_comm_type.inc.php
trunk/phpgwapi/inc/class.contact_note.inc.php
trunk/phpgwapi/inc/class.contact_note_type.inc.php
trunk/phpgwapi/inc/class.contact_org.inc.php
trunk/phpgwapi/inc/class.contact_org_person.inc.php
trunk/phpgwapi/inc/class.contact_others.inc.php
trunk/phpgwapi/inc/class.contact_person.inc.php
trunk/phpgwapi/inc/class.contact_types.inc.php
trunk/phpgwapi/inc/class.contacts_sql.inc.php
trunk/phpgwapi/inc/class.crypto.inc.php
trunk/phpgwapi/inc/class.csstooltip.inc.php
trunk/phpgwapi/inc/class.data_cleaner.inc.php
trunk/phpgwapi/inc/class.error.inc.php
trunk/phpgwapi/inc/class.gdbutton.inc.php
trunk/phpgwapi/inc/class.gdgraph.inc.php
trunk/phpgwapi/inc/class.gdimage.inc.php
trunk/phpgwapi/inc/class.html2text.inc.php
trunk/phpgwapi/inc/class.http.inc.php
trunk/phpgwapi/inc/class.http_svn_client.inc.php
trunk/phpgwapi/inc/class.interserver.inc.php
trunk/phpgwapi/inc/class.ipc_manager.inc.php
trunk/phpgwapi/inc/class.jscalendar.inc.php
trunk/phpgwapi/inc/class.listbox.inc.php
trunk/phpgwapi/inc/class.log_message.inc.php
trunk/phpgwapi/inc/class.mail_handlers.inc.php
trunk/phpgwapi/inc/class.matrixview.inc.php
trunk/phpgwapi/inc/class.menutree.inc.php
trunk/phpgwapi/inc/class.net_http_client.inc.php
trunk/phpgwapi/inc/class.network.inc.php
trunk/phpgwapi/inc/class.nextmatchs_xslt.inc.php
trunk/phpgwapi/inc/class.ping.inc.php
trunk/phpgwapi/inc/class.portalbox.inc.php
trunk/phpgwapi/inc/class.resultbox.inc.php
trunk/phpgwapi/inc/class.rssparser.inc.php
trunk/phpgwapi/inc/class.schema_proc.inc.php
trunk/phpgwapi/inc/class.schema_proc_array.inc.php
trunk/phpgwapi/inc/class.schema_proc_mssql.inc.php
trunk/phpgwapi/inc/class.schema_proc_oracle.inc.php
trunk/phpgwapi/inc/class.schema_proc_pgsql.inc.php
trunk/phpgwapi/inc/class.schema_proc_sapdb.inc.php
trunk/phpgwapi/inc/class.send.inc.php
trunk/phpgwapi/inc/class.service_contacts.inc.php
trunk/phpgwapi/inc/class.service_notes.inc.php
trunk/phpgwapi/inc/class.service_schedule.inc.php
trunk/phpgwapi/inc/class.sql_builder.inc.php
trunk/phpgwapi/inc/class.sql_entity.inc.php
trunk/phpgwapi/inc/class.template_portico.inc.php
trunk/phpgwapi/inc/class.ui_tools.inc.php
trunk/phpgwapi/inc/class.uijsaddressbook.inc.php
trunk/phpgwapi/inc/class.vcard.inc.php
trunk/phpgwapi/inc/class.xml.inc.php
Modified: trunk/phpgwapi/inc/class.Mail_mimeDecode.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.Mail_mimeDecode.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.Mail_mimeDecode.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -130,7 +130,7 @@
* @param string The input to decode
* @access public
*/
- function Mail_mimeDecode($input)
+ function __construct($input)
{
list($header, $body) = $this->_splitBodyHeader($input);
Modified: trunk/phpgwapi/inc/class.Services_JSON.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.Services_JSON.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.Services_JSON.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -132,7 +132,7 @@
* bubble up with an error, so all return
values
* from encode() should be checked with
isError()
*/
- function Services_JSON($use = 0)
+ function __construct($use = 0)
{
$this->use = $use;
}
Modified: trunk/phpgwapi/inc/class.Template.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.Template.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.Template.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -160,7 +160,7 @@
* @access public
* @return void
*/
- function Template($root = ".", $unknowns = "remove") {
+ function __construct($root = ".", $unknowns = "remove") {
if ($this->debug & 4) {
echo "<p><b>Template:</b> root = $root, unknowns =
$unknowns</p>\n";
}
Modified: trunk/phpgwapi/inc/class.Template_experimental.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.Template_experimental.inc.php 2015-09-14
15:59:28 UTC (rev 13890)
+++ trunk/phpgwapi/inc/class.Template_experimental.inc.php 2015-09-14
19:31:31 UTC (rev 13891)
@@ -53,7 +53,7 @@
* root: template directory.
* unknowns: how to handle unknown variables.
*/
- function Template($root = '.', $unknowns = 'remove')
+ function __construct($root = '.', $unknowns = 'remove')
{
$this->set_root($root);
$this->set_unknowns($unknowns);
Modified: trunk/phpgwapi/inc/class.arrayfunctions.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.arrayfunctions.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.arrayfunctions.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -18,7 +18,7 @@
*/
class arrayfunctions
{
- function arrayfunctions($vars='')
+ function __construct($vars='')
{
}
Modified: trunk/phpgwapi/inc/class.bojsaddressbook.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.bojsaddressbook.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.bojsaddressbook.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -139,7 +139,7 @@
* compare it with what results from parsing the incoming
contactquery. If its the same,
* we shouldnt refetch.
*/
- function bojsaddressbook($contactquery="",$queryresults="")
+ function __construct($contactquery="",$queryresults="")
{
$this->contactsobject =
createObject('phpgwapi.contacts');
$this->boaddressbook =
createObject('addressbook.boaddressbook');
Modified: trunk/phpgwapi/inc/class.calendar_holidays.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.calendar_holidays.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.calendar_holidays.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -40,7 +40,7 @@
*
* @static
*/
- function calendar_holidays()
+ function __construct()
{
}
Modified: trunk/phpgwapi/inc/class.clientsniffer.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.clientsniffer.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.clientsniffer.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -83,7 +83,7 @@
/**
* Constructor
*/
- function clientsniffer()
+ function __construct()
{
$this->UA = $_SERVER['HTTP_USER_AGENT'];
Modified: trunk/phpgwapi/inc/class.contact_accounts.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_accounts.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.contact_accounts.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -46,7 +46,7 @@
'person_only' => array('criteria'
=> ''),
'is_user' => array('select'
=> ''));
- function contact_accounts ($ali = '', $field = '', $criteria =
'')
+ function __construct ($ali = '', $field = '', $criteria =
'')
{
$this->_constructor('phpgw_accounts',
'contact_accounts');
if($field)
Modified: trunk/phpgwapi/inc/class.contact_addr.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_addr.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.contact_addr.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -242,7 +242,7 @@
var $secondary_set;
- function contact_addr ($ali = '', $field = '', $criteria = '')
+ function __construct ($ali = '', $field = '', $criteria = '')
{
$this->_constructor('phpgw_contact_addr',
'contact_addr');
if($field)
Modified: trunk/phpgwapi/inc/class.contact_addr_type.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_addr_type.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.contact_addr_type.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -44,7 +44,7 @@
'field' =>
'description',
'type'
=> 'string'));
- function contact_addr_type ($ali = '', $field =
'', $criteria = '')
+ function __construct ($ali = '', $field = '',
$criteria = '')
{
$this->_constructor('phpgw_contact_addr_type', 'contact_addr_type');
if($field)
Modified: trunk/phpgwapi/inc/class.contact_categories.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_categories.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.contact_categories.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -45,7 +45,7 @@
'type'
=> 'integer'));
- function contact_categories ($ali = '', $field = '', $criteria
= '')
+ function __construct ($ali = '', $field = '', $criteria =
'')
{
$this->_constructor('phpgw_categories',
'contact_categories');
if($field)
Modified: trunk/phpgwapi/inc/class.contact_central.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_central.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.contact_central.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -93,7 +93,7 @@
- function contact_central ($ali = '', $field = '', $criteria =
'')
+ function __construct ($ali = '', $field = '', $criteria =
'')
{
$this->_constructor('phpgw_contact', 'contact_central');
Modified: trunk/phpgwapi/inc/class.contact_comm.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_comm.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.contact_comm.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -235,7 +235,7 @@
'sort'
=> '',
'field'
=> 'comm_data'));
- function contact_comm ($ali = '', $field = '', $criteria =
'')
+ function __construct ($ali = '', $field = '', $criteria =
'')
{
$this->_constructor('phpgw_contact_comm',
'contact_comm');
if($field)
Modified: trunk/phpgwapi/inc/class.contact_comm_descr.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_comm_descr.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.contact_comm_descr.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -59,7 +59,7 @@
'sort'
=> '',
'field'
=> 'descr'));
- function contact_comm_descr ($ali = '', $field = '', $criteria
= '')
+ function __construct ($ali = '', $field = '', $criteria =
'')
{
$this->_constructor('phpgw_contact_comm_descr',
'contact_comm_descr');
if($field)
Modified: trunk/phpgwapi/inc/class.contact_comm_type.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_comm_type.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.contact_comm_type.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -61,7 +61,7 @@
'type' =>
'string'));
- function contact_comm_type ($ali = '', $field = '', $criteria =
'')
+ function __construct ($ali = '', $field = '', $criteria = '')
{
$this->_constructor('phpgw_contact_comm_type',
'contact_comm_type');
if($field)
Modified: trunk/phpgwapi/inc/class.contact_note.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_note.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.contact_note.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -101,7 +101,7 @@
'type'
=> 'string'));
- function contact_note ($ali = '', $field = '', $criteria =
'')
+ function __construct ($ali = '', $field = '', $criteria =
'')
{
$this->_constructor('phpgw_contact_note',
'contact_note');
if($field)
Modified: trunk/phpgwapi/inc/class.contact_note_type.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_note_type.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.contact_note_type.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -44,7 +44,7 @@
'field'
=> 'description',
'type'
=> 'string'));
- function contact_note_type ($ali = '', $field = '', $criteria =
'')
+ function __construct ($ali = '', $field = '', $criteria =
'')
{
$this->_constructor('phpgw_contact_note_type',
'contact_note_type');
if($field)
Modified: trunk/phpgwapi/inc/class.contact_org.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_org.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.contact_org.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -109,7 +109,7 @@
'organizations'=> array('select' =>
'relink_org_person'),
'orgs_local' => array('select' =>
'relink_org_person'));
- function contact_org ($ali = '', $field = '', $criteria =
'')
+ function __construct ($ali = '', $field = '', $criteria =
'')
{
$this->_constructor('phpgw_contact_org', 'contact_org');
if($field)
Modified: trunk/phpgwapi/inc/class.contact_org_person.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_org_person.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.contact_org_person.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -78,7 +78,7 @@
'people_org_person' => array('select' =>
'relink_person'),
'organizations_org_person' => array('select' =>
'relink_org'));
- function contact_org_person ($ali = '', $field = '', $criteria
= '')
+ function __construct ($ali = '', $field = '', $criteria = '')
{
$this->_constructor('phpgw_contact_org_person',
'contact_org_person');
if($field)
Modified: trunk/phpgwapi/inc/class.contact_others.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_others.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.contact_others.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -111,7 +111,7 @@
'field'
=> ''));
- function contact_others ($ali = '', $field = '', $criteria =
'')
+ function __construct ($ali = '', $field = '', $criteria =
'')
{
$this->_constructor('phpgw_contact_others',
'contact_others');
if($field)
Modified: trunk/phpgwapi/inc/class.contact_person.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_person.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.contact_person.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -282,7 +282,7 @@
'people' => array('select'
=> 'relink_org_person'),
'people_local' => array('select'
=> 'relink_org_person'));
- function contact_person ($ali = '', $field = '', $criteria =
'')
+ function __construct ($ali = '', $field = '', $criteria =
'')
{
$this->_constructor('phpgw_contact_person',
'contact_person');
if($field)
Modified: trunk/phpgwapi/inc/class.contact_types.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_types.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.contact_types.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -52,7 +52,7 @@
'field'
=> '',
'type'
=> 'string'));
- function contact_types ($ali = '', $field = '', $criteria =
'')
+ function __construct ($ali = '', $field = '', $criteria =
'')
{
$this->_constructor('phpgw_contact_types',
'contact_types');
if($field)
Modified: trunk/phpgwapi/inc/class.contacts_sql.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contacts_sql.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.contacts_sql.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -613,7 +613,7 @@
*/
var $trans = False;
- function contacts_($session=True)
+ function __construct($session=True)
{
$this->db = &$GLOBALS['phpgw']->db;
if(!is_object($GLOBALS['phpgw']->session))
Modified: trunk/phpgwapi/inc/class.crypto.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.crypto.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.crypto.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -26,7 +26,7 @@
var $iv = '';
var $key = '';
- function crypto($vars='')
+ function __construct($vars='')
{
if(is_array($vars))
{
Modified: trunk/phpgwapi/inc/class.csstooltip.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.csstooltip.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.csstooltip.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -31,7 +31,7 @@
*
* @access public
*/
- function csstooltip()
+ function __construct()
{
if(!is_object($GLOBALS['phpgw']->css))
{
Modified: trunk/phpgwapi/inc/class.data_cleaner.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.data_cleaner.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.data_cleaner.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -33,7 +33,7 @@
*
* @param string $data the data to be cleaned
*/
- function data_cleaner($data = '')
+ function __construct($data = '')
{
$this->data = $data;
}
Modified: trunk/phpgwapi/inc/class.error.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.error.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.error.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -41,7 +41,7 @@
return lang($this->msg,$this->parms);
}
- function error($parms)
+ function __construct($parms)
{
if ($parms == '')
{
Modified: trunk/phpgwapi/inc/class.gdbutton.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.gdbutton.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.gdbutton.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -32,7 +32,7 @@
var $url_base;
- function gdbutton()
+ function __construct()
{
$this->image = 0;
$this->font_size = 0;
Modified: trunk/phpgwapi/inc/class.gdgraph.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.gdgraph.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.gdgraph.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -38,7 +38,7 @@
var $margin_right;
var $img;
- function gdgraph($debug = False)
+ function __construct($debug = False)
{
$this->debug = $debug;
Modified: trunk/phpgwapi/inc/class.gdimage.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.gdimage.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.gdimage.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -31,7 +31,7 @@
var $font;
var $temp_file;
- function gdimage()
+ function __construct()
{
$this->gd = $this->check_gd();
Modified: trunk/phpgwapi/inc/class.html2text.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.html2text.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.html2text.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -253,7 +253,7 @@
* @access public
* @return void
*/
- function html2text( $source = '', $from_file = false )
+ function __construct( $source = '', $from_file = false )
{
if ( !empty($source) ) {
$this->set_html($source, $from_file);
Modified: trunk/phpgwapi/inc/class.http.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.http.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.http.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -53,7 +53,7 @@
'Dec' => '12'
);
- function http()
+ function __construct()
{
$this->user_agent = 'phpGroupWare HTTP client v' .
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi'];
}
Modified: trunk/phpgwapi/inc/class.http_svn_client.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.http_svn_client.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.http_svn_client.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -34,7 +34,7 @@
var $cdata;
var $logentry;
- function SVNParser()
+ function __construct()
{
$this->xml = xml_parser_create();
xml_set_object($this->xml,$this);
Modified: trunk/phpgwapi/inc/class.interserver.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.interserver.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.interserver.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -75,7 +75,7 @@
'SOAP' => 'soap'
);
- function interserver($serverid='')
+ function __construct($serverid='')
{
$this->urlparts = array(
'xmlrpc' =>
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/xmlrpc.php?domain=default",
Modified: trunk/phpgwapi/inc/class.ipc_manager.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.ipc_manager.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.ipc_manager.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -33,7 +33,7 @@
/**
* constructor
*/
- function ipc_manager()
+ function __construct()
{
$this->_ipcObjectList = array();
$this->xmlrpc_methods = array();
Modified: trunk/phpgwapi/inc/class.jscalendar.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.jscalendar.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.jscalendar.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -25,7 +25,7 @@
*
* @param $do_header if true, necessary javascript and css gets loaded,
only needed for input
*/
- function jscalendar($do_header=True)
+ function __construct($do_header=True)
{
$GLOBALS['phpgw']->js->validate_file('jscalendar',
'calendar_stripped');
$this->phpgw_js_url =
$GLOBALS['phpgw_info']['server']['webserver_url'].'/phpgwapi/js';
Modified: trunk/phpgwapi/inc/class.listbox.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.listbox.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.listbox.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -34,7 +34,7 @@
the parent class, I simply call the parent constructor. Of
course,
if I then wanted to override any of the values, I could easily
do so.
*/
- function listbox($param)
+ function __construct($param)
{
$this->setvar('classname','listbox');
$this->setvar('outerwidth',300);
@@ -54,7 +54,7 @@
$this->setvar($key, $value);
}
}
- $this->portalbox($param['title'], $param['primary'],
$param['secondary'], $param['tertiary']);
+ parent::__construct($param['title'], $param['primary'],
$param['secondary'], $param['tertiary']);
$this->start_template();
}
Modified: trunk/phpgwapi/inc/class.log_message.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.log_message.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.log_message.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -30,7 +30,7 @@
var $public_functions = array();
- function log_message($parms)
+ function __construct($parms)
{
if ($parms == '')
{
Modified: trunk/phpgwapi/inc/class.mail_handlers.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.mail_handlers.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.mail_handlers.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -12,7 +12,7 @@
*/
var $db;
- function phpgwapi_mail_handlers()
+ function __construct()
{
$this->db =& $GLOBALS['phpgw']->db;
}
Modified: trunk/phpgwapi/inc/class.matrixview.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.matrixview.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.matrixview.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -50,7 +50,7 @@
* @param int year (for example: 2001)
*
*/
- function matrixview ($month_int = 0, $year_int = 0)
+ function __construct ($month_int = 0, $year_int = 0)
{
if ( !$month_int )
{
Modified: trunk/phpgwapi/inc/class.menutree.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.menutree.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.menutree.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -23,7 +23,7 @@
var $root_level_value; // This is what the top level
name or image will be
var $last_column_size;
- function menutree($read_from_file='text')
+ function __construct($read_from_file='text')
{
if($read_from_file == 'text')
{
Modified: trunk/phpgwapi/inc/class.net_http_client.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.net_http_client.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.net_http_client.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -83,7 +83,7 @@
* Note : when host and port are defined, the connection is
immediate
* @see Connect()
**/
- function net_http_client( $host= NULL, $port= NULL, $ssl=False )
+ function __construct( $host= NULL, $port= NULL, $ssl=False )
{
if( $this->debug & DBGTRACE ) echo "net_http_client(
$host, $port )\n";
Modified: trunk/phpgwapi/inc/class.network.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.network.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.network.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -23,7 +23,7 @@
var $error;
var $errorset = 0;
- function network($addcrlf=true)
+ function __construct($addcrlf=true)
{
$this->errorset = 0;
$this->set_addcrlf($addcrlf);
Modified: trunk/phpgwapi/inc/class.nextmatchs_xslt.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.nextmatchs_xslt.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.nextmatchs_xslt.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -21,7 +21,7 @@
var $action;
var $template;
- function nextmatchs_xslt()
+ function __construct()
{
}
Modified: trunk/phpgwapi/inc/class.ping.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.ping.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.ping.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -28,7 +28,7 @@
var $raw_array_of_data = array();
- function ping($hostname)
+ function __construct($hostname)
{
$this->hostname = $hostname;
$this->re_ping();
Modified: trunk/phpgwapi/inc/class.portalbox.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.portalbox.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.portalbox.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -68,7 +68,7 @@
/*
This is the constructor for the object.
*/
- function portalbox($title='', $primary='', $secondary='',
$tertiary='')
+ function __construct($title='', $primary='', $secondary='',
$tertiary='')
{
$this->setvar('title',$title);
// echo 'After SetVar Title =
'.$this->getvar('title')."<br>\n";
Modified: trunk/phpgwapi/inc/class.resultbox.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.resultbox.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.resultbox.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -25,7 +25,7 @@
space for variables. In this circumstance it is not necessary.
*/
//constructor
- function resultbox($title='', $primary='', $secondary='',
$tertiary='')
+ function __construct($title='', $primary='', $secondary='',
$tertiary='')
{
$this->portalbox($title, $primary, $secondary,
$tertiary);
$this->setvar('outerwidth',400);
Modified: trunk/phpgwapi/inc/class.rssparser.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.rssparser.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.rssparser.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -164,7 +164,7 @@
var $tmpurl = array();
var $depth;
- function rssparser()
+ function __construct()
{
$this->nitems = 0;
$this->depth = 0;
Modified: trunk/phpgwapi/inc/class.schema_proc.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.schema_proc.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.schema_proc.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -25,7 +25,7 @@
var $m_aTables;
var $m_bDeltaOnly;
- function schema_proc($dbms)
+ function __construct($dbms)
{
switch($dbms)
{
Modified: trunk/phpgwapi/inc/class.schema_proc_array.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.schema_proc_array.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.schema_proc_array.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -21,7 +21,7 @@
{
var $m_sStatementTerminator;
- function schema_proc_array()
+ function __construct()
{
$this->m_sStatementTerminator = ';';
}
Modified: trunk/phpgwapi/inc/class.schema_proc_mssql.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.schema_proc_mssql.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.schema_proc_mssql.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -27,7 +27,7 @@
var $ix = array();
var $uc = array();
- function schema_proc_mssql()
+ function __construct()
{
$this->m_sStatementTerminator = ';';
}
Modified: trunk/phpgwapi/inc/class.schema_proc_oracle.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.schema_proc_oracle.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.schema_proc_oracle.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -28,7 +28,7 @@
var $ix = array();
var $uc = array();
- function schema_proc_oracle()
+ function __construct()
{
$this->m_sStatementTerminator = ';';
$this->m_sSequencePrefix = 'sq';
Modified: trunk/phpgwapi/inc/class.schema_proc_pgsql.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.schema_proc_pgsql.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.schema_proc_pgsql.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -34,7 +34,7 @@
var $uc = array();
var $indexes_sql = array();
- function schema_proc_pgsql()
+ function __construct()
{
$this->m_sStatementTerminator = ';';
}
Modified: trunk/phpgwapi/inc/class.schema_proc_sapdb.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.schema_proc_sapdb.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.schema_proc_sapdb.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -55,7 +55,7 @@
/**
* Constructor
*/
- function schema_proc_sapdb()
+ function __construct()
{
$this->m_sStatementTerminator = ';';
}
Modified: trunk/phpgwapi/inc/class.send.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.send.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.send.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -27,7 +27,7 @@
var $to_res = array();
var $errorInfo;
- function send()
+ function __construct()
{
$this->err['code'] = ' ';
$this->err['msg'] = ' ';
Modified: trunk/phpgwapi/inc/class.service_contacts.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.service_contacts.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.service_contacts.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -18,7 +18,7 @@
*/
class service_contacts extends service
{
- function service_contacts()
+ function __construct()
{
$this->provider =
$GLOBALS['phpgw_info']['contact_service'] ?
$GLOBALS['phpgw_info']['contact_service'] : 'addressbook';
$this->svc = $this->provider . '.bo' . $this->provider;
Modified: trunk/phpgwapi/inc/class.service_notes.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.service_notes.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.service_notes.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -19,7 +19,7 @@
*/
class service_contacts extends service
{
- function service_contacts()
+ function __construct()
{
$this->provider =
$GLOBALS['phpgw_info']['notes_service'] ?
$GLOBALS['phpgw_info']['notes_service'] : 'notes';
$this->svc = $this->provider . '.bo' . $this->provider;
Modified: trunk/phpgwapi/inc/class.service_schedule.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.service_schedule.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.service_schedule.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -19,7 +19,7 @@
*/
class service_contacts extends service
{
- function service_contacts()
+ function __construct()
{
$this->provider =
$GLOBALS['phpgw_info']['schedule_service'] ?
$GLOBALS['phpgw_info']['schedule_service'] : 'calendar';
$this->svc = $this->provider . '.bo' . $this->provider;
Modified: trunk/phpgwapi/inc/class.sql_builder.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.sql_builder.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.sql_builder.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -50,7 +50,7 @@
/**
* Class contructor
*/
- function sql_builder()
+ function __construct()
{
}
Modified: trunk/phpgwapi/inc/class.sql_entity.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.sql_entity.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.sql_entity.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -69,7 +69,7 @@
var $ondebug;
var $table;
- function sql_entity()
+ function __construct()
{
}
@@ -77,6 +77,9 @@
* Entity, class and general section *
\*************************************************************/
+ /**
+ * FIXME - wrong name of constructor
+ */
public function _constructor($table='', $alias='')
{
$this->table = $table;
Modified: trunk/phpgwapi/inc/class.template_portico.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.template_portico.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.template_portico.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -2,7 +2,7 @@
/**
* phpGroupWare portico template class
*
- * @author Jan \xC5ge Johnsen <address@hidden>
+ * @author Jan Åge Johnsen <address@hidden>
* @copyright Copyright (C) 2007-2008 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgroupware
Modified: trunk/phpgwapi/inc/class.ui_tools.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.ui_tools.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.ui_tools.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -6,7 +6,7 @@
'color_picker' => true
);
- function ui_tools()
+ function __construct()
{
$GLOBALS['phpgw']->xslttpl->add_file('form_elements',
PHPGW_TEMPLATE_DIR);
}
Modified: trunk/phpgwapi/inc/class.uijsaddressbook.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.uijsaddressbook.inc.php 2015-09-14 15:59:28 UTC
(rev 13890)
+++ trunk/phpgwapi/inc/class.uijsaddressbook.inc.php 2015-09-14 19:31:31 UTC
(rev 13891)
@@ -176,7 +176,7 @@
//true, and the js framework will call an got_contact_ids
method in the opening
//window, which is the one where the window.open() function was
called to pop up
//the jsaddressbook
- function uijsaddressbook($update_opener=false)
+ function __construct($update_opener=false)
{
//Grab data that MUST be propagated through all frames
//Post Allways has precedence for good reason.
Modified: trunk/phpgwapi/inc/class.vcard.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.vcard.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.vcard.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -113,7 +113,7 @@
var $vCard_Version;
- function vcard()
+ function __construct()
{
$this->vCard_Version = '2.1';
/* _debug_array($this); */
Modified: trunk/phpgwapi/inc/class.xml.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.xml.inc.php 2015-09-14 15:59:28 UTC (rev
13890)
+++ trunk/phpgwapi/inc/class.xml.inc.php 2015-09-14 19:31:31 UTC (rev
13891)
@@ -155,7 +155,7 @@
* @param string $file Path and name of the file to read and parsed.
* @see load_file()
*/
- function XML ( $file = "" )
+ function __construct ( $file = "" )
{
// Check whether a file was given.
if ( !empty($file) )
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13891] API: rename constructor, preparing for PHP 7,
Sigurd Nes <=