Version 4.3.0

applications/convert/sources/Library/Calendar.php

@@ -33,7 +33,6 @@ class _Calendar extends Core
 	public function menuRows()
 	{
 		$return		= array();
-		$classname	= get_class( $this->software );
 
 		foreach( $this->getConvertableItems() as $k => $v )
 		{
@@ -72,6 +71,7 @@ class _Calendar extends Core
 						'per_cycle'			=> 1500,
 						'dependencies'		=> array( 'convertCalendarCalendars' ),
 						'link_type'			=> 'calendar_events',
+						'requires_rebuild'	=> TRUE
 					);
 					break;
 				
@@ -84,6 +84,7 @@ class _Calendar extends Core
 						'per_cycle'			=> 2000,
 						'dependencies'		=> array( 'convertCalendarEvents' ),
 						'link_type'			=> 'calendar_event_comments',
+						'requires_rebuild'	=> TRUE
 					);
 					break;
 				
@@ -96,6 +97,7 @@ class _Calendar extends Core
 						'per_cycle'			=> 2000,
 						'dependencies'		=> array( 'convertCalendarEvents' ),
 						'link_type'			=> 'calendar_event_reviews',
+						'requires_rebuild'	=> TRUE
 					);
 					break;
 				
@@ -148,6 +150,8 @@ class _Calendar extends Core
 					break;
 			}
 		}
+
+		$return = $this->software->extraMenuRows( $return );
 		
 		return $return;
 	}
@@ -172,7 +176,11 @@ class _Calendar extends Core
 			switch( $k )
 			{
 				case 'convertCalendarCalendars':
-					$return['convertCalendarCalendars'] = array( 'calendar_calendars' => NULL, 'core_clubs_node_map' => array( "node_class=?", "IPS\\calendar\\Calendar" ) );
+					$return['convertCalendarCalendars'] = array( 
+																'calendar_calendars'	=> NULL,
+																'core_clubs_node_map'	=> array( "node_class=?", "IPS\\calendar\\Calendar" ),
+																'core_permission_index' => array( 'app=? AND perm_type=?', 'calendar', 'calendar' )
+						);
 					break;
 				
 				case 'convertCalendarEvents':
@@ -279,7 +287,7 @@ class _Calendar extends Core
 		
 		if ( !isset( $info['cal_position'] ) )
 		{
-			$position = \IPS\Db::i()->select( 'MAX(position)', 'calendar_calendars' )->first();
+			$position = \IPS\Db::i()->select( 'MAX(cal_position)', 'calendar_calendars' )->first();
 			$info['cal_position'] = $position + 1;
 		}
 		
@@ -1304,7 +1312,7 @@ class _Calendar extends Core
 	 * @param	string|NULL		$filedata	Binary data for the file, or NULL.
 	 * @return	integer|boolean	The ID of the newly inserted attachment, or FALSE on failure.
 	 */
-	public function convertAttachment( $info=array(), $map=array(), $filepath=NULL, $filedata=NULL )
+	public function convertAttachment( $info=array(), $map=array(), $filepath=NULL, $filedata=NULL, $thumbnailpath=NULL )
 	{
 		$map['location_key']	= 'calendar_Calendar';
 		$map['id1_type']		= 'calendar_events';
@@ -1325,6 +1333,6 @@ class _Calendar extends Core
 			$map['id2_type'] = 'calendar_event_reviews';
 		}
 		
-		return parent::convertAttachment( $info, $map, $filepath, $filedata );
+		return parent::convertAttachment( $info, $map, $filepath, $filedata, $thumbnailpath );
 	}
 }