Changeset 7681 for trunk/phpgwapi
- Timestamp:
- 12/19/12 16:44:18 (11 years ago)
- Location:
- trunk/phpgwapi
- Files:
-
- 12 edited
-
cron/asyncservices.php (modified) (1 diff)
-
inc/class.Template.inc.php (modified) (2 diffs)
-
inc/class.accounts.inc.php (modified) (2 diffs)
-
inc/class.asyncservice.inc.php (modified) (1 diff)
-
inc/class.matrixview.inc.php (modified) (2 diffs)
-
inc/class.uiaccountsel.inc.php (modified) (2 diffs)
-
inc/class.vfs_dav.inc.php (modified) (4 diffs)
-
inc/class.vfs_shared.inc.php (modified) (2 diffs)
-
inc/class.vfs_sql.inc.php (modified) (4 diffs)
-
templates/classic/login_classic.php (modified) (1 diff)
-
templates/default/login_default.php (modified) (1 diff)
-
templates/news/login_news.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/phpgwapi/cron/asyncservices.php
r5141 r7681 57 57 if (!isset($GLOBALS['phpgw_domain'][$_GET['domain']]) || empty($db_type)) 58 58 { 59 echo $msg = "asyncservice.php: Domain ' $_GET[domain]' is not configured or renamed, exiting !!!\n";59 echo $msg = "asyncservice.php: Domain '{$_GET['domain']}' is not configured or renamed, exiting !!!\n"; 60 60 if (defined('ASYNC_LOG')) 61 61 { -
trunk/phpgwapi/inc/class.Template.inc.php
r2 r7681 25 25 var $debug = False; // array('cat_list','cat_list_t'); 26 26 27 /* $file[ handle] = 'filename'; */27 /* $file['handle'] = 'filename'; */ 28 28 var $file = array(); 29 29 … … 31 31 var $root = ''; 32 32 33 /* $varkeys[ key] = 'key'; $varvals[key] = 'value'; */33 /* $varkeys['key'] = 'key'; $varvals['key'] = 'value'; */ 34 34 var $varkeys = array(); 35 35 var $varvals = array(); -
trunk/phpgwapi/inc/class.accounts.inc.php
r7673 r7681 189 189 * @param $param['query'] string to search for, no search if unset or empty 190 190 * @param $param['query_type'] string: 191 * 'all' - query all fields for containing $param[ query]192 * 'start' - query all fields starting with $param[ query]193 * 'exact' - query all fields for exact $param[ query]194 * 'lid','firstname','lastname','email' - query only the given field for containing $param[ query]191 * 'all' - query all fields for containing $param['query'] 192 * 'start' - query all fields starting with $param['query'] 193 * 'exact' - query all fields for exact $param['query'] 194 * 'lid','firstname','lastname','email' - query only the given field for containing $param['query'] 195 195 * @param $param['app'] string with an app-name, to limit result on accounts with run-right for that app 196 196 * @param $param['offset'] int - number of matches to return if start given, default use the value in the prefs … … 251 251 $this->total = $account_search[$serial2]['total']; 252 252 } 253 //echo "accounts_::get_list( $param[type],$param[start],$param[sort],$param[order],$param[query],$param[offset],$param[query_type]) returned<pre>".print_r($account_search[$serial2],True)."</pre>\n";253 //echo "accounts_::get_list({$param['type']},{$param['start']},{$param['sort']},{$param['order']},{$param['query']},{$param['offset']},{$param['query_type']}) returned<pre>".print_r($account_search[$serial2],True)."</pre>\n"; 254 254 if ($app || $group) // limit the search on accounts with run-rights for app or a group 255 255 { -
trunk/phpgwapi/inc/class.asyncservice.inc.php
r6057 r7681 522 522 if ($exists || $this->read($job['id'])) 523 523 { 524 $this->db->query("UPDATE $this->db_table SET next= $job[next],times='$job[times]',".525 "method=' $job[method]',data='$job[data]',account_id=$job[account_id] WHERE id='$job[id]'",__LINE__,__FILE__);524 $this->db->query("UPDATE $this->db_table SET next={$job['next']},times='{$job['times']}',". 525 "method='{$job['method']}',data='{$job['data']}',account_id={$job['account_id']} WHERE id='{$job['id']}'",__LINE__,__FILE__); 526 526 } 527 527 else 528 528 { 529 529 $this->db->query("INSERT INTO $this->db_table (id,next,times,method,data,account_id) VALUES ". 530 "(' $job[id]',$job[next],'$job[times]','$job[method]','$job[data]',$job[account_id])",__LINE__,__FILE__);530 "('{$job['id']}',{$job['next']},'{$job['times']}','{$job['method']}','{$job['data']}',{$job['account_id']})",__LINE__,__FILE__); 531 531 } 532 532 } -
trunk/phpgwapi/inc/class.matrixview.inc.php
r7655 r7681 104 104 { 105 105 $dinfo = getdate(mktime(0,0,0, $this->month+1,0,$this->year)); 106 $this->day = $dinfo[ mday];106 $this->day = $dinfo['mday']; 107 107 } 108 108 … … 200 200 201 201 $in = getdate(mktime(0,0,0, $this->month+1,0,$this->year)); 202 $this->sumdays = $in[ mday];203 $this->monthname = $in[ month];202 $this->sumdays = $in['mday']; 203 $this->monthname = $in['month']; 204 204 205 205 $this->out_monthyear($form_link); -
trunk/phpgwapi/inc/class.uiaccountsel.inc.php
r2 r7681 343 343 344 344 $GLOBALS['phpgw']->template->set_var('onclick',"addOption('$element_id','". 345 $GLOBALS['phpgw']->common->grab_owner_name($group['account_id'])."',' $group[account_id]')".345 $GLOBALS['phpgw']->common->grab_owner_name($group['account_id'])."','{$group['account_id']}')". 346 346 ($single ? '; window.close()' : '')); 347 347 … … 409 409 'lastname' => $user['account_lastname'] ? $user['account_lastname'] : ' ', 410 410 'onclick' => "addOption('$element_id','". 411 $GLOBALS['phpgw']->common->grab_owner_name($user['account_id'])."',' $user[account_id]')".411 $GLOBALS['phpgw']->common->grab_owner_name($user['account_id'])."','{$user['account_id']}')". 412 412 ($single ? '; window.close()' : ''), 413 413 )); -
trunk/phpgwapi/inc/class.vfs_dav.inc.php
r7655 r7681 585 585 while (list ($num, $link_info) = each ($this->linked_dirs)) 586 586 { 587 if (preg_match("/^ $link_info[directory]\/$link_info[name](\/|$)/", $rarray['fake_full_path']))587 if (preg_match("/^{$link_info['directory']}\/{$link_info['name']}(\/|$)/", $rarray['fake_full_path'])) 588 588 { 589 589 $rarray['real_full_path'] = preg_replace("/^$this->basedir/", '', $rarray['real_full_path']); 590 $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']);590 $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']); 591 591 592 592 $p = $this->path_parts (array( … … 643 643 644 644 /* 645 echo "<br>fake_full_path: $rarray[fake_full_path]646 <br>fake_leading_dirs: $rarray[fake_leading_dirs]647 <br>fake_extra_path: $rarray[fake_extra_path]648 <br>fake_name: $rarray[fake_name]649 <br>real_full_path: $rarray[real_full_path]650 <br>real_full_url: $rarray[real_full_url]651 <br>real_leading_dirs: $rarray[real_leading_dirs]652 <br>real_extra_path: $rarray[real_extra_path]653 <br>real_name: $rarray[real_name]";645 echo "<br>fake_full_path: {$rarray['fake_full_path']} 646 <br>fake_leading_dirs: {$rarray['fake_leading_dirs']} 647 <br>fake_extra_path: {$rarray['fake_extra_path']} 648 <br>fake_name: {$rarray['fake_name']} 649 <br>real_full_path: {$rarray['real_full_path']} 650 <br>real_full_url: {$rarray['real_full_url']} 651 <br>real_leading_dirs: {$rarray['real_leading_dirs']} 652 <br>real_extra_path: {$rarray['real_extra_path']} 653 <br>real_name: {$rarray['real_name']}"; 654 654 */ 655 655 … … 1681 1681 $newdir = preg_replace("/^$f->fake_full_path/", "$t->fake_full_path", $entry['directory']); 1682 1682 $this->cp (array( 1683 'from' => "$entry[directory]/ $entry[name]",1684 'to' => "$newdir/ $entry[name]",1683 'from' => "$entry[directory]/{$entry['name']}", 1684 'to' => "$newdir/{$entry['name']}", 1685 1685 'relatives' => array ($f->mask, $t->mask) 1686 1686 ) … … 1951 1951 { 1952 1952 $this->rm (array( 1953 'string' => " $entry[directory]/$entry[name]",1953 'string' => "{$entry['directory']}/{$entry['name']}", 1954 1954 'relatives' => array ($p->mask) 1955 1955 ) -
trunk/phpgwapi/inc/class.vfs_shared.inc.php
r7655 r7681 1028 1028 while (list ($num, $link_info) = each ($this->linked_dirs)) 1029 1029 { 1030 if (preg_match("/^ $link_info[directory]\/$link_info[name](\/|$)/", $rarray['fake_full_path']))1030 if (preg_match("/^{$link_info['directory']}\/{$link_info['name']}(\/|$)/", $rarray['fake_full_path'])) 1031 1031 { 1032 1032 $rarray['real_full_path'] = preg_replace("/^$this->basedir/", '', $rarray['real_full_path']); 1033 $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']);1033 $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']); 1034 1034 1035 1035 $p = $this->path_parts (array( … … 1069 1069 } 1070 1070 1071 1072 echo "<br>fake_full_path: $rarray[fake_full_path]1073 <br>fake_leading_dirs: $rarray[fake_leading_dirs]1074 <br>fake_extra_path: $rarray[fake_extra_path]1075 <br>fake_name: $rarray[fake_name]1076 <br>real_full_path: $rarray[real_full_path]1077 <br>real_leading_dirs: $rarray[real_leading_dirs]1078 <br>real_extra_path: $rarray[real_extra_path]1079 <br>real_name: $rarray[real_name]";1080 1071 /* 1072 echo "<br>fake_full_path: {$rarray['fake_full_path']} 1073 <br>fake_leading_dirs: {$rarray['fake_leading_dirs']} 1074 <br>fake_extra_path: {$rarray['fake_extra_path']} 1075 <br>fake_name: {$rarray['fake_name']} 1076 <br>real_full_path: {$rarray['real_full_path']} 1077 <br>real_leading_dirs: {$rarray['real_leading_dirs']} 1078 <br>real_extra_path: {$rarray['real_extra_path']} 1079 <br>real_name: {$rarray['real_name']}"; 1080 */ 1081 1081 1082 1082 if ($data['object']) -
trunk/phpgwapi/inc/class.vfs_sql.inc.php
r7655 r7681 1411 1411 $newdir = preg_replace("/^$f->fake_full_path/", "$t->fake_full_path", $entry['directory']); 1412 1412 $this->cp (array( 1413 'from' => "$entry[directory]/ $entry[name]",1414 'to' => "$newdir/ $entry[name]",1413 'from' => "$entry[directory]/{$entry['name']}", 1414 'to' => "$newdir/{$entry['name']}", 1415 1415 'relatives' => array ($f->mask, $t->mask) 1416 1416 ) … … 1651 1651 1652 1652 $query = $GLOBALS['phpgw']->db->query ("UPDATE phpgw_vfs SET directory='". 1653 $GLOBALS['phpgw']->db->db_addslashes($newdir_clean)."' WHERE file_id=' $entry[file_id]'" .1653 $GLOBALS['phpgw']->db->db_addslashes($newdir_clean)."' WHERE file_id='{$entry['file_id']}'" . 1654 1654 $this->extra_sql (array ('query_type' => VFS_SQL_UPDATE)), __LINE__, __FILE__); 1655 1655 $this->correct_attributes (array( 1656 'string' => "$newdir/ $entry[name]",1656 'string' => "$newdir/{$entry['name']}", 1657 1657 'relatives' => array ($t->mask) 1658 1658 ) … … 1782 1782 1783 1783 $this->rm (array( 1784 'string' => " $entry[directory]/$entry[name]",1784 'string' => "{$entry['directory']}/{$entry['name']}", 1785 1785 'relatives' => array ($p->mask) 1786 1786 ) … … 1798 1798 /* Only the best in confusing recursion */ 1799 1799 $this->rm (array( 1800 'string' => " $entry[directory]/$entry[name]",1800 'string' => "{$entry['directory']}/{$entry['name']}", 1801 1801 'relatives' => array ($p->mask) 1802 1802 ) -
trunk/phpgwapi/templates/classic/login_classic.php
r7673 r7681 315 315 $config_reg = $cnf_reg->config_data; 316 316 317 if($config_reg[ enable_registration]=='True' && $config_reg[register_link]=='True')317 if($config_reg['enable_registration']=='True' && $config_reg['register_link']=='True') 318 318 { 319 319 $reg_link=' <a href="registration/">'.lang('Not a user yet? Register now').'</a><br/>'; -
trunk/phpgwapi/templates/default/login_default.php
r7673 r7681 428 428 $config_reg = $cnf_reg->config_data; 429 429 430 if($config_reg[ enable_registration]=='True' && $config_reg[register_link]=='True')430 if($config_reg['enable_registration']=='True' && $config_reg['register_link']=='True') 431 431 { 432 432 $reg_link=' <a href="registration/">'.lang('Not a user yet? Register now').'</a><br/>'; -
trunk/phpgwapi/templates/news/login_news.php
r7673 r7681 364 364 $config_reg = $cnf_reg->config_data; 365 365 366 if($config_reg[ enable_registration]=='True' && $config_reg[register_link]=='True')366 if($config_reg['enable_registration']=='True' && $config_reg['register_link']=='True') 367 367 { 368 368 $reg_link=' <a href="registration/">'.lang('Not a user yet? Register now').'</a><br/>';
Note: See TracChangeset
for help on using the changeset viewer.
