Version 4.1.2

applications/cms/modules/admin/pages/ajax.php

@@ -90,7 +90,10 @@ class _ajax extends \IPS\Dispatcher\Controller
 			$templateBits  = \IPS\Theme::master()->getRawTemplates( $location['app'], $location['location'], $location['group'], \IPS\Theme::RETURN_ALL );
 			$templateBit   = $templateBits[ $location['app'] ][ $location['location'] ][ $location['group'] ][ $location['name'] ];
 			
-			$templateBit['template_content'] = htmlentities( $templateBit['template_content'], \IPS\HTMLENTITIES, 'UTF-8', TRUE );
+			if ( ! isset( \IPS\Request::i()->noencode ) OR ! \IPS\Request::i()->noencode )
+			{
+				$templateBit['template_content'] = htmlentities( $templateBit['template_content'], \IPS\HTMLENTITIES, 'UTF-8', TRUE );
+			}
 			
 			$templateArray = array(
 				'template_id' 			=> $templateBit['template_id'],
@@ -132,7 +135,7 @@ class _ajax extends \IPS\Dispatcher\Controller
 	                'template_key' 			=> $template->key,
 	                'template_title'		=> $template->title,
 	                'template_desc' 		=> $template->desc,
-	                'template_content' 		=> htmlentities( $template->content, \IPS\HTMLENTITIES, 'UTF-8', TRUE ),
+	                'template_content' 		=> ( isset( \IPS\Request::i()->noencode ) AND \IPS\Request::i()->noencode ) ? $template->content : htmlentities( $template->content, \IPS\HTMLENTITIES, 'UTF-8', TRUE ),
 	                'template_location' 	=> $template->location,
 	                'template_group' 		=> $template->group,
 	                'template_container' 	=> $template->container,

applications/cms/modules/admin/pages/blocks.php

@@ -138,17 +138,22 @@ class _blocks extends \IPS\Node\Controller
 			}
 			catch ( \OutOfRangeException $e ) { }
 		}
-
+		
+		$disabled = array();
 		foreach( \IPS\cms\Databases::databases() as $db )
 		{
 			if ( $db->page_id )
 			{
 				$plugins[ \IPS\Member::loggedIn()->language()->addToStack( 'cms_db_feed_title' ) ][ 'db_feed_' . $db->id ] = \IPS\Member::loggedIn()->language()->addToStack( 'cms_db_feed_block_with_name', NULL, array( 'sprintf' => array( $db->_title ) ) );
 			}
+			else
+			{
+				$disabled[] = 'db_feed_' . $db->id;
+				$plugins[ \IPS\Member::loggedIn()->language()->addToStack( 'cms_db_feed_title' ) ][ 'db_feed_' . $db->id ] = \IPS\Member::loggedIn()->language()->addToStack( 'cms_db_feed_block_with_name_disabled', NULL, array( 'sprintf' => array( $db->_title ) ) );
+			}
 		}
 
-		$form->add( new \IPS\Helpers\Form\Select( 'content_block_add_type_plugin', null, false, array( 'options' => $plugins ), NULL, NULL, NULL, 'content_block_add_type_plugin' ) );
-
+		$form->add( new \IPS\Helpers\Form\Select( 'content_block_add_type_plugin', null, false, array( 'options' => $plugins, 'disabled' => $disabled ), NULL, NULL, NULL, 'content_block_add_type_plugin' ) );
 
 		$form->add( new \IPS\Helpers\Form\Radio( 'content_block_add_custom_type', 'editor', TRUE, array(
 				'options' => array( 'editor'	=> 'content_block_add_custom_type_wysiwyg',
@@ -180,4 +185,18 @@ class _blocks extends \IPS\Node\Controller
 		\IPS\Output::i()->output .= \IPS\Theme::i()->getTemplate( 'global', 'core', 'admin' )->block( \IPS\Member::loggedIn()->language()->addToStack('content_block_block_add'), $form, FALSE );
 		\IPS\Output::i()->title   = \IPS\Member::loggedIn()->language()->addToStack('content_block_block_add');
 	}
+
+    /**
+     * View external embed options
+     *
+     * @return	void
+     */
+    public function embedOptions()
+    {
+        $block = \IPS\cms\Blocks\Block::load( \IPS\Request::i()->id );
+        $embedKey = md5( $block->key . time() );
+        /* Output */
+        \IPS\Output::i()->title	 = "External Embed"; // @todo
+        \IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global', 'core', 'admin' )->block( '', \IPS\Theme::i()->getTemplate( 'blocks', 'cms', 'admin' )->embedCode( $block, $embedKey ) );;
+    }
 }

applications/cms/modules/admin/pages/media.php

@@ -0,0 +1,410 @@
+<?php
+/**
+ * @brief		Pages Media Management
+ * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) 2001 - 2015 Invision Power Services, Inc.
+ * @license		http://www.invisionpower.com/legal/standards/
+ * @package		IPS Social Suite
+ * @subpackage	Pages
+ * @since		07 Jul 2015
+ * @version		SVN_VERSION_NUMBER
+ */
+
+namespace IPS\cms\modules\admin\pages;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * media
+ */
+class _media extends \IPS\Node\Controller
+{
+	/**
+	 * Node Class
+	 */
+	protected $nodeClass = '\IPS\cms\Media\Folder';
+
+	/**
+	 * Execute
+	 *
+	 * @return	void
+	 */
+	public function execute()
+	{
+		\IPS\Dispatcher::i()->checkAcpPermission( 'media_manage' );
+		parent::execute();
+	}
+
+	/**
+	* Get Root Buttons
+	*
+	* @return	array
+	*/
+	public function _getRootButtons()
+	{
+		$buttons   = array();
+
+		if ( \IPS\Member::loggedIn()->hasAcpRestriction( 'cms', 'pages', 'page_add' )  )
+		{
+			$buttons['add_folder'] = array(
+				'icon'	=> 'folder-open',
+				'title'	=> 'cms_add_media_folder',
+				'link'	=> \IPS\Http\Url::internal( 'app=cms&module=pages&controller=media&do=form' ),
+				'data'  => array( 'ipsDialog' => '', 'ipsDialog-title' => \IPS\Member::loggedIn()->language()->addToStack('cms_add_media_folder') )
+			);
+
+			$buttons['add_page'] = array(
+				'icon'	=> 'plus-circle',
+				'title'	=> 'cms_add_media',
+				'link'	=>  \IPS\Http\Url::internal( 'app=cms&module=pages&controller=media&subnode=1&do=form' ),
+				'data'  => array( 'ipsDialog' => '', 'ipsDialog-title' => \IPS\Member::loggedIn()->language()->addToStack('cms_add_media') )
+			);
+		}
+
+		return $buttons;
+	}
+	
+	/**
+	 * Delete many at once
+	 *
+	 * @return void
+	 */
+	public function deleteByFileIds()
+	{
+		if ( isset( \IPS\Request::i()->fileIds ) )
+		{
+			$ids = \IPS\Request::i()->fileIds;
+			
+			if ( ! is_array( $ids ) )
+			{
+				$try = json_decode( $ids, TRUE );
+				
+				if ( ! is_array( $try ) )
+				{
+					$ids = array( $ids );
+				}
+				else
+				{
+					$ids = $try;
+				}
+			}
+			
+			if ( count( $ids ) )
+			{
+				\IPS\cms\Media::deleteByFileIds( $ids );
+			}
+		}
+	}
+	
+	/**
+	 * Show the pages tree
+	 *
+	 * @return	string
+	 */
+	protected function manage()
+	{
+		$url = \IPS\Http\Url::internal( "app=cms&module=pages&controller=media" );
+
+		/* Display the table */
+		\IPS\Output::i()->title  = \IPS\Member::loggedIn()->language()->addToStack('menu__cms_pages_media');
+		$output = new \IPS\Helpers\Tree\Tree( $url, 'menu__cms_pages_media',
+			/* Get Roots */
+			function () use ( $url )
+			{
+				$data = \IPS\cms\modules\admin\pages\media::getRowsForTree( 0 );
+				$rows = array();
+
+				foreach ( $data as $id => $row )
+				{
+					if( ( \IPS\Request::i()->isAjax() && $row instanceof \IPS\cms\Media ) || !\IPS\Request::i()->isAjax() )
+					{
+						$rows[ $id ] = ( $row instanceof \IPS\cms\Media) ? \IPS\cms\modules\admin\pages\media::getItemRow( $row, $url ) : \IPS\cms\modules\admin\pages\media::getFolderRow( $row, $url );	
+					}					
+				}
+
+				if( \IPS\Request::i()->isAjax() ){
+					\IPS\Output::i()->sendOutput( json_encode( $rows ), 200, 'application/json', \IPS\Output::i()->httpHeaders );
+				}
+
+				return $data;
+			},
+			/* Get Row */
+			function ( $id, $root ) use ( $url )
+			{
+				if ( $root )
+				{
+					return \IPS\cms\modules\admin\pages\media::getFolderRow( \IPS\cms\Media\Folder::load( $id ), $url );
+				}
+				else
+				{
+					return \IPS\cms\modules\admin\pages\media::getItemRow( \IPS\cms\Media::load( $id ), $url );
+				}
+			},
+			/* Get Row Parent ID*/
+			function ()
+			{
+				return NULL;
+			},
+			/* Get Children */
+			function ( $id ) use ( $url )
+			{
+				$rows = array();
+				$data = \IPS\cms\modules\admin\pages\media::getRowsForTree( $id );
+
+				if ( ! isset( \IPS\Request::i()->subnode ) )
+				{
+					foreach ( $data as $id => $row )
+					{
+						if( \IPS\Request::i()->get == 'folders' && !( $row instanceof \IPS\cms\Media ) )
+						{
+							$rows[ $id ] = \IPS\cms\modules\admin\pages\media::getFolderRow( $row, $url );
+						}
+						elseif ( \IPS\Request::i()->get == 'files' && $row instanceof \IPS\cms\Media )
+						{
+							$rows[ $id ] = \IPS\cms\modules\admin\pages\media::getItemRow( $row, $url );
+						}
+						
+					}
+				}
+
+				if( \IPS\Request::i()->isAjax() ){
+					\IPS\Output::i()->sendOutput( json_encode( $rows ), 200, 'application/json', \IPS\Output::i()->httpHeaders );
+				}
+
+				return $rows;
+			},
+           array( $this, '_getRootButtons' ),
+           TRUE,
+           FALSE,
+           FALSE
+		);
+		
+		\IPS\Output::i()->jsFiles  = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'admin_media.js', 'cms' ) );
+		\IPS\Output::i()->cssFiles = array_merge( \IPS\Output::i()->cssFiles, \IPS\Theme::i()->css( 'media/media.css', 'cms', 'admin' ) );
+		
+		if( \IPS\Request::i()->isAjax() )
+		{
+			\IPS\Output::i()->sendOutput( $output, 200, 'text/html', \IPS\Output::i()->httpHeaders );
+		}
+		else
+		{
+			\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'media', 'cms', 'admin' )->media( $output );	
+		}
+	}
+	
+	/**
+	 * Upload items
+	 *
+	 * @return void
+	 */
+	public function upload()
+	{
+		$form = new \IPS\Helpers\Form( 'form', 'upload' );
+		$form->class = 'ipsForm_vertical ipsForm_noLabels';
+			
+		$form->add( new \IPS\Helpers\Form\Upload( 'media_filename', NULL, FALSE, array( 'allowedFileTypes' => \IPS\File::$safeFileExtensions, 'obscure' => FALSE, 'maxFileSize' => 5, 'storageExtension' => 'core_Theme', 'storageContainer' => 'pages_media', 'multiple' => true, 'minimize' => FALSE ), NULL, NULL, NULL, 'media_filename' ) );
+			
+		if ( ! isset( \IPS\Request::i()->media_parent ) and ! \IPS\Request::i()->media_parent )
+		{
+			$form->add( new \IPS\Helpers\Form\Node( 'media_parent', 0, FALSE, array(
+				'class'    => '\IPS\cms\Media\Folder',
+				'zeroVal'  => 'node_no_parent'
+			) ) );
+		}
+		else
+		{
+			$form->hiddenValues['media_parent_inline'] = \IPS\Request::i()->media_parent;
+		}
+		
+		if ( $values = $form->values() )
+		{
+			$parent = 0;
+			$count = 0;
+
+			if ( isset( $values['media_parent_inline'] ) AND $values['media_parent_inline'] )
+			{
+				$parent = $values['media_parent_inline'];
+			}
+			else
+			{
+				if ( isset( $values['media_parent'] ) AND ( ! empty( $values['media_parent'] ) OR $values['media_parent'] === 0 ) )
+				{
+					$parent = ( $values['media_parent'] === 0 ) ? 0 : $values['media_parent']->id;
+				}
+			}
+
+			foreach( $values['media_filename'] as $media )
+			{
+				$filename = $media->originalFilename;
+	
+				$prefix = $parent . '_';
+	
+				if ( mb_strstr( $filename, $prefix ) )
+				{
+					$filename = mb_substr( $filename, mb_strlen( $prefix ) );
+				}
+				
+				$new = new \IPS\cms\Media;
+				$new->filename        = $filename;
+				$new->filename_stored = $parent . '_' . $filename;
+				$new->is_image        = $media->isImage();
+				$new->parent          = $parent;
+				$new->added           = time();
+				$new->file_object     = (string) \IPS\File::create( 'cms_Media', $new->filename_stored, $media->contents(), 'pages_media', TRUE, NULL, FALSE );
+				$new->save();
+				
+				$new->setFullPath( ( $parent ? \IPS\cms\Media\Folder::load( $parent )->path : '' ) );
+				$new->save();
+
+				$count++;
+			}
+			
+			if ( \IPS\Request::i()->isAjax() )
+			{
+				$url = \IPS\Http\Url::internal( "app=cms&module=pages&controller=media" );
+				$data = \IPS\cms\modules\admin\pages\media::getRowsForTree( $parent );
+				$rows = array();
+
+				foreach ( $data as $id => $row )
+				{
+					if ( $row instanceof \IPS\cms\Media )
+					{
+						$rows[ $id ] = \IPS\cms\modules\admin\pages\media::getItemRow( $row, $url );
+					}
+				}
+
+				\IPS\Output::i()->sendOutput( json_encode( array( 'count' => $count, 'folderID' => $parent, 'rows' => $rows ) ), 200, 'application/json', \IPS\Output::i()->httpHeaders );
+			}
+			else
+			{
+				\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=cms&module=pages&controller=media' ) );
+			}
+		}
+		
+		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global', 'core', 'admin' )->block( 'upload', $form, FALSE );
+	}
+	
+	/**
+	 * Tree Search
+	 *
+	 * @return	void
+	 */
+	protected function search()
+	{
+		$rows = array();
+		$url  = \IPS\Http\Url::internal( "app=cms&module=pages&controller=media" );
+
+		/* Get results */
+		$items   = \IPS\cms\Media::search( 'media_filename', \IPS\Request::i()->input, 'media_filename' );
+
+		/* Convert to HTML */
+		foreach ( $items as $id => $result )
+		{
+			$rows[ $id ] = $this->getItemRow( $result, $url );
+		}
+
+		if( \IPS\Request::i()->isAjax() )
+		{
+			\IPS\Output::i()->sendOutput( json_encode( $rows ), 200, 'application/json', \IPS\Output::i()->httpHeaders );
+		}
+		else
+		{
+			\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'trees', 'core' )->rows( $rows, '' );	
+		}		
+	}
+
+	/**
+	 * Returns a JSON object with some file information
+	 *
+	 * @return	void
+	 */
+	protected function getFileInfo()
+	{
+		try
+		{
+			$row = \IPS\cms\Media::load( \IPS\Request::i()->id );
+			$fileObject = \IPS\File::get( 'cms_Media', $row->file_object );
+		}
+		catch( \OutOfRangeException $ex )
+		{
+			return;
+		}
+		
+		/* Make a human-readable size */
+		$filesize = \IPS\Output\Plugin\Filesize::humanReadableFilesize( $fileObject->filesize() );
+		\IPS\Member::loggedIn()->language()->parseOutputForDisplay( $filesize );
+
+		$output = array( 
+			'fileSize' => $filesize,
+			'dimensions' => NULL
+		);
+
+		/* If this is an image we'll also show the dimensions */
+		if( $row->is_image )
+		{
+			$dimensions = $fileObject->getImageDimensions();
+			$output['dimensions'] = $dimensions[0] . ' x ' . $dimensions[1];
+		}
+
+		\IPS\Output::i()->sendOutput( json_encode( $output ), 200, 'application/json', \IPS\Output::i()->httpHeaders );
+	}
+
+	/**
+	 * Return HTML for a page row
+	 *
+	 * @param   array   $row	Row data
+	 * @param	object	$url	\IPS\Http\Url object
+	 * @return	string	HTML
+	 */
+	public static function getItemRow( $item, $url )
+	{
+		return \IPS\Theme::i()->getTemplate( 'media', 'cms', 'admin' )->fileListing( $url, $item );
+	}
+
+	/**
+	 * Return HTML for a folder row
+	 *
+	 * @param   array   $row	Row data
+	 * @param	object	$url	\IPS\Http\Url object
+	 * @return	string	HTML
+	 */
+	public static function getFolderRow( $folder, $url )
+	{
+		return \IPS\Theme::i()->getTemplate( 'media', 'cms', 'admin' )->folderRow( $url, $folder );
+	}
+
+
+	/**
+	 * Fetch rows of folders/pages
+	 *
+	 * @param int $folderId		Parent ID to fetch from
+	 */
+	public static function getRowsForTree( $folderId=0 )
+	{
+		try
+		{
+			if ( $folderId === 0 )
+			{
+				$folders = \IPS\cms\Media\Folder::roots();
+			}
+			else
+			{
+				$folders = \IPS\cms\Media\Folder::load( $folderId )->children( NULL, NULL, FALSE );
+			}
+		}
+		catch( \OutOfRangeException $ex )
+		{
+			$folders = array();
+		}
+
+		$media = \IPS\cms\Media::getChildren( $folderId );
+
+		return \IPS\cms\Media\Folder::munge( $folders, $media );
+	}
+
+}

applications/cms/modules/admin/pages/menu.php

@@ -1,69 +0,0 @@
-<?php
-/**
- * @brief		Page menu Controller
- * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @since		15 Sept 2014
- * @version		SVN_VERSION_NUMBER
- */
-
-namespace IPS\cms\modules\admin\pages;
-
-/* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
-{
-	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
-	exit;
-}
-
-/**
- * Page management
- */
-class _menu extends \IPS\Node\Controller
-{
-	/**
-	 * Node Class
-	 */
-	protected $nodeClass = '\IPS\cms\Pages\Menu';
-	
-	/**
-	 * Execute
-	 *
-	 * @return	void
-	 */
-	public function execute()
-	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'menu_manage' );
-		parent::execute();
-	}
-	
-	/**
-	 * Show the pages tree
-	 *
-	 * @return	string
-	 */
-	protected function manage()
-	{
-		\IPS\Output::i()->title  = \IPS\Member::loggedIn()->language()->addToStack('menu__cms_pages_menu');
-
-		if ( ! \IPS\Request::i()->isAjax() )
-		{
-			\IPS\Output::i()->output .= \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->message( \IPS\Member::loggedIn()->language()->addToStack('cms_menu_information'), 'information', NULL, FALSE );
-		}
-
-		return parent::manage();
-	}
-
-	/**
-	 * Delete
-	 *
-	 * @return	void
-	 */
-	protected function delete()
-	{
-		unset( \IPS\Data\Store::i()->cms_menu );
-		parent::delete();
-	}
-}

applications/cms/modules/admin/pages/pages.php

@@ -153,7 +153,7 @@ class _pages extends \IPS\Node\Controller
 		$options  = array();
 		$url['path'] = preg_replace( '#^/?(.+?)?/?$#', '\1', $url['path'] );
 		
-		$disabled = ( $url['path'] ) ? FALSE : TRUE;
+		$disabled = ( \IPS\Settings::i()->cms_use_different_gateway or $url['path'] ) ? FALSE : TRUE;
 		$dirs     = explode( '/', $url['path'] );
 		
 		if ( count( $dirs ) )
@@ -213,13 +213,21 @@ class _pages extends \IPS\Node\Controller
 			}
 		}, NULL, NULL, 'cms_root_page_url' ) );
 
+		$form->add( new \IPS\Helpers\Form\Node( 'cms_error_page', \IPS\Settings::i()->cms_error_page ? \IPS\Settings::i()->cms_error_page : 0, FALSE,array(
+			'class'           => '\IPS\cms\Pages\Page',
+			'zeroVal'         => 'cms_error_page_none',
+			'subnodes'		  => true,
+			'permissionCheck' => function( $node )
+			{
+				return $node->type == 'html';
+			}
+		) ) );
+
 		if ( $values = $form->values() )
 		{
 			$form->saveAsSettings();
 			\IPS\Member::clearCreateMenu();
-			
-			\IPS\cms\Pages\Menu::clearCaches();
-						
+									
 			/* Clear Sidebar Caches */
 			\IPS\Widget::deleteCaches();
 			
@@ -231,7 +239,7 @@ class _pages extends \IPS\Node\Controller
 		\IPS\Output::i()->title  = \IPS\Member::loggedIn()->language()->addToStack('cms_pages_settings');
 	}
 	
-		/**
+	/**
 	 * Download .htaccess file
 	 *
 	 * @return	void
@@ -344,7 +352,7 @@ FILE;
 		/* Convert to HTML */
 		foreach ( $results as $id => $result )
 		{
-			$rows[ $id ] = ( $result instanceof \IPS\cms\Pages\Page ) ? $this->_getPageRow( $result, $url ) : $this->_getFolderRow( $result, $url );
+			$rows[ $id ] = ( $result instanceof \IPS\cms\Pages\Page ) ? $this->getPageRow( $result, $url ) : $this->getFolderRow( $result, $url );
 		}
 
 		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'trees', 'core' )->rows( $rows, '' );

applications/cms/modules/admin/pages/templates.php

@@ -46,7 +46,292 @@ class _templates extends \IPS\Dispatcher\Controller
 
 		\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=cms&module=pages&controller=templates' ), 'completed' );
 	}
-	
+
+	/**
+	 * Import dialog
+	 *
+	 * @return void
+	 */
+	public function import()
+	{
+		$form = new \IPS\Helpers\Form( 'form', 'next' );
+
+		$form->add( new \IPS\Helpers\Form\Upload( 'cms_templates_import', NULL, FALSE, array( 'allowedFileTypes' => array( 'xml' ), 'temporary' => TRUE ), NULL, NULL, NULL, 'cms_templates_import' ) );
+
+		if ( $values = $form->values() )
+		{
+			if ( $values['cms_templates_import'] )
+			{
+				/* Move it to a temporary location */
+				$tempFile = tempnam( \IPS\TEMP_DIRECTORY, 'IPS' );
+				move_uploaded_file( $values['cms_templates_import'], $tempFile );
+
+				/* Initate a redirector */
+				\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=cms&module=pages&controller=templates&do=importProcess&file=' . urlencode( $tempFile ) . '&key=' . md5_file( $tempFile ) ) );
+			}
+			else
+			{
+				\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=cms&module=pages&controller=templates&do=manage' ) );
+			}
+		}
+
+		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global', 'core', 'admin' )->block( 'cms_templates_import_title', $form, FALSE );
+	}
+
+	/**
+	 * Import from upload
+	 *
+	 * @return	void
+	 */
+	public function importProcess()
+	{
+		if ( !file_exists( \IPS\Request::i()->file ) or md5_file( \IPS\Request::i()->file ) !== \IPS\Request::i()->key )
+		{
+			\IPS\Output::i()->error( 'generic_error', '3T259/3', 403, '' );
+		}
+
+		/* Open XML file */
+		$xml = new \XMLReader;
+		$xml->open( \IPS\Request::i()->file );
+		$prefix = date('m') . '.' . date('d') . '.' . date('y') . '_';
+
+		if ( ! @$xml->read() )
+		{
+			\IPS\Output::i()->error( 'xml_upload_invalid', '2C163/1', 403, '' );
+		}
+		$xml->read();
+		while ( $xml->read() )
+		{
+			if ( $xml->name === 'template' )
+			{
+				$templates = \IPS\cms\Theme::i()->getRawTemplates( 'cms', NULL, NULL, \IPS\cms\Theme::RETURN_ALL );
+				$node      = new \SimpleXMLElement( $xml->readOuterXML() );
+				$attrs     = array();
+
+				foreach( $node->attributes() as $k => $v )
+				{
+					$attrs[ $k ] = (string) $v;
+				}
+
+				/* Any kids of your own? */
+				foreach( $node->children() as $k => $v )
+				{
+					$tryJson = json_decode( $v, TRUE );
+					$attrs[ $k ] =  ( $tryJson ) ? $tryJson : (string) $v;
+				}
+
+				if ( isset( $attrs['template_title'] ) and isset( $attrs['template_location'] ) and isset( $attrs['template_group'] ) )
+				{
+					/* Got this template? */
+					if ( $attrs['template_location'] === 'database' )
+					{
+						/* Database templates are really governed by the group as they are a collection of templates */
+						if ( isset( $templates['cms'][$attrs['template_location']][$attrs['template_group']] ) )
+						{
+							$attrs['template_group'] = $prefix . $attrs['template_group'];
+						}
+					}
+					else
+					{
+						/* But post and block templates are not */
+						if ( isset( $templates['cms'][$attrs['template_location']][$attrs['template_group']] ) )
+						{
+							$exists = FALSE;
+							foreach ( $templates['cms'][$attrs['template_location']][$attrs['template_group']] as $key => $template )
+							{
+								if ( $template['template_title'] === $attrs['template_title'] )
+								{
+									$exists = TRUE;
+									break;
+								}
+							}
+
+							if ( $exists )
+							{
+								$attrs['template_title'] = $prefix . $attrs['template_title'];
+							}
+						}
+					}
+
+					$obj                 = new \IPS\cms\Templates;
+					$obj->location       = $attrs['template_location'];
+					$obj->group          = $attrs['template_group'];
+					$obj->title          = $attrs['template_title'];
+					$obj->params         = $attrs['template_params'];
+					$obj->content        = $attrs['template_content'];
+					$obj->original_group = $attrs['template_original_group'];
+					$obj->type           = 'template';
+					$obj->user_created   = 1;
+					$obj->user_edited    = 1;
+					$obj->desc           = '';
+					$obj->save();
+
+					$obj->key = $obj->location . \IPS\Http\Url::seoTitle( $obj->group ) . '_' . \IPS\Http\Url::seoTitle( $obj->title ) . '_' . $obj->id;
+					$obj->save();
+				}
+			}
+
+			$xml->next();
+		}
+
+		/* Done */
+		\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=cms&module=pages&controller=templates&do=manage' ), 'cms_templates_imported' );
+	}
+
+	/**
+	 * Export templates
+	 *
+	 * @return void
+	 */
+	public function export()
+	{
+		$form = new \IPS\Helpers\Form( 'form', 'next' );
+		$templates = array();
+
+		$form->addMessage( 'cms_templates_export_description', 'ipsMessage ipsMessage_information' );
+		foreach( \IPS\cms\Templates::getTemplates( \IPS\cms\Templates::RETURN_DATABASE_ONLY + \IPS\cms\Templates::RETURN_ALL ) as $template )
+		{
+			$title = \IPS\cms\Templates::readableGroupName( $template->group );
+
+			if ( $template->location === 'database' )
+			{
+				$templates['database'][ $template->group ] = $title;
+			}
+			else if ( $template->location === 'block' )
+			{
+				$templates['block'][ $template->key ] = $title . ' > ' . $template->title;
+			}
+			else if ( $template->location === 'page' )
+			{
+				$templates['page'][ $template->key ] = $title . ' > ' . $template->title;
+			}
+		}
+
+		foreach( $templates as $location => $data )
+		{
+			$form->add( new \IPS\Helpers\Form\CheckboxSet( 'templates_' . $location, FALSE, FALSE, array( 'options' => $data ) ) );
+		}
+
+		if ( $values = $form->values() )
+		{
+			$exportTemplates = array();
+			foreach( $templates as $location => $data )
+			{
+				if ( isset( $values[ 'templates_' . $location ] ) and count( $values[ 'templates_' . $location ] ) )
+				{
+					if ( $location === 'database' )
+					{
+						$tmp = \IPS\cms\Theme::i()->getRawTemplates( 'cms', array('database'), array_values( $values[ 'templates_' . $location ] ) );
+
+						foreach( $tmp['cms'] as $loc => $data )
+						{
+							if ( $loc === $location )
+							{
+								foreach ( $data as $key => $tdata )
+								{
+									foreach ( $tdata as $tkey => $tkdata )
+									{
+										$exportTemplates['cms'][ $location ][ $key ][ $tkey ] = $tkdata;
+									}
+								}
+							}
+						}
+					}
+					else
+					{
+						$tmp = \IPS\cms\Theme::i()->getRawTemplates( 'cms', array( $location ), NULL, \IPS\cms\Theme::RETURN_DATABASE_ONLY + \IPS\cms\Theme::RETURN_ALL );
+
+						foreach( $tmp['cms'] as $loc => $data )
+						{
+							if ( $loc === $location )
+							{
+								foreach( $data as $key => $tdata )
+								{
+									foreach( $tdata as $tkey => $tkdata )
+									{
+										if ( in_array( $tkey, $values[ 'templates_' . $location ] ) )
+										{
+											$exportTemplates['cms'][ $location ][ $key ][ $tkey ] = $tkdata;
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+
+			if ( count( $exportTemplates ) )
+			{
+				/* Init */
+				$xml = new \XMLWriter;
+				$xml->openMemory();
+				$xml->setIndent( TRUE );
+				$xml->startDocument( '1.0', 'UTF-8' );
+
+				/* Root tag */
+				$xml->startElement('templates');
+
+				foreach ( $exportTemplates as $app => $location )
+				{
+					foreach ( $location as $key => $data )
+					{
+						foreach ( $data as $group => $template )
+						{
+							foreach( $template as $key => $templateData )
+							{
+								/* Initiate the <template> tag */
+								$xml->startElement( 'template' );
+
+								foreach ( $templateData as $k => $v )
+								{
+									if ( ! in_array( \substr( $k, 9 ), array( 'content', 'params' ) ) )
+									{
+										$xml->startAttribute( $k );
+										$xml->text( $v );
+										$xml->endAttribute();
+									}
+								}
+
+								/* Write (potential) HTML fields */
+								foreach( array( 'template_params', 'template_content' ) as $field )
+								{
+									if ( isset( $templateData[ $field ] ) )
+									{
+										$xml->startElement( $field );
+										if ( preg_match( '/<|>|&/', $templateData[ $field ] ) )
+										{
+											$xml->writeCData( str_replace( ']]>', ']]]]><![CDATA[>', $templateData[ $field ] ) );
+										}
+										else
+										{
+											$xml->text( $templateData[ $field ] );
+										}
+										$xml->endElement();
+									}
+								}
+
+								/* Close the <template> tag */
+								$xml->endElement();
+							}
+						}
+					}
+				}
+
+				/* Finish */
+				$xml->endDocument();
+
+				\IPS\Output::i()->sendOutput( $xml->outputMemory(), 200, 'application/xml', array( 'Content-Disposition' => \IPS\Output::getContentDisposition( 'attachment', "pages_templates.xml" ) ) );
+			}
+			else
+			{
+				\IPS\Output::i()->error( 'cms_no_templates_selected', '1T285/1', 403, '' );
+			}
+		}
+
+		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global', 'core', 'admin' )->block( 'cms_templates_export_title', $form, FALSE );
+	}
+
 	/**
 	 * List templates
 	 * 
@@ -143,6 +428,20 @@ class _templates extends \IPS\Dispatcher\Controller
 				);
 			}
 
+			\IPS\Output::i()->sidebar['actions']['download'] = array(
+				'icon'  => 'download',
+				'title' => 'cms_templates_export_title',
+				'link'  => \IPS\Http\Url::internal( "app=cms&module=pages&controller=templates&do=export" ),
+				'data'  => array( 'ipsDialog' => '', 'ipsDialog-title' => \IPS\Member::loggedIn()->language()->addToStack('cms_templates_export_title') )
+			);
+
+			\IPS\Output::i()->sidebar['actions']['upload'] = array(
+				'icon'  => 'upload',
+				'title' => 'cms_templates_import_title',
+				'link'  => \IPS\Http\Url::internal( "app=cms&module=pages&controller=templates&do=import" ),
+				'data'  => array( 'ipsDialog' => '', 'ipsDialog-title' => \IPS\Member::loggedIn()->language()->addToStack('cms_templates_import_title') )
+			);
+
 			\IPS\Output::i()->jsFiles  = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'codemirror/diff_match_patch.js', 'core', 'interface' ) );
 			\IPS\Output::i()->jsFiles  = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'codemirror/codemirror.js', 'core', 'interface' ) );
 			\IPS\Output::i()->cssFiles = array_merge( \IPS\Output::i()->cssFiles, \IPS\Theme::i()->css( 'codemirror/codemirror.css', 'core', 'interface' ) );
@@ -214,7 +513,7 @@ class _templates extends \IPS\Dispatcher\Controller
 		$form = new \IPS\Helpers\Form();
 		$form->hiddenValues['type'] = $type;
 		
-		$form->add( new \IPS\Helpers\Form\Text( 'template_title', NULL, TRUE ) );
+		$form->add( new \IPS\Helpers\Form\Text( 'template_title', NULL, TRUE, array( 'regex' => '/^([A-Z0-9_]+?)$/i' ) ) );
 
 		/* Very specific */
 		if ( $type === 'database' )
@@ -570,7 +869,10 @@ class _templates extends \IPS\Dispatcher\Controller
 
 		/* Clear guest page caches */
 		\IPS\Data\Cache::i()->clearAll();
-
+		
+		/* Clear block caches */
+		\IPS\cms\Blocks\Block::deleteCompiled();
+		
 		if(  \IPS\Request::i()->isAjax() )
 		{
 			\IPS\Output::i()->json( array( 'template_id' => $obj->id, 'template_title' => $obj->title, 'template_container' => $obj->container, 'template_user_added' => $obj->user_created ) );