\n";
- echo ''.lang('Contact fields:')." |
";
-
- $n = 0;
- foreach($this->contacts->contact_fields as $name => $label)
- {
- if (in_array($name,array('tid','label','geo'))) continue; // dont show them, as they are not used in the UI atm.
-
- if (in_array($name,array('email','org_name','tel_work','url')) && $n&1) // main values, which should be in the first column
- {
- echo "\n";
- $n++;
- }
- if (!($n&1)) echo '';
- echo '| {{'.$name.'}} | '.$label.' | ';
- if($name == 'cat_id')
- {
- if ($n&1) echo "
\n";
- echo '{{categories}} | '.lang('Category path').' | ';
- $n++;
- }
- if ($n&1) echo "\n";
- $n++;
- }
-
- echo ''.lang('Custom fields').": |
";
- foreach($this->contacts->customfields as $name => $field)
- {
- echo '| {{#'.$name.'}} | '.$field['label']." |
\n";
- }
-
- echo ''.lang('General fields:')." |
";
- foreach(array(
- 'link' => lang('HTML link to the current record'),
- 'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
- 'attachments' => lang('List of files linked to the current record'),
- 'links_attachments' => lang('Links and attached files'),
- 'links/[appname]' => lang('Links to specified application. Example: {{links/infolog}}'),
- 'date' => lang('Date'),
- 'user/n_fn' => lang('Name of current user, all other contact fields are valid too'),
- 'user/account_lid' => lang('Username'),
- 'pagerepeat' => lang('For serial letter use this tag. Put the content, you want to repeat between two Tags.'),
- 'label' => lang('Use this tag for addresslabels. Put the content, you want to repeat, between two tags.'),
- 'labelplacement' => lang('Tag to mark positions for address labels'),
- 'IF fieldname' => lang('Example {{IF n_prefix~Mr~Hello Mr.~Hello Ms.}} - search the field "n_prefix", for "Mr", if found, write Hello Mr., else write Hello Ms.'),
- 'NELF' => lang('Example {{NELF role}} - if field role is not empty, you will get a new line with the value of field role'),
- 'NENVLF' => lang('Example {{NENVLF role}} - if field role is not empty, set a LF without any value of the field'),
- 'LETTERPREFIX' => lang('Example {{LETTERPREFIX}} - Gives a letter prefix without double spaces, if the title is empty for example'),
- 'LETTERPREFIXCUSTOM' => lang('Example {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Example: Mr Dr. James Miller'),
- ) as $name => $label)
- {
- echo '| {{'.$name.'}} | '.$label." |
\n";
- }
-
- echo ''.lang('EPL Only').": |
";
- echo '| {{share}} | '.lang('Public sharing URL')." |
\n";
-
- Api\Translation::add_app('calendar');
- echo ''.lang('Calendar fields:')." # = 1, 2, ..., 20, -1 |
";
- foreach(array(
- 'title' => lang('Title'),
- 'description' => lang('Description'),
- 'participants' => lang('Participants'),
- 'location' => lang('Location'),
- 'start' => lang('Start').': '.lang('Date').'+'.lang('Time'),
- 'startday' => lang('Start').': '.lang('Weekday'),
- 'startdate'=> lang('Start').': '.lang('Date'),
- 'starttime'=> lang('Start').': '.lang('Time'),
- 'end' => lang('End').': '.lang('Date').'+'.lang('Time'),
- 'endday' => lang('End').': '.lang('Weekday'),
- 'enddate' => lang('End').': '.lang('Date'),
- 'endtime' => lang('End').': '.lang('Time'),
- 'duration' => lang('Duration'),
- 'category' => lang('Category'),
- 'priority' => lang('Priority'),
- 'updated' => lang('Updated'),
- 'recur_type' => lang('Repetition'),
- 'access' => lang('Access').': '.lang('public').', '.lang('private'),
- 'owner' => lang('Owner'),
- ) as $name => $label)
- {
- if(in_array($name, array('start',
- 'end')) && $n & 1) // main values, which should be in the first column
- {
- echo "\n";
- $n++;
- }
- if(!($n & 1))
- {
- echo '';
- }
- echo '| {{calendar/#/' . $name . '}} | ' . $label . ' | ';
- if($n & 1)
- {
- echo "
\n";
- }
- $n++;
- }
- echo "
\n";
-
- $GLOBALS['egw']->framework->render(ob_get_clean());
- }
-
/**
* Get a list of placeholders provided.
*
@@ -352,10 +239,58 @@ class Merge extends Api\Storage\Merge
'label' => "Formatted private address"
];
+ $placeholders['EPL only'][] = [
+ 'value' => $this->prefix($prefix, 'share', '{'),
+ 'label' => 'Public sharing URL'
+ ];
+
$this->add_customfield_placeholders($placeholders, $prefix);
+
+ // Don't add any linked placeholders if we're not at the top level
+ // This avoids potential recursion
+ if(!$prefix)
+ {
+ $this->add_calendar_placeholders($placeholders, $prefix);
+ }
+
return $placeholders;
}
+ protected function add_calendar_placeholders(&$placeholders, $prefix)
+ {
+ Api\Translation::add_app('calendar');
+
+ // NB: The -1 is actually ‑1, a non-breaking hyphen to avoid UI issues where we split on -
+ $group = lang('Calendar fields:') . " # = 1, 2, ..., 20, ‑1";
+ foreach(array(
+ 'title' => lang('Title'),
+ 'description' => lang('Description'),
+ 'participants' => lang('Participants'),
+ 'location' => lang('Location'),
+ 'start' => lang('Start') . ': ' . lang('Date') . '+' . lang('Time'),
+ 'startday' => lang('Start') . ': ' . lang('Weekday'),
+ 'startdate' => lang('Start') . ': ' . lang('Date'),
+ 'starttime' => lang('Start') . ': ' . lang('Time'),
+ 'end' => lang('End') . ': ' . lang('Date') . '+' . lang('Time'),
+ 'endday' => lang('End') . ': ' . lang('Weekday'),
+ 'enddate' => lang('End') . ': ' . lang('Date'),
+ 'endtime' => lang('End') . ': ' . lang('Time'),
+ 'duration' => lang('Duration'),
+ 'category' => lang('Category'),
+ 'priority' => lang('Priority'),
+ 'updated' => lang('Updated'),
+ 'recur_type' => lang('Repetition'),
+ 'access' => lang('Access') . ': ' . lang('public') . ', ' . lang('private'),
+ 'owner' => lang('Owner'),
+ ) as $name => $label)
+ {
+ $placeholders[$group][] = array(
+ 'value' => $this->prefix(($prefix ? $prefix . '/' : '') . 'calendar/#', $name, '{'),
+ 'label' => $label
+ );
+ }
+ }
+
/**
* Get insert-in-document action with optional default document on top
*
diff --git a/api/src/Contacts/Sql.php b/api/src/Contacts/Sql.php
index 481d2b9fb0..a6748459fc 100644
--- a/api/src/Contacts/Sql.php
+++ b/api/src/Contacts/Sql.php
@@ -77,15 +77,15 @@ class Sql extends Api\Storage
// Get custom fields from addressbook instead of api
$this->customfields = Api\Storage\Customfields::get('addressbook');
- if ($GLOBALS['egw_info']['server']['account_repository'])
+ if (!empty($GLOBALS['egw_info']['server']['account_repository']))
{
$this->account_repository = $GLOBALS['egw_info']['server']['account_repository'];
}
- elseif ($GLOBALS['egw_info']['server']['auth_type'])
+ elseif (!empty($GLOBALS['egw_info']['server']['auth_type']))
{
$this->account_repository = $GLOBALS['egw_info']['server']['auth_type'];
}
- if ($GLOBALS['egw_info']['server']['contact_repository'])
+ if (!empty($GLOBALS['egw_info']['server']['contact_repository']))
{
$this->contact_repository = $GLOBALS['egw_info']['server']['contact_repository'];
}
@@ -742,7 +742,7 @@ class Sql extends Api\Storage
$cat_filter = array();
foreach(is_array($cats) ? $cats : (is_numeric($cats) ? array($cats) : explode(',',$cats)) as $cat)
{
- if (is_numeric($cat)) $cat_filter[] = $this->db->concat("','",cat_id,"','")." LIKE '%,$cat,%'";
+ if (is_numeric($cat)) $cat_filter[] = $this->db->concat("','", 'cat_id', "','")." LIKE '%,$cat,%'";
}
return $cat_filter;
}
diff --git a/api/src/Contacts/Storage.php b/api/src/Contacts/Storage.php
index 0cb66f4b6d..fe2b3b4531 100755
--- a/api/src/Contacts/Storage.php
+++ b/api/src/Contacts/Storage.php
@@ -256,7 +256,7 @@ class Storage
}
$this->customfields = Api\Storage\Customfields::get('addressbook');
// contacts backend (contacts in LDAP require accounts in LDAP!)
- if($GLOBALS['egw_info']['server']['contact_repository'] == 'ldap' && $this->account_repository == 'ldap')
+ if (($GLOBALS['egw_info']['server']['contact_repository']??null) === 'ldap' && $this->account_repository === 'ldap')
{
$this->contact_repository = 'ldap';
$this->somain = new Ldap();
@@ -264,7 +264,7 @@ class Storage
}
else // sql or sql->ldap
{
- if ($GLOBALS['egw_info']['server']['contact_repository'] == 'sql-ldap')
+ if (($GLOBALS['egw_info']['server']['contact_repository']??null) === 'sql-ldap')
{
$this->contact_repository = 'sql-ldap';
}
@@ -347,9 +347,9 @@ class Storage
if ($user)
{
// contacts backend (contacts in LDAP require accounts in LDAP!)
- if($GLOBALS['egw_info']['server']['contact_repository'] == 'ldap' && $this->account_repository == 'ldap')
+ if(($GLOBALS['egw_info']['server']['contact_repository']??null) === 'ldap' && $this->account_repository === 'ldap')
{
- // static grants from ldap: all rights for the own personal addressbook and the group ones of the meberships
+ // static grants from ldap: all rights for the own personal addressbook and the group ones of the memberships
$grants = array($user => ~0);
foreach($GLOBALS['egw']->accounts->memberships($user,true) as $gid)
{
@@ -415,9 +415,9 @@ class Storage
*/
function allow_account_edit($user=null)
{
- return $GLOBALS['egw_info']['server']['allow_account_edit'] &&
+ return !empty($GLOBALS['egw_info']['server']['allow_account_edit']) &&
array_intersect($GLOBALS['egw_info']['server']['allow_account_edit'],
- $GLOBALS['egw']->accounts->memberships($user ? $user : $this->user, true));
+ $GLOBALS['egw']->accounts->memberships($user ?: $this->user, true));
}
/**
diff --git a/api/src/Db.php b/api/src/Db.php
index cb42718df4..c2160cc0a8 100644
--- a/api/src/Db.php
+++ b/api/src/Db.php
@@ -591,7 +591,7 @@ class Db
$this->setupType = $this->Type;
$this->Type = 'mysql';
}
- if ($new_connection)
+ if (!empty($new_connection))
{
foreach(get_included_files() as $file)
{
@@ -1599,7 +1599,7 @@ class Db
{
return $array;
}
- if (!$column_definitions)
+ if (empty($column_definitions))
{
$column_definitions = $this->column_definitions;
}
diff --git a/api/src/Db/Pdo.php b/api/src/Db/Pdo.php
index cd038c6f15..353409d523 100644
--- a/api/src/Db/Pdo.php
+++ b/api/src/Db/Pdo.php
@@ -125,7 +125,7 @@ class Pdo
// Exception reveals password, so we ignore the exception and connect again without pw, to get the right exception without pw
self::$pdo = new \PDO($dsn,$egw_db->User,'$egw_db->Password');
}
- if ($query)
+ if (!empty($query))
{
self::$pdo->exec($query);
}
diff --git a/api/src/Etemplate.php b/api/src/Etemplate.php
index 0631d9e3b7..45e88ae271 100644
--- a/api/src/Etemplate.php
+++ b/api/src/Etemplate.php
@@ -117,22 +117,22 @@ class Etemplate extends Etemplate\Widget\Template
foreach(count(array_filter(array_keys($extras), 'is_int')) ? $extras : array($extras) as $extra)
{
- if ($extra['data'] && is_array($extra['data']))
+ if (!empty($extra['data']) && is_array($extra['data']))
{
$content = array_merge($content, $extra['data']);
}
- if ($extra['preserve'] && is_array($extra['preserve']))
+ if (!empty($extra['preserve']) && is_array($extra['preserve']))
{
$preserv = array_merge($preserv, $extra['preserve']);
}
- if ($extra['readonlys'] && is_array($extra['readonlys']))
+ if (!empty($extra['readonlys']) && is_array($extra['readonlys']))
{
$readonlys = array_merge($readonlys, $extra['readonlys']);
}
- if ($extra['sel_options'] && is_array($extra['sel_options']))
+ if (!empty($extra['sel_options']) && is_array($extra['sel_options']))
{
$sel_options = array_merge($sel_options, $extra['sel_options']);
}
@@ -177,7 +177,7 @@ class Etemplate extends Etemplate\Widget\Template
}
// some apps (eg. InfoLog) set app_header only in get_rows depending on filter settings
- self::$request->app_header = $GLOBALS['egw_info']['flags']['app_header'];
+ self::$request->app_header = $GLOBALS['egw_info']['flags']['app_header'] ?? null;
// compile required translations translations
$currentapp = $GLOBALS['egw_info']['flags']['currentapp'];
@@ -209,7 +209,7 @@ class Etemplate extends Etemplate\Widget\Template
'currentapp' => $currentapp,
);
- if($data['content']['nm']['rows'] && is_array($data['content']['nm']['rows']))
+ if (!empty($data['content']['nm']['rows']) && is_array($data['content']['nm']['rows']))
{
// Deep copy rows so we don't lose them when request is set to null
// (some content by reference)
@@ -420,7 +420,7 @@ class Etemplate extends Etemplate\Widget\Template
}
$tcontent = is_array($content) ? $content :
- self::complete_array_merge(self::$request->preserv, $validated);
+ self::complete_array_merge(self::$request->preserv ?? [], $validated);
$hook_data = Hooks::process(
array(
diff --git a/api/src/Etemplate/Request.php b/api/src/Etemplate/Request.php
index f4823645b9..4843c9503d 100644
--- a/api/src/Etemplate/Request.php
+++ b/api/src/Etemplate/Request.php
@@ -428,9 +428,9 @@ class Request
* @param string $var
* @param mixed $val
*/
- public function __set($var,$val)
+ public function __set($var, $val)
{
- if ($this->data[$var] !== $val)
+ if (!isset($this->data[$var]) || $this->data[$var] !== $val)
{
$this->data[$var] = $val;
//error_log(__METHOD__."('$var', ...) data of id=$this->id changed ...");
diff --git a/api/src/Etemplate/Request/Files.php b/api/src/Etemplate/Request/Files.php
index b15054d320..613bd5be30 100644
--- a/api/src/Etemplate/Request/Files.php
+++ b/api/src/Etemplate/Request/Files.php
@@ -97,9 +97,10 @@ class Files extends Etemplate\Request
* Factory method to get a new request object or the one for an existing request
*
* @param string $id =null
- * @return ?Etemplate\Request|false the object or false if $id is not found
+ * @param bool $handle_not_found =true true: handle not found by trying to redirect, false: just return null
+ * @return Request|null null if Request not found and $handle_not_found === false
*/
- static function read($id=null)
+ public static function read($id=null, $handle_not_found=true)
{
$request = new Files($id);
diff --git a/api/src/Etemplate/Request/Session.php b/api/src/Etemplate/Request/Session.php
index 7bad1420fe..339c09307d 100644
--- a/api/src/Etemplate/Request/Session.php
+++ b/api/src/Etemplate/Request/Session.php
@@ -83,9 +83,10 @@ class Session extends Etemplate\Request
* Factory method to get a new request object or the one for an existing request
*
* @param string $id =null
- * @return ?Etemplate\request|false the object or false if $id is not found
+ * @param bool $handle_not_found =true true: handle not found by trying to redirect, false: just return null
+ * @return Request|null null if Request not found and $handle_not_found === false
*/
- static function read($id=null)
+ public static function read($id=null, $handle_not_found=true)
{
$request = new Session($id);
diff --git a/api/src/Etemplate/Widget.php b/api/src/Etemplate/Widget.php
index 00a591f000..a3f41e0f23 100644
--- a/api/src/Etemplate/Widget.php
+++ b/api/src/Etemplate/Widget.php
@@ -553,12 +553,21 @@ class Widget
$method = new ReflectionMethod($this, $method_name);
foreach($method->getParameters() as $index => $param)
{
- if(!$param->isOptional() && !array_key_exists($index,$params))
+ if(!$param->isOptional() && !array_key_exists($index, $params))
{
error_log("Missing required parameter {$param->getPosition()}: {$param->getName()}");
$call = false;
}
- if($param->isArray() && !is_array($params[$index]))
+ // Check to see if method wants an array, and we're providing it
+ $paramType = $param->getType();
+ if(!$paramType)
+ {
+ continue;
+ }
+ $types = $paramType instanceof \ReflectionUnionType
+ ? $paramType->getTypes()
+ : [$paramType];
+ if(in_array('array', array_map(fn(\ReflectionNamedType $t) => $t->getName(), $types)) && !is_array($params[$index]))
{
error_log("$method_name expects an array for {$param->getPosition()}: {$param->getName()}");
$params[$index] = (array)$params[$index];
@@ -1044,6 +1053,10 @@ class Widget
*/
public static function &setElementAttribute($name,$attr,$val)
{
+ if (!isset(self::$request))
+ {
+ throw new \Exception(__METHOD__."('$name', '$attr', ".json_encode($val)." called before instanciating Api\Etemplate!");
+ }
//error_log(__METHOD__."('$name', '$attr', ...) request=".get_class(self::$request).", response=".get_class(self::$response).function_backtrace());
$ref =& self::$request->modifications[$name][$attr];
if(self::$request && self::$response)
diff --git a/api/src/Etemplate/Widget/Box.php b/api/src/Etemplate/Widget/Box.php
index de3a379091..74a198d239 100644
--- a/api/src/Etemplate/Widget/Box.php
+++ b/api/src/Etemplate/Widget/Box.php
@@ -50,7 +50,7 @@ class Box extends Etemplate\Widget
$old_expand = $params[1];
if ($this->id && $this->type != 'groupbox') $cname = self::form_name($cname, $this->id, $params[1]);
- if (!empty($expand['cname']) && $expand['cname'] !== $cname && trim($cname))
+ if (($expand['cname'] ?? null) !== $cname && trim($cname))
{
$expand['cont'] =& self::get_array(self::$request->content, $cname);
$expand['cname'] = $cname;
diff --git a/api/src/Etemplate/Widget/Customfields.php b/api/src/Etemplate/Widget/Customfields.php
index 0964a7fd9b..466ff5f5bc 100644
--- a/api/src/Etemplate/Widget/Customfields.php
+++ b/api/src/Etemplate/Widget/Customfields.php
@@ -98,7 +98,7 @@ class Customfields extends Transformer
$form_name = self::form_name($cname, $this->id, $expand);
// Store properties at top level, so all customfield widgets can share
- if($this->attrs['app'])
+ if (!empty($this->attrs['app']))
{
$app = $this->attrs['app'];
}
@@ -141,12 +141,12 @@ class Customfields extends Transformer
// app changed
$customfields = Api\Storage\Customfields::get($app);
}
- if($this->attrs['customfields'])
+ if (!empty($this->attrs['customfields']))
{
$customfields = $this->attrs['customfields'];
}
// Filter fields
- if($this->attrs['field-names'])
+ if (!empty($this->attrs['field-names']))
{
$fields_name = explode(',', $this->attrs['field-names']);
foreach($fields_name as &$f)
@@ -162,8 +162,8 @@ class Customfields extends Transformer
$fields = $customfields;
- $use_private = self::expand_name($this->attrs['use-private'],0,0,'','',self::$cont);
- $this->attrs['sub-type'] = self::expand_name($this->attrs['sub-type'],0,0,'','',self::$cont);
+ $use_private = self::expand_name($this->attrs['use-private'] ?? null,0,0,'','',self::$cont);
+ $this->attrs['sub-type'] = self::expand_name($this->attrs['sub-type'] ?? null,0,0,'','',self::$cont);
foreach((array)$fields as $key => $field)
{
@@ -174,7 +174,7 @@ class Customfields extends Transformer
}
// Remove filtered fields
- if($field_filters && in_array($key, $negate_fields) && in_array($key, $field_filters))
+ if (!empty($field_filters) && in_array($key, $negate_fields) && in_array($key, $field_filters))
{
unset($fields[$key]);
}
@@ -284,7 +284,7 @@ class Customfields extends Transformer
$type = $field['type'];
// Link-tos needs to change from appname to link-to
- if($link_types[$field['type']])
+ if (!empty($link_types[$field['type']]))
{
if($type == 'filemanager')
{
@@ -314,8 +314,8 @@ class Customfields extends Transformer
{
$widget->attrs['data_format'] = $type == 'date' ? 'Y-m-d' : 'Y-m-d H:i:s';
}
- if($field['values']['min']) $widget->attrs['min'] = $field['values']['min'];
- if($field['values']['max']) $widget->attrs['min'] = $field['values']['max'];
+ if (isset($field['values']['min'])) $widget->attrs['min'] = $field['values']['min'];
+ if (isset($field['values']['max'])) $widget->attrs['min'] = $field['values']['max'];
break;
case 'vfs-upload':
@@ -355,7 +355,7 @@ class Customfields extends Transformer
$field['values'] = Api\Storage\Customfields::get_options_from_file($field['values']['@']);
}
// keep extra values set by app code, eg. addressbook advanced search
- if (is_array(self::$request->sel_options[self::$prefix.$fname]))
+ if (!empty(self::$request->sel_options[self::$prefix.$fname]) && is_array(self::$request->sel_options[self::$prefix.$fname]))
{
self::$request->sel_options[self::$prefix.$fname] += (array)$field['values'];
}
diff --git a/api/src/Etemplate/Widget/Description.php b/api/src/Etemplate/Widget/Description.php
index 338e80f15d..e69bcdfd19 100644
--- a/api/src/Etemplate/Widget/Description.php
+++ b/api/src/Etemplate/Widget/Description.php
@@ -42,7 +42,7 @@ class Description extends Etemplate\Widget
*/
public function beforeSendToClient($cname, array $expand=null)
{
- if ($this->attrs['activate_links'])
+ if (!empty($this->attrs['activate_links']))
{
$form_name = self::form_name($cname, $this->id, $expand);
$value =& self::get_array(self::$request->content, $form_name);
diff --git a/api/src/Etemplate/Widget/Grid.php b/api/src/Etemplate/Widget/Grid.php
index 17433ba3e1..a26d76a73b 100644
--- a/api/src/Etemplate/Widget/Grid.php
+++ b/api/src/Etemplate/Widget/Grid.php
@@ -88,8 +88,11 @@ class Grid extends Box
return false; // return
}
- if ($this->id && $this->type !== 'row') $cname = self::form_name($cname, $this->id, $expand);
- if (!empty($expand['cname']) && $expand['cname'] !== $cname && $cname)
+ if($this->id && $this->type !== 'row')
+ {
+ $cname = self::form_name($cname, $this->id, $expand);
+ }
+ if($cname && (!empty($expand['cname']) && $expand['cname'] !== $cname || !$expand['cname']))
{
$expand['cont'] =& self::get_array(self::$request->content, $cname);
$expand['cname'] = $cname;
diff --git a/api/src/Etemplate/Widget/Image.php b/api/src/Etemplate/Widget/Image.php
index 7969ab83dc..f77067f082 100644
--- a/api/src/Etemplate/Widget/Image.php
+++ b/api/src/Etemplate/Widget/Image.php
@@ -36,17 +36,17 @@ class Image extends Etemplate\Widget
$image = $value != '' ? $value : $this->attrs['src'];
- if (is_string($image)) list($app,$img) = explode('/',$image,2);
- if (!$app || !$img || !is_dir(EGW_SERVER_ROOT.'/'.$app) || strpos($img,'/')!==false)
+ if (is_string($image)) list($app,$img) = explode('/',$image,2)+[null,null];
+ if (empty($app) || empty($img) || !is_dir(EGW_SERVER_ROOT.'/'.$app) || strpos($img,'/')!==false)
{
$img = $image;
list($app) = explode('.',$form_name);
}
$src = Api\Image::find($app, $img);
- if(!$this->id)
+ /*if(!$this->id)
{
// self::setElementAttribute($this->attrs['src'], 'id', $this->attrs['src']);
- }
+ }*/
self::setElementAttribute($this->attrs['src'], 'src', $src);
}
}
diff --git a/api/src/Etemplate/Widget/Nextmatch.php b/api/src/Etemplate/Widget/Nextmatch.php
index d6ccd128c7..10004d276e 100644
--- a/api/src/Etemplate/Widget/Nextmatch.php
+++ b/api/src/Etemplate/Widget/Nextmatch.php
@@ -130,13 +130,13 @@ class Nextmatch extends Etemplate\Widget
$send_value = $value;
list($app) = explode('.',$value['get_rows']);
- if(!$GLOBALS['egw_info']['apps'][$app])
+ if (empty($GLOBALS['egw_info']['apps'][$app]))
{
list($app) = explode('.',$this->attrs['template']);
}
// Check for a favorite in URL
- if($_GET['favorite'] && $value['favorites'])
+ if (!empty($_GET['favorite']) && !empty($value['favorites']))
{
$safe_name = preg_replace('/[^A-Za-z0-9-_]/','_',strip_tags($_GET['favorite']));
$pref_name = "favorite_" .$safe_name;
@@ -210,7 +210,7 @@ class Nextmatch extends Etemplate\Widget
}
// Favorite group for admins
- if($GLOBALS['egw_info']['apps']['admin'] && $value['favorites'])
+ if (!empty($GLOBALS['egw_info']['apps']['admin']) && !empty($value['favorites']))
{
self::$request->sel_options[$form_name]['favorite']['group'] = array('all' => lang('All users')) +
Select::typeOptions('select-account',',groups');
@@ -894,7 +894,7 @@ class Nextmatch extends Etemplate\Widget
if ($default_attrs) $action += $default_attrs;
// Add 'Select All' after first group
- if ($first_level && $group !== false && $action['group'] != $group && empty($egw_actions[$prefix.'select_all']))
+ if ($first_level && $group !== false && ($action['group']??null) != $group && empty($egw_actions[$prefix.'select_all']))
{
$egw_actions[$prefix.'select_all'] = array(
diff --git a/api/src/Etemplate/Widget/Password.php b/api/src/Etemplate/Widget/Password.php
index ae4d5ef7f3..3e7cbe9997 100644
--- a/api/src/Etemplate/Widget/Password.php
+++ b/api/src/Etemplate/Widget/Password.php
@@ -49,7 +49,8 @@ class Password extends Etemplate\Widget\Textbox
{
$form_name = self::form_name($cname, $this->id, $expand);
$value =& self::get_array(self::$request->content, $form_name);
- $plaintext = !in_array(self::expand_name($this->attrs['plaintext'],$expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']),
+ $plaintext = !empty($this->attrs['plaintext']) && !in_array(
+ self::expand_name($this->attrs['plaintext'], $expand['c'] ?? null, $expand['row'] ?? null, $expand['c_'] ?? null, $expand['row_'] ?? null, $expand['cont']),
['false', '0']);
if (!empty($value))
diff --git a/api/src/Etemplate/Widget/Placeholder.php b/api/src/Etemplate/Widget/Placeholder.php
index a31d88c49d..c2f933c6c8 100644
--- a/api/src/Etemplate/Widget/Placeholder.php
+++ b/api/src/Etemplate/Widget/Placeholder.php
@@ -64,9 +64,13 @@ class Placeholder extends Etemplate\Widget
if(is_null($apps))
{
- $apps = ['addressbook', 'user', 'general'] +
+ $apps = array_merge(
+ ['addressbook', 'user', 'general'],
// We use linking for preview, so limit to apps that support links
- array_keys(Api\Link::app_list('query'));
+ array_keys(Api\Link::app_list('query')),
+ // Filemanager doesn't support links, but add it anyway
+ ['filemanager']
+ );
}
foreach($apps as $appname)
@@ -86,6 +90,8 @@ class Placeholder extends Etemplate\Widget
// Looks like app doesn't support merging
continue 2;
}
+
+ Api\Translation::load_app($appname, $GLOBALS['egw_info']['user']['preferences']['common']['lang']);
$list = method_exists($merge, 'get_placeholder_list') ? $merge->get_placeholder_list() : [];
break;
}
diff --git a/api/src/Etemplate/Widget/Select.php b/api/src/Etemplate/Widget/Select.php
index 84817c9aa5..e8c8844cff 100644
--- a/api/src/Etemplate/Widget/Select.php
+++ b/api/src/Etemplate/Widget/Select.php
@@ -109,14 +109,14 @@ class Select extends Etemplate\Widget
{
parent::set_attrs($xml, $cloned);
- if ($this->attrs['multiple'] !== 'dynamic')
+ if (!isset($this->attrs['multiple']) || $this->attrs['multiple'] !== 'dynamic')
{
$this->attrs['multiple'] = !isset($this->attrs['multiple']) ? false :
!(!$this->attrs['multiple'] || $this->attrs['multiple'] === 'false');
}
// set attrs[multiple] from attrs[options], unset options only if it just contains number or rows
- if ($this->attrs['options'] > 1)
+ if (isset($this->attrs['options']) && $this->attrs['options'] > 1)
{
$this->attrs['multiple'] = (int)$this->attrs['options'];
if ((string)$this->attrs['multiple'] == $this->attrs['options'])
@@ -124,7 +124,7 @@ class Select extends Etemplate\Widget
unset($this->attrs['options']);
}
}
- elseif($this->attrs['rows'] > 1)
+ elseif(isset($this->attrs['rows']) && $this->attrs['rows'] > 1)
{
$this->attrs['multiple'] = true;
}
@@ -311,8 +311,8 @@ class Select extends Etemplate\Widget
{
$form_name = self::form_name($cname, $this->id, $expand);
}
- if (!is_array(self::$request->sel_options[$form_name])) self::$request->sel_options[$form_name] = array();
- $type = $this->attrs['type'] ? $this->attrs['type'] : $this->type;
+ if (empty(self::$request->sel_options[$form_name]) || !is_array(self::$request->sel_options[$form_name])) self::$request->sel_options[$form_name] = [];
+ $type = $this->attrs['type'] ?? $this->type;
if ($type != 'select' && $type != 'menupopup')
{
// Check selection preference, we may be able to skip reading some data
@@ -335,8 +335,8 @@ class Select extends Etemplate\Widget
if (!isset($form_names_done[$form_name]) &&
($type_options = self::typeOptions($this,
// typeOptions thinks # of rows is the first thing in options
- ($this->attrs['rows'] && strpos($this->attrs['options'], $this->attrs['rows']) !== 0 ? $this->attrs['rows'].','.$this->attrs['options'] : $this->attrs['options']),
- $no_lang, $this->attrs['readonly'], self::get_array(self::$request->content, $form_name), $form_name)))
+ (!empty($this->attrs['rows']) && !empty($this->attrs['options']) && strpos($this->attrs['options'], $this->attrs['rows']) !== 0 ? $this->attrs['rows'].','.$this->attrs['options'] : $this->attrs['options']),
+ $no_lang, $this->attrs['readonly'] ?? false, self::get_array(self::$request->content, $form_name), $form_name)))
{
self::fix_encoded_options($type_options);
@@ -356,7 +356,7 @@ class Select extends Etemplate\Widget
$options = (isset(self::$request->sel_options[$form_name]) ? $form_name : $this->id);
if(is_array(self::$request->sel_options[$options]))
{
- if(in_array($this->attrs['type'], self::$cached_types) && !isset($form_names_done[$options]))
+ if (isset($this->attrs['type']) && in_array($this->attrs['type'], self::$cached_types) && !isset($form_names_done[$options]))
{
// Fix any custom options from application
self::fix_encoded_options(self::$request->sel_options[$options],true);
@@ -561,7 +561,7 @@ class Select extends Etemplate\Widget
$field = self::expand_name($field, 0, 0,'','',self::$cont);
}
- list($rows,$type,$type2,$type3,$type4,$type5) = $legacy_options;
+ list($rows,$type,$type2,$type3,$type4,$type5) = $legacy_options+[null,null,null,null,null,null];
$no_lang = false;
$options = array();
switch ($widget_type)
@@ -644,7 +644,7 @@ class Select extends Etemplate\Widget
// These are extra info for easy dealing with categories
// client side, without extra loading
'main' => (int)$cat['main'],
- 'children' => $cat['children'],
+ 'children' => $cat['children'] ?? null,
//add different class per level to allow different styling for each category level:
'class' => "cat_level". $cat['level']
);
@@ -839,7 +839,7 @@ class Select extends Etemplate\Widget
}
foreach((array)$options as $right => $name)
{
- if(!!($value & $right))
+ if (!!((int)$value & (int)$right))
{
$new_value[] = $right;
}
diff --git a/api/src/Etemplate/Widget/Template.php b/api/src/Etemplate/Widget/Template.php
index b83255e7e9..f256e78272 100644
--- a/api/src/Etemplate/Widget/Template.php
+++ b/api/src/Etemplate/Widget/Template.php
@@ -68,7 +68,7 @@ class Template extends Etemplate\Widget
list($name) = explode('?', $_name); // remove optional cache-buster
if (isset(self::$cache[$name]) || !($path = self::relPath($name, $template_set, $version, $load_via)))
{
- if ((!$path || self::read($load_via, $template_set)) && isset(self::$cache[$name]))
+ if ((empty($path) || self::read($load_via, $template_set)) && isset(self::$cache[$name]))
{
//error_log(__METHOD__."('$name', '$template_set', '$version', '$load_via') read from cache");
return self::$cache[$name];
@@ -146,7 +146,7 @@ class Template extends Etemplate\Widget
{
static $prefixes = null;
unset($version); // not used currently
- list($app, $rest) = explode('.', $load_via ?: $name, 2);
+ list($app, $rest) = explode('.', $load_via ?: $name, 2)+[null,null];
if (empty($template_set))
{
@@ -184,7 +184,7 @@ class Template extends Etemplate\Widget
$path = $prefix.$path;
}
//error_log(__METHOD__."('$name', '$template_set') returning ".array2string($path));
- return $path;
+ return $path ?? null;
}
/**
@@ -230,16 +230,16 @@ class Template extends Etemplate\Widget
{
$cname =& $params[0];
$old_cname = $params[0];
- if ($this->attrs['content']) $cname = self::form_name($cname, $this->attrs['content'], $params[1]);
+ if (!empty($this->attrs['content'])) $cname = self::form_name($cname, $this->attrs['content'], $params[1]);
// Check for template from content, and run over it
// templates included via template tag have their name to load them from in attribute "template"
- $expand_name = self::expand_name($this->id ? $this->id : $this->attrs['template'], '','','','',self::$request->content);
+ $expand_name = self::expand_name($this->id ?: $this->attrs['template'], '','','','',self::$request->content);
if(!$expand_name && $this->id && $this->attrs['template'])
{
$expand_name = $this->attrs['template'];
}
- if($this->original_name)
+ if (!empty($this->original_name))
{
$expand_name = self::expand_name($this->original_name, '','','','',self::$request->content);
}
diff --git a/api/src/Etemplate/Widget/Textbox.php b/api/src/Etemplate/Widget/Textbox.php
index 74717982ac..26a32a3897 100644
--- a/api/src/Etemplate/Widget/Textbox.php
+++ b/api/src/Etemplate/Widget/Textbox.php
@@ -62,14 +62,14 @@ class Textbox extends Etemplate\Widget
parent::set_attrs($xml, $cloned);
// Legacy handling only
- // A negative size triggered the HTML readonly attibute, but not etemplate readonly,
+ // A negative size triggered the HTML readonly attribute, but not etemplate readonly,
// so you got an input element, but it was not editable.
- if ($this->attrs['size'] < 0)
+ if (isset($this->attrs['size']) && $this->attrs['size'] < 0)
{
self::setElementAttribute($this->id, 'size', abs($this->attrs['size']));
self::$request->readonlys[$this->id] = false;
self::setElementAttribute($this->id, 'readonly', true);
- trigger_error("Using a negative size to set textbox readonly. " .$this, E_USER_DEPRECATED);
+ //trigger_error("Using a negative size to set textbox readonly. " .$this, E_USER_DEPRECATED);
}
return $this;
}
diff --git a/api/src/Etemplate/Widget/Tree.php b/api/src/Etemplate/Widget/Tree.php
index 1fa12c56d0..b05deaac1c 100644
--- a/api/src/Etemplate/Widget/Tree.php
+++ b/api/src/Etemplate/Widget/Tree.php
@@ -143,7 +143,7 @@ class Tree extends Etemplate\Widget
parent::set_attrs($xml, $cloned);
// set attrs[multiple] from attrs[options]
- if ($this->attrs['options'] > 1)
+ if (isset($this->attrs['options']) && (int)$this->attrs['options'] > 1)
{
self::setElementAttribute($this->id, 'multiple', true);
}
@@ -297,21 +297,21 @@ class Tree extends Etemplate\Widget
{
$form_name = self::form_name($cname, $this->id);
- if (($templated_path = self::templateImagePath($this->attrs['image_path'])) != $this->attrs['image_path'])
+ if (($templated_path = self::templateImagePath($this->attrs['image_path'] ?? null)) !== ($this->attrs['image_path'] ?? null))
{
self::setElementAttribute($form_name, 'image_path', $this->attrs['image_path'] = $templated_path);
//error_log(__METHOD__."() setting templated image-path for $form_name: $templated_path");
}
- if (!is_array(self::$request->sel_options[$form_name])) self::$request->sel_options[$form_name] = array();
- if ($this->attrs['type'])
+ if (empty(self::$request->sel_options[$form_name])) self::$request->sel_options[$form_name] = [];
+ if (!empty($this->attrs['type']))
{
// += to keep further options set by app code
- self::$request->sel_options[$form_name] += self::typeOptions($this->attrs['type'], $this->attrs['options'],
- $no_lang, $this->attrs['readonly'], self::get_array(self::$request->content, $form_name), $form_name);
+ self::$request->sel_options[$form_name] += self::typeOptions($this->attrs['type'], $this->attrs['options'] ?? null,
+ $no_lang, $this->attrs['readonly'] ?? null, self::get_array(self::$request->content, $form_name), $form_name);
// if no_lang was modified, forward modification to the client
- if ($no_lang != $this->attr['no_lang'])
+ if (!isset($this->attr['no_lang']) || $no_lang != $this->attr['no_lang'])
{
self::setElementAttribute($form_name, 'no_lang', $no_lang);
}
@@ -440,7 +440,7 @@ class Tree extends Etemplate\Widget
*/
public static function typeOptions($widget_type, $legacy_options, &$no_lang=false, $readonly=false, $value=null, $form_name=null)
{
- list($rows,$type,$type2,$type3) = explode(',',$legacy_options);
+ list($rows,$type,$type2,$type3) = explode(',', $legacy_options)+[null,null,null,null];
$no_lang = false;
$options = array();
diff --git a/api/src/Etemplate/Widget/Vfs.php b/api/src/Etemplate/Widget/Vfs.php
index 9781da9ad7..d04e8b96cc 100644
--- a/api/src/Etemplate/Widget/Vfs.php
+++ b/api/src/Etemplate/Widget/Vfs.php
@@ -37,10 +37,10 @@ class Vfs extends File
*/
public function beforeSendToClient($cname, $expand = array())
{
- if($this->type == 'vfs-upload' || $this->attrs['type'] == 'vfs-upload')
+ if ($this->type === 'vfs-upload' || !empty($this->attrs['type']) && $this->attrs['type'] === 'vfs-upload')
{
$form_name = self::form_name($cname, $this->id, $expand ? $expand : array('cont'=>self::$request->content));
- if($this->attrs['path'])
+ if (!empty($this->attrs['path']))
{
$path = self::expand_name($this->attrs['path'],$expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
}
@@ -226,7 +226,7 @@ class Vfs extends File
foreach($links as $link)
{
$matches = null;
- if (is_array($link) && preg_match('|^'.preg_quote(Api\Vfs::PREFIX,'|').'('.preg_quote(self::get_temp_dir($app, ''), '|').'[^/]+)/|', $link['id']['tmp_name'], $matches))
+ if (is_array($link) && !empty($link['id']['tmp_name']) && preg_match('|^'.preg_quote(Api\Vfs::PREFIX,'|').'('.preg_quote(self::get_temp_dir($app, ''), '|').'[^/]+)/|', $link['id']['tmp_name'], $matches))
{
$replace[substr($link['id']['tmp_name'], strlen(Api\Vfs::PREFIX))] =
Api\Link::vfs_path($app, $id, Api\Vfs::basename($link['id']['tmp_name']), true);
diff --git a/api/src/Framework/Ajax.php b/api/src/Framework/Ajax.php
index 77f0e67530..e10618fa2c 100755
--- a/api/src/Framework/Ajax.php
+++ b/api/src/Framework/Ajax.php
@@ -2,12 +2,12 @@
/**
* EGroupware - Framework for Ajax based templates: jdots & Pixelegg
*
- * @link http://www.stylite.de
+ * @link https://www.egroupware.org
* @package api
* @subpackage framework
- * @author Andreas Stöckel