VMS-267 VMS-268 VMS-269 VMS-273 VMS-274 VMS-275 VMS-276 VMS-277 #closed fixed

Author: Nabeel Shahzad

admin/index.php

@@ -72,11 +72,9 @@
 $BaseTemplate->template_path = SITE_ROOT . '/admin/lib/'.$tplname;
 $BaseTemplate->Set('title', SITE_NAME);
 
-if(isset($_GLOBALS['NAVBAR']))
-	Template::Set('MODULE_NAV_INC', $_GLOBALS['NAVBAR']);
-	
-if(isset($_GLOBALS['HTMLHead']))
-	Template::Set('MODULE_HEAD_INC', $_GLOBALS['HTMLHead']);
+
+Template::Set('MODULE_NAV_INC', $NAVBAR);
+Template::Set('MODULE_HEAD_INC', $HTMLHead);
 
 $BaseTemplate->Show('header.tpl');
 

admin/modules/Dashboard/Dashboard.php

@@ -23,7 +23,7 @@
  */
 
 class Dashboard extends CodonModule
-{
+{	
 	public function HTMLHead()
 	{
 		$this->set('sidebar', 'sidebar_dashboard.tpl');
@@ -39,10 +39,6 @@ public function index()
 
 		$this->set('unexported_count', count(PIREPData::getReportsByExportStatus(false)));
 		$this->render('dashboard.tpl');
-		
-		
-		/*$this->set('allpilots', PilotData::GetPendingPilots());
-		$this->render('pilots_pending.tpl');*/
 	}
 
 	public function pirepcounts()
@@ -93,7 +89,6 @@ public function CheckForUpdates()
 
 			# Default to fopen(), if that fails it'll use CURL
 			$file = new CodonWebService();
-			//$file->setType('fopen'); 
 			$contents = @$file->get($url);
 
 			# Something should have been returned

admin/modules/Maintenance/Maintenance.php

@@ -198,6 +198,31 @@ public function resetacars()
 
 	}
 
+	public function clearcache()
+	{
+		echo '<h3>Clearing Cache</h3>';
+		
+		$dir_iterator = new RecursiveDirectoryIterator(CACHE_PATH);
+		$iterator = new RecursiveIteratorIterator($dir_iterator, RecursiveIteratorIterator::SELF_FIRST);
+
+		foreach ($iterator as $file) 
+		{
+			if($file->getType() != 'file')
+			{
+				continue;
+			}
+			
+			$file_name = $file->getBaseName();
+			if($file_name === 'index.php')
+				continue;
+				
+			echo "Removing \"{$file_name}\"<br />";
+			unlink($file);
+		}
+		
+		echo 'Cache cleared!';
+	}
+	
 	public function calculateranks()
 	{
 		echo '<h3>Resetting Ranks</h3>';
@@ -273,7 +298,7 @@ public function resetpirepfinance()
 		echo '<h3>Reset PIREP Data</h3> 
 				Resetting PIREPs...<br />';
 
-		PIREPData::PopulateEmptyPIREPS();
+		//PIREPData::PopulateEmptyPIREPS();
 
 		echo 'Complete';
 

admin/modules/TemplateDiffs/TemplateDiffs.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * phpVMS - Virtual Airline Administration Software
+ * Copyright (c) 2008 Nabeel Shahzad
+ * For more information, visit www.phpvms.net
+ *	Forums: http://www.phpvms.net/forum
+ *	Documentation: http://www.phpvms.net/docs
+ *
+ * phpVMS is licenced under the following license:
+ *   Creative Commons Attribution Non-commercial Share Alike (by-nc-sa)
+ *   View license.txt in the root, or visit http://creativecommons.org/licenses/by-nc-sa/3.0/
+ *
+ * @author Nabeel Shahzad
+ * @copyright Copyright (c) 2008, Nabeel Shahzad
+ * @link http://www.phpvms.net
+ * @license http://creativecommons.org/licenses/by-nc-sa/3.0/
+ */
+ 
+class TemplateDiffs extends CodonModule
+{
+	
+	public function index()
+	{
+		echo '<h3>Template Diff Viewer</h3>
+			<p>This lists any templates which are found to have changes (based on the current selected skin)</p>
+			<ul>';
+		$dir_iterator = new RecursiveDirectoryIterator(Config::Get('BASE_TEMPLATE_PATH').DS.$file);
+		$iterator = new RecursiveIteratorIterator($dir_iterator, RecursiveIteratorIterator::SELF_FIRST);
+
+		$custom_found = false;
+		foreach ($iterator as $file) 
+		{		
+			if($file->getType() != 'file')
+			{
+				continue;
+			}
+			
+			$filename = $file->getBaseName();
+			
+			$custom_path =  SKINS_PATH.DS.$filename;
+			
+			if(file_exists($custom_path))
+			{
+				$custom_found = true;
+				echo '<li><strong>'.$filename.':</strong> <a href="'.adminurl('/templatediffs/showdiff/'.$filename).'">View changes</a></li>';
+			}
+			else
+			{
+				//echo 'No changes<br>';
+			}
+		}
+		
+		if($custom_found === false)
+		{
+			echo '<li>No customized templates found in this skin\'s folder</li>';
+		}
+		
+		echo '</ul>';
+	}
+	
+	
+	public function showdiff($file)
+	{
+		$this->render('diff_showdiff.tpl');
+				
+		# Paths
+		$base = Config::Get('BASE_TEMPLATE_PATH').DS.$file;
+		$custom = SKINS_PATH.DS.$file;
+		
+		if(!file_exists($custom))
+		{
+			echo '<strong>Error: </strong>The file "'.$file.'" has not been modified';
+			return;
+		}
+		
+		# Load the diffs
+		include CORE_LIB_PATH.DS.'diff'.DS.'diff.php';
+		$diff = new filediff();
+		$text = $diff->inline($base, $custom, 2);
+		echo count($diff->changes).' changes';
+		echo $text;
+	}
+}