[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9946] whitespace-fix (formatting)
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [9946] whitespace-fix (formatting) |
|
Date: |
Fri, 31 Aug 2012 08:29:48 +0000 |
Revision: 9946
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9946
Author: erikhl
Date: 2012-08-31 08:29:46 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
whitespace-fix (formatting)
Modified Paths:
--------------
trunk/activitycalendarfrontend/index.php
trunk/activitycalendarfrontend/setup/default_records.inc.php
trunk/activitycalendarfrontend/setup/setup.inc.php
trunk/activitycalendarfrontend/setup/tables_current.inc.php
Modified: trunk/activitycalendarfrontend/index.php
===================================================================
--- trunk/activitycalendarfrontend/index.php 2012-08-31 08:28:15 UTC (rev
9945)
+++ trunk/activitycalendarfrontend/index.php 2012-08-31 08:29:46 UTC (rev
9946)
@@ -1,242 +1,171 @@
<?php
- $GLOBALS['phpgw_info']['flags'] = array(
- 'noheader' => true,
- 'nonavbar' => true,
- 'currentapp' => 'login'
- );
-
- $GLOBALS['phpgw_info']['flags']['session_name'] =
'activitycalendarfrontendsession';
- $GLOBALS['phpgw_remote_user_fallback'] = 'sql';
- include_once('../header.inc.php');
- // Make sure we're always logged in
- if (!phpgw::get_var(session_name()) ||
!$GLOBALS['phpgw']->session->verify())
- {
-
- $c = createobject('phpgwapi.config','activitycalendarfrontend');
- $c->read();
- $config = $c->config_data;
+$GLOBALS['phpgw_info']['flags'] = array(
+ 'noheader' => true,
+ 'nonavbar' => true,
+ 'currentapp' => 'login'
+);
- $login = $c->config_data['anonymous_user'];
- $passwd = $c->config_data['anonymous_pass'];
- $_POST['submitit'] = "";
-
-/* $login = "activitycalendar_guest";
- $passwd = "bkactivities";
- $_POST['submitit'] = "";
-*/
- $GLOBALS['sessionid'] =
$GLOBALS['phpgw']->session->create($login, $passwd);
- if(!$GLOBALS['sessionid'])
- {
- $lang_denied = lang('Anonymous access not correctly
configured');
- if($GLOBALS['phpgw']->session->reason)
- {
- $lang_denied =
$GLOBALS['phpgw']->session->reason;
- }
- echo <<<HTML
+$GLOBALS['phpgw_info']['flags']['session_name'] =
'activitycalendarfrontendsession';
+$GLOBALS['phpgw_remote_user_fallback'] = 'sql';
+include_once('../header.inc.php');
+
+// Make sure we're always logged in
+if (!phpgw::get_var(session_name()) || !$GLOBALS['phpgw']->session->verify()) {
+
+ $c = createobject('phpgwapi.config', 'activitycalendarfrontend');
+ $c->read();
+ $config = $c->config_data;
+
+ $login = $c->config_data['anonymous_user'];
+ $passwd = $c->config_data['anonymous_pass'];
+ $_POST['submitit'] = "";
+
+ /* $login = "activitycalendar_guest";
+ $passwd = "bkactivities";
+ $_POST['submitit'] = "";
+ */
+ $GLOBALS['sessionid'] = $GLOBALS['phpgw']->session->create($login, $passwd);
+ if (!$GLOBALS['sessionid']) {
+ $lang_denied = lang('Anonymous access not correctly configured');
+ if ($GLOBALS['phpgw']->session->reason) {
+ $lang_denied = $GLOBALS['phpgw']->session->reason;
+ }
+ echo <<<HTML
<div class="error">$lang_denied</div>
HTML;
- $GLOBALS['phpgw']->common->phpgw_exit(True);
- }
- }
- $GLOBALS['phpgw_info']['flags']['currentapp'] =
'activitycalendarfrontend';
-
-
/////////////////////////////////////////////////////////////////////////////
+ $GLOBALS['phpgw']->common->phpgw_exit(True);
+ }
+}
+$GLOBALS['phpgw_info']['flags']['currentapp'] = 'activitycalendarfrontend';
+
+/////////////////////////////////////////////////////////////////////////////
// BEGIN Stuff copied from functions.inc.php
/////////////////////////////////////////////////////////////////////////////
-
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] !='en')
- {
-
$GLOBALS['phpgw']->translation->set_userlang($GLOBALS['phpgw_info']['user']['preferences']['common']['lang'],
true);
- }
+if (isset($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] != 'en') {
+
$GLOBALS['phpgw']->translation->set_userlang($GLOBALS['phpgw_info']['user']['preferences']['common']['lang'],
true);
+}
- /* A few hacker resistant constants that will be used throught
the program */
- define('PHPGW_TEMPLATE_DIR',
ExecMethod('phpgwapi.phpgw.common.get_tpl_dir', 'phpgwapi'));
- define('PHPGW_IMAGES_DIR',
ExecMethod('phpgwapi.phpgw.common.get_image_path', 'phpgwapi'));
- define('PHPGW_IMAGES_FILEDIR',
ExecMethod('phpgwapi.phpgw.common.get_image_dir', 'phpgwapi'));
- define('PHPGW_APP_ROOT',
ExecMethod('phpgwapi.phpgw.common.get_app_dir'));
- define('PHPGW_APP_INC',
ExecMethod('phpgwapi.phpgw.common.get_inc_dir'));
- define('PHPGW_APP_TPL',
ExecMethod('phpgwapi.phpgw.common.get_tpl_dir'));
- define('PHPGW_IMAGES',
ExecMethod('phpgwapi.phpgw.common.get_image_path'));
- define('PHPGW_APP_IMAGES_DIR',
ExecMethod('phpgwapi.phpgw.common.get_image_dir'));
+/* A few hacker resistant constants that will be used throught the program */
+define('PHPGW_TEMPLATE_DIR', ExecMethod('phpgwapi.phpgw.common.get_tpl_dir',
'phpgwapi'));
+define('PHPGW_IMAGES_DIR', ExecMethod('phpgwapi.phpgw.common.get_image_path',
'phpgwapi'));
+define('PHPGW_IMAGES_FILEDIR',
ExecMethod('phpgwapi.phpgw.common.get_image_dir', 'phpgwapi'));
+define('PHPGW_APP_ROOT', ExecMethod('phpgwapi.phpgw.common.get_app_dir'));
+define('PHPGW_APP_INC', ExecMethod('phpgwapi.phpgw.common.get_inc_dir'));
+define('PHPGW_APP_TPL', ExecMethod('phpgwapi.phpgw.common.get_tpl_dir'));
+define('PHPGW_IMAGES', ExecMethod('phpgwapi.phpgw.common.get_image_path'));
+define('PHPGW_APP_IMAGES_DIR',
ExecMethod('phpgwapi.phpgw.common.get_image_dir'));
-
/************************************************************************\
- * Load the menuaction
*
-
\************************************************************************/
- $GLOBALS['phpgw_info']['menuaction'] =
phpgw::get_var('menuaction');
- if(!$GLOBALS['phpgw_info']['menuaction'])
- {
- unset($GLOBALS['phpgw_info']['menuaction']);
- }
+/* * **********************************************************************\
+ * Load the menuaction *
+ \*********************************************************************** */
+$GLOBALS['phpgw_info']['menuaction'] = phpgw::get_var('menuaction');
+if (!$GLOBALS['phpgw_info']['menuaction']) {
+ unset($GLOBALS['phpgw_info']['menuaction']);
+}
- /********* This sets the user variables *********/
- $GLOBALS['phpgw_info']['user']['private_dir'] =
$GLOBALS['phpgw_info']['server']['files_dir']
- . '/users/'.$GLOBALS['phpgw_info']['user']['userid'];
+/* * ******* This sets the user variables ******** */
+$GLOBALS['phpgw_info']['user']['private_dir'] =
$GLOBALS['phpgw_info']['server']['files_dir']
+ . '/users/' . $GLOBALS['phpgw_info']['user']['userid'];
- /* This will make sure that a user has the basic default prefs.
If not it will add them */
- $GLOBALS['phpgw']->preferences->verify_basic_settings();
+/* This will make sure that a user has the basic default prefs. If not it will
add them */
+$GLOBALS['phpgw']->preferences->verify_basic_settings();
- /********* Optional classes, which can be disabled for
performance increases *********/
- while ($phpgw_class_name =
each($GLOBALS['phpgw_info']['flags']))
- {
- if (ereg('enable_', $phpgw_class_name[0]))
- {
- $enable_class = str_replace('enable_', '',
$phpgw_class_name[0]);
- $enable_class = str_replace('_class', '',
$enable_class);
- $GLOBALS['phpgw']->$enable_class =
createObject("phpgwapi.{$enable_class}");
- }
- }
- unset($enable_class);
- reset($GLOBALS['phpgw_info']['flags']);
+/* * ******* Optional classes, which can be disabled for performance increases
******** */
+while ($phpgw_class_name = each($GLOBALS['phpgw_info']['flags'])) {
+ if (ereg('enable_', $phpgw_class_name[0])) {
+ $enable_class = str_replace('enable_', '', $phpgw_class_name[0]);
+ $enable_class = str_replace('_class', '', $enable_class);
+ $GLOBALS['phpgw']->$enable_class =
createObject("phpgwapi.{$enable_class}");
+ }
+}
+unset($enable_class);
+reset($GLOBALS['phpgw_info']['flags']);
-
/*************************************************************************\
- * These lines load up the templates class
*
-
\*************************************************************************/
- if (
!isset($GLOBALS['phpgw_info']['flags']['disable_Template_class'])
- ||
!$GLOBALS['phpgw_info']['flags']['disable_Template_class'] )
- {
- $GLOBALS['phpgw']->template =
createObject('phpgwapi.Template',PHPGW_APP_TPL);
- $GLOBALS['phpgw']->xslttpl =
createObject('phpgwapi.xslttemplates',PHPGW_APP_TPL);
- }
+/* * ***********************************************************************\
+ * These lines load up the templates class *
+ \************************************************************************ */
+if (!isset($GLOBALS['phpgw_info']['flags']['disable_Template_class'])
+ || !$GLOBALS['phpgw_info']['flags']['disable_Template_class']) {
+ $GLOBALS['phpgw']->template = createObject('phpgwapi.Template',
PHPGW_APP_TPL);
+ $GLOBALS['phpgw']->xslttpl = createObject('phpgwapi.xslttemplates',
PHPGW_APP_TPL);
+}
-
/*************************************************************************\
- * Verify that the users session is still active otherwise kick
them out *
-
\*************************************************************************/
- if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'about')
- {
- if (!$GLOBALS['phpgw']->acl->check('run',
PHPGW_ACL_READ, $GLOBALS['phpgw_info']['flags']['currentapp']))
- {
- $GLOBALS['phpgw']->common->phpgw_header(true);
-
$GLOBALS['phpgw']->log->write(array('text'=>'W-Permissions, Attempted to access
%1','p1'=>$GLOBALS['phpgw_info']['flags']['currentapp']));
+/* * ***********************************************************************\
+ * Verify that the users session is still active otherwise kick them out *
+ \************************************************************************ */
+if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'about') {
+ if (!$GLOBALS['phpgw']->acl->check('run', PHPGW_ACL_READ,
$GLOBALS['phpgw_info']['flags']['currentapp'])) {
+ $GLOBALS['phpgw']->common->phpgw_header(true);
+ $GLOBALS['phpgw']->log->write(array('text' => 'W-Permissions, Attempted to
access %1', 'p1' => $GLOBALS['phpgw_info']['flags']['currentapp']));
- $lang_denied = lang('Access not permitted');
- echo <<<HTML
+ $lang_denied = lang('Access not permitted');
+ echo <<<HTML
<div class="error">$lang_denied</div>
HTML;
- $GLOBALS['phpgw']->common->phpgw_exit(True);
- }
- }
+ $GLOBALS['phpgw']->common->phpgw_exit(True);
+ }
+}
- // Already called from sessions::verify
- // $GLOBALS['phpgw']->applications->read_installed_apps(); // to
get translated app-titles
+// Already called from sessions::verify
+// $GLOBALS['phpgw']->applications->read_installed_apps(); // to get
translated app-titles
-
/*************************************************************************\
- * Load the header unless the developer turns it off
*
-
\*************************************************************************/
- if ( !isset($GLOBALS['phpgw_info']['flags']['noheader']) ||
!$GLOBALS['phpgw_info']['flags']['noheader'] )
- {
- $inc_navbar =
!isset($GLOBALS['phpgw_info']['flags']['nonavbar']) ||
!$GLOBALS['phpgw_info']['flags']['nonavbar'];
- $GLOBALS['phpgw']->common->phpgw_header($inc_navbar);
- unset($inc_navbar);
- }
+/* * ***********************************************************************\
+ * Load the header unless the developer turns it off *
+ \************************************************************************ */
+if (!isset($GLOBALS['phpgw_info']['flags']['noheader']) ||
!$GLOBALS['phpgw_info']['flags']['noheader']) {
+ $inc_navbar = !isset($GLOBALS['phpgw_info']['flags']['nonavbar']) ||
!$GLOBALS['phpgw_info']['flags']['nonavbar'];
+ $GLOBALS['phpgw']->common->phpgw_header($inc_navbar);
+ unset($inc_navbar);
+}
-
/*************************************************************************\
- * Load the app include files if the exists
*
-
\*************************************************************************/
- /* Then the include file */
- if (! preg_match ("/phpgwapi/i", PHPGW_APP_INC) &&
file_exists(PHPGW_APP_INC . '/functions.inc.php') &&
!isset($GLOBALS['phpgw_info']['menuaction']))
- {
- include_once(PHPGW_APP_INC . '/functions.inc.php');
- }
- if (address@hidden'phpgw_info']['flags']['noheader'] &&
- address@hidden'phpgw_info']['flags']['noappheader'] &&
- file_exists(PHPGW_APP_INC . '/header.inc.php') &&
!isset($GLOBALS['phpgw_info']['menuaction']))
- {
- include_once(PHPGW_APP_INC . '/header.inc.php');
- }
+/* * ***********************************************************************\
+ * Load the app include files if the exists *
+ \************************************************************************ */
+/* Then the include file */
+if (!preg_match("/phpgwapi/i", PHPGW_APP_INC) && file_exists(PHPGW_APP_INC .
'/functions.inc.php') && !isset($GLOBALS['phpgw_info']['menuaction'])) {
+ include_once(PHPGW_APP_INC . '/functions.inc.php');
+}
+if (address@hidden'phpgw_info']['flags']['noheader'] &&
+ address@hidden'phpgw_info']['flags']['noappheader'] &&
+ file_exists(PHPGW_APP_INC . '/header.inc.php') &&
!isset($GLOBALS['phpgw_info']['menuaction'])) {
+ include_once(PHPGW_APP_INC . '/header.inc.php');
+}
/////////////////////////////////////////////////////////////////////////////
// END Stuff copied from functions.inc.php
/////////////////////////////////////////////////////////////////////////////
- if (isset($_GET['menuaction']))
- {
- list($app,$class,$method) = explode('.',$_GET['menuaction']);
- }
- else
- {
- //
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction' =>
'activitycalendarfrontend.uiactivity.add'));
- $app = 'activitycalendarfrontend';
- $class = 'uiactivity';
- $method = 'add';
- }
- $GLOBALS[$class] = CreateObject("{$app}.{$class}");
+if (isset($_GET['menuaction'])) {
+ list($app, $class, $method) = explode('.', $_GET['menuaction']);
+} else {
+ // $GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction' =>
'activitycalendarfrontend.uiactivity.add'));
+ $app = 'activitycalendarfrontend';
+ $class = 'uiactivity';
+ $method = 'add';
+}
+$GLOBALS[$class] = CreateObject("{$app}.{$class}");
- $invalid_data = false; //FIXME consider whether this should be computed
as in the main index.php
- if ( !$invalid_data
- && is_object($GLOBALS[$class])
- && isset($GLOBALS[$class]->public_functions)
- && is_array($GLOBALS[$class]->public_functions)
- && isset($GLOBALS[$class]->public_functions[$method])
- && $GLOBALS[$class]->public_functions[$method] )
-
- {
- if ( phpgw::get_var('X-Requested-With', 'string', 'SERVER') ==
'XMLHttpRequest'
- // deprecated
- || phpgw::get_var('phpgw_return_as', 'string', 'GET')
== 'json' )
- {
- // comply with RFC 4627
- header('Content-Type: application/json');
- $return_data = $GLOBALS[$class]->$method();
- echo json_encode($return_data);
- $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
- $GLOBALS['phpgw']->common->phpgw_exit();
- }
- else
- {
- $GLOBALS[$class]->$method();
- $GLOBALS['phpgw']->common->phpgw_footer();
- }
- }
-
- //$GLOBALS['phpgw_info']['flags']['noframework'] = true;
-
-/*
-
- if (isset($_GET['menuaction']))
- {
- //list($app,$class,$method) = explode('.',$_GET['menuaction']);
- $GLOBALS['phpgw']->redirect_link('/index.php',$_GET);
- }
- else
- {
-
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction' =>
'activitycalendarfrontend.uiactivity.index'));
- //$app = 'activitycalendarfrontend';
- //$class = 'uiactivity';
- //$method = 'index';
- }*/
- /*
- $GLOBALS[$class] = CreateObject("{$app}.{$class}");
-
- $invalid_data = false; //FIXME consider whether this should be computed
as in the main index.php
- if ( !$invalid_data
- && is_object($GLOBALS[$class])
- && isset($GLOBALS[$class]->public_functions)
- && is_array($GLOBALS[$class]->public_functions)
- && isset($GLOBALS[$class]->public_functions[$method])
- && $GLOBALS[$class]->public_functions[$method] )
-
- {
- if ( phpgw::get_var('X-Requested-With', 'string', 'SERVER') ==
'XMLHttpRequest'
- // deprecated
- || phpgw::get_var('phpgw_return_as', 'string', 'GET')
== 'json' )
- {
- // comply with RFC 4627
- header('Content-Type: application/json');
- $return_data = $GLOBALS[$class]->$method();
- echo json_encode($return_data);
- $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
- $GLOBALS['phpgw']->common->phpgw_exit();
- }
- else
- {
- $GLOBALS[$class]->$method();
- $GLOBALS['phpgw']->common->phpgw_footer();
- }
- }*/
-
-
-// include_once('../header.inc.php');
-
-
+$invalid_data = false; //FIXME consider whether this should be computed as in
the main index.php
+if (!$invalid_data
+ && is_object($GLOBALS[$class])
+ && isset($GLOBALS[$class]->public_functions)
+ && is_array($GLOBALS[$class]->public_functions)
+ && isset($GLOBALS[$class]->public_functions[$method])
+ && $GLOBALS[$class]->public_functions[$method]) {
+ if (phpgw::get_var('X-Requested-With', 'string', 'SERVER') ==
'XMLHttpRequest'
+ // deprecated
+ || phpgw::get_var('phpgw_return_as', 'string', 'GET') == 'json') {
+ // comply with RFC 4627
+ header('Content-Type: application/json');
+ $return_data = $GLOBALS[$class]->$method();
+ echo json_encode($return_data);
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+ $GLOBALS['phpgw']->common->phpgw_exit();
+ } else {
+ $GLOBALS[$class]->$method();
+ $GLOBALS['phpgw']->common->phpgw_footer();
+ }
+}
\ No newline at end of file
Modified: trunk/activitycalendarfrontend/setup/default_records.inc.php
===================================================================
--- trunk/activitycalendarfrontend/setup/default_records.inc.php
2012-08-31 08:28:15 UTC (rev 9945)
+++ trunk/activitycalendarfrontend/setup/default_records.inc.php
2012-08-31 08:29:46 UTC (rev 9946)
@@ -1,32 +1,13 @@
<?php
// Default user
-$GLOBALS['phpgw']->accounts = createObject('phpgwapi.accounts');
-$GLOBALS['phpgw']->acl = CreateObject('phpgwapi.acl');
+$GLOBALS['phpgw']->accounts = createObject('phpgwapi.accounts');
+$GLOBALS['phpgw']->acl = CreateObject('phpgwapi.acl');
$modules = array
-(
- 'activitycalendarfrontend',
+ (
+ 'activitycalendarfrontend',
// 'preferences'
);
-$aclobj =& $GLOBALS['phpgw']->acl;
-/*
-if (!$GLOBALS['phpgw']->accounts->exists('bookingguest') ) // no guest account
already exists
-{
- $GLOBALS['phpgw_info']['server']['password_level'] = '8CHAR';
- $account = new phpgwapi_user();
- $account->lid = 'bookingguest';
- $account->firstname = 'booking';
- $account->lastname = 'Guest';
- $account->passwd = 'bkbooking';
- $account->enabled = true;
- $account->expires = -1;
- $bookingguest = $GLOBALS['phpgw']->accounts->create($account,
array(), array(), $modules);
-
- $preferences = createObject('phpgwapi.preferences');
- $preferences->set_account_id($bookingguest);
- $preferences->add('bookingfrontend','template_set','bkbooking');
- $preferences->save_repository(true,$GLOBALS['type']);
-}
-*/
\ No newline at end of file
+$aclobj = & $GLOBALS['phpgw']->acl;
\ No newline at end of file
Modified: trunk/activitycalendarfrontend/setup/setup.inc.php
===================================================================
--- trunk/activitycalendarfrontend/setup/setup.inc.php 2012-08-31 08:28:15 UTC
(rev 9945)
+++ trunk/activitycalendarfrontend/setup/setup.inc.php 2012-08-31 08:29:46 UTC
(rev 9946)
@@ -1,43 +1,44 @@
<?php
- $setup_info['activitycalendarfrontend']['name'] =
'activitycalendarfrontend';
- $setup_info['activitycalendarfrontend']['version'] = '0.1';
- $setup_info['activitycalendarfrontend']['app_order'] = 61;
- $setup_info['activitycalendarfrontend']['enable'] = 1;
- $setup_info['activitycalendarfrontend']['app_group'] = 'office';
- $setup_info['activitycalendarfrontend']['description'] = 'Bergen
kommune activitycalendarfrontend';
+$setup_info['activitycalendarfrontend']['name'] = 'activitycalendarfrontend';
+$setup_info['activitycalendarfrontend']['version'] = '0.1';
+$setup_info['activitycalendarfrontend']['app_order'] = 61;
+$setup_info['activitycalendarfrontend']['enable'] = 1;
+$setup_info['activitycalendarfrontend']['app_group'] = 'office';
- $setup_info['activitycalendarfrontend']['author'][] = array
- (
- 'name' => 'Bouvet ASA',
- 'email' => 'address@hidden'
- );
+$setup_info['activitycalendarfrontend']['description'] = 'Bergen kommune
activitycalendarfrontend';
- /* Dependencies for this app to work */
- $setup_info['activitycalendarfrontend']['depends'][] = array(
- 'appname' => 'phpgwapi',
- 'versions' => Array('0.9.17', '0.9.18')
- );
+$setup_info['activitycalendarfrontend']['author'][] = array
+ (
+ 'name' => 'Bouvet ASA',
+ 'email' => 'address@hidden'
+);
- $setup_info['activitycalendarfrontend']['depends'][] = array(
- 'appname' => 'booking',
- 'versions' => Array('0.2.00',
'0.2.01','0.2.02','0.2.03','0.2.04','0.2.05','0.2.06','0.2.07','0.2.08','0.2.09')
- );
+/* Dependencies for this app to work */
+$setup_info['activitycalendarfrontend']['depends'][] = array(
+ 'appname' => 'phpgwapi',
+ 'versions' => Array('0.9.17', '0.9.18')
+);
- $setup_info['activitycalendarfrontend']['depends'][] = array(
- 'appname' => 'property',
- 'versions' => Array('0.9.17')
- );
-
- $setup_info['activitycalendarfrontend']['depends'][] = array(
- 'appname' => 'activitycalendar',
- 'versions' =>
Array('0.1.3','0.1.4','0.1.5','0.1.6','0.1.7','0.1.8','0.1.9','0.1.10','0.1.11')
- );
+$setup_info['activitycalendarfrontend']['depends'][] = array(
+ 'appname' => 'booking',
+ 'versions' => Array('0.2.00', '0.2.01', '0.2.02', '0.2.03', '0.2.04',
'0.2.05', '0.2.06', '0.2.07', '0.2.08', '0.2.09')
+);
- /* The hooks this app includes, needed for hooks registration */
- $setup_info['activitycalendarfrontend']['hooks'] = array
- (
- 'menu' => 'activitycalendarfrontend.menu.get_menu',
- 'config'
- );
+$setup_info['activitycalendarfrontend']['depends'][] = array(
+ 'appname' => 'property',
+ 'versions' => Array('0.9.17')
+);
+
+$setup_info['activitycalendarfrontend']['depends'][] = array(
+ 'appname' => 'activitycalendar',
+ 'versions' => Array('0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8',
'0.1.9', '0.1.10', '0.1.11')
+);
+
+/* The hooks this app includes, needed for hooks registration */
+$setup_info['activitycalendarfrontend']['hooks'] = array
+ (
+ 'menu' => 'activitycalendarfrontend.menu.get_menu',
+ 'config'
+);
?>
Modified: trunk/activitycalendarfrontend/setup/tables_current.inc.php
===================================================================
--- trunk/activitycalendarfrontend/setup/tables_current.inc.php 2012-08-31
08:28:15 UTC (rev 9945)
+++ trunk/activitycalendarfrontend/setup/tables_current.inc.php 2012-08-31
08:29:46 UTC (rev 9946)
@@ -1,3 +1,4 @@
<?php
- $phpgw_baseline = array();
+
+$phpgw_baseline = array();
?>
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9946] whitespace-fix (formatting),
Erik Holm-Larsen <=