Merge branch 'release/3.0.0' of https://github.com/contao/core into r…

…elease/3.0.0 Conflicts: system/modules/core/library/Contao/Database.php system/modules/core/library/Contao/System.php
contao · Aug 18, 2012 · cd0ac28 · cd0ac28
2 parents f3dfcf7 + 8298172
commit cd0ac28
Show file tree

Hide file tree

Showing 22 changed files with 238 additions and 172 deletions.
diff --git a/contao/main.php b/contao/main.php
@@ -165,7 +165,7 @@ protected function welcomeScreen()
 		$objTotal = $this->Database->prepare("SELECT COUNT(*) AS count FROM tl_version" . (!$this->User->isAdmin ? " WHERE userid=?" : ""))
 								   ->execute($this->User->id);
 
-		$intPage   = Input::get('page') ?: 1;
+		$intPage   = Input::get('vp') ?: 1;
 		$intOffset = ($intPage - 1) * 30;
 		$intLast   = ceil($objTotal->count / 30);
 

diff --git a/system/modules/calendar/classes/Calendar.php b/system/modules/calendar/classes/Calendar.php
@@ -72,7 +72,9 @@ public function generateFeed($intId, $blnIsFeedId=false)
 	 */
 	public function generateFeeds()
 	{
-		$this->removeOldFeeds();
+		$this->import('Automator');
+		$this->Automator->purgeXmlFiles();
+
 		$objCalendar = \CalendarFeedModel::findAll();
 
 		if ($objCalendar !== null)
@@ -244,7 +246,7 @@ public function getSearchablePages($arrPages, $intRoot=0)
 
 		if ($intRoot > 0)
 		{
-			$arrRoot = $this->getChildRecords($intRoot, 'tl_page');
+			$arrRoot = $this->Database->getChildRecords($intRoot, 'tl_page');
 		}
 
 		$arrProcessed = array();

diff --git a/system/modules/calendar/dca/tl_calendar_events.php b/system/modules/calendar/dca/tl_calendar_events.php
@@ -765,7 +765,7 @@ public function getArticleAlias(DataContainer $dc)
 			foreach ($this->User->pagemounts as $id)
 			{
 				$arrPids[] = $id;
-				$arrPids = array_merge($arrPids, $this->getChildRecords($id, 'tl_page'));
+				$arrPids = array_merge($arrPids, $this->Database->getChildRecords($id, 'tl_page'));
 			}
 
 			if (empty($arrPids))

diff --git a/system/modules/calendar/dca/tl_calendar_feed.php b/system/modules/calendar/dca/tl_calendar_feed.php
@@ -445,7 +445,8 @@ public function checkFeedAlias($varValue, DataContainer $dc)
 			return $varValue;
 		}
 
-		$arrFeeds = $this->removeOldFeeds(true);
+		$this->import('Automator');
+		$arrFeeds = $this->Automator->purgeXmlFiles(true);
 
 		// Alias exists
 		if (array_search($varValue, $arrFeeds) !== false)

diff --git a/system/modules/comments/dca/tl_comments.php b/system/modules/comments/dca/tl_comments.php
@@ -351,7 +351,7 @@ protected function isAllowedToEditComment($intParent, $strSource)
 		foreach ($this->User->pagemounts as $root)
 		{
 			$pagemounts[] = $root;
-			$pagemounts = array_merge($pagemounts, $this->getChildRecords($root, 'tl_page'));
+			$pagemounts = array_merge($pagemounts, $this->Database->getChildRecords($root, 'tl_page'));
 		}
 
 		$pagemounts = array_unique($pagemounts);

diff --git a/system/modules/core/classes/Automator.php b/system/modules/core/classes/Automator.php
@@ -237,14 +237,77 @@ public function generateXmlFiles()
 	}
 
 
+	/**
+	 * Remove old XML files from the share directory
+	 * 
+	 * @param boolean $blnReturn If true, only return the finds and don't delete
+	 * 
+	 * @return array An array of old XML files
+	 */
+	public function purgeXmlFiles($blnReturn=false)
+	{
+		$arrFeeds = array();
+
+		// XML sitemaps
+		$objFeeds = $this->Database->execute("SELECT sitemapName FROM tl_page WHERE type='root' AND createSitemap=1 AND sitemapName!=''");
+
+		while ($objFeeds->next())
+		{
+			$arrFeeds[] = $objFeeds->sitemapName;
+		}
+
+		// HOOK: preserve third party feeds
+		if (isset($GLOBALS['TL_HOOKS']['removeOldFeeds']) && is_array($GLOBALS['TL_HOOKS']['removeOldFeeds']))
+		{
+			foreach ($GLOBALS['TL_HOOKS']['removeOldFeeds'] as $callback)
+			{
+				$this->import($callback[0]);
+				$arrFeeds = array_merge($arrFeeds, $this->$callback[0]->$callback[1]());
+			}
+		}
+
+		// FIXME: is the "rootFiles" check still relevant now that the files are in a subfolder?
+
+		// Make sure the dcaconfig.php is loaded
+		@include TL_ROOT . '/system/config/dcaconfig.php';
+
+		// Add the root files
+		if (is_array($GLOBALS['TL_CONFIG']['rootFiles']))
+		{
+			foreach ($GLOBALS['TL_CONFIG']['rootFiles'] as $strFile)
+			{
+				$arrFeeds[] = str_replace('.xml', '', $strFile);
+			}
+		}
+
+		// Delete the old files
+		if (!$blnReturn)
+		{
+			foreach (scan(TL_ROOT . '/share') as $file)
+			{
+				$objFile = new \File('share/' . $file);
+
+				if ($objFile->extension == 'xml' && !in_array($objFile->filename, $arrFeeds) && !preg_match('/^sitemap/i', $objFile->filename))
+				{
+					$objFile->delete();
+				}
+
+				$objFile->close();
+			}
+		}
+
+		return $arrFeeds;
+	}
+
+
 	/**
 	 * Generate the Google XML sitemaps
 	 * @param integer
 	 */
 	public function generateSitemap($intId=0)
 	{
 		$time = time();
-		$this->removeOldFeeds();
+		$this->purgeXmlFiles();
 
 		// Only root pages should have sitemap names
 		$this->Database->execute("UPDATE tl_page SET createSitemap='', sitemapName='' WHERE type!='root'");

diff --git a/system/modules/core/dca/tl_article.php b/system/modules/core/dca/tl_article.php
@@ -474,7 +474,7 @@ public function checkPermission()
 				foreach ($this->User->pagemounts as $root)
 				{
 					$pagemounts[] = $root;
-					$pagemounts = array_merge($pagemounts, $this->getChildRecords($root, 'tl_page'));
+					$pagemounts = array_merge($pagemounts, $this->Database->getChildRecords($root, 'tl_page'));
 				}
 
 				$pagemounts = array_unique($pagemounts);

diff --git a/system/modules/core/dca/tl_content.php b/system/modules/core/dca/tl_content.php
@@ -814,7 +814,7 @@ public function checkPermission()
 		foreach ($this->User->pagemounts as $root)
 		{
 			$pagemounts[] = $root;
-			$pagemounts = array_merge($pagemounts, $this->getChildRecords($root, 'tl_page'));
+			$pagemounts = array_merge($pagemounts, $this->Database->getChildRecords($root, 'tl_page'));
 		}
 
 		$pagemounts = array_unique($pagemounts);
@@ -1016,7 +1016,7 @@ public function getArticleAlias(DataContainer $dc)
 			foreach ($this->User->pagemounts as $id)
 			{
 				$arrPids[] = $id;
-				$arrPids = array_merge($arrPids, $this->getChildRecords($id, 'tl_page'));
+				$arrPids = array_merge($arrPids, $this->Database->getChildRecords($id, 'tl_page'));
 			}
 
 			if (empty($arrPids))
@@ -1073,7 +1073,7 @@ public function getAlias()
 			foreach ($this->User->pagemounts as $id)
 			{
 				$arrPids[] = $id;
-				$arrPids = array_merge($arrPids, $this->getChildRecords($id, 'tl_page'));
+				$arrPids = array_merge($arrPids, $this->Database->getChildRecords($id, 'tl_page'));
 			}
 
 			if (empty($arrPids))
@@ -1297,7 +1297,7 @@ public function getArticles(DataContainer $dc)
 		if ($objPage->numRows)
 		{
 			$objPage = $this->getPageDetails($objPage->pid);
-			$arrRoot = $this->getChildRecords($objPage->rootId, 'tl_page');
+			$arrRoot = $this->Database->getChildRecords($objPage->rootId, 'tl_page');
 			array_unshift($arrRoot, $objPage->rootId);
 		}
 
@@ -1316,7 +1316,7 @@ public function getArticles(DataContainer $dc)
 				}
 
 				$arrPids[] = $id;
-				$arrPids = array_merge($arrPids, $this->getChildRecords($id, 'tl_page'));
+				$arrPids = array_merge($arrPids, $this->Database->getChildRecords($id, 'tl_page'));
 			}
 
 			if (empty($arrPids))

diff --git a/system/modules/core/dca/tl_page.php b/system/modules/core/dca/tl_page.php
@@ -800,7 +800,7 @@ public function checkPermission()
 						$pagemounts[] = $root;
 					}
 
-					$pagemounts = array_merge($pagemounts, $this->getChildRecords($root, 'tl_page'));
+					$pagemounts = array_merge($pagemounts, $this->Database->getChildRecords($root, 'tl_page'));
 				}
 
 				$error = false;
@@ -1169,7 +1169,8 @@ public function checkFeedAlias($varValue, DataContainer $dc)
 			return $varValue;
 		}
 
-		$arrFeeds = $this->removeOldFeeds(true);
+		$this->import('Automator');
+		$arrFeeds = $this->Automator->purgeXmlFiles(true);
 
 		// Alias exists
 		if (array_search($varValue, $arrFeeds) !== false)
@@ -1551,7 +1552,7 @@ public function addAliasButton()
 
 			$ids = $session['CURRENT']['IDS'];
 			$ids = $this->eliminateNestedPages($ids);
-			$ids = $this->getChildRecords($ids, 'tl_page');
+			$ids = $this->Database->getChildRecords($ids, 'tl_page');
 
 			foreach ($ids as $id)
 			{

diff --git a/system/modules/core/drivers/DC_Table.php b/system/modules/core/drivers/DC_Table.php
@@ -688,7 +688,7 @@ public function cut($blnDoNotRedirect=false)
 		// Avoid circular references when there is no parent table
 		if ($this->Database->fieldExists('pid', $this->strTable) && !strlen($this->ptable))
 		{
-			$cr = $this->getChildRecords($this->intId, $this->strTable);
+			$cr = $this->Database->getChildRecords($this->intId, $this->strTable);
 			$cr[] = $this->intId;
 		}
 
@@ -1315,7 +1315,7 @@ public function delete($blnDoNotRedirect=false)
 		// If there is a PID field but no parent table
 		if ($this->Database->fieldExists('pid', $this->strTable) && !strlen($this->ptable))
 		{
-			$delete[$this->strTable] = $this->getChildRecords($this->intId, $this->strTable);
+			$delete[$this->strTable] = $this->Database->getChildRecords($this->intId, $this->strTable);
 			array_unshift($delete[$this->strTable], $this->intId);
 		}
 		else
@@ -3227,7 +3227,7 @@ public function ajaxTreeView($id, $level)
 
 		for ($i=0; $i<count($arrIds); $i++)
 		{
-			$return .= ' ' . trim($this->generateTree($table, $arrIds[$i], array('p'=>$arrIds[($i-1)], 'n'=>$arrIds[($i+1)]), $hasSorting, $margin, ($blnClipboard ? $arrClipboard : false), ($id == $arrClipboard ['id'] || (is_array($arrClipboard ['id']) && in_array($id, $arrClipboard ['id'])) || (!$blnPtable && !is_array($arrClipboard['id']) && in_array($id, $this->getChildRecords($arrClipboard['id'], $table)))), $blnProtected));
+			$return .= ' ' . trim($this->generateTree($table, $arrIds[$i], array('p'=>$arrIds[($i-1)], 'n'=>$arrIds[($i+1)]), $hasSorting, $margin, ($blnClipboard ? $arrClipboard : false), ($id == $arrClipboard ['id'] || (is_array($arrClipboard ['id']) && in_array($id, $arrClipboard ['id'])) || (!$blnPtable && !is_array($arrClipboard['id']) && in_array($id, $this->Database->getChildRecords($arrClipboard['id'], $table)))), $blnProtected));
 		}
 
 		return $return;