diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2005-12-18 22:34:09 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2005-12-18 22:34:09 +0000 |
| commit | 3096c1e2f1f8f755e795c2766d15a339696e800d (patch) | |
| tree | 6a9a9ac09515a636d82ce926731b0a2cfb1eb765 /admin | |
| parent | 302b267e93928d3777681a81e2b47d463cfed49a (diff) | |
| download | calendar-3096c1e2f1f8f755e795c2766d15a339696e800d.tar.gz calendar-3096c1e2f1f8f755e795c2766d15a339696e800d.tar.bz2 calendar-3096c1e2f1f8f755e795c2766d15a339696e800d.zip | |
merge recent changes into HEAD
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/admin_calendar_inc.php | 14 | ||||
| -rw-r--r-- | admin/schema_inc.php | 9 |
2 files changed, 5 insertions, 18 deletions
diff --git a/admin/admin_calendar_inc.php b/admin/admin_calendar_inc.php index 9a94335..830231f 100644 --- a/admin/admin_calendar_inc.php +++ b/admin/admin_calendar_inc.php @@ -15,21 +15,17 @@ $dayEnd = range( 24, 13 ); $gBitSmarty->assign( 'dayEnd', $dayEnd ); $calendarValues = array( - 'calendar_week_offset', - 'calendar_hour_fraction', - 'calendar_day_start', - 'calendar_day_end', - 'calendar_user_prefs', + 'week_offset', + 'hour_fraction', + 'day_start', + 'day_end', ); // this function only exists if it's been included by the index.php page. if // it's been included from anywhere else, we don't execute this section if( function_exists( 'simple_set_value' ) && $gBitUser->isAdmin() && !empty( $_REQUEST['calendar_submit'] ) ) { foreach( $calendarValues as $item ) { - if ( $item != 'calendar_user_prefs' ) - simple_set_value( $item, CALENDAR_PKG_NAME ); - else - simple_set_toggle( $item, CALENDAR_PKG_NAME ); + simple_set_value( $item, CALENDAR_PKG_NAME ); } } ?> diff --git a/admin/schema_inc.php b/admin/schema_inc.php index c1c2634..6670a29 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -8,15 +8,6 @@ $gBitInstaller->registerPackageInfo( CALENDAR_PKG_NAME, array( 'license' => '<a href="http://www.gnu.org/licenses/licenses.html#LGPL">LGPL</a>', ) ); -// ### Default Preferences -$gBitInstaller->registerPreferences( KERNEL_PKG_NAME, array( - array(CALENDAR_PKG_NAME,'calendar_week_offset','7'), - array(CALENDAR_PKG_NAME,'calendar_hour_fraction','1'), - array(CALENDAR_PKG_NAME,'calendar_user_prefs','y'), - array(CALENDAR_PKG_NAME,'calendar_day_start','0'), - array(CALENDAR_PKG_NAME,'calendar_day_end','24'), -) ); - // ### Default User Permissions $gBitInstaller->registerUserPermissions( CALENDAR_PKG_NAME, array( array('bit_p_view_calendar', 'Can browse the calendar', 'basic', CALENDAR_PKG_NAME), |