extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix deprecated constructor names

Browse Source
This commit is contained in:
Ralf Becker 2016-03-27 09:31:42 +00:00
parent c81884e622
commit baec50fe92
9 changed files with 26 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etemplate/inc/class.ajax_select_widget.inc.php
View File

@ -58,7 +58,7 @@ class ajax_select_widget
private $debug = false; private $debug = false;
function ajax_select_widget($ui='') function __construct($ui='')
{ {
switch($ui) switch($ui)

2
etemplate/inc/class.date_widget.inc.php
View File

@ -66,7 +66,7 @@ class date_widget
* *
* @param string $ui '' for html * @param string $ui '' for html
*/ */
function date_widget($ui) function __construct($ui)
{ {
if ($ui == 'html') if ($ui == 'html')
{ {

3
etemplate/inc/class.etemplate_widget.inc.php
View File

@ -12,13 +12,14 @@
*/ */
use EGroupware\Api\Etemplate\Widget; use EGroupware\Api\Etemplate\Widget;
use EGroupware\Api\Etemplate;
/** /**
* eTemplate widget baseclass * eTemplate widget baseclass
* *
* @deprecated use Api\Etemplate\Widget * @deprecated use Api\Etemplate\Widget
*/ */
class etemplate_widget extends Widget {} class etemplate_widget extends Etemplate\Widget {}
/** /**
* eTemplate Extension: Entry widget * eTemplate Extension: Entry widget

10
etemplate/inc/class.link_widget.inc.php
View File

@ -96,16 +96,6 @@ class link_widget
*/ */
const LIMIT_LINKS = 1000; const LIMIT_LINKS = 1000;
/**
* Constructor of the extension
*
* @param string $ui '' for html
*/
function link_widget($ui='')
{
}
/** /**
* pre-processing of the extension * pre-processing of the extension
* *

10
etemplate/inc/class.manual_widget.inc.php
View File

@ -16,7 +16,7 @@
* *
* With the value or the name of the widget, you can specify a certain manual page * With the value or the name of the widget, you can specify a certain manual page
* (eg. ManualAddressbook). Additional params can be past to the manual app with * (eg. ManualAddressbook). Additional params can be past to the manual app with
* $GLOBALS['egw_info']['flags']['params']['manual']. * $GLOBALS['egw_info']['flags']['params']['manual'].
* If no page is set after that two mechanisms the URL will contains the referer. * If no page is set after that two mechanisms the URL will contains the referer.
* *
* @package etemplate * @package etemplate
@ -26,7 +26,7 @@
*/ */
class manual_widget class manual_widget
{ {
/** /**
* exported methods of this class * exported methods of this class
* @var array $public_functions * @var array $public_functions
*/ */
@ -48,7 +48,7 @@
* *
* @param string $ui '' for html * @param string $ui '' for html
*/ */
function manual_widget($ui) function __construct($ui)
{ {
$this->ui = $ui; $this->ui = $ui;
} }
@ -60,7 +60,7 @@
* *
* @param string $name form-name of the control * @param string $name form-name of the control
* @param mixed &$value value / existing content, can be modified * @param mixed &$value value / existing content, can be modified
* @param array &$cell array with the widget, can be modified for ui-independent widgets * @param array &$cell array with the widget, can be modified for ui-independent widgets
* @param array &$readonlys names of widgets as key, to be made readonly * @param array &$readonlys names of widgets as key, to be made readonly
* @param mixed &$extension_data data the extension can store persisten between pre- and post-process * @param mixed &$extension_data data the extension can store persisten between pre- and post-process
* @param object &$tmpl reference to the template we belong too * @param object &$tmpl reference to the template we belong too
@ -89,7 +89,7 @@
$cell['onclick'] = $GLOBALS['egw']->framework->open_manual_js($link).'; return false;'; $cell['onclick'] = $GLOBALS['egw']->framework->open_manual_js($link).'; return false;';
if (!$cell['label']) $cell['label'] = 'Manual'; if (!$cell['label']) $cell['label'] = 'Manual';
if (!$cell['help']) $cell['help'] = /*lang(*/'Open the online help.'/*)*/; if (!$cell['help']) $cell['help'] = /*lang(*/'Open the online help.'/*)*/;
if (!$cell['readonly'] && !isset($GLOBALS['egw_info']['user']['apps']['manual'])) if (!$cell['readonly'] && !isset($GLOBALS['egw_info']['user']['apps']['manual']))
{ {
$cell['readonly'] = true; // we disable / remove the button, if use has no run-rights for the manual $cell['readonly'] = true; // we disable / remove the button, if use has no run-rights for the manual

14
etemplate/inc/class.path_widget.inc.php
View File

@ -12,7 +12,7 @@
/** /**
* eTemplate Extension: widget to display a path with clickable components * eTemplate Extension: widget to display a path with clickable components
* *
* The value is an array with id => label pairs. * The value is an array with id => label pairs.
* Returned will be the id of the clicked component or nothing at all. * Returned will be the id of the clicked component or nothing at all.
* *
* @package etemplate * @package etemplate
@ -22,7 +22,7 @@
*/ */
class path_widget class path_widget
{ {
/** /**
* exported methods of this class * exported methods of this class
* @var array * @var array
*/ */
@ -41,7 +41,7 @@
* *
* @param string $ui '' for html * @param string $ui '' for html
*/ */
function select_widget($ui) function __construct($ui)
{ {
$this->ui = $ui; $this->ui = $ui;
} }
@ -53,7 +53,7 @@
* *
* @param string $name form-name of the control * @param string $name form-name of the control
* @param mixed &$value value / existing content, can be modified * @param mixed &$value value / existing content, can be modified
* @param array &$cell array with the widget, can be modified for ui-independent widgets * @param array &$cell array with the widget, can be modified for ui-independent widgets
* @param array &$readonlys names of widgets as key, to be made readonly * @param array &$readonlys names of widgets as key, to be made readonly
* @param mixed &$extension_data data the extension can store persisten between pre- and post-process * @param mixed &$extension_data data the extension can store persisten between pre- and post-process
* @param object &$tmpl reference to the template we belong too * @param object &$tmpl reference to the template we belong too
@ -81,7 +81,7 @@
$sep['label'] = $seperator; $sep['label'] = $seperator;
soetemplate::add_child($cell,$sep); soetemplate::add_child($cell,$sep);
unset($sep); unset($sep);
$button = soetemplate::empty_cell('button',$cell_name.'['.$id.']'); $button = soetemplate::empty_cell('button',$cell_name.'['.$id.']');
$button['label'] = $label; $button['label'] = $label;
$button['onchange'] = 1; // display as link $button['onchange'] = 1; // display as link
@ -89,7 +89,7 @@
$button['help'] = $cell['help'] ? $cell['help'] : lang($label)."($i)"; $button['help'] = $cell['help'] ? $cell['help'] : lang($label)."($i)";
soetemplate::add_child($cell,$button); soetemplate::add_child($cell,$button);
unset($button); unset($button);
} }
return True; // extra Label Ok return True; // extra Label Ok
} }
@ -113,7 +113,7 @@
function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in) function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
{ {
$value = ''; $value = '';
foreach((array)$value_in as $id => $pressed) foreach((array)$value_in as $id => $pressed)
{ {
if ($pressed && isset($extension_data[$id])) if ($pressed && isset($extension_data[$id]))

2
etemplate/inc/class.select_widget.inc.php
View File

@ -75,7 +75,7 @@ class select_widget
* *
* @param string $ui '' for html * @param string $ui '' for html
*/ */
function select_widget($ui='') function __construct($ui='')
{ {
foreach($this->monthnames as $k => $name) foreach($this->monthnames as $k => $name)
{ {

11
etemplate/inc/class.tab_widget.inc.php
View File

@ -41,21 +41,12 @@
*/ */
var $human_name = 'Tabs'; // this is the name for the editor var $human_name = 'Tabs'; // this is the name for the editor
/**
* Constructor of the extension
*
* @param string $ui '' for html
*/
function tab_widget($ui)
{
}
/** /**
* pre-processing of the extension * pre-processing of the extension
* *
* This function is called before the extension gets rendered * This function is called before the extension gets rendered
* *
* @param string $name form-name of the control * @param string $form_name form-name of the control
* @param mixed &$value value / existing content, can be modified * @param mixed &$value value / existing content, can be modified
* @param array &$cell array with the widget, can be modified for ui-independent widgets * @param array &$cell array with the widget, can be modified for ui-independent widgets
* @param array &$readonlys names of widgets as key, to be made readonly * @param array &$readonlys names of widgets as key, to be made readonly

16
etemplate/inc/class.tree_widget.inc.php
View File

@ -15,7 +15,7 @@
*/ */
class tree_widget class tree_widget
{ {
/** /**
* exported methods of this class * exported methods of this class
* @var array * @var array
*/ */
@ -37,7 +37,7 @@ class tree_widget
* *
* @param string $ui '' for html * @param string $ui '' for html
*/ */
function tree_widget($ui) function __construct($ui)
{ {
$this->ui = $ui; $this->ui = $ui;
} }
@ -49,7 +49,7 @@ class tree_widget
* *
* @param string $name form-name of the control * @param string $name form-name of the control
* @param mixed &$value value / existing content, can be modified * @param mixed &$value value / existing content, can be modified
* @param array &$cell array with the widget, can be modified for ui-independent widgets * @param array &$cell array with the widget, can be modified for ui-independent widgets
* @param array &$readonlys names of widgets as key, to be made readonly * @param array &$readonlys names of widgets as key, to be made readonly
* @param mixed &$extension_data data the extension can store persisten between pre- and post-process * @param mixed &$extension_data data the extension can store persisten between pre- and post-process
* @param etemplate &$tmpl reference to the template we belong too * @param etemplate &$tmpl reference to the template we belong too
@ -134,10 +134,10 @@ class tree_widget
$onCheck = 'onCheck_'.$tree_id; $onCheck = 'onCheck_'.$tree_id;
$script .= " $script .= "
function $onCheck(id) { function $onCheck(id) {
document.getElementsByName('$name')[0].value=$tree_id.getAllChecked(); document.getElementsByName('$name')[0].value=$tree_id.getAllChecked();
$onclick; $onclick;
} }
function $onNodeSelect(id) { function $onNodeSelect(id) {
$tree_id.setCheck(id,$tree_id.isItemChecked(id) ? 0 : 1); $tree_id.setCheck(id,$tree_id.isItemChecked(id) ? 0 : 1);
$onCheck(id); $onCheck(id);
} }
@ -146,7 +146,7 @@ class tree_widget
else // single selection else // single selection
{ {
$script .= " $script .= "
function $onNodeSelect(id) { function $onNodeSelect(id) {
document.getElementsByName('$name')[0].value=id; document.getElementsByName('$name')[0].value=id;
$onclick; $onclick;
} }
@ -161,7 +161,7 @@ class tree_widget
return True; // extra Label Ok return True; // extra Label Ok
} }
/** /**
* postprocessing method, called after the submission of the form * postprocessing method, called after the submission of the form
* *
@ -182,7 +182,7 @@ class tree_widget
function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in) function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
{ {
//echo "value_in"; _debug_array($value_in); //echo "value_in"; _debug_array($value_in);
if (!preg_match('/^[0-9\\/'.($extension_data['multiple']?',':'').']*$/',$value_in)) return false; // guard against xss and other malious content if (!preg_match('/^[0-9\\/'.($extension_data['multiple']?',':'').']*$/',$value_in)) return false; // guard against xss and other malious content
$value = $extension_data['multiple'] ? explode(',',$value_in) : $value_in; $value = $extension_data['multiple'] ? explode(',',$value_in) : $value_in;