mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-25 16:19:00 +01:00
Prefixed code that generates PHP notices with a '@' to minimize new user confusion.
This commit is contained in:
parent
076f639288
commit
8b9c73d089
@ -243,7 +243,7 @@
|
|||||||
$c_extraparams = count($extraparams) + 1;
|
$c_extraparams = count($extraparams) + 1;
|
||||||
for($i=0;$i<$c_extraparams;$i++)
|
for($i=0;$i<$c_extraparams;$i++)
|
||||||
{
|
{
|
||||||
if($extraparams[$i])
|
if(isset($extraparams[$i]))
|
||||||
{
|
{
|
||||||
list($var,$value) = explode('=',$extraparams[$i]);
|
list($var,$value) = explode('=',$extraparams[$i]);
|
||||||
if($var != 'menuaction')
|
if($var != 'menuaction')
|
||||||
@ -306,7 +306,7 @@
|
|||||||
'filter' => $filter,
|
'filter' => $filter,
|
||||||
'q_field' => $qfield,
|
'q_field' => $qfield,
|
||||||
'sort' => $sort,
|
'sort' => $sort,
|
||||||
'query' => urlencode(stripslashes($GLOBALS['query']))
|
'query' => urlencode(stripslashes(@$GLOBALS['query']))
|
||||||
);
|
);
|
||||||
|
|
||||||
$extravars = $this->split_extras($extravars,$extradata);
|
$extravars = $this->split_extras($extravars,$extradata);
|
||||||
@ -360,7 +360,7 @@
|
|||||||
'filter' => $filter,
|
'filter' => $filter,
|
||||||
'q_field' => $qfield,
|
'q_field' => $qfield,
|
||||||
'sort' => $sort,
|
'sort' => $sort,
|
||||||
'query' => urlencode(stripslashes($GLOBALS['query']))
|
'query' => urlencode(stripslashes(@$GLOBALS['query']))
|
||||||
);
|
);
|
||||||
|
|
||||||
$extravars = $this->split_extras($extravars,$extradata);
|
$extravars = $this->split_extras($extravars,$extradata);
|
||||||
@ -683,7 +683,7 @@
|
|||||||
{
|
{
|
||||||
if (! $currentcolor)
|
if (! $currentcolor)
|
||||||
{
|
{
|
||||||
$currentcolor = $GLOBALS['tr_color'];
|
$currentcolor = @$GLOBALS['tr_color'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($currentcolor == $GLOBALS['phpgw_info']['theme']['row_on'])
|
if ($currentcolor == $GLOBALS['phpgw_info']['theme']['row_on'])
|
||||||
@ -742,7 +742,7 @@
|
|||||||
$extra = $this->extras_to_string($extra);
|
$extra = $this->extras_to_string($extra);
|
||||||
}
|
}
|
||||||
|
|
||||||
$extravar = 'order='.$var.'&sort='.$sort.'&filter='.$filter.'&qfield='.$qfield.'&start='.$start.'&query='.urlencode(stripslashes($GLOBALS['query'])).$extra;
|
$extravar = 'order='.$var.'&sort='.$sort.'&filter='.$filter.'&qfield='.$qfield.'&start='.$start.'&query='.urlencode(stripslashes(@$GLOBALS['query'])).$extra;
|
||||||
|
|
||||||
$link = ($this->action?$this->page($extravar):$GLOBALS['phpgw']->link($program,$extravar));
|
$link = ($this->action?$this->page($extravar):$GLOBALS['phpgw']->link($program,$extravar));
|
||||||
|
|
||||||
|
@ -692,7 +692,7 @@
|
|||||||
{
|
{
|
||||||
if ($p1 == '_UNDEF_' && $p1 != 1)
|
if ($p1 == '_UNDEF_' && $p1 != 1)
|
||||||
{
|
{
|
||||||
$obj = new $classname;
|
$obj = @new $classname;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -36,16 +36,16 @@
|
|||||||
\**************************************************************************/
|
\**************************************************************************/
|
||||||
if (PHPGW_APP_INC != PHPGW_API_INC && // this prevents an endless inclusion on the homepage
|
if (PHPGW_APP_INC != PHPGW_API_INC && // this prevents an endless inclusion on the homepage
|
||||||
// (some apps set currentapp in hook_home => it's not releyable)
|
// (some apps set currentapp in hook_home => it's not releyable)
|
||||||
(file_exists (PHPGW_APP_INC . '/footer.inc.php') || isset($GLOBALS['HTTP_GET_VARS']['menuaction'])) &&
|
(file_exists (PHPGW_APP_INC . '/footer.inc.php') || isset($_GET['menuaction'])) &&
|
||||||
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
|
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
|
||||||
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' &&
|
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' &&
|
||||||
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' &&
|
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' &&
|
||||||
!@$GLOBALS['phpgw_info']['flags']['noappfooter'])
|
!@$GLOBALS['phpgw_info']['flags']['noappfooter'])
|
||||||
{
|
{
|
||||||
if ($GLOBALS['HTTP_GET_VARS']['menuaction'])
|
if ($_GET['menuaction'])
|
||||||
{
|
{
|
||||||
list($app,$class,$method) = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
|
list($app,$class,$method) = explode('.',$_GET['menuaction']);
|
||||||
if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['footer'])
|
if (is_array($GLOBALS[$class]->public_functions) && isset($GLOBALS[$class]->public_functions['footer']))
|
||||||
{
|
{
|
||||||
// eval("\$GLOBALS[$class]->footer();");
|
// eval("\$GLOBALS[$class]->footer();");
|
||||||
$GLOBALS[$class]->footer();
|
$GLOBALS[$class]->footer();
|
||||||
|
Loading…
Reference in New Issue
Block a user