Index: /trunk/phpgwapi/cron/asyncservices.php
===================================================================
--- /trunk/phpgwapi/cron/asyncservices.php (revision 5141)
+++ /trunk/phpgwapi/cron/asyncservices.php (revision 7681)
@@ -57,5 +57,5 @@
if (!isset($GLOBALS['phpgw_domain'][$_GET['domain']]) || empty($db_type))
{
- echo $msg = "asyncservice.php: Domain '$_GET[domain]' is not configured or renamed, exiting !!!\n";
+ echo $msg = "asyncservice.php: Domain '{$_GET['domain']}' is not configured or renamed, exiting !!!\n";
if (defined('ASYNC_LOG'))
{
Index: /trunk/phpgwapi/inc/class.vfs_shared.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.vfs_shared.inc.php (revision 7655)
+++ /trunk/phpgwapi/inc/class.vfs_shared.inc.php (revision 7681)
@@ -1028,8 +1028,8 @@
while (list ($num, $link_info) = each ($this->linked_dirs))
{
- if (preg_match("/^$link_info[directory]\/$link_info[name](\/|$)/", $rarray['fake_full_path']))
+ if (preg_match("/^{$link_info['directory']}\/{$link_info['name']}(\/|$)/", $rarray['fake_full_path']))
{
$rarray['real_full_path'] = preg_replace("/^$this->basedir/", '', $rarray['real_full_path']);
- $rarray['real_full_path'] = preg_replace("/^$link_info[directory]" . SEP . "$link_info[name]/", $link_info['link_directory'] . SEP . $link_info['link_name'], $rarray['real_full_path']);
+ $rarray['real_full_path'] = preg_replace("/^{$link_info['directory']}" . SEP . "{$link_info['name']}/", $link_info['link_directory'] . SEP . $link_info['link_name'], $rarray['real_full_path']);
$p = $this->path_parts (array(
@@ -1069,14 +1069,14 @@
}
- /*
- echo " fake_full_path: $rarray[fake_full_path]
- fake_leading_dirs: $rarray[fake_leading_dirs]
- fake_extra_path: $rarray[fake_extra_path]
- fake_name: $rarray[fake_name]
- real_full_path: $rarray[real_full_path]
- real_leading_dirs: $rarray[real_leading_dirs]
- real_extra_path: $rarray[real_extra_path]
- real_name: $rarray[real_name]";
- */
+ /*
+ echo " fake_full_path: {$rarray['fake_full_path']}
+ fake_leading_dirs: {$rarray['fake_leading_dirs']}
+ fake_extra_path: {$rarray['fake_extra_path']}
+ fake_name: {$rarray['fake_name']}
+ real_full_path: {$rarray['real_full_path']}
+ real_leading_dirs: {$rarray['real_leading_dirs']}
+ real_extra_path: {$rarray['real_extra_path']}
+ real_name: {$rarray['real_name']}";
+ */
if ($data['object'])
Index: /trunk/phpgwapi/inc/class.uiaccountsel.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.uiaccountsel.inc.php (revision 2)
+++ /trunk/phpgwapi/inc/class.uiaccountsel.inc.php (revision 7681)
@@ -343,5 +343,5 @@
$GLOBALS['phpgw']->template->set_var('onclick',"addOption('$element_id','".
- $GLOBALS['phpgw']->common->grab_owner_name($group['account_id'])."','$group[account_id]')".
+ $GLOBALS['phpgw']->common->grab_owner_name($group['account_id'])."','{$group['account_id']}')".
($single ? '; window.close()' : ''));
@@ -409,5 +409,5 @@
'lastname' => $user['account_lastname'] ? $user['account_lastname'] : ' ',
'onclick' => "addOption('$element_id','".
- $GLOBALS['phpgw']->common->grab_owner_name($user['account_id'])."','$user[account_id]')".
+ $GLOBALS['phpgw']->common->grab_owner_name($user['account_id'])."','{$user['account_id']}')".
($single ? '; window.close()' : ''),
));
Index: /trunk/phpgwapi/inc/class.asyncservice.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.asyncservice.inc.php (revision 6057)
+++ /trunk/phpgwapi/inc/class.asyncservice.inc.php (revision 7681)
@@ -522,11 +522,11 @@
if ($exists || $this->read($job['id']))
{
- $this->db->query("UPDATE $this->db_table SET next=$job[next],times='$job[times]',".
- "method='$job[method]',data='$job[data]',account_id=$job[account_id] WHERE id='$job[id]'",__LINE__,__FILE__);
+ $this->db->query("UPDATE $this->db_table SET next={$job['next']},times='{$job['times']}',".
+ "method='{$job['method']}',data='{$job['data']}',account_id={$job['account_id']} WHERE id='{$job['id']}'",__LINE__,__FILE__);
}
else
{
$this->db->query("INSERT INTO $this->db_table (id,next,times,method,data,account_id) VALUES ".
- "('$job[id]',$job[next],'$job[times]','$job[method]','$job[data]',$job[account_id])",__LINE__,__FILE__);
+ "('{$job['id']}',{$job['next']},'{$job['times']}','{$job['method']}','{$job['data']}',{$job['account_id']})",__LINE__,__FILE__);
}
}
Index: /trunk/phpgwapi/inc/class.matrixview.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.matrixview.inc.php (revision 7655)
+++ /trunk/phpgwapi/inc/class.matrixview.inc.php (revision 7681)
@@ -104,5 +104,5 @@
{
$dinfo = getdate(mktime(0,0,0, $this->month+1,0,$this->year));
- $this->day = $dinfo[mday];
+ $this->day = $dinfo['mday'];
}
@@ -200,6 +200,6 @@
$in = getdate(mktime(0,0,0, $this->month+1,0,$this->year));
- $this->sumdays = $in[mday];
- $this->monthname = $in[month];
+ $this->sumdays = $in['mday'];
+ $this->monthname = $in['month'];
$this->out_monthyear($form_link);
Index: /trunk/phpgwapi/inc/class.vfs_sql.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.vfs_sql.inc.php (revision 7655)
+++ /trunk/phpgwapi/inc/class.vfs_sql.inc.php (revision 7681)
@@ -1411,6 +1411,6 @@
$newdir = preg_replace("/^$f->fake_full_path/", "$t->fake_full_path", $entry['directory']);
$this->cp (array(
- 'from' => "$entry[directory]/$entry[name]",
- 'to' => "$newdir/$entry[name]",
+ 'from' => "$entry[directory]/{$entry['name']}",
+ 'to' => "$newdir/{$entry['name']}",
'relatives' => array ($f->mask, $t->mask)
)
@@ -1651,8 +1651,8 @@
$query = $GLOBALS['phpgw']->db->query ("UPDATE phpgw_vfs SET directory='".
- $GLOBALS['phpgw']->db->db_addslashes($newdir_clean)."' WHERE file_id='$entry[file_id]'" .
+ $GLOBALS['phpgw']->db->db_addslashes($newdir_clean)."' WHERE file_id='{$entry['file_id']}'" .
$this->extra_sql (array ('query_type' => VFS_SQL_UPDATE)), __LINE__, __FILE__);
$this->correct_attributes (array(
- 'string' => "$newdir/$entry[name]",
+ 'string' => "$newdir/{$entry['name']}",
'relatives' => array ($t->mask)
)
@@ -1782,5 +1782,5 @@
$this->rm (array(
- 'string' => "$entry[directory]/$entry[name]",
+ 'string' => "{$entry['directory']}/{$entry['name']}",
'relatives' => array ($p->mask)
)
@@ -1798,5 +1798,5 @@
/* Only the best in confusing recursion */
$this->rm (array(
- 'string' => "$entry[directory]/$entry[name]",
+ 'string' => "{$entry['directory']}/{$entry['name']}",
'relatives' => array ($p->mask)
)
Index: /trunk/phpgwapi/inc/class.accounts.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.accounts.inc.php (revision 7673)
+++ /trunk/phpgwapi/inc/class.accounts.inc.php (revision 7681)
@@ -189,8 +189,8 @@
* @param $param['query'] string to search for, no search if unset or empty
* @param $param['query_type'] string:
- * 'all' - query all fields for containing $param[query]
- * 'start' - query all fields starting with $param[query]
- * 'exact' - query all fields for exact $param[query]
- * 'lid','firstname','lastname','email' - query only the given field for containing $param[query]
+ * 'all' - query all fields for containing $param['query']
+ * 'start' - query all fields starting with $param['query']
+ * 'exact' - query all fields for exact $param['query']
+ * 'lid','firstname','lastname','email' - query only the given field for containing $param['query']
* @param $param['app'] string with an app-name, to limit result on accounts with run-right for that app
* @param $param['offset'] int - number of matches to return if start given, default use the value in the prefs
@@ -251,5 +251,5 @@
$this->total = $account_search[$serial2]['total'];
}
- //echo "accounts_::get_list($param[type],$param[start],$param[sort],$param[order],$param[query],$param[offset],$param[query_type]) returned
".print_r($account_search[$serial2],True)." \n";
+ //echo "accounts_::get_list({$param['type']},{$param['start']},{$param['sort']},{$param['order']},{$param['query']},{$param['offset']},{$param['query_type']}) returned".print_r($account_search[$serial2],True)." \n";
if ($app || $group) // limit the search on accounts with run-rights for app or a group
{
Index: /trunk/phpgwapi/inc/class.Template.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.Template.inc.php (revision 2)
+++ /trunk/phpgwapi/inc/class.Template.inc.php (revision 7681)
@@ -25,5 +25,5 @@
var $debug = False; // array('cat_list','cat_list_t');
- /* $file[handle] = 'filename'; */
+ /* $file['handle'] = 'filename'; */
var $file = array();
@@ -31,5 +31,5 @@
var $root = '';
- /* $varkeys[key] = 'key'; $varvals[key] = 'value'; */
+ /* $varkeys['key'] = 'key'; $varvals['key'] = 'value'; */
var $varkeys = array();
var $varvals = array();
Index: /trunk/phpgwapi/inc/class.vfs_dav.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.vfs_dav.inc.php (revision 7655)
+++ /trunk/phpgwapi/inc/class.vfs_dav.inc.php (revision 7681)
@@ -585,8 +585,8 @@
while (list ($num, $link_info) = each ($this->linked_dirs))
{
- if (preg_match("/^$link_info[directory]\/$link_info[name](\/|$)/", $rarray['fake_full_path']))
+ if (preg_match("/^{$link_info['directory']}\/{$link_info['name']}(\/|$)/", $rarray['fake_full_path']))
{
$rarray['real_full_path'] = preg_replace("/^$this->basedir/", '', $rarray['real_full_path']);
- $rarray['real_full_path'] = preg_replace("/^$link_info[directory]" . SEP . "$link_info[name]/", $link_info['link_directory'] . SEP . $link_info['link_name'], $rarray['real_full_path']);
+ $rarray['real_full_path'] = preg_replace("/^{$link_info['directory']}" . SEP . "{$link_info['name']}/", $link_info['link_directory'] . SEP . $link_info['link_name'], $rarray['real_full_path']);
$p = $this->path_parts (array(
@@ -643,13 +643,13 @@
/*
- echo " fake_full_path: $rarray[fake_full_path]
- fake_leading_dirs: $rarray[fake_leading_dirs]
- fake_extra_path: $rarray[fake_extra_path]
- fake_name: $rarray[fake_name]
- real_full_path: $rarray[real_full_path]
- real_full_url: $rarray[real_full_url]
- real_leading_dirs: $rarray[real_leading_dirs]
- real_extra_path: $rarray[real_extra_path]
- real_name: $rarray[real_name]";
+ echo " fake_full_path: {$rarray['fake_full_path']}
+ fake_leading_dirs: {$rarray['fake_leading_dirs']}
+ fake_extra_path: {$rarray['fake_extra_path']}
+ fake_name: {$rarray['fake_name']}
+ real_full_path: {$rarray['real_full_path']}
+ real_full_url: {$rarray['real_full_url']}
+ real_leading_dirs: {$rarray['real_leading_dirs']}
+ real_extra_path: {$rarray['real_extra_path']}
+ real_name: {$rarray['real_name']}";
*/
@@ -1681,6 +1681,6 @@
$newdir = preg_replace("/^$f->fake_full_path/", "$t->fake_full_path", $entry['directory']);
$this->cp (array(
- 'from' => "$entry[directory]/$entry[name]",
- 'to' => "$newdir/$entry[name]",
+ 'from' => "$entry[directory]/{$entry['name']}",
+ 'to' => "$newdir/{$entry['name']}",
'relatives' => array ($f->mask, $t->mask)
)
@@ -1951,5 +1951,5 @@
{
$this->rm (array(
- 'string' => "$entry[directory]/$entry[name]",
+ 'string' => "{$entry['directory']}/{$entry['name']}",
'relatives' => array ($p->mask)
)
Index: /trunk/phpgwapi/templates/classic/login_classic.php
===================================================================
--- /trunk/phpgwapi/templates/classic/login_classic.php (revision 7673)
+++ /trunk/phpgwapi/templates/classic/login_classic.php (revision 7681)
@@ -315,5 +315,5 @@
$config_reg = $cnf_reg->config_data;
- if($config_reg[enable_registration]=='True' && $config_reg[register_link]=='True')
+ if($config_reg['enable_registration']=='True' && $config_reg['register_link']=='True')
{
$reg_link=' '.lang('Not a user yet? Register now').' ';
Index: /trunk/phpgwapi/templates/default/login_default.php
===================================================================
--- /trunk/phpgwapi/templates/default/login_default.php (revision 7673)
+++ /trunk/phpgwapi/templates/default/login_default.php (revision 7681)
@@ -428,5 +428,5 @@
$config_reg = $cnf_reg->config_data;
- if($config_reg[enable_registration]=='True' && $config_reg[register_link]=='True')
+ if($config_reg['enable_registration']=='True' && $config_reg['register_link']=='True')
{
$reg_link=' '.lang('Not a user yet? Register now').' ';
Index: /trunk/phpgwapi/templates/news/login_news.php
===================================================================
--- /trunk/phpgwapi/templates/news/login_news.php (revision 7673)
+++ /trunk/phpgwapi/templates/news/login_news.php (revision 7681)
@@ -364,5 +364,5 @@
$config_reg = $cnf_reg->config_data;
- if($config_reg[enable_registration]=='True' && $config_reg[register_link]=='True')
+ if($config_reg['enable_registration']=='True' && $config_reg['register_link']=='True')
{
$reg_link=' '.lang('Not a user yet? Register now').' ';
Index: /trunk/reports/inc/class.uireports_maillists.inc.php
===================================================================
--- /trunk/reports/inc/class.uireports_maillists.inc.php (revision 7655)
+++ /trunk/reports/inc/class.uireports_maillists.inc.php (revision 7681)
@@ -65,9 +65,9 @@
}
- $grouplist = trim($_POST[setor]);
+ $grouplist = trim($_POST['setor']);
$grouplist = trim(ereg_replace("-","",$grouplist));
- $setordn = trim($_POST[setordn]);
- $subtitulo1 = trim($_POST[subtitulo]);
+ $setordn = trim($_POST['setordn']);
+ $subtitulo1 = trim($_POST['subtitulo']);
define('FPDF_FONTPATH','font/');
@@ -300,11 +300,11 @@
function report_maillists_group_print()
{
- $grouplist = trim($_POST[setor]);
+ $grouplist = trim($_POST['setor']);
$grouplist = trim(ereg_replace("-","",$grouplist));
- $organizacao = trim($_POST[organizacao]);
- $setordn = trim($_POST[setordn]);
- $organizacaodn = trim($_POST[organizacaodn]);
- $sectornamedncompleto = trim($_POST[sectornamedncompleto]);
- $Psectornamedncompleto = trim($_POST[Psectornamedncompleto]);
+ $organizacao = trim($_POST['organizacao']);
+ $setordn = trim($_POST['setordn']);
+ $organizacaodn = trim($_POST['organizacaodn']);
+ $sectornamedncompleto = trim($_POST['sectornamedncompleto']);
+ $Psectornamedncompleto = trim($_POST['Psectornamedncompleto']);
if ($sectornamedncompleto=="" && $Psectornamedncompleto=="")
@@ -385,5 +385,5 @@
// **** Grupo de paginas ****
- $gpag = $_POST[gpage];
+ $gpag = $_POST['gpage'];
$grupopage = 20;
@@ -394,5 +394,5 @@
// recebe o numero da pagina
- $npag = $_POST[page];
+ $npag = $_POST['page'];
// verifica se o get com o numero da pagina é nulo
Index: /trunk/reports/inc/class.uireports_users.inc.php
===================================================================
--- /trunk/reports/inc/class.uireports_users.inc.php (revision 7655)
+++ /trunk/reports/inc/class.uireports_users.inc.php (revision 7681)
@@ -65,9 +65,9 @@
}
- $grouplist = trim($_POST[setor]);
+ $grouplist = trim($_POST['setor']);
$grouplist = trim(ereg_replace("-","",$grouplist));
- $setordn = trim($_POST[setordn]);
- $subtitulo1 = trim($_POST[subtitulo]);
+ $setordn = trim($_POST['setordn']);
+ $subtitulo1 = trim($_POST['subtitulo']);
define('FPDF_FONTPATH','font/');
@@ -318,11 +318,11 @@
function report_users_group_setor_print()
{
- $grouplist = trim($_POST[setor]);
+ $grouplist = trim($_POST['setor']);
$grouplist = trim(ereg_replace("-","",$grouplist));
- $organizacao = trim($_POST[organizacao]);
- $setordn = trim($_POST[setordn]);
- $organizacaodn = trim($_POST[organizacaodn]);
- $sectornamedncompleto = trim($_POST[sectornamedncompleto]);
- $Psectornamedncompleto = trim($_POST[Psectornamedncompleto]);
+ $organizacao = trim($_POST['organizacao']);
+ $setordn = trim($_POST['setordn']);
+ $organizacaodn = trim($_POST['organizacaodn']);
+ $sectornamedncompleto = trim($_POST['sectornamedncompleto']);
+ $Psectornamedncompleto = trim($_POST['Psectornamedncompleto']);
if ($sectornamedncompleto=="" && $Psectornamedncompleto=="")
@@ -403,5 +403,5 @@
// **** Grupo de paginas ****
- $gpag = $_POST[gpage];
+ $gpag = $_POST['gpage'];
$grupopage = 20;
@@ -412,5 +412,5 @@
// recebe o numero da pagina
- $npag = $_POST[page];
+ $npag = $_POST['page'];
// verifica se o get com o numero da pagina é nulo
Index: /trunk/reports/inc/class.uireports_usersgroups.inc.php
===================================================================
--- /trunk/reports/inc/class.uireports_usersgroups.inc.php (revision 7655)
+++ /trunk/reports/inc/class.uireports_usersgroups.inc.php (revision 7681)
@@ -65,9 +65,9 @@
}
- $grouplist = trim($_POST[setor]);
+ $grouplist = trim($_POST['setor']);
$grouplist = trim(ereg_replace("-","",$grouplist));
- $setordn = trim($_POST[setordn]);
- $subtitulo1 = trim($_POST[subtitulo]);
+ $setordn = trim($_POST['setordn']);
+ $subtitulo1 = trim($_POST['subtitulo']);
define('FPDF_FONTPATH','font/');
@@ -297,11 +297,11 @@
function report_usersgroups_group_print()
{
- $grouplist = trim($_POST[setor]);
+ $grouplist = trim($_POST['setor']);
$grouplist = trim(ereg_replace("-","",$grouplist));
- $organizacao = trim($_POST[organizacao]);
- $setordn = trim($_POST[setordn]);
- $organizacaodn = trim($_POST[organizacaodn]);
- $sectornamedncompleto = trim($_POST[sectornamedncompleto]);
- $Psectornamedncompleto = trim($_POST[Psectornamedncompleto]);
+ $organizacao = trim($_POST['organizacao']);
+ $setordn = trim($_POST['setordn']);
+ $organizacaodn = trim($_POST['organizacaodn']);
+ $sectornamedncompleto = trim($_POST['sectornamedncompleto']);
+ $Psectornamedncompleto = trim($_POST['Psectornamedncompleto']);
if ($sectornamedncompleto=="" && $Psectornamedncompleto=="")
@@ -382,5 +382,5 @@
// **** Grupo de paginas ****
- $gpag = $_POST[gpage];
+ $gpag = $_POST['gpage'];
$grupopage = 20;
@@ -391,5 +391,5 @@
// recebe o numero da pagina
- $npag = $_POST[page];
+ $npag = $_POST['page'];
// verifica se o get com o numero da pagina é nulo
Index: /trunk/reports/inc/class.uireports_shareAccounts.inc.php
===================================================================
--- /trunk/reports/inc/class.uireports_shareAccounts.inc.php (revision 7655)
+++ /trunk/reports/inc/class.uireports_shareAccounts.inc.php (revision 7681)
@@ -67,9 +67,9 @@
}
- $grouplist = trim($_POST[setor]);
+ $grouplist = trim($_POST['setor']);
$grouplist = trim(ereg_replace("-","",$grouplist));
- $setordn = trim($_POST[setordn]);
- $subtitulo1 = trim($_POST[subtitulo]);
+ $setordn = trim($_POST['setordn']);
+ $subtitulo1 = trim($_POST['subtitulo']);
define('FPDF_FONTPATH','font/');
@@ -329,11 +329,11 @@
function report_shareAccounts_group_setor_print()
{
- $grouplist = trim($_POST[setor]);
+ $grouplist = trim($_POST['setor']);
$grouplist = trim(ereg_replace("-","",$grouplist));
- $organizacao = trim($_POST[organizacao]);
- $setordn = trim($_POST[setordn]);
- $organizacaodn = trim($_POST[organizacaodn]);
- $sectornamedncompleto = trim($_POST[sectornamedncompleto]);
- $Psectornamedncompleto = trim($_POST[Psectornamedncompleto]);
+ $organizacao = trim($_POST['organizacao']);
+ $setordn = trim($_POST['setordn']);
+ $organizacaodn = trim($_POST['organizacaodn']);
+ $sectornamedncompleto = trim($_POST['sectornamedncompleto']);
+ $Psectornamedncompleto = trim($_POST['Psectornamedncompleto']);
if ($sectornamedncompleto=="" && $Psectornamedncompleto=="")
@@ -414,5 +414,5 @@
// **** Grupo de paginas ****
- $gpag = $_POST[gpage];
+ $gpag = $_POST['gpage'];
$grupopage = 20;
@@ -423,5 +423,5 @@
// recebe o numero da pagina
- $npag = $_POST[page];
+ $npag = $_POST['page'];
// verifica se o get com o numero da pagina é nulo
Index: /trunk/reports/inc/class.uireports_institutionalAccounts.inc.php
===================================================================
--- /trunk/reports/inc/class.uireports_institutionalAccounts.inc.php (revision 7655)
+++ /trunk/reports/inc/class.uireports_institutionalAccounts.inc.php (revision 7681)
@@ -65,9 +65,9 @@
}
- $grouplist = trim($_POST[setor]);
+ $grouplist = trim($_POST['setor']);
$grouplist = trim(ereg_replace("-","",$grouplist));
- $setordn = trim($_POST[setordn]);
- $subtitulo1 = trim($_POST[subtitulo]);
+ $setordn = trim($_POST['setordn']);
+ $subtitulo1 = trim($_POST['subtitulo']);
define('FPDF_FONTPATH','font/');
@@ -324,11 +324,11 @@
function report_institutionalAccounts_group_setor_print()
{
- $grouplist = trim($_POST[setor]);
+ $grouplist = trim($_POST['setor']);
$grouplist = trim(ereg_replace("-","",$grouplist));
- $organizacao = trim($_POST[organizacao]);
- $setordn = trim($_POST[setordn]);
- $organizacaodn = trim($_POST[organizacaodn]);
- $sectornamedncompleto = trim($_POST[sectornamedncompleto]);
- $Psectornamedncompleto = trim($_POST[Psectornamedncompleto]);
+ $organizacao = trim($_POST['organizacao']);
+ $setordn = trim($_POST['setordn']);
+ $organizacaodn = trim($_POST['organizacaodn']);
+ $sectornamedncompleto = trim($_POST['sectornamedncompleto']);
+ $Psectornamedncompleto = trim($_POST['Psectornamedncompleto']);
if ($sectornamedncompleto=="" && $Psectornamedncompleto=="")
@@ -409,5 +409,5 @@
// **** Grupo de paginas ****
- $gpag = $_POST[gpage];
+ $gpag = $_POST['gpage'];
$grupopage = 20;
@@ -418,5 +418,5 @@
// recebe o numero da pagina
- $npag = $_POST[page];
+ $npag = $_POST['page'];
// verifica se o get com o numero da pagina é nulo
Index: /trunk/reports/inc/class.uireports_logon.inc.php
===================================================================
--- /trunk/reports/inc/class.uireports_logon.inc.php (revision 7655)
+++ /trunk/reports/inc/class.uireports_logon.inc.php (revision 7681)
@@ -66,11 +66,11 @@
}
- $grouplist = trim($_POST[setor]);
+ $grouplist = trim($_POST['setor']);
$grouplist = trim(ereg_replace("-","",$grouplist));
- $setordn = trim($_POST[setordn]);
- $subtitulo1 = trim($_POST[subtitulo]);
-
- $vnumacesso = trim($_POST[nacesso]);
+ $setordn = trim($_POST['setordn']);
+ $subtitulo1 = trim($_POST['subtitulo']);
+
+ $vnumacesso = trim($_POST['nacesso']);
$numacesso = abs(round($vnumacesso));
@@ -401,11 +401,11 @@
}
- $grouplist = trim($_POST[setor]);
+ $grouplist = trim($_POST['setor']);
$grouplist = trim(ereg_replace("-","",$grouplist));
- $organizacao = trim($_POST[organizacao]);
- $setordn = trim($_POST[setordn]);
- $organizacaodn = trim($_POST[organizacaodn]);
- $sectornamedncompleto = trim($_POST[sectornamedncompleto]);
- $Psectornamedncompleto = trim($_POST[Psectornamedncompleto]);
+ $organizacao = trim($_POST['organizacao']);
+ $setordn = trim($_POST['setordn']);
+ $organizacaodn = trim($_POST['organizacaodn']);
+ $sectornamedncompleto = trim($_POST['sectornamedncompleto']);
+ $Psectornamedncompleto = trim($_POST['Psectornamedncompleto']);
if ($sectornamedncompleto=="" && $Psectornamedncompleto=="")
@@ -485,5 +485,5 @@
// **** Grupo de paginas ****
- $gpag = $_POST[gpage];
+ $gpag = $_POST['gpage'];
$grupopage = 20;
@@ -494,5 +494,5 @@
// recebe o numero da pagina
- $npag = $_POST[page];
+ $npag = $_POST['page'];
// verifica se o get com o numero da pagina é nulo
Index: /trunk/reports/inc/class.uireports_cota.inc.php
===================================================================
--- /trunk/reports/inc/class.uireports_cota.inc.php (revision 7655)
+++ /trunk/reports/inc/class.uireports_cota.inc.php (revision 7681)
@@ -203,11 +203,11 @@
function report_cota_group_setor_print()
{
- $grouplist = trim($_POST[setor]);
+ $grouplist = trim($_POST['setor']);
$grouplist = trim(ereg_replace("-","",$grouplist));
- $organizacao = trim($_POST[organizacao]);
- $setordn = trim($_POST[setordn]);
- $organizacaodn = trim($_POST[organizacaodn]);
- $sectornamedncompleto = trim($_POST[sectornamedncompleto]);
- $Psectornamedncompleto = trim($_POST[Psectornamedncompleto]);
+ $organizacao = trim($_POST['organizacao']);
+ $setordn = trim($_POST['setordn']);
+ $organizacaodn = trim($_POST['organizacaodn']);
+ $sectornamedncompleto = trim($_POST['sectornamedncompleto']);
+ $Psectornamedncompleto = trim($_POST['Psectornamedncompleto']);
if ($sectornamedncompleto=="" && $Psectornamedncompleto=="")
@@ -289,5 +289,5 @@
// **** Grupo de paginas ****
- $gpag = $_POST[gpage];
+ $gpag = $_POST['gpage'];
$grupopage = 20;
@@ -298,5 +298,5 @@
// recebe o numero da pagina
- $npag = $_POST[page];
+ $npag = $_POST['page'];
// verifica se o get com o numero da pagina é nulo
@@ -512,9 +512,9 @@
}
- $grouplist = trim($_POST[setor]);
+ $grouplist = trim($_POST['setor']);
$grouplist = trim(ereg_replace("-","",$grouplist));
- $setordn = trim($_POST[setordn]);
- $subtitulo1 = trim($_POST[subtitulo]);
+ $setordn = trim($_POST['setordn']);
+ $subtitulo1 = trim($_POST['subtitulo']);
define('FPDF_FONTPATH','font/');
Index: /trunk/reports/inc/class.functions.inc.php
===================================================================
--- /trunk/reports/inc/class.functions.inc.php (revision 7655)
+++ /trunk/reports/inc/class.functions.inc.php (revision 7681)
@@ -58,48 +58,48 @@
{
case list_users:
- if ($array_acl[acl_add_users] || $array_acl[acl_edit_users] || $array_acl[acl_delete_users] || $array_acl[acl_change_users_password] || $array_acl[acl_change_users_quote] || $array_acl[acl_edit_sambausers_attributes] || $array_acl[acl_view_users] || $array_acl[acl_manipulate_corporative_information] || $array_acl[acl_edit_users_phonenumber] )
+ if ($array_acl['acl_add_users'] || $array_acl['acl_edit_users'] || $array_acl['acl_delete_users'] || $array_acl['acl_change_users_password'] || $array_acl['acl_change_users_quote'] || $array_acl['acl_edit_sambausers_attributes'] || $array_acl['acl_view_users'] || $array_acl['acl_manipulate_corporative_information'] || $array_acl['acl_edit_users_phonenumber'] )
return true;
break;
case report_users:
- if ($array_acl[acl_change_users_quote] || $array_acl[acl_view_users])
+ if ($array_acl['acl_change_users_quote'] || $array_acl['acl_view_users'])
return true;
break;
case list_groups:
- if ($array_acl[acl_add_groups] || $array_acl[acl_edit_groups] || $array_acl[acl_delete_groups])
+ if ($array_acl['acl_add_groups'] || $array_acl['acl_edit_groups'] || $array_acl['acl_delete_groups'])
return true;
break;
case list_maillists:
- if ($array_acl[acl_add_maillists] || $array_acl[acl_edit_maillists] || $array_acl[acl_delete_maillists])
+ if ($array_acl['acl_add_maillists'] || $array_acl['acl_edit_maillists'] || $array_acl['acl_delete_maillists'])
return true;
break;
case list_sectors:
// if ($array_acl[acl_create_sectors] || $array_acl[acl_edit_sectors] || $array_acl[acl_delete_sectors])
- if ($array_acl[acl_view_users])
+ if ($array_acl['acl_view_users'])
return true;
break;
case list_computers:
- if ($array_acl[acl_create_computers] || $array_acl[acl_edit_computers] || $array_acl[acl_delete_computers])
+ if ($array_acl['acl_create_computers'] || $array_acl['acl_edit_computers'] || $array_acl['acl_delete_computers'])
return true;
break;
case display_groups:
- if ( $array_acl[acl_edit_users] || $array_acl[acl_view_users] || ($array_acl[acl_edit_sambausers_attributes] && ($this->current_config['expressoAdmin_samba_support'] == 'true')) )
+ if ( $array_acl['acl_edit_users'] || $array_acl['acl_view_users'] || ($array_acl['acl_edit_sambausers_attributes'] && ($this->current_config['expressoAdmin_samba_support'] == 'true')) )
return true;
break;
case display_emailconfig:
- if ($array_acl[acl_edit_users] || $array_acl[acl_view_users])
+ if ($array_acl['acl_edit_users'] || $array_acl['acl_view_users'])
return true;
break;
case display_applications:
- if ($array_acl[acl_edit_users] || $array_acl[acl_view_users])
+ if ($array_acl['acl_edit_users'] || $array_acl['acl_view_users'])
return true;
break;
case display_emaillists:
- if ($array_acl[acl_edit_users] || $array_acl[acl_view_users])
+ if ($array_acl['acl_edit_users'] || $array_acl['acl_view_users'])
return true;
break;
case list_institutional_accounts:
- if ($array_acl[acl_add_institutional_accounts] || $array_acl[acl_edit_institutional_accounts] || $array_acl[acl_delete_institutional_accounts])
+ if ($array_acl['acl_add_institutional_accounts'] || $array_acl['acl_edit_institutional_accounts'] || $array_acl['acl_delete_institutional_accounts'])
return true;
break;
Index: /trunk/reports/index.php
===================================================================
--- /trunk/reports/index.php (revision 6920)
+++ /trunk/reports/index.php (revision 7681)
@@ -34,5 +34,5 @@
'lang_rel_maillists_org' => lang('report maillists organization'),
'lang_rel_usersgroups_org' => lang('report usersgroups organization'),
- 'page' => $_GET[page]
+ 'page' => $_GET['page']
);
$template->set_var($var);
Index: /trunk/library/PEAR/PEAR/Frontend/CLI.php
===================================================================
--- /trunk/library/PEAR/PEAR/Frontend/CLI.php (revision 7673)
+++ /trunk/library/PEAR/PEAR/Frontend/CLI.php (revision 7681)
@@ -106,5 +106,5 @@
$frame['function'] = !isset($frame['function']) ? '' : $frame['function'];
$frame['line'] = !isset($frame['line']) ? '' : $frame['line'];
- $this->_displayLine("#$i: $frame[class]$frame[type]$frame[function] $frame[line]");
+ $this->_displayLine("#$i: {$frame['class']}{$frame['type']}{$frame['function']}{$frame['line']}");
}
}
Index: /trunk/library/PEAR/PEAR/Installer.php
===================================================================
--- /trunk/library/PEAR/PEAR/Installer.php (revision 5146)
+++ /trunk/library/PEAR/PEAR/Installer.php (revision 7681)
@@ -236,5 +236,5 @@
if ((bool) $os->matchSignature($platform) === $negate) {
- $this->log(3, "skipped $file (meant for $atts[platform], we are ".$os->getSignature().")");
+ $this->log(3, "skipped $file (meant for {$atts['platform']}, we are ".$os->getSignature().")");
return PEAR_INSTALLER_SKIPPED;
}
@@ -264,5 +264,5 @@
break;
default:
- return $this->raiseError("Invalid role `$atts[role]' for file $file");
+ return $this->raiseError("Invalid role '{$atts['role']}' for file $file");
}
@@ -354,8 +354,8 @@
if ($a['type'] == 'php-const') {
if (preg_match('/^[a-z0-9_]+\\z/i', $a['to'])) {
- eval("\$to = $a[to];");
+ eval("\$to = {$a['to']};");
} else {
if (!isset($options['soft'])) {
- $this->log(0, "invalid php-const replacement: $a[to]");
+ $this->log(0, "invalid php-const replacement: {$a['to']}");
}
continue;
@@ -374,5 +374,5 @@
if (is_null($to)) {
if (!isset($options['soft'])) {
- $this->log(0, "invalid pear-config replacement: $a[to]");
+ $this->log(0, "invalid pear-config replacement: {$a['to']}");
}
continue;
@@ -383,5 +383,5 @@
} else {
if (!isset($options['soft'])) {
- $this->log(0, "invalid package-info replacement: $a[to]");
+ $this->log(0, "invalid package-info replacement: {$a['to']}");
}
continue;
@@ -1586,5 +1586,5 @@
}
- $this->log(3, "+ cp $ext[file] $copyto");
+ $this->log(3, "+ cp {$ext['file']} $copyto");
$this->addFileOperation('rename', array($ext['file'], $copyto));
if (!OS_WINDOWS) {
Index: /trunk/library/PEAR/PEAR/Downloader.php
===================================================================
--- /trunk/library/PEAR/PEAR/Downloader.php (revision 7655)
+++ /trunk/library/PEAR/PEAR/Downloader.php (revision 7681)
@@ -1633,5 +1633,5 @@
if (isset($lastmodified['ETag'])) {
- $ifmodifiedsince .= "If-None-Match: $lastmodified[ETag]\r\n";
+ $ifmodifiedsince .= "If-None-Match: {$lastmodified['ETag']}\r\n";
}
} else {
Index: /trunk/library/PEAR/PEAR/PackageFile/Generator/v1.php
===================================================================
--- /trunk/library/PEAR/PEAR/PackageFile/Generator/v1.php (revision 5146)
+++ /trunk/library/PEAR/PEAR/PackageFile/Generator/v1.php (revision 7681)
@@ -204,5 +204,5 @@
" $pkginfo[package] ";
if (isset($pkginfo['extends'])) {
- $ret .= "\n$pkginfo[extends] ";
+ $ret .= "\n{$pkginfo['extends']} ";
}
$ret .=
@@ -251,14 +251,14 @@
$ret = "$indent \n";
if (!empty($pkginfo['version'])) {
- $ret .= "$indent $pkginfo[version] \n";
+ $ret .= "$indent {$pkginfo['version']} \n";
}
if (!empty($pkginfo['release_date'])) {
- $ret .= "$indent $pkginfo[release_date] \n";
+ $ret .= "$indent {$pkginfo['release_date']} \n";
}
if (!empty($pkginfo['release_license'])) {
- $ret .= "$indent $pkginfo[release_license] \n";
+ $ret .= "$indent {$pkginfo['release_license']} \n";
}
if (!empty($pkginfo['release_state'])) {
- $ret .= "$indent $pkginfo[release_state] \n";
+ $ret .= "$indent {$pkginfo['release_state']} \n";
}
if (!empty($pkginfo['release_notes'])) {
@@ -272,13 +272,13 @@
$ret .= "$indent \n";
foreach ($pkginfo['release_deps'] as $dep) {
- $ret .= "$indent $what) {
- $ret .= "$indent _packageInfo['provides']["$attribs[type];$attribs[name]"] = $attribs;
+ $this->_packageInfo['provides']["{$attribs['type']};{$attribs['name']}"] = $attribs;
break;
case 'package' :
Index: /trunk/library/PEAR/PEAR/ChannelFile.php
===================================================================
--- /trunk/library/PEAR/PEAR/ChannelFile.php (revision 5146)
+++ /trunk/library/PEAR/PEAR/ChannelFile.php (revision 7681)
@@ -459,5 +459,5 @@
. $channelInfo['attribs']['version'] . " http://pear.php.net/dtd/channel-" .
$channelInfo['attribs']['version'] . ".xsd\">
- $channelInfo[name]
+ {$channelInfo['name']}
" . htmlspecialchars($channelInfo['summary'])."
";
Index: /trunk/library/PEAR/PEAR/Task/Replace.php
===================================================================
--- /trunk/library/PEAR/PEAR/Task/Replace.php (revision 5146)
+++ /trunk/library/PEAR/PEAR/Task/Replace.php (revision 7681)
@@ -124,5 +124,5 @@
$to = $chan->getServer();
} else {
- $this->logger->log(0, "$dest: invalid pear-config replacement: $a[to]");
+ $this->logger->log(0, "$dest: invalid pear-config replacement: {$a['to']}");
return false;
}
@@ -140,5 +140,5 @@
}
if (is_null($to)) {
- $this->logger->log(0, "$dest: invalid pear-config replacement: $a[to]");
+ $this->logger->log(0, "$dest: invalid pear-config replacement: {$a['to']}");
return false;
}
@@ -150,5 +150,5 @@
$to = constant($a['to']);
} else {
- $this->logger->log(0, "$dest: invalid php-const replacement: $a[to]");
+ $this->logger->log(0, "$dest: invalid php-const replacement: {$a['to']}");
return false;
}
@@ -157,5 +157,5 @@
$to = $t;
} else {
- $this->logger->log(0, "$dest: invalid package-info replacement: $a[to]");
+ $this->logger->log(0, "$dest: invalid package-info replacement: {$a['to']}");
return false;
}
Index: /trunk/library/PEAR/PEAR/REST.php
===================================================================
--- /trunk/library/PEAR/PEAR/REST.php (revision 5146)
+++ /trunk/library/PEAR/PEAR/REST.php (revision 7681)
@@ -377,5 +377,5 @@
if (isset($lastmodified['ETag'])) {
- $ifmodifiedsince .= "If-None-Match: $lastmodified[ETag]\r\n";
+ $ifmodifiedsince .= "If-None-Match: {$lastmodified['ETag']}\r\n";
}
} else {
Index: /trunk/library/PEAR/PEAR/Builder.php
===================================================================
--- /trunk/library/PEAR/PEAR/Builder.php (revision 5146)
+++ /trunk/library/PEAR/PEAR/Builder.php (revision 7681)
@@ -333,7 +333,7 @@
if (substr($o['name'], 0, 5) == 'with-' &&
($r == 'yes' || $r == 'autodetect')) {
- $configure_command .= " --$o[name]";
+ $configure_command .= " --{$o['name']}";
} else {
- $configure_command .= " --$o[name]=".trim($r);
+ $configure_command .= " --{$o['name']}=".trim($r);
}
}
Index: /trunk/library/PEAR/PEAR/Command/Remote.php
===================================================================
--- /trunk/library/PEAR/PEAR/Command/Remote.php (revision 7655)
+++ /trunk/library/PEAR/PEAR/Command/Remote.php (revision 7681)
@@ -623,5 +623,5 @@
$downloaded = $downloader->getDownloadedPackages();
foreach ($downloaded as $pkg) {
- $this->ui->outputData("File $pkg[file] downloaded", $command);
+ $this->ui->outputData("File {$pkg['file']} downloaded", $command);
}
Index: /trunk/library/PEAR/PEAR/Command/Registry.php
===================================================================
--- /trunk/library/PEAR/PEAR/Command/Registry.php (revision 5146)
+++ /trunk/library/PEAR/PEAR/Command/Registry.php (revision 7681)
@@ -514,5 +514,5 @@
$mstr .= $m['handle'] . '@php.net';
}
- $mstr .= "> ($m[role])";
+ $mstr .= "> ({$m['role']})";
}
$info[$key] = $mstr;
@@ -866,5 +866,5 @@
$info[$infoindex] .= "$type $name";
if (isset($package['uri'])) {
- $info[$infoindex] .= "\n Download URI: $package[uri]";
+ $info[$infoindex] .= "\n Download URI: {$package['uri']}";
continue;
}
@@ -882,5 +882,5 @@
if (isset($package['recommended'])) {
- $info[$infoindex] .= "\n Recommended version: $package[recommended]";
+ $info[$infoindex] .= "\n Recommended version: {$package['recommended']}";
}
@@ -920,8 +920,8 @@
$info['Not Compatible with'] .= "\n";
}
- $info['Not Compatible with'] .= "$os[name] Operating System";
+ $info['Not Compatible with'] .= "{$os['name']} Operating System";
} else {
$info['Required Dependencies'] .= "\n";
- $info['Required Dependencies'] .= "$os[name] Operating System";
+ $info['Required Dependencies'] .= "{$os['name']} Operating System";
}
}
@@ -940,8 +940,8 @@
$info['Not Compatible with'] .= "\n";
}
- $info['Not Compatible with'] .= "OS/Arch matching pattern '/$os[pattern]/'";
+ $info['Not Compatible with'] .= "OS/Arch matching pattern '/{$os['pattern']}/'";
} else {
$info['Required Dependencies'] .= "\n";
- $info['Required Dependencies'] .= "OS/Arch matching pattern '/$os[pattern]/'";
+ $info['Required Dependencies'] .= "OS/Arch matching pattern '/{$os['pattern']}/'";
}
}
@@ -1006,5 +1006,5 @@
if (isset($package['recommended'])) {
- $info[$infoindex] .= "\n Recommended version: $package[recommended]";
+ $info[$infoindex] .= "\n Recommended version: {$package['recommended']}";
}
@@ -1066,5 +1066,5 @@
}
- $info[$groupindex] .= "\n Download URI: $package[uri]";
+ $info[$groupindex] .= "\n Download URI: {$package['uri']}";
continue;
}
@@ -1088,5 +1088,5 @@
if (isset($package['recommended'])) {
- $info[$groupindex] .= "\n Recommended version: $package[recommended]";
+ $info[$groupindex] .= "\n Recommended version: {$package['recommended']}";
}
@@ -1119,5 +1119,5 @@
if (isset($package['uri'])) {
$info['Bundled Packages'] .= '__uri/' . $package['name'];
- $info['Bundled Packages'] .= "\n (URI: $package[uri]";
+ $info['Bundled Packages'] .= "\n (URI: {$package['uri']}";
} else {
$info['Bundled Packages'] .= $package['channel'] . '/' . $package['name'];
Index: /trunk/library/PEAR/PEAR/Command/Common.php
===================================================================
--- /trunk/library/PEAR/PEAR/Command/Common.php (revision 5146)
+++ /trunk/library/PEAR/PEAR/Command/Common.php (revision 7681)
@@ -223,6 +223,6 @@
$lapp = "[=$arg]";
} else {
- $sapp = " $v[arg]";
- $lapp = "=$v[arg]";
+ $sapp = " {$v['arg']}";
+ $lapp = "={$v['arg']}";
}
} else {
Index: /trunk/mobile/inc/class.ui_mobilemail.inc.php
===================================================================
--- /trunk/mobile/inc/class.ui_mobilemail.inc.php (revision 7655)
+++ /trunk/mobile/inc/class.ui_mobilemail.inc.php (revision 7681)
@@ -459,9 +459,9 @@
$messages = $this->imap_functions->get_range_msgs2($params);
- if($params['msg_range_end']<$messages[num_msgs])
+ if($params['msg_range_end']<$messages['num_msgs'])
$p->set_var("show_more","block");
else
$p->set_var("show_more","none");
- $this->number_of_messages = $messages[num_msgs];
+ $this->number_of_messages = $messages['num_msgs'];
unset($messages["offsetToGMT"]);
Index: /trunk/filemanager/inc/class.uifilemanager.inc.php
===================================================================
--- /trunk/filemanager/inc/class.uifilemanager.inc.php (revision 7673)
+++ /trunk/filemanager/inc/class.uifilemanager.inc.php (revision 7681)
@@ -155,10 +155,10 @@
// check if basedir exist
$test = $this->bo->vfs->get_real_info(array('string' => $this->bo->basedir, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
- if ($test[mime_type] != 'Directory') {
+ if ($test['mime_type'] != 'Directory') {
die('Base directory does not exist, Ask adminstrator to check the global configuration.');
}
$test = $this->bo->vfs->get_real_info(array('string' => $this->bo->basedir . $this->bo->fakebase, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
- if ($test[mime_type] != 'Directory') {
+ if ($test['mime_type'] != 'Directory') {
$this->bo->vfs->override_acl = 1;
@@ -173,5 +173,5 @@
$test = $this->bo->vfs->get_real_info(array('string' => $this->bo->basedir . $this->bo->fakebase, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
- if ($test[mime_type] != 'Directory') {
+ if ($test['mime_type'] != 'Directory') {
die('Fake Base directory does not exist and could not be created, please ask the administrator to check the global configuration.');
} else {
@@ -181,5 +181,5 @@
$test = $this->bo->vfs->get_real_info(array('string' => $this->bo->basedir . $this->bo->homedir, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
- if ($test[mime_type] != 'Directory') {
+ if ($test['mime_type'] != 'Directory') {
$c_admin = CreateObject('phpgwapi.config', 'expressoAdmin1_2');
@@ -205,5 +205,5 @@
$test = $this->bo->vfs->get_real_info(array('string' => $this->bo->basedir . $this->bo->homedir, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
- if ($test[mime_type] != 'Directory') {
+ if ($test['mime_type'] != 'Directory') {
die('Your Home Dir does not exist and could not be created, please ask the adminstrator to check the global configuration.');
} else {
@@ -622,30 +622,30 @@
if ($this->numoffiles || $this->cwd) {
- $vars[path] = ' ';
- $vars[css] = ' ';
- $vars[css].=' ';
+ $vars['path'] = ' ';
+ $vars['css'] = ' ';
+ $vars['css'].=' ';
$_SESSION['phpgw_info']['user']['preferences']['filemanager']['lid'] = $GLOBALS['phpgw_info']['user']['account_lid'];
- $vars[preferences] = ' ';
+ $vars['preferences'] = ' ';
// Used for important operations that needs security
for ($key = ""; strlen($key) < 150; $key .= chr(rand(48, 95)))
;
$_SESSION['phpgw_info']['filemanager']['user']['sec_key'] = $key;
- $vars[sec_key] = ' ';
- $vars[script] = '';
-
- $vars[new_button] = $this->toolButton('new', 'createfile', lang('New...'));
- $vars[new_button].=' ';
+ $vars['sec_key'] = ' ';
+ $vars['script'] = '';
+
+ $vars['new_button'] = $this->toolButton('new', 'createfile', lang('New...'));
+ $vars['new_button'].=' ';
// reload button with this url
- $vars[refresh_button] = $this->toolButton('reload', 'reload', lang('reload'));
+ $vars['refresh_button'] = $this->toolButton('reload', 'reload', lang('reload'));
// go up icon when we're not at the top, dont allow to go outside /home = fakebase
if ($this->path != '/' && $this->path != $this->bo->fakebase) {
- $vars[tools_button] = $this->toolButton('tools', 'tools', lang('tools'));
+ $vars['tools_button'] = $this->toolButton('tools', 'tools', lang('tools'));
}
else
- $vars[tools_button] = "";
-
- $vars[toolbar1] = $toolbar;
+ $vars['tools_button'] = "";
+
+ $vars['toolbar1'] = $toolbar;
if (count($this->messages) > 0) {
@@ -656,5 +656,5 @@
$this->messages = NULL;
- $vars[messages] = $messages;
+ $vars['messages'] = $messages;
$this->t->set_var($vars);
@@ -815,5 +815,5 @@
$var = array(
'change_upload_boxes' => lang('Show'),
- 'form_action' => $GLOBALS[phpgw]->link('/filemanager/inc/upload.php'),
+ 'form_action' => $GLOBALS['phpgw']->link('/filemanager/inc/upload.php'),
'emails_to' => $notify->EmailsToSend($GLOBALS['phpgw']->preferences->values['email']),
'lang_file' => lang('File(s)'),
@@ -906,7 +906,7 @@
- $vars[refresh_script] = "";
-
- $vars[preview_content] = '';
+ $vars['refresh_script'] = "";
+
+ $vars['preview_content'] = '';
if ($this->edit_file) {
$this->edit_file_content = stripslashes($this->edit_file_content);
@@ -916,7 +916,7 @@
$content = $this->edit_file_content;
- $vars[lang_preview_of] = lang('Preview of %1', $this->path . '/' . $edit_file);
-
- $vars[preview_content] = nl2br($content);
+ $vars['lang_preview_of'] = lang('Preview of %1', $this->path . '/' . $edit_file);
+
+ $vars['preview_content'] = nl2br($content);
} elseif ($this->edit_save_x || $this->edit_save_done_x) {
$content = $this->edit_file_content;
@@ -954,6 +954,6 @@
$content = $this->bo->vfs->read(array('string' => $this->filename));
}
- $vars[form_action] = $GLOBALS['phpgw']->link('/index.php', 'menuaction=filemanager.uifilemanager.index', 'path=' . $this->path);
- $vars[edit_file] = $this->filename;
+ $vars['form_action'] = $GLOBALS['phpgw']->link('/index.php', 'menuaction=filemanager.uifilemanager.index', 'path=' . $this->path);
+ $vars['edit_file'] = $this->filename;
# We need to include all of the fileman entries for each file's form,
# so we loop through again
@@ -961,15 +961,15 @@
if ($this->filename)
$value = 'value="' . $this->filename . '"';
- $vars[filemans_hidden] = ' ';
- }
- $vars[file_content] = $content;
-
- $vars[buttonPreview] = $this->inputButton('edit_preview', 'edit_preview', lang('Preview %1', $this->bo->html_encode($this->fileman[0], 1)));
- $vars[buttonSave] = $this->inputButton('edit_save', 'save', lang('Save %1', $this->bo->html_encode($this->filename, 1)));
- $vars[buttonDone] = $this->inputButton('edit_save_done', 'ok', lang('Save %1, and go back to file listing ', $this->bo->html_encode($this->filename, 1)));
- $vars[buttonCancel] = $this->inputButton('edit_cancel', 'cancel', lang('Cancel editing %1 without saving', $this->bo->html_encode($this->filename, 1)));
+ $vars['filemans_hidden'] = ' ';
+ }
+ $vars['file_content'] = $content;
+
+ $vars['buttonPreview'] = $this->inputButton('edit_preview', 'edit_preview', lang('Preview %1', $this->bo->html_encode($this->fileman[0], 1)));
+ $vars['buttonSave'] = $this->inputButton('edit_save', 'save', lang('Save %1', $this->bo->html_encode($this->filename, 1)));
+ $vars['buttonDone'] = $this->inputButton('edit_save_done', 'ok', lang('Save %1, and go back to file listing ', $this->bo->html_encode($this->filename, 1)));
+ $vars['buttonCancel'] = $this->inputButton('edit_cancel', 'cancel', lang('Cancel editing %1 without saving', $this->bo->html_encode($this->filename, 1)));
if ($mime_type == 'text/html') {
- $vars[fck_edit] = '
+ $vars['fck_edit'] = '