[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7200] Merge 7197:7199 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7200] Merge 7197:7199 from trunk |
|
Date: |
Fri, 08 Apr 2011 10:12:03 +0000 |
Revision: 7200
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7200
Author: sigurdne
Date: 2011-04-08 10:12:03 +0000 (Fri, 08 Apr 2011)
Log Message:
-----------
Merge 7197:7199 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/admin/inc/hook_after_navbar.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_dav.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_shared.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_sql.inc.php
branches/Version-1_0-branch/property/inc/cron/cron.php
branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199
Modified: branches/Version-1_0-branch/admin/inc/hook_after_navbar.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/hook_after_navbar.inc.php
2011-04-08 10:09:28 UTC (rev 7199)
+++ branches/Version-1_0-branch/admin/inc/hook_after_navbar.inc.php
2011-04-08 10:12:03 UTC (rev 7200)
@@ -78,13 +78,13 @@
}
if(!isset($_current[$GLOBALS['phpgw_info']['flags']['currentapp']]))
{
- $app_str = '<br>' . lang('This application
requires an upgrade') . ':' . "\n";
+ $app_str = '<br>' . lang('This application
requires an upgrade') . ": {$GLOBALS['phpgw_info']['flags']['currentapp']}\n";
$app_str .= '<br>' . lang('Please run setup to
become current') . '.' . "\n";
$require_upgrade = true;
}
else
{
- $app_str = '<br>' . lang('This application is
current') . "\n";
+ // $app_str = '<br>' . lang('This application is
current') . "\n";
}
if($require_upgrade)
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.vfs_dav.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.vfs_dav.inc.php
2011-04-08 10:09:28 UTC (rev 7199)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.vfs_dav.inc.php
2011-04-08 10:12:03 UTC (rev 7200)
@@ -38,7 +38,7 @@
* @package phpgwapi
* @subpackage vfs
*/
- class vfs extends vfs_shared
+ class phpgwapi_vfs extends phpgwapi_vfs_shared
{
/*
* That's the history add to the path !
@@ -83,9 +83,9 @@
*
*/
- function vfs ()
+ function __construct()
{
- $this->vfs_shared();
+ parent::__construct();
/*
File/dir attributes, each corresponding to a
database field. Useful for use in loops
If an attribute was added to the table, add it here
and possibly add it to
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.vfs_shared.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.vfs_shared.inc.php
2011-04-08 10:09:28 UTC (rev 7199)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.vfs_shared.inc.php
2011-04-08 10:12:03 UTC (rev 7200)
@@ -125,7 +125,7 @@
* @package phpgwapi
* @subpackage vfs
*/
- class vfs_shared
+ class phpgwapi_vfs_shared
{
/*
* All VFS classes must have some form of 'linked directories'.
@@ -210,7 +210,7 @@
* * All derived classes should call this function in their
* constructor ($this->vfs_shared())
*/
- function vfs_shared ()
+ function __construct()
{
$this->basedir =
$GLOBALS['phpgw_info']['server']['files_dir'];
$this->working_id =
$GLOBALS['phpgw_info']['user']['account_id'];
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.vfs_sql.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.vfs_sql.inc.php
2011-04-08 10:09:28 UTC (rev 7199)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.vfs_sql.inc.php
2011-04-08 10:12:03 UTC (rev 7200)
@@ -35,7 +35,7 @@
* @subpackage vfs
* @ignore
*/
- class vfs extends vfs_shared
+ class phpgwapi_vfs extends phpgwapi_vfs_shared
{
var $file_actions;
@@ -43,9 +43,9 @@
* constructor, sets up variables
*
*/
- function vfs ()
+ function __construct()
{
- parent::vfs_shared();
+ parent::__construct();
/*
File/dir attributes, each corresponding to a
database field. Useful for use in loops
If an attribute was added to the table, add it here
and possibly add it to
Modified: branches/Version-1_0-branch/property/inc/cron/cron.php
===================================================================
--- branches/Version-1_0-branch/property/inc/cron/cron.php 2011-04-08
10:09:28 UTC (rev 7199)
+++ branches/Version-1_0-branch/property/inc/cron/cron.php 2011-04-08
10:12:03 UTC (rev 7200)
@@ -89,6 +89,8 @@
$GLOBALS['phpgw_info']['user']['apps']['admin'] = true;
$GLOBALS['phpgw_info']['user']['domain'] = $_GET['domain'];
+ $GLOBALS['phpgw_info']['user']['account_id'] = -1;
+ $GLOBALS['phpgw_info']['user']['account_lid'] = 'cron_job';
$num = ExecMethod('property.custom_functions.index',$data);
// echo date('Y/m/d H:i:s ').$_GET['domain'].': '.($num ? "$num job(s)
executed" : 'Nothing to execute')."\n";
Modified: branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
2011-04-08 10:09:28 UTC (rev 7199)
+++ branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
2011-04-08 10:12:03 UTC (rev 7200)
@@ -29,6 +29,7 @@
/**
* Description
+ * example cron : /usr/local/bin/php -q
/var/www/html/phpgroupware/property/inc/cron/cron.php default catch_ppc
* @package property
*/
@@ -43,7 +44,7 @@
$this->like = & $this->db->like;
}
- function pre_run($data='')
+ function pre_run($data = array())
{
phpgwapi_cache::session_set('catch', 'data', $data);
@@ -116,7 +117,6 @@
function execute($cron='')
{
-
try
{
$this->import_ppc();
@@ -149,6 +149,7 @@
function import_ppc()
{
+
//do the actual import
$config = CreateObject('catch.soconfig');
$config->read_repository();
@@ -179,6 +180,7 @@
$xmlparse->setEncoding('UTF-8');
$file_list = $this->get_files();
+
$i = 0;
foreach ($file_list as $file)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7200] Merge 7197:7199 from trunk,
Sigurd Nes <=