[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11648] api: more on vfs
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11648] api: more on vfs |
|
Date: |
Fri, 31 Jan 2014 18:48:51 +0000 |
Revision: 11648
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11648
Author: sigurdne
Date: 2014-01-31 18:48:50 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
api: more on vfs
Modified Paths:
--------------
trunk/admin/inc/class.cat_hooks.inc.php
trunk/admin/inc/class.menu.inc.php
trunk/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
trunk/phpgwapi/setup/default_records.inc.php
trunk/phpgwapi/setup/tables_current.inc.php
trunk/phpgwapi/setup/tables_update.inc.php
Modified: trunk/admin/inc/class.cat_hooks.inc.php
===================================================================
--- trunk/admin/inc/class.cat_hooks.inc.php 2014-01-31 15:35:38 UTC (rev
11647)
+++ trunk/admin/inc/class.cat_hooks.inc.php 2014-01-31 18:48:50 UTC (rev
11648)
@@ -50,7 +50,7 @@
$location = $location_info['location'];
if($location == 'vfs_filedata')
{
-
$GLOBALS['phpgw']->locations->add("vfs_filedata.{$data['cat_id']}",
$data['cat_name'], 'phpgwapi', false, false, false, true);
+
$GLOBALS['phpgw']->locations->add("vfs_filedata.{$data['cat_id']}",
$data['cat_name'], 'admin', false, false, false, true);
}
}
}
@@ -70,7 +70,7 @@
if($location_info['location'] == 'vfs_filedata')
{
$location =
"{$location_info['location']}.{$data['cat_id']}";
-
$GLOBALS['phpgw']->locations->delete('phpgwapi', $location, false);
+
$GLOBALS['phpgw']->locations->delete('admin', $location, false);
}
}
}
@@ -91,7 +91,7 @@
if($location_info['location'] == 'vfs_filedata')
{
$location =
"{$location_info['location']}.{$data['cat_id']}";
-
$GLOBALS['phpgw']->locations->update_description($location, $data['cat_name'],
'phpgwapi');
+
$GLOBALS['phpgw']->locations->update_description($location, $data['cat_name'],
'admin');
}
}
}
Modified: trunk/admin/inc/class.menu.inc.php
===================================================================
--- trunk/admin/inc/class.menu.inc.php 2014-01-31 15:35:38 UTC (rev 11647)
+++ trunk/admin/inc/class.menu.inc.php 2014-01-31 18:48:50 UTC (rev 11648)
@@ -55,7 +55,6 @@
);
$menus['admin'] = array();
-// if (!
$GLOBALS['phpgw']->acl->check('site_config_access', phpgwapi_acl::READ,
'admin'))
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
{
$menus['admin']['index'] = array
@@ -64,6 +63,45 @@
'url' =>
$GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'admin.uiconfig.index', 'appname' => 'admin'))
);
+ $menus['admin']['file_config'] = array
+ (
+ 'text' =>
$GLOBALS['phpgw']->translation->translate('file configuration', array(), true),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php',
+ array
+ (
+ 'menuaction' =>
'admin.uiconfig2.index',
+ 'location_id' =>
$GLOBALS['phpgw']->locations->get_id('admin', 'vfs_filedata')
+ )
+ )
+ );
+
+ $menus['admin']['file_attribs'] = array
+ (
+ 'text' =>
$GLOBALS['phpgw']->translation->translate('file attributes', array(), true),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php',
+ array
+ (
+ 'menuaction'
=> 'admin.ui_custom.list_attribute',
+ 'appname'
=> 'admin',
+ 'location'
=> 'vfs_filedata',
+ 'menu_selection'
=> 'admin::file_attribs'
+ )
+ )
+ );
+ $menus['admin']['file_cats'] = array
+ (
+ 'text' =>
$GLOBALS['phpgw']->translation->translate('file categories', array(), true),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php',
+ array
+ (
+ 'menuaction'
=> 'admin.uicategories.index',
+ 'appname'
=> 'admin',
+ 'location'
=> 'vfs_filedata',
+ 'menu_selection'
=> 'admin::file_cats'
+ )
+ )
+ );
+
}
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
@@ -115,7 +153,6 @@
);
}
-// if (! $GLOBALS['phpgw']->acl->check('sync_account',
PHPGW_ACL_READ, 'admin'))
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
{
$menus['admin']['sync_account'] = array
@@ -125,7 +162,6 @@
);
}
-// if (!
$GLOBALS['phpgw']->acl->check('applications_access', phpgwapi_acl::READ,
'admin'))
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
{
$menus['admin']['apps'] = array
@@ -136,7 +172,6 @@
);
}
-// if (!
$GLOBALS['phpgw']->acl->check('global_categories_access', phpgwapi_acl::READ,
'admin'))
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
{
$menus['admin']['categories'] = array
@@ -147,7 +182,6 @@
);
}
-// if (! $GLOBALS['phpgw']->acl->check('account_access',
phpgwapi_acl::READ, 'admin'))
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
{
$menus['admin']['addressmasters'] = array
@@ -161,8 +195,6 @@
);
}
-// if (
!$GLOBALS['phpgw']->acl->check('mainscreen_message_access', phpgwapi_acl::READ,
'admin')
-// ||
!$GLOBALS['phpgw']->acl->check('mainscreen_message_access', phpgwapi_acl::ADD,
'admin'))
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
{
$menus['admin']['mainscreen'] = array
@@ -173,7 +205,6 @@
);
}
-// if (!
$GLOBALS['phpgw']->acl->check('current_sessions_access', phpgwapi_acl::READ,
'admin'))
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
{
$menus['admin']['sessions'] = array
@@ -184,7 +215,6 @@
);
}
-// if (!
$GLOBALS['phpgw']->acl->check('access_log_access', phpgwapi_acl::READ, 'admin'))
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
{
$menus['admin']['access_log'] = array
@@ -195,7 +225,6 @@
);
}
-// if (! $GLOBALS['phpgw']->acl->check('error_log_access',
phpgwapi_acl::READ, 'admin'))
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
{
$menus['admin']['error_log'] = array
@@ -206,7 +235,6 @@
);
}
-// if (! $GLOBALS['phpgw']->acl->check('error_log_access',
phpgwapi_acl::READ, 'admin'))
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
{
$menus['admin']['log_levels'] = array
@@ -217,7 +245,6 @@
);
}
-// if (!
$GLOBALS['phpgw']->acl->check('applications_access', phpgwapi_acl::PRIV,
'admin'))
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
{
$text =
$GLOBALS['phpgw']->translation->translate('Find and Register all Application
Hooks',
@@ -231,7 +258,6 @@
);
}
-// if (!
$GLOBALS['phpgw']->acl->check('asyncservice_access', phpgwapi_acl::READ,
'admin'))
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
{
$menus['admin']['async'] = array
@@ -242,7 +268,6 @@
);
}
-// if (! $GLOBALS['phpgw']->acl->check('info_access',
phpgwapi_acl::READ, 'admin')
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin')
&& function_exists('phpinfo') ) // it
is possible to disable commands in php.ini
{
Modified: trunk/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php 2014-01-31
15:35:38 UTC (rev 11647)
+++ trunk/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php 2014-01-31
18:48:50 UTC (rev 11648)
@@ -34,7 +34,7 @@
public function __construct()
{
$this->db = & $GLOBALS['phpgw']->db;
- $location_id =
$GLOBALS['phpgw']->locations->get_id('phpgwapi', 'vfs_filedata');
+ $location_id =
$GLOBALS['phpgw']->locations->get_id('admin', 'vfs_filedata');
$c = CreateObject('admin.soconfig',$location_id);
@@ -111,7 +111,7 @@
$GLOBALS['phpgw']->redirect_link('/index.php', array(
'menuaction' =>
'admin.uiconfig2.list_attrib',
'section_id' =>
$receipt_section['section_id'],
- 'location_id' =>
$GLOBALS['phpgw']->locations->get_id('phpgwapi', 'vfs_braArkiv')
+ 'location_id' =>
$GLOBALS['phpgw']->locations->get_id('admin', 'vfs_filedata')
)
);
}
@@ -236,7 +236,7 @@
$this->Services->fileTransferSendChunk($fileTransferSendChunk);
}
- $fileTransferSendChunkedEnd = new
fileTransferSendChunkedEnd()
+ $fileTransferSendChunkedEnd = new
fileTransferSendChunkedEnd();
$fileTransferSendChunkedEnd->secKey = $this->secKey;
$fileTransferSendChunkedEnd->fileid = $transaction_id;
Modified: trunk/phpgwapi/setup/default_records.inc.php
===================================================================
--- trunk/phpgwapi/setup/default_records.inc.php 2014-01-31 15:35:38 UTC
(rev 11647)
+++ trunk/phpgwapi/setup/default_records.inc.php 2014-01-31 18:48:50 UTC
(rev 11648)
@@ -367,4 +367,4 @@
$GLOBALS['phpgw']->locations->add('changepassword', 'allow user to
change password', 'preferences', false);
$GLOBALS['phpgw']->locations->add('anonymous', 'allow anonymous
sessions for public modules', 'phpgwapi', false);
- $GLOBALS['phpgw']->locations->add('vfs_filedata', 'config section for
VFS filedata - file backend', 'phpgwapi', false);
+ $GLOBALS['phpgw']->locations->add('vfs_filedata', 'config section for
VFS filedata - file backend', 'admin', false);
Modified: trunk/phpgwapi/setup/tables_current.inc.php
===================================================================
--- trunk/phpgwapi/setup/tables_current.inc.php 2014-01-31 15:35:38 UTC (rev
11647)
+++ trunk/phpgwapi/setup/tables_current.inc.php 2014-01-31 18:48:50 UTC (rev
11648)
@@ -305,7 +305,7 @@
'metadata' => array('type' => 'xml','nullable'
=> False),
),
'pk' => array('file_id'),
- 'fk' => array(array('phpgw_vfs' => array('file_id' =>
'file_id')),
+ 'fk' => array('phpgw_vfs' => array('file_id' =>
'file_id')),
'ix' => array(),
'uc' => array()
),
Modified: trunk/phpgwapi/setup/tables_update.inc.php
===================================================================
--- trunk/phpgwapi/setup/tables_update.inc.php 2014-01-31 15:35:38 UTC (rev
11647)
+++ trunk/phpgwapi/setup/tables_update.inc.php 2014-01-31 18:48:50 UTC (rev
11648)
@@ -3189,7 +3189,7 @@
{
$GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
- $GLOBALS['phpgw']->locations->add('vfs_filedata', 'config
section for VFS filedata - file backend', 'phpgwapi', false);
+ $GLOBALS['phpgw']->locations->add('vfs_filedata', 'config
section for VFS filedata - file backend', 'admin', false);
$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_vfs_filedata',array(
'fd' => array(
@@ -3198,7 +3198,7 @@
'metadata' => array('type' => 'xml','nullable'
=> False),
),
'pk' => array('file_id'),
- 'fk' => array(array('phpgw_vfs' => array('file_id' =>
'file_id'))),
+ 'fk' => array('phpgw_vfs' => array('file_id' =>
'file_id')),
'ix' => array(),
'uc' => array()
));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11648] api: more on vfs,
Sigurd Nes <=