Merge lp:~spirit55555/pluck-cms/hooks into lp:pluck-cms

[Anders G. Jørgensen]

[Sander (sanderth-deactivatedaccount)]

Approved, Anders. It's a little difficult to review such a big changeset, but I'll dive into the hooks after the merge ;)

review: Approve

=== modified file 'admin.php'
--- admin.php	2009-01-14 16:32:09 +0000
+++ admin.php	2009-03-04 18:15:49 +0000
@@ -12,6 +12,24 @@
  * See docs/COPYING for the complete license.
 */
 
+//Load all the modules, so we can use hooks.
+//This has to be done before anything else.
+$path = opendir('data/modules');
+while (false !== ($dir = readdir($path))) {
+	if ($dir != '.' && $dir != '..') {
+		if (is_dir('data/modules/'.$dir))
+			$modules[] = $dir;
+	}
+}
+closedir($path);
+
+foreach ($modules as $module) {
+	if (file_exists('data/modules/'.$module.'/'.$module.'.php')) {
+		require_once ('data/modules/'.$module.'/'.$module.'.php');
+		$module_list[] = $module;
+	}
+}
+
 //Include security-enhancements
 require_once ('data/inc/security.php');
 //Include functions
@@ -27,6 +45,7 @@
 	redirect('install.php', 3);
 	echo $lang_login2;
 	include_once ('data/inc/footer.php');
+	exit;
 }
 
 else {
@@ -68,7 +87,6 @@
 
 			//Page:New Page
 			case 'newpage':
-				$tinymce = 'yes';
 				$titelkop = $lang_kop11;
 				include_once ('data/inc/header.php');
 				include_once ('data/inc/newpage.php');
@@ -226,7 +244,6 @@
 
 			//Page:Editpage
 			case 'editpage':
-				$tinymce = 'yes';
 				$titelkop = $lang_page3;
 				include_once ('data/inc/header.php');
 				include_once ('data/inc/editpage.php');
@@ -256,7 +273,7 @@
 
 	//Module pages.
 	elseif (isset($module))
-		include_once ('data/inc/modules_admininclude.php');
+		require_once ('data/inc/modules_admininclude.php');
 
 	//Unknown pages
 	else {

=== modified file 'data/inc/changepass.php'
--- data/inc/changepass.php	2009-01-07 19:46:21 +0000
+++ data/inc/changepass.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 ?>
 <p>

=== modified file 'data/inc/credits.php'
--- data/inc/credits.php	2009-01-04 15:55:47 +0000
+++ data/inc/credits.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 ?>
 

=== modified file 'data/inc/deleteimage.php'
--- data/inc/deleteimage.php	2009-01-06 22:15:40 +0000
+++ data/inc/deleteimage.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Check if image exists.

=== modified file 'data/inc/deletepage.php'
--- data/inc/deletepage.php	2009-01-07 19:46:21 +0000
+++ data/inc/deletepage.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Check if page exists.

=== modified file 'data/inc/editpage.php'
--- data/inc/editpage.php	2009-01-10 20:58:15 +0000
+++ data/inc/editpage.php	2009-03-04 18:15:49 +0000
@@ -17,20 +17,22 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Include page information.
-	require_once ('data/settings/pages/'.$var1);
+require_once ('data/settings/pages/'.$var1);
+
+//Load module functions.
+foreach ($module_list as $module) {
+	if (file_exists('data/modules/'.$module.'/'.$module.'.site.php'))
+		require_once ('data/modules/'.$module.'/'.$module.'.site.php');
+}
 
 //Generate the menu on the right.
 ?>
 <div class="rightmenu">
-<?php
-	//We don't want to show the message, if there aren't any pages or images.
-	if (read_imagesinpages('images') != false && read_pagesinpages('data/settings/pages', $var1) != false)
-		echo $lang_page8;
-?>
+<?php echo $lang_page8; ?>
 <br />
 <?php
 	read_imagesinpages('images');
@@ -62,63 +64,52 @@
 					<br />
 					<table>
 					<?php
-						//Define path to the module-dir.
-						$path = 'data/modules';
-						//Open the folder.
-						$dir_handle = @opendir($path) or die('Unable to open '.$path.'. Check if it\'s readable.');
 						//First count how many modules we have, and exclude disabled modules.
-						$number_modules = count(glob('data/modules/*'));
-						while ($dir = readdir($dir_handle)) {
-							if ($dir != '.' && $dir != '..') {
-								if (!module_is_compatible($dir))
-									$number_modules--;
-							}
+						$number_modules = count($module_list);
+						foreach ($module_list as $module) {
+							if (!module_is_compatible($module) || !function_exists($module.'_theme_main'))
+								$number_modules--;
 						}
-						closedir($dir_handle);
-
-						//Loop through dirs, and display the modules.
-						$dir_handle = @opendir($path) or die('Unable to open '.$path.'. Check if it\'s readable.');
-						while ($dir = readdir($dir_handle)) {
-							if ($dir != "." && $dir != "..") {
-								//Only show if module is compatible.
-								if (module_is_compatible($dir)) {
-									include ('data/modules/'.$dir.'/module_info.php');
-									?>
-										<tr>
-											<td><?php echo $module_name; ?></td>
-											<td>
-												<select name="cont3[<?php echo $module_dir; ?>]">
-													<option value="0"><?php echo $lang_modules6; ?></option>
-													<?php
-														$counting_modules = 1;
-														while ($counting_modules <= $number_modules) {
-															//Check if this is the current setting.
-															//...and select the html-option if needed
-															if (isset($module_pageinc[$module_dir]) && $module_pageinc[$module_dir] == $counting_modules) {
-															?>
-																<option value="<?php echo $counting_modules; ?>" selected="selected"><?php echo $counting_modules; ?></option>
-															<?php
-															}
-
-															//...if this is no the current setting, don't select the html-option.
-															else {
-															?>
-																<option value="<?php echo $counting_modules; ?>"><?php echo $counting_modules; ?></option>
-															<?php
-															}
-
-															//Higher counting_modules.
-															$counting_modules++;
-														}
-													?>
-												</select>
-											</td>
-										</tr>
-									<?php
-									}
+
+						//Loop through modules, and display them.
+						foreach ($module_list as $module) {
+							//Only show if module is compatible.
+							if (module_is_compatible($module) && function_exists($module.'_theme_main')) {
+								$module_info = call_user_func($module.'_info');
+								?>
+									<tr>
+										<td><?php echo $module_info['name']; ?></td>
+										<td>
+											<select name="cont3[<?php echo $module; ?>]">
+												<option value="0"><?php echo $lang_modules6; ?></option>
+												<?php
+													$counting_modules = 1;
+													while ($counting_modules <= $number_modules) {
+														//Check if this is the current setting.
+														//...and select the html-option if needed
+														if (isset($module_pageinc[$module]) && $module_pageinc[$module] == $counting_modules) {
+														?>
+															<option value="<?php echo $counting_modules; ?>" selected="selected"><?php echo $counting_modules; ?></option>
+														<?php
+														}
+
+														//...if this is no the current setting, don't select the html-option.
+														else {
+														?>
+															<option value="<?php echo $counting_modules; ?>"><?php echo $counting_modules; ?></option>
+														<?php
+														}
+
+														//Higher counting_modules.
+														$counting_modules++;
+													}
+												?>
+											</select>
+										</td>
+									</tr>
+								<?php
 								}
 							}
-							closedir($dir_handle);
 						?>
 					</table>
 				</td>

=== modified file 'data/inc/footer.php'
--- data/inc/footer.php	2008-12-29 00:00:05 +0000
+++ data/inc/footer.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 ?>
 <div id="somp"><?php echo $lang_footer; ?></div>

=== modified file 'data/inc/functions.admin.php'
--- data/inc/functions.admin.php	2009-01-10 20:58:15 +0000
+++ data/inc/functions.admin.php	2009-03-04 18:17:05 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Function: read the available languages.
@@ -30,7 +30,7 @@
 			if ($file != $not_this_file) {
 				include ('data/inc/lang/'.$file);
 				?>
-				<option value='<?php echo $file; ?>'><?php echo $lang; ?></option>
+					<option value='<?php echo $file; ?>'><?php echo $lang; ?></option>
 				<?php
 			}
 		}
@@ -51,7 +51,9 @@
 					<img src="data/image/image_small.png" alt="" />
 				</span>
 				<span>
-					<span><a  style="font-size: 16px !important;" href="images/<?php echo $file; ?>" target="_blank"><?php echo $file; ?></a></span>
+					<span>
+						<a  style="font-size: 16px !important;" href="images/<?php echo $file; ?>" target="_blank"><?php echo $file; ?></a>
+					</span>
 					<br />
 					<a style="font-size: 14px;" href="#" onclick="tinyMCE.execCommand('mceInsertContent',false,'&lt;img src=\'images/<?php echo $file; ?>\' alt=\'\' />');return false;"><?php echo $lang_page7; ?></a>
 				</span>
@@ -59,8 +61,6 @@
 		<?php
 		}
 	}
-	else
-		return false;
 }
 
 //Function: read out the pages to let them be included in pages as link
@@ -89,8 +89,6 @@
 			}
 		}
 	}
-	else
-		return false;
 }
 
 //Function: display a menudiv.
@@ -118,14 +116,14 @@
 function count_trashcan() {
 	//Pages
 	$count_pages_array = glob('data/trash/pages/*.*');
-	if ((isset($count_pages_array)) && (!empty($count_pages_array)))
+	if (isset($count_pages_array) && !empty($count_pages_array))
 		$count_pages = count($count_pages_array);
 	else
 		$count_pages = null;
 
 	//Images
 	$count_images_array = glob('data/trash/images/*.*');
-	if ((isset($count_images_array)) && (!empty($count_images_array)))
+	if (isset($count_images_array) && !empty($count_images_array))
 		$count_images = count($count_images_array);
 	else
 		$count_images = null;
@@ -233,6 +231,10 @@
  * @param array $modules If there are any modules on the page.
  */
 function save_page($name, $title, $content, $hidden = 'no', $description = null, $keywords = null, $modules = null) {
+	//Run a few hooks.
+	run_hook('admin_save_page', array(&$name, &$title, &$content));
+	run_hook('admin_save_page_meta', array(&$description, &$keywords));
+
 	//Sanitize the inputs.
 	$title = sanitize($title);
 	$content = sanitize($content, false);

=== modified file 'data/inc/functions.all.php'
--- data/inc/functions.all.php	2008-12-25 14:48:00 +0000
+++ data/inc/functions.all.php	2009-03-04 18:15:49 +0000
@@ -17,37 +17,32 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Function: check if module is compatible.
 //--------------------
 function module_is_compatible($module) {
 	//Include module information.
-	if (file_exists('data/modules/'.$module.'/module_info.php')) {
-		include ('data/modules/'.$module.'/module_info.php');
-	}
-
-	if (isset($module_compatibility)) {
-		if (preg_match('/,/', $module_compatibility))
-			$version_compat = explode(',', $module_compatibility);
-		else
-			$version_compat [0] = $module_compatibility;
-
-		//Now check if we have a compatible version. NOTE: If pluck is an alpha or beta version, it will always be compatible.
-		foreach ($version_compat as $number => $version) {
-			if ($version == PLUCK_VERSION || preg_match('/(alpha|beta)/', PLUCK_VERSION)) {
-				$compatible = 'yes';
+	if (file_exists('data/modules/'.$module.'/'.$module.'.php')) {
+		$module_info = call_user_func($module.'_info');
+		if (isset($module_info['compatibility'])) {
+			if (strpos($module_info['compatibility'], ','))
+				$version_compat = explode(',', $module_info['compatibility']);
+			else
+				$version_compat[0] = $module_info['compatibility'];
+
+			//Now check if we have a compatible version. NOTE: If pluck is an alpha or beta version, it will always be compatible.
+			foreach ($version_compat as $number => $version) {
+				if ($version == PLUCK_VERSION || preg_match('/(alpha|beta)/', PLUCK_VERSION)) {
+					return true;
+				}
 			}
 		}
 	}
 
-	if (isset($compatible) && $compatible == 'yes')
-		return true;
 	else
 		return false;
-
-	unset($compatible);
 }
 
 //Function: recursively delete an entire directory.
@@ -125,7 +120,7 @@
 function read_dir_contents($directory, $mode) {
 	$path = opendir($directory);
 	while (false !== ($file = readdir($path))) {
-		if (($file != '.') && ($file != '..')) {
+		if ($file != '.' && $file != '..') {
 			if (is_file($directory.'/'.$file)) {
 				$files[] = $file;
 			}
@@ -159,4 +154,23 @@
 
 	return $var;
 }
+
+/**
+ * Run a module hook.
+ *
+ * @param string $name Name of the hook.
+ */
+function run_hook($name, $par = null) {
+	global $module_list;
+	if (!isset($name))
+		return;
+	foreach ($module_list as $module) {
+		if (is_callable($module.'_'.$name) && module_is_compatible($module)) {
+			if ($par == null)
+				call_user_func($module.'_'.$name);
+			else
+				call_user_func_array($module.'_'.$name, $par);
+		}
+	}
+}
 ?>
\ No newline at end of file

=== modified file 'data/inc/functions.site.php'
--- data/inc/functions.site.php	2008-12-28 00:03:55 +0000
+++ data/inc/functions.site.php	2009-03-04 18:15:49 +0000
@@ -17,15 +17,15 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Function: get page title
 //---------------------------------
 function get_pagetitle() {
-	global $lang_front1;
+	global $lang_front1, $module;
 	//Get the title if we are looking at a normal page
-	if ((isset($_GET['file'])) && (!empty($_GET['file']))) {
+	if (isset($_GET['file']) && !empty($_GET['file'])) {
 		if (isset($_GET ['file']))
 			$filetoread = $_GET ['file'];
 
@@ -36,39 +36,16 @@
 		}
 
 		//If page doesn't exist; display error
-		else {
+		else
 			return $lang_front1;
-		}
 	}
 
 	//Get the title if we are looking at a module page
-	if (isset($_GET ['module']))
-		$module = $_GET ['module'];
-
-	if (isset($_GET ['page']))
-		$page = $_GET ['page'];
-
-	if (isset($module)) {
-		//Include module files (but only if they exist)
- 		if (file_exists('data/modules/'.$module.'/module_info.php')) {
- 			include ('data/modules/'.$module.'/module_info.php');
- 			if (module_is_compatible($module)) {
-				if (file_exists('data/modules/'.$module.'/module_pages_site.php')) {
- 					include ('data/modules/'.$module.'/module_pages_site.php');
-
-	 				//Include all module-pages, but
-					//only include pages if array has been given
-					if (isset($module_page)) {
-	 					foreach ($module_page as $filename => $pagetitle) {
- 							//Generate filename with extension
-							$filename_ext = $filename.'.php';
-							if (($module == $module_dir) && ($page == $filename)) {
-								return $pagetitle;
-							}
-						}
-					}
-				}
-			}
+	elseif (isset($module) && module_is_compatible($module) && function_exists($module.'_page_site_list')) {
+		$module_page_site = call_user_func($module.'_page_site_list');
+		foreach ($module_page_site as $module_page) {
+			if ($module_page['func'] == CURRENT_MODULE_PAGE)
+				return $module_page['title'];
 		}
 	}
 }
@@ -82,18 +59,15 @@
 function theme_meta() {
 	//Get page-info (for meta-information)
 	if (defined('CURRENT_PAGE_FILENAME')) {
-		if (file_exists('data/settings/pages/'.CURRENT_PAGE_FILENAME)) {
+		if (file_exists('data/settings/pages/'.CURRENT_PAGE_FILENAME))
 			include ('data/settings/pages/'.CURRENT_PAGE_FILENAME);
-		}
 	}
 
 	//Check which CSS-file we need to use (LTR or RTL)
-	if ((isset($direction)) && ($direction == 'rtl')) {
+	if (isset($direction) && $direction == 'rtl')
 		$cssfile = THEME_DIR.'/style-rtl.css';
-	}
-	else {
+	else
 		$cssfile = THEME_DIR.'/style.css';
-	}
 
 	echo '<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />'."\n";
 	echo '<meta name="generator" content="pluck '.PLUCK_VERSION.'" />'."\n";
@@ -104,37 +78,17 @@
 	//If we are not looking at a module: include metatag information
 	if (defined('CURRENT_PAGE_FILENAME') && file_exists('data/settings/pages/'.CURRENT_PAGE_FILENAME)) {
 		echo '<meta name="title" content="'.PAGE_TITLE.'" />'."\n";
-		if (isset($keywords) && !empty($keywords)) {
+		if (isset($keywords) && !empty($keywords))
 			echo '<meta name="keywords" content="'.$keywords.'" />'."\n";
-		}
-		if (isset($description) && !empty($description)) {
+		if (isset($description) && !empty($description))
 			echo '<meta name="description" content="'.$description.'" />'."\n";
-		}
 	}
 
 	//If RTL, set direction to RTL in CSS
-	if ((isset($direction)) && ($direction == 'rtl')) {
+	if (isset($direction) && $direction == 'rtl')
 		echo '<style type="text/css">body {direction:rtl;}</style>'."\n";
-	}
-
-	//Also include module head-inclusion files (inc_site_head.php)
-	//--------------
-	//Open the folder
-	$dir_handle = @opendir('data/modules') or die('Unable to open module directory. Check if it\'s readable.');
-
-	//Loop through dirs
-	while ($dir = readdir($dir_handle)) {
-		if ($dir == '.' || $dir == '..')
-			continue;
-		//Include the inc_site.php if it exists, and if module is compatible
-		include ('data/modules/'.$dir.'/module_info.php');
-		if (module_is_compatible($dir)) {
-			if (file_exists('data/modules/'.$dir.'/inc_site_head.php'))
-				include ('data/modules/'.$dir.'/inc_site_head.php');
-		}
-	}
-	//Close module-dir
-	closedir($dir_handle);
+
+	run_hook('theme_meta');
 }
 
 //[THEME] FUNCTION TO SHOW SITE TITLE
@@ -148,7 +102,7 @@
 function theme_menu($html,$htmlactive = NULL) {
 	$files = read_dir_contents('data/settings/pages', 'files');
 	if ($files) {
-		//Sort the array
+		//Sort the array.
 		natcasesort($files);
 
 		foreach ($files as $file) {
@@ -157,9 +111,9 @@
 
 			include ('data/settings/pages/'.$file);
 
-			//Only display in menu if page isn't hidden by user
+			//Only display in menu if page isn't hidden by user.
 			if (isset($hidden) && $hidden == 'no') {
-				//Check if we need to show an active link
+				//Check if we need to show an active link.
 				if (isset($currentpage) && $currentpage == $file && $htmlactive) {
 					$html_new = str_replace('#title', $title, $htmlactive);
 					$html_new = str_replace('#file', '?file='.$file, $html_new);
@@ -186,109 +140,71 @@
 function theme_content() {
 	//Get needed variables
 	global $lang_front2;
+
 	//Get the contents only if we are looking at a normal page
 	if (defined('CURRENT_PAGE_FILENAME')) {
 		//Check if page exists
 		if (file_exists('data/settings/pages/'.CURRENT_PAGE_FILENAME)) {
 			include ('data/settings/pages/'.CURRENT_PAGE_FILENAME);
+			run_hook('theme_content_before');
+			run_hook('theme_content', array(&$content));
 			echo $content;
+			run_hook('theme_content_after');
 		}
+
 		//If page doesn't exist, show error message
-		else {
+		else
 			echo $lang_front2;
-		}
 	}
 }
 
 //[THEME] FUNCTION TO INCLUDE MODULES
 //---------------------------------
-function theme_module($place) {
-	//Include needed variables
+function theme_area($place) {
+	//Include needed variables.
 	global $lang_modules27;
-
-	//If mainspace: include the page-specific modules
+	//If mainspace: include the page-specific modules.
 	if ($place == 'main') {
-		//If we are looking at a normal page: include the inclusion file of the module (but only if specified page exists)
-		if (!defined('CURRENT_MODULE_DIR') && defined('CURRENT_PAGE_FILENAME') && file_exists('data/settings/pages/'.CURRENT_PAGE_FILENAME)) {
-			//Include page-information
+		if (defined('CURRENT_PAGE_FILENAME') && file_exists('data/settings/pages/'.CURRENT_PAGE_FILENAME)) {
+			//Include page-information.
 			include ('data/settings/pages/'.CURRENT_PAGE_FILENAME);
-			//First, check if we want to include any modules
+			//First, check if we want to include any modules.
 			if (isset($module_pageinc)) {
-				//Let's make sure that the modules are dislayed in the right order
+				//Let's make sure that the modules are dislayed in the right order.
 				natcasesort($module_pageinc);
-
 				foreach ($module_pageinc as $module_to_include => $order) {
-					//Check if module is set to be displayed, and make sure module exists
-					if ($order != 0 && file_exists('data/modules/'.$module_to_include.'/module_info.php')) {
-						//Include module information
-						include ('data/modules/'.$module_to_include.'/module_info.php');
-						//Check if module is compatible
-						if (module_is_compatible($module_to_include)) {
-							//Check if module wants to insert pages
-							if (file_exists('data/modules/'.$module_to_include.'/module_pages_site.php')) {
-								include ('data/modules/'.$module_to_include.'/module_pages_site.php');
-								//Include the file for the "main" module area
-								include ('data/modules/'.$module_to_include.'/pages_site/'.$includepage);
-							}
-						}
-					}
+					//Check if module is compatible, and the function exists.
+					if (module_is_compatible($module_to_include) && function_exists($module_to_include.'_theme_main'))
+							call_user_func($module_to_include.'_theme_main');
 				}
 			}
 		}
-		//If we are looking at a module-page: include that page
+
+		//If we are looking at a module page.
 		elseif (defined('CURRENT_MODULE_DIR')) {
-			//Include module files (but only if they exist)
-			if (file_exists('data/modules/'.CURRENT_MODULE_DIR.'/module_info.php')) {
-				include ('data/modules/'.CURRENT_MODULE_DIR.'/module_info.php');
-				if (module_is_compatible(CURRENT_MODULE_DIR)) {
-					if (file_exists('data/modules/'.CURRENT_MODULE_DIR.'/module_pages_site.php')) {
-						include ('data/modules/'.CURRENT_MODULE_DIR.'/module_pages_site.php');
-
-						//Only include pages if array has been given
-						if (isset($module_page)) {
-							//Loop through module-pages
-							foreach ($module_page as $filename => $pagetitle) {
-								//And include them
-								if (CURRENT_MODULE_DIR == $module_dir && CURRENT_MODULE_PAGE == $filename) {
-									include ('data/modules/'.$module_dir.'/pages_site/'.$filename.'.php');
-								}
-							}
-						}
-					}
-				}
-				//If module is not compatible
-				else {
-					echo $lang_modules27;
-				}
+			$module_page_site = call_user_func(CURRENT_MODULE_DIR.'_page_site_list');
+			foreach ($module_page_site as $module_page) {
+				if ($module_page['func'] == CURRENT_MODULE_PAGE)
+					call_user_func(CURRENT_MODULE_DIR.'_page_site_'.$module_page['func']);
 			}
 		}
 	}
 
-	//Include the other modules
-	//Include info of theme (to see which modules we should include etc), but only if file exists
-	if (file_exists('data/settings/themes/'.THEME.'/moduleconf.php')) {
+	//Include info of theme (to see which modules we should include etc), but only if file exists.
+	elseif (file_exists('data/settings/themes/'.THEME.'/moduleconf.php')) {
 		include ('data/settings/themes/'.THEME.'/moduleconf.php');
 
-		//Get the array and sort it
+		//Get the array and sort it.
 		foreach ($space as $area => $number) {
-
-			//Sort the array, so that the modules will be displayed in correct order
+			//Sort the array, so that the modules will be displayed in correct order.
 			natcasesort($number);
-
-			//Get final variables
 			foreach ($number as $module => $order) {
 				//If the area where the module should be displayed is the same as the area we're currently...
-				//...processing: include the module
-				if (($area == $place) && ($order != 0)) {
-					//Check if module wants to insert pages
-					if (file_exists('data/modules/'.$module.'/module_pages_site.php')) {
-						if (module_is_compatible($module)) {
-							include ('data/modules/'.$module.'/module_pages_site.php');
-
-							//...and include the module
-							include ('data/modules/'.$module.'/pages_site/'.$includepage);
-						}
-					}
+				//...processing: include the module.
+				if ($area == $place) {
+					//Check if module is compatible, and the function exists.
+					if (module_is_compatible($module) && function_exists($module.'_theme_main'))
+							call_user_func($module.'_theme_main');
 				}
 			}
 		}

=== modified file 'data/inc/header.php'
--- data/inc/header.php	2009-01-08 19:40:48 +0000
+++ data/inc/header.php	2009-03-04 18:15:49 +0000
@@ -18,7 +18,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //First set character encoding
@@ -34,17 +34,13 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <?php
 //Check if we need rtl-direction
-if (isset($direction) && $direction == "rtl") {
+if (isset($direction) && $direction == "rtl")
 	echo '<link href="data/styleadmin-rtl.css" rel="stylesheet" type="text/css" media="screen" />';
-}
-else {
+else
 	echo '<link href="data/styleadmin.css" rel="stylesheet" type="text/css" media="screen" />';
-}
 
-//Include TinyMCE, if needed
-if (isset($tinymce) && $tinymce == 'yes') {
-	include_once ('data/inc/tinymce_inc.php');
-}
+//Include TinyMCE.
+require_once ('data/inc/tinymce_inc.php');
 ?>
 <meta name="robots" content="noindex" />
 <script type="text/javascript">
@@ -70,6 +66,7 @@
 }
 //-->
 </script>
+<?php run_hook('admin_header_main'); ?>
 </head>
 <body>
 <div id="menuheader">
@@ -78,7 +75,9 @@
 		<?php include('data/inc/update_applet.php'); ?>
 	</div>
 	<h1>pluck</h1>
+	<?php run_hook('admin_menu_outside_before'); ?>
 	<div id="menu">
+		<?php run_hook('admin_menu_inside_before'); ?>
 		<div class="menuitem">
 			<span>
 				<img src="data/image/menu/start.png" alt="" />
@@ -109,7 +108,9 @@
 				<a href="?action=logout" title="<?php echo $lang_kop5; ?>"><?php echo $lang_kop5; ?></a>
 			</span>
 		</div>
+		<?php run_hook('admin_menu_inside_after'); ?>
 	</div>
+	<?php run_hook('admin_menu_outside_after'); ?>
 </div>
 <div id="text">
 <h2><?php echo $titelkop; ?></h2>
\ No newline at end of file

=== modified file 'data/inc/header2.php'
--- data/inc/header2.php	2009-01-08 19:40:48 +0000
+++ data/inc/header2.php	2009-03-04 18:15:49 +0000
@@ -17,12 +17,9 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
-//We need tinyMCE...
-$tinymce = 'yes';
-
 //Then set character encoding.
 header('Content-Type:text/html;charset=utf-8');
 ?>
@@ -39,8 +36,9 @@
 	echo '<link href="data/styleadmin.css" rel="stylesheet" type="text/css" media="screen" />';
 }
 
-//Include TinyMCE.
-include_once ('data/inc/tinymce_inc.php');
+//Include TinyMCE, but not on the login page.
+if (!strpos($_SERVER['SCRIPT_FILENAME'], 'login.php'))
+	require_once ('data/inc/tinymce_inc.php');
 ?>
 <meta name="robots" content="noindex" />
 <script language="javascript" type="text/javascript">

=== modified file 'data/inc/images.php'
--- data/inc/images.php	2009-01-08 11:07:03 +0000
+++ data/inc/images.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Introduction text

=== modified file 'data/inc/lang/en.php'
--- data/inc/lang/en.php	2009-01-09 14:20:13 +0000
+++ data/inc/lang/en.php	2009-02-01 12:50:18 +0000
@@ -303,5 +303,5 @@
 $lang_blog27 = "no category";
 $lang_credits6 = "main developers";
 $lang_credits7 = "contributions";
-$lang_album19 = 'There is already an album with that name.'
+$lang_albums19 = 'There is already an album with that name.'
 ?>
\ No newline at end of file

=== modified file 'data/inc/language.php'
--- data/inc/language.php	2009-01-07 19:46:21 +0000
+++ data/inc/language.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Introduction text.

=== modified file 'data/inc/lib/tarlib.class.php'
--- data/inc/lib/tarlib.class.php	2008-12-29 00:00:05 +0000
+++ data/inc/lib/tarlib.class.php	2009-03-04 18:15:49 +0000
@@ -53,7 +53,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 define('COMPRESS_GZIP',1);

=== modified file 'data/inc/logout.php'
--- data/inc/logout.php	2009-01-04 17:57:35 +0000
+++ data/inc/logout.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 echo '...';

=== modified file 'data/inc/modules.php'
--- data/inc/modules.php	2009-01-04 17:57:35 +0000
+++ data/inc/modules.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Introduction text.
@@ -26,24 +26,16 @@
 		<strong><?php echo $lang_modules1; ?></strong>
 	</p>
 <?php
-//Define path to the module-dir.
-$path = 'data/modules';
-//Open the folder.
-$dir_handle = @opendir($path) or die('Unable to open '.$path.'. Check if it\'s readable.');
 
-//Loop through dirs, and display the modules.
-while ($dir = readdir($dir_handle)) {
-if ($dir == '.' || $dir == '..')
-   continue;
-   if (file_exists('data/modules/'.$dir.'/module_info.php'))
-		include('data/modules/'.$dir.'/module_info.php');
+foreach ($module_list as $module) {
+	//Load module admin pages.
+	if (file_exists('data/modules/'.$module.'/'.$module.'.admin.php'))
+		require_once ('data/modules/'.$module.'/'.$module.'.admin.php');
 
 	//Only show the button if there are admincenter pages for the module, and if the modules is compatible.
-	if (file_exists('data/modules/'.$dir.'/module_pages_admin.php') && module_is_compatible($dir))
-		showmenudiv($module_name, $module_intro, 'data/modules/'.$module_dir.'/'.$module_icon, '?module='.$module_dir);
-
+	if (module_is_compatible($module) && function_exists($module.'_page_admin_list')) {
+		$module_info = call_user_func($module.'_info');
+		showmenudiv($module_info['name'], $module_info['intro'], 'data/modules/'.$module.'/'.$module_info['icon'], '?module='.$module);
+	}
 }
-
-//Close module-dir.
-closedir($dir_handle);
 ?>
\ No newline at end of file

=== modified file 'data/inc/modules_admininclude.php'
--- data/inc/modules_admininclude.php	2009-01-14 16:32:09 +0000
+++ data/inc/modules_admininclude.php	2009-03-04 18:15:49 +0000
@@ -17,67 +17,49 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //-----------------
 //Lets start including the pages of the modules.
 //-----------------
 
-//Define path to the module-dir.
-$path = 'data/modules';
-//Open the folder.
-$dir_handle = @opendir($path) or die('Unable to open '.$path.'. Check if it\'s readable.');
-
 //Loop through dirs.
-while ($dir = readdir($dir_handle)) {
-	if ($dir == '.' || $dir == '..')
-		continue;
-
-	if (file_exists('data/modules/'.$dir.'/module_info.php'))
-		include ('data/modules/'.$dir.'/module_info.php');
+foreach ($module_list as $dir) {
+	//Load module admin pages.
+	if (file_exists('data/modules/'.$module.'/'.$module.'.admin.php'))
+		require_once ('data/modules/'.$module.'/'.$module.'.admin.php');
 
 	//Check if module is compatible, otherwise don't include pages.
-	if (module_is_compatible($dir)) {
-
-		if (file_exists('data/modules/'.$dir.'/module_pages_admin.php')) {
-			include ('data/modules/'.$dir.'/module_pages_admin.php');
-
-			//Include startpage of module.
-			if ($module == $module_dir && !isset($page)) {
-				$titelkop = $module_name;
-				include_once ('data/inc/header.php');
-				include ('data/modules/'.$module_dir.'/pages_admin/'.$startpage);
-			}
-
-			//Include other module-pages,
-			//but only include pages if array has been given.
-			if (isset($module_page) && isset($page)) {
-				foreach ($module_page as $filename => $pagetitle) {
-					//Generate filename with extension
-					$filename_ext = $filename.'.php';
-					if ($module == $module_dir && $page == $filename) {
-						$titelkop = $pagetitle;
-						include_once ('data/inc/header.php');
-						include ('data/modules/'.$module_dir.'/pages_admin/'.$filename_ext);
-					}
+	if (module_is_compatible($dir) && function_exists($dir.'_page_admin_list')) {
+		$module_info = call_user_func($module.'_info');
+		$module_pages = call_user_func($dir.'_page_admin_list');
+
+		//Include startpage of module.
+		if ($module == $dir && !isset($page) && isset($module_pages[0])) {
+			$titelkop = $module_pages[0]['title'];
+			include_once ('data/inc/header.php');
+			call_user_func($dir.'_page_admin_'.$module_pages[0]['func']);
+		}
+
+		//Include other module-pages,
+		//but only include pages if array has been given.
+		elseif (isset($module_pages) && isset($page)) {
+			foreach ($module_pages as $module_page) {
+				if ($module == $dir && $page == $module_page['func'] && function_exists($dir.'_page_admin_'.$module_page['func'])) {
+					$titelkop = $module_page['title'];
+					include_once ('data/inc/header.php');
+					call_user_func($dir.'_page_admin_'.$module_page['func']);
 				}
 			}
 		}
 	}
 
-	//If module is not compatible
+	//If module is not compatible.
 	elseif (!module_is_compatible($dir) && $module == $dir) {
 		$titelkop = $module_name;
 		include_once ('data/inc/header.php');
 		echo $lang_modules27;
 	}
-
-	//Also include the module-include file (if it exists).
-	if (file_exists('data/modules/'.$dir.'/inc_admin.php') && module_is_compatible($dir))
-		include ('data/modules/'.$dir.'/inc_admin.php');
 }
-
-//Close module-dir
-closedir($dir_handle);
 ?>
\ No newline at end of file

=== modified file 'data/inc/modules_install.php'
--- data/inc/modules_install.php	2009-01-04 17:57:35 +0000
+++ data/inc/modules_install.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 ?>
 <p>

=== modified file 'data/inc/modules_manage.php'
--- data/inc/modules_manage.php	2009-01-04 17:57:35 +0000
+++ data/inc/modules_manage.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 ?>
 <p>
@@ -25,26 +25,26 @@
 </p>
 <div class="smallmenu">
 	<span class="smallmenu_button">
-		<a class="smallmenu_a" href="?action=module_addtosite" style="background:url(data/image/add_small.png) no-repeat;"><?php echo $lang_modules13; ?></a>
+		<a class="smallmenu_a" href="?action=module_addtosite" style="background: url('data/image/add_small.png') no-repeat;"><?php echo $lang_modules13; ?></a>
 	</span>
 	<span class="smallmenu_button">
-		<a class="smallmenu_a" href="?action=installmodule" style="background:url(data/image/install_small.png) no-repeat;"><?php echo $lang_modules11; ?></a>
+		<a class="smallmenu_a" href="?action=installmodule" style="background: url('data/image/install_small.png') no-repeat;"><?php echo $lang_modules11; ?></a>
 	</span>
 </div>
 <?php
 //Readout dir and put dirs in array
-$dirs = read_dir_contents('data/modules','dirs');
+$dirs = read_dir_contents('data/modules', 'dirs');
 //Display modules
 foreach($dirs as $dir) {
-	include_once ('data/modules/'.$dir.'/module_info.php');
+	$module_info = call_user_func($dir.'_info');
 	?>
 	<div class="menudiv">
 		<div>
 			<span>
-				<img src="data/modules/<?php echo $module_dir; ?>/<?php echo $module_icon; ?>" alt="" />
+				<img src="data/modules/<?php echo $dir; ?>/<?php echo $module_info['icon']; ?>" alt="" />
 			</span>
 			<span>
-				<span class="title-module"><?php echo $module_name; ?></span>
+				<span class="title-module"><?php echo $module_info['name']; ?></span>
 				<br />
 				<?php
 					//If module has been disabled, show warning
@@ -68,13 +68,13 @@
 		</div>
 		<div>
 			<p id="<?php echo $dir; ?>" style="display: none; padding-left: 43px;">
-				<?php echo $module_intro; ?>
-				<br />
-				<strong><?php echo $lang_modules2; ?></strong>: <?php echo $module_version; ?>
-				<br />
-				<strong><?php echo $lang_modules18; ?></strong>: <?php echo $module_author; ?>
-				<br />
-				<strong><?php echo $lang_modules17; ?></strong>: <a href="<?php echo $module_website; ?>" target="_blank"><?php echo $module_website; ?></a>
+				<?php echo $module_info['intro']; ?>
+				<br />
+				<strong><?php echo $lang_modules2; ?></strong>: <?php echo $module_info['version']; ?>
+				<br />
+				<strong><?php echo $lang_modules18; ?></strong>: <?php echo $module_info['author']; ?>
+				<br />
+				<strong><?php echo $lang_modules17; ?></strong>: <a href="<?php echo $module_info['website']; ?>" target="_blank"><?php echo $module_info['website'] ?></a>
 				<br />
 			</p>
 		</div>

=== modified file 'data/inc/modules_manage_addtosite.php'
--- data/inc/modules_manage_addtosite.php	2008-12-28 21:51:13 +0000
+++ data/inc/modules_manage_addtosite.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,13 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
+}
+
+//Load module functions.
+foreach ($module_list as $module) {
+	if (file_exists('data/modules/'.$module.'/'.$module.'.site.php'))
+		require_once ('data/modules/'.$module.'/'.$module.'.site.php');
 }
 
 //Introduction text
@@ -51,62 +57,49 @@
 					<strong><?php echo $lang_modules7; ?></strong>
 					<table>
 						<?php
-							//Define path to the module-dir.
-							$path = 'data/modules';
-
-							//Open the folder.
-							$dir_handle = @opendir($path) or die('Unable to open '.$path.'. Check if it\'s readable.');
-
 							//First count how many modules we have, and exclude disabled modules.
-							$number_modules = count(glob('data/modules/*'));
-							while ($dir = readdir($dir_handle)) {
-								if($dir != '.' && $dir != '..') {
-									if (!module_is_compatible($dir))
-										$number_modules--;
-								}
+							$number_modules = count($module_list);
+							foreach ($module_list as $module) {
+								if (!module_is_compatible($module) || !function_exists($module.'_theme_main'))
+									$number_modules--;
 							}
-							closedir($dir_handle);
 
 							//Loop through dirs, and display the modules.
-							$dir_handle = @opendir($path) or die('Unable to open '.$path.'. Check if it\'s readable.');
-							while ($dir = readdir($dir_handle)) {
-								if ($dir != '.' && $dir != '..') {
-									//Only show if module is compatible.
-									if (module_is_compatible($dir)) {
-										include('data/modules/'.$dir.'/module_info.php');
-										?>
-											<tr>
-												<td><?php echo $module_name; ?></td>
-												<td>
-													<select name="<?php echo $position.'|'.$module_dir; ?>">
-														<option value="0"><?php echo $lang_modules6; ?></option>
-														<?php
-															$counting_modules = 1;
-															while ($counting_modules <= $number_modules) {
-																//Check if this is the current setting.
-																//...and select the html-option if needed.
-																if (isset($space)) {
-																	$currentsetting = $space [$position] [$module_dir];
-																	if ($currentsetting == $counting_modules)
-																		echo '<option value="'.$counting_modules.'" selected="selected">'.$counting_modules.'</option>';
-																}
-
-																//...if this is not the current setting, don't select the html-option.
-																else
-																	echo '<option value="'.$counting_modules.'">'.$counting_modules.'</option>';
-
-																//Higher counting_modules.
-																$counting_modules++;
-															}
-														?>
-													</select>
-												</td>
-											</tr>
-										<?php
-									}
+							foreach ($module_list as $module) {
+								//Only show if module is compatible.
+								if (module_is_compatible($module) && function_exists($module.'_theme_main')) {
+									$module_info = call_user_func($module.'_info');
+									?>
+										<tr>
+											<td><?php echo $module_info['name']; ?></td>
+											<td>
+												<select name="<?php echo $position.'|'.$module; ?>">
+													<option value="0"><?php echo $lang_modules6; ?></option>
+													<?php
+														$counting_modules = 1;
+														while ($counting_modules <= $number_modules) {
+															//Check if this is the current setting.
+															//...and select the html-option if needed.
+															if (isset($space[$position][$module]))
+																$currentsetting = $space[$position][$module];
+															if (isset($currentsetting) && $currentsetting == $counting_modules)
+																echo '<option value="'.$counting_modules.'" selected="selected">'.$counting_modules.'</option>';
+
+															//...if this is not the current setting, don't select the html-option.
+															else
+																echo '<option value="'.$counting_modules.'">'.$counting_modules.'</option>';
+
+															//Higher counting_modules.
+															$counting_modules++;
+															unset($currentsetting);
+														}
+													?>
+												</select>
+											</td>
+										</tr>
+									<?php
 								}
 							}
-							closedir($dir_handle);
 						?>
 					</table>
 				</td>

=== modified file 'data/inc/modules_manage_delete.php'
--- data/inc/modules_manage_delete.php	2008-12-29 00:00:05 +0000
+++ data/inc/modules_manage_delete.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Check if we defined a module to uninstall

=== modified file 'data/inc/newpage.php'
--- data/inc/newpage.php	2009-01-07 19:46:21 +0000
+++ data/inc/newpage.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,13 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
+}
+
+//Load module functions.
+foreach ($module_list as $module) {
+	if (file_exists('data/modules/'.$module.'/'.$module.'.site.php'))
+		require_once ('data/modules/'.$module.'/'.$module.'.site.php');
 }
 
 //Generate the menu on the right.
@@ -55,51 +61,40 @@
 					<br />
 					<table>
 					<?php
-						//Define path to the module-dir.
-						$path = 'data/modules';
-						//Open the folder.
-						$dir_handle = @opendir($path) or die('Unable to open '.$path.'. Check if it\'s readable.');
 						//First count how many modules we have, and exclude disabled modules.
-						$number_modules = count(glob('data/modules/*'));
-						while ($dir = readdir($dir_handle)) {
-							if ($dir != '.' && $dir != '..') {
-								if (!module_is_compatible($dir))
-									$number_modules--;
-							}
+						$number_modules = count($module_list);
+						foreach ($module_list as $module) {
+							if (!module_is_compatible($module) || !function_exists($module.'_theme_main'))
+								$number_modules--;
 						}
-						closedir($dir_handle);
 
-						//Loop through dirs, and display the modules.
-						$dir_handle = @opendir($path) or die('Unable to open '.$path.'. Check if it\'s readable.');
-						while ($dir = readdir($dir_handle)) {
-							if ($dir != "." && $dir != "..") {
-								//Only show if module is compatible.
-								if (module_is_compatible($dir)) {
-									include ('data/modules/'.$dir.'/module_info.php');
-									?>
-										<tr>
-											<td><?php echo $module_name; ?></td>
-											<td>
-												<select name="cont3[<?php echo $module_dir; ?>]">
-													<option value="0"><?php echo $lang_modules6; ?></option>
-													<?php
-														$counting_modules = 1;
-														while ($counting_modules <= $number_modules) {
-															?>
-																<option value="<?php echo $counting_modules; ?>"><?php echo $counting_modules; ?></option>
-															<?php
-															//Higher counting_modules.
-															$counting_modules++;
-														}
-													?>
-												</select>
-											</td>
-										</tr>
-									<?php
-									}
+						//Loop through modules, and display them.
+						foreach ($module_list as $module) {
+							//Only show if module is compatible.
+							if (module_is_compatible($module) && function_exists($module.'_theme_main')) {
+								$module_info = call_user_func($module.'_info');
+								?>
+									<tr>
+										<td><?php echo $module_info['name']; ?></td>
+										<td>
+											<select name="cont3[<?php echo $module; ?>]">
+												<option value="0"><?php echo $lang_modules6; ?></option>
+												<?php
+													$counting_modules = 1;
+													while ($counting_modules <= $number_modules) {
+														?>
+															<option value="<?php echo $counting_modules; ?>"><?php echo $counting_modules; ?></option>
+														<?php
+														//Higher counting_modules.
+														$counting_modules++;
+													}
+												?>
+											</select>
+										</td>
+									</tr>
+								<?php
 								}
 							}
-							closedir($dir_handle);
 						?>
 					</table>
 				</td>

=== modified file 'data/inc/options.php'
--- data/inc/options.php	2009-01-04 17:57:35 +0000
+++ data/inc/options.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Introduction text

=== modified file 'data/inc/page.php'
--- data/inc/page.php	2009-01-06 22:15:40 +0000
+++ data/inc/page.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Introduction text.
@@ -43,6 +43,7 @@
 					<img src="data/image/page.png" alt="" />
 				</span>
 				<span class="title-page"><?php echo $title; ?></span>
+				<?php run_hook('admin_page_list_before'); ?>
 				<span>
 					<a href="?action=editpage&amp;var1=<?php echo $file; ?>">
 					<img src="data/image/edit.png" title="<?php echo $lang_page3; ?>" alt="<?php echo $lang_page3; ?>" />
@@ -68,6 +69,7 @@
 						<img src="data/image/delete.png" title="<?php echo $lang_trash1; ?>" alt="<?php echo $lang_trash1; ?>" />
 					</a>
 				</span>
+				<?php run_hook('admin_page_list_after'); ?>
 			</div>
 		<?php
 	}

=== modified file 'data/inc/page_editmeta.php'
--- data/inc/page_editmeta.php	2009-01-06 22:15:40 +0000
+++ data/inc/page_editmeta.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Include the actual siteinfo

=== modified file 'data/inc/pagedown.php'
--- data/inc/pagedown.php	2009-01-06 22:15:40 +0000
+++ data/inc/pagedown.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Check if file exists

=== modified file 'data/inc/pageup.php'
--- data/inc/pageup.php	2009-01-06 22:15:40 +0000
+++ data/inc/pageup.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Check if file exists

=== modified file 'data/inc/settings.php'
--- data/inc/settings.php	2009-01-07 19:46:21 +0000
+++ data/inc/settings.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Include old settings, to display them.

=== modified file 'data/inc/start.php'
--- data/inc/start.php	2009-01-04 17:57:35 +0000
+++ data/inc/start.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Introduction text
@@ -27,7 +27,6 @@
 		<br />
 		<?php echo $lang_start9; ?>
 	</p>
-
 	<span class="kop2"><?php echo $lang_start10; ?></span>
 <?php
 //Show the divs

=== modified file 'data/inc/theme.php'
--- data/inc/theme.php	2009-01-08 11:07:03 +0000
+++ data/inc/theme.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 ?>
 	<div class="rightmenu">

=== modified file 'data/inc/themeinstall.php'
--- data/inc/themeinstall.php	2009-01-08 11:07:03 +0000
+++ data/inc/themeinstall.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 ?>
 	<p>

=== modified file 'data/inc/tinymce_inc.php'
--- data/inc/tinymce_inc.php	2009-01-10 20:58:15 +0000
+++ data/inc/tinymce_inc.php	2009-03-04 18:15:49 +0000
@@ -19,7 +19,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //First check out which language we use and which tinymce-language we need

=== modified file 'data/inc/trashcan.php'
--- data/inc/trashcan.php	2009-01-07 19:46:21 +0000
+++ data/inc/trashcan.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 ?>
 	<p>

=== modified file 'data/inc/trashcan_applet.php'
--- data/inc/trashcan_applet.php	2009-01-04 17:57:35 +0000
+++ data/inc/trashcan_applet.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Count items in trashcan

=== modified file 'data/inc/trashcan_deleteitem.php'
--- data/inc/trashcan_deleteitem.php	2009-01-07 19:46:21 +0000
+++ data/inc/trashcan_deleteitem.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Page

=== modified file 'data/inc/trashcan_empty.php'
--- data/inc/trashcan_empty.php	2009-01-04 17:57:35 +0000
+++ data/inc/trashcan_empty.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Images

=== modified file 'data/inc/trashcan_restoreitem.php'
--- data/inc/trashcan_restoreitem.php	2009-01-07 19:46:21 +0000
+++ data/inc/trashcan_restoreitem.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //If we want to restore a page.

=== modified file 'data/inc/trashcan_viewitem.php'
--- data/inc/trashcan_viewitem.php	2009-01-07 19:46:21 +0000
+++ data/inc/trashcan_viewitem.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 if ($var2 == 'page' && file_exists('data/trash/pages/'.$var1)) {

=== modified file 'data/inc/update_applet.php'
--- data/inc/update_applet.php	2009-01-04 17:57:35 +0000
+++ data/inc/update_applet.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //First get the day of the year

=== modified file 'data/inc/variables.all.php'
--- data/inc/variables.all.php	2009-01-11 12:51:36 +0000
+++ data/inc/variables.all.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Include Translation data.
@@ -26,6 +26,14 @@
 if ($langpref != 'en.php')
 	require_once ('data/inc/lang/'.$langpref);
 
+foreach ($module_list as $module) {
+	if (file_exists('data/modules/'.$module.'/lang/en.php'))
+		require_once ('data/modules/'.$module.'/lang/en.php');
+	if ($langpref != 'en.php' && file_exists('data/modules/'.$module.'/lang/'.$langpref))
+		require_once ('data/modules/'.$module.'/lang/'.$langpref);
+}
+unset($module);
+
 //Variables for module programmers.
 if (file_exists('data/settings/options.php'))
 	require_once ('data/settings/options.php');

=== modified file 'data/inc/variables.site.php'
--- data/inc/variables.site.php	2008-12-25 14:48:00 +0000
+++ data/inc/variables.site.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Constants for module programmers

=== added file 'data/modules/albums/albums.admin.php'
--- data/modules/albums/albums.admin.php	1970-01-01 00:00:00 +0000
+++ data/modules/albums/albums.admin.php	2009-02-04 17:49:59 +0000
@@ -0,0 +1,417 @@
+<?php
+require_once ('data/modules/albums/functions.php');
+
+function albums_page_admin_list() {
+	global $lang_albums, $lang_albums5, $lang_albums6, $lang_albums15, $lang_kop13, $lang_updown5;
+	$module_page_admin[] = array(
+		'func'  => 'albums',
+		'title' => $lang_albums
+	);
+	$module_page_admin[] = array(
+		'func'  => 'editalbum',
+		'title' => $lang_albums6
+	);
+	$module_page_admin[] = array(
+		'func'  => 'deletealbum',
+		'title' => $lang_albums5
+	);
+	$module_page_admin[] = array(
+		'func'  => 'editimage',
+		'title' => $lang_albums15
+	);
+	$module_page_admin[] = array(
+		'func'  => 'deleteimage',
+		'title' => $lang_kop13
+	);
+	$module_page_admin[] = array(
+		'func'  => 'imageup',
+		'title' => $lang_updown5
+	);
+	$module_page_admin[] = array(
+		'func'  => 'imagedown',
+		'title' => $lang_updown5
+	);
+	return $module_page_admin;
+}
+
+function albums_page_admin_albums() {
+	global $cont1, $lang_albums1, $lang_albums2, $lang_albums3, $lang_albums4, $lang_albums19, $lang_install13, $lang_theme12;
+	?>
+		<p>
+			<strong><?php echo $lang_albums1; ?></strong>
+		</p>
+		<span class="kop2"><?php echo $lang_albums2; ?></span>
+		<br />
+		<?php
+		read_albums('data/settings/modules/albums');
+		//Check if the PHP-gd module is installed on server.
+		if (extension_loaded('gd')) {
+		?>
+			<br /><br />
+			<label class="kop2" for="cont1"><?php echo $lang_albums3; ?></label>
+			<br />
+			<form method="post" action="">
+				<span class="kop4"><?php echo $lang_albums4; ?></span>
+				<br />
+				<input name="cont1" id="cont1" type="text" />
+				<input type="submit" name="Submit" value="<?php echo $lang_install13; ?>" />
+			</form>
+		<?php
+		//When form is submitted.
+		if (isset($_POST['Submit'])) {
+			if (isset($cont1) && file_exists('data/settings/modules/albums/'.$cont1))
+				echo '<span class="red">'.$lang_albums19.'</span>';
+
+			elseif (isset($cont1)) {
+				//Delete unwanted characters.
+				$cont1 = str_replace ('"','', $cont1);
+				$cont1 = str_replace (' ','', $cont1);
+				$cont1 = str_replace ('\'','', $cont1);
+				$cont1 = str_replace ('.','', $cont1);
+				$cont1 = str_replace ('/','', $cont1);
+
+				//Create and chmod directories.
+				mkdir ('data/settings/modules/albums/'.$cont1);
+				mkdir ('data/settings/modules/albums/'.$cont1.'/thumb');
+				chmod ('data/settings/modules/albums/'.$cont1, 0777);
+				chmod ('data/settings/modules/albums/'.$cont1.'/thumb', 0777);
+				redirect('?module=albums', 0);
+			}
+		}
+	}
+
+	//If PHP-gd module is not installed.
+	elseif (!extension_loaded('gd')) {
+	?>
+		<p class="red"><?php echo $lang_albums16; ?></p>
+	<?php
+	}
+	?>
+	<p>
+		<a href="?action=modules">&lt;&lt;&lt; <?php echo $lang_theme12; ?></a>
+	</p>
+<?php
+}
+
+function albums_page_admin_editalbum() {
+	global $cont1, $cont2, $cont3, $lang_albums8, $lang_albums9, $lang_albums10, $lang_albums11, $lang_albums12, $lang_albums13, $lang_albums17, $lang_image2, $lang_install13, $lang_install17, $lang_theme12, $var1;
+
+	//Check if album exists
+	if (file_exists('data/settings/modules/albums/'.$var1)) {
+		//Introduction text.
+		?>
+			<p>
+				<strong><?php echo $lang_albums8; ?></strong>
+			</p>
+		<?php
+		//Edit images
+		?>
+			<span class="kop2"><?php echo $lang_albums9; ?></span>
+			<br />
+		<?php
+		read_albumimages('data/settings/modules/albums/'.$var1);
+
+		//New images upload
+		?>
+			<p>
+				<span class="kop2"><?php echo $lang_albums10; ?></span>
+				<br />
+				<span class="kop4"><?php echo $lang_albums13; ?></span>
+			</p>
+			<form method="post" action="" enctype="multipart/form-data">
+				<label class="kop2" for="cont1"><?php echo $lang_install17; ?></label>
+				<br />
+				<input name="cont1" id="cont1" type="text" />
+				<br /><br />
+				<label class="kop2" for="cont2"><?php echo $lang_albums11; ?></label>
+				<br />
+				<textarea cols="50" rows="5" name="cont2" id="cont2"></textarea>
+				<br /><br />
+				<input type="file" name="imagefile" id="imagefile" />
+				<br />
+				<label class="kop4" for="cont3"><?php echo $lang_albums12; ?></label>
+				<input name="cont3" id="cont3" type="text" size="3" value="85" />
+				<br /><br />
+				<input type="submit" name="Submit" value="<?php echo $lang_install13; ?>" />
+			</form>
+		<?php
+		//Let's process the image...
+		if (isset($_POST['Submit'])) {
+			//Define some variables
+			$imageme = $_FILES['imagefile']['name'];
+			list($imageze, $ext) = explode('.', $imageme);
+			$fullimage = 'data/settings/modules/albums/'.$var1.'/'.$imageme;
+			$thumbimage = 'data/settings/modules/albums/'.$var1.'/thumb/'.$imageme;
+			$tempimage = 'data/settings/modules/albums/'.$var1.'/temp.jpg';
+
+			//First: Upload the image.
+			//If file is pjpeg or jpeg: Accept.
+			if ($_FILES['imagefile']['type'] == 'image/jpeg' || $_FILES['imagefile']['type'] == 'image/pjpeg') {
+				copy($_FILES['imagefile']['tmp_name'], 'data/settings/modules/albums/'.$var1.'/'.$_FILES['imagefile']['name']) or die ('Error: Upload failed!');
+
+				//If the extension is with capitals, we have to rename it...
+				if ($ext == 'JPG') {
+					rename($fullimage, 'data/settings/modules/albums/'.$var1.'/'.$imageze.'.jpg');
+					$fullimage = 'data/settings/modules/albums/'.$var1.'/'.$imageze.'.jpg';
+					$thumbimage = 'data/settings/modules/albums/'.$var1.'/thumb/'.$imageze.'.jpg';
+				}
+
+				//Define which filenames are already in use, and define what filename we should use.
+				if (file_exists('data/settings/modules/albums/'.$var1.'/image1.jpg')) {
+					$i = 2;
+					$o = 3;
+					while (file_exists('data/settings/modules/albums/'.$var1.'/image'.$i.'.jpg') || file_exists('data/settings/modules/albums/'.$var1.'/image'.$o.'.jpg')) {
+						$i++;
+						$o++;
+					}
+					$newfile = 'image'.$i;
+				}
+				else
+					$newfile = 'image1';
+
+				//Then rename the file and give it the right filename, also define new image-variables.
+				rename($fullimage, 'data/settings/modules/albums/'.$var1.'/'.$newfile.'.jpg');
+				$fullimage = 'data/settings/modules/albums/'.$var1.'/'.$newfile.'.jpg';
+				$thumbimage = 'data/settings/modules/albums/'.$var1.'/thumb/'.$newfile.'.jpg';
+
+				//FIXME: Need to CHMOD the full image.
+			}
+
+			//Block images other then JPG.
+			else {
+				echo '<p><span class="red">'.$lang_image2.'</span></p>';
+				include_once ('data/inc/footer.php');
+				exit;
+			}
+
+			//Copy the image to the thumbdir.
+			copy ($fullimage, $thumbimage) or die ('Error: Thumb copying failed!');
+
+			//Compress the big image.
+			$ThumbWidth = 640;
+			list($width, $height) = getimagesize($fullimage);
+			$imgratio = $width / $height;
+
+			if ($imgratio > 1) {
+				$newwidth = $ThumbWidth;
+				$newheight = $ThumbWidth / $imgratio;
+			}
+
+			else {
+				$newheight = $ThumbWidth;
+				$newwidth = $ThumbWidth * $imgratio;
+			}
+
+			$resized_img = imagecreatetruecolor($newwidth, $newheight);
+			$new_img = imagecreatefromjpeg($fullimage);
+
+			imagecopyresampled($resized_img, $new_img, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
+			ImageJpeg($resized_img, $tempimage, $cont3);
+			ImageDestroy($resized_img);
+			ImageDestroy($new_img);
+			unlink($fullimage);
+			rename($tempimage, $fullimage);
+
+			//Then make a thumb from the image.
+			$ThumbWidth = 200;
+			list($width, $height) = getimagesize($thumbimage);
+			$imgratio = $width / $height;
+
+			if ($imgratio > 1) {
+				$newwidth = $ThumbWidth;
+				$newheight = $ThumbWidth / $imgratio;
+			}
+
+			else {
+				$newheight = $ThumbWidth;
+				$newwidth = $ThumbWidth * $imgratio;
+			}
+
+			$resized_img = imagecreatetruecolor($newwidth, $newheight);
+			$new_img = imagecreatefromjpeg($thumbimage);
+
+			imagecopyresampled($resized_img, $new_img, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
+			ImageJpeg($resized_img, $tempimage);
+			ImageDestroy($resized_img);
+			ImageDestroy($new_img);
+			unlink($thumbimage);
+			rename($tempimage, $thumbimage);
+			chmod($thumbimage, 0777);
+
+			//Sanitize data.
+			$cont1 = sanitize($cont1);
+			$cont2 = sanitize($cont2);
+			$cont2 = str_replace ("\n",'<br />', $cont2);
+
+			//Then save the imageinformation.
+			$data = 'data/settings/modules/albums/'.$var1.'/'.$newfile.'.php';
+			$file = fopen($data, 'w');
+			fputs($file, '<?php'."\n"
+			.'$name = \''.$cont1.'\';'."\n"
+			.'$info = \''.$cont2.'\';'."\n"
+			.'?>');
+			fclose($file);
+			chmod($data, 0777);
+
+			//Redirect.
+			redirect('?module=albums&page=editalbum&var1='.$var1, 0);
+		}
+	}
+	?>
+		<br />
+		<p>
+			<a href="?module=albums">&lt;&lt;&lt; <?php echo $lang_theme12; ?></a>
+		</p>
+	<?php
+}
+
+function albums_page_admin_deletealbum() {
+	global $var1;
+
+	//Check if an album was defined, and if the album exists
+	if (isset($var1) && file_exists('data/settings/modules/albums/'.$var1)) {
+		recursive_remove_directory('data/settings/modules/albums/'.$var1);
+	}
+
+	redirect('?module=albums', 0);
+}
+
+function albums_page_admin_editimage() {
+	global $cont1, $cont2, $lang_albums11, $lang_install13, $lang_install14, $lang_install17, $var1, $var2;
+
+	//Check if an image was defined, and if the image exists
+	if (isset($var1) && file_exists('data/settings/modules/albums/'.$var2.'/'.$var1.'.php')) {
+		//Include the image-information
+		include_once ('data/settings/modules/albums/'.$var2.'/'.$var1.'.php');
+
+		//Replace html-breaks by real ones
+		$info = str_replace('<br />', "\n", $info);
+		?>
+		<br />
+		<form name="form1" method="post" action="">
+			<label class="kop2" for="cont1"><?php echo $lang_install17; ?></label>
+			<br />
+			<input name="cont1" id="cont1" type="text" value="<?php echo $name; ?>" />
+			<br /><br />
+			<label class="kop2" for="cont2"><?php echo $lang_albums11; ?></label>
+			<br />
+			<textarea cols="50" rows="5" name="cont2" id="cont2"><?php echo $info; ?></textarea>
+			<br /><br />
+			<input type="submit" name="Submit" value="<?php echo $lang_install13; ?>" />
+			<input type="button" name="Cancel" value="<?php echo $lang_install14; ?>" onclick="javascript: window.location='?module=albums&amp;page=editalbum&amp;var1=<?php echo $var2; ?>';" />
+		</form>
+		<?php
+		//When the information is posted:
+		if (isset($_POST['Submit'])) {
+			//Sanitize data.
+			$cont1 = sanitize($cont1);
+			$cont2 = sanitize($cont2);
+			$cont2 = str_replace ("\n",'<br />', $cont2);
+
+			//Then save the imageinformation
+			$data = 'data/settings/modules/albums/'.$var2.'/'.$var1.'.php';
+			$file = fopen($data, 'w');
+			fputs($file, '<?php'."\n"
+			.'$name = \''.$cont1.'\';'."\n"
+			.'$info = \''.$cont2.'\';'."\n"
+			.'?>');
+			fclose($file);
+			chmod($data, 0777);
+
+			redirect('?module=albums&page=editalbum&var1='.$var2, 0);
+		}
+	}
+}
+
+function albums_page_admin_deleteimage() {
+	global $var1, $var2;
+	//Check if an image was defined, and if the image exists
+	if (isset($var1) && isset($var2) && file_exists('data/settings/modules/albums/'.$var2.'/'.$var1.'.php') && file_exists('data/settings/modules/albums/'.$var2.'/thumb/'.$var1.'.jpg')) {
+		unlink('data/settings/modules/albums/'.$var2.'/'.$var1.'.php');
+		unlink('data/settings/modules/albums/'.$var2.'/'.$var1.'.jpg');
+		unlink('data/settings/modules/albums/'.$var2.'/thumb/'.$var1.'.jpg');
+	}
+
+	redirect('?module=albums&page=editalbum&var1='.$var2, 0);
+}
+
+function albums_page_admin_imageup() {
+	global $lang_footer, $lang_updown3, $lang_updown6, $var1, $var2;
+
+	//Check if images exist.
+	if (file_exists('data/settings/modules/albums/'.$var2.'/'.$var1.'.jpg') && file_exists('data/settings/modules/albums/'.$var2.'/'.$var1.'.php') && file_exists('data/settings/modules/albums/'.$var2.'/thumb/'.$var1.'.jpg')) {
+		//We can't higher image1, so we have to check:
+		if ($var1 == 'image1') {
+			echo $lang_updown6;
+			redirect('?module=albums&page=editalbum&var1='.$var2, 2);
+			include_once ('data/inc/footer.php');
+			exit;
+		}
+
+		//Determine the imagenumber.
+		list($filename, $pagenumber) = explode('e', $var1);
+		$higherpagenumber = $pagenumber - 1;
+
+		//First make temporary files.
+		rename('data/settings/modules/albums/'.$var2.'/'.$var1.'.jpg', 'data/settings/modules/albums/'.$var2.'/'.$var1.TEMP.'.jpg');
+		rename('data/settings/modules/albums/'.$var2.'/'.$var1.'.php', 'data/settings/modules/albums/'.$var2.'/'.$var1.TEMP.'.php');
+		rename('data/settings/modules/albums/'.$var2.'/thumb/'.$var1.'.jpg', 'data/settings/modules/albums/'.$var2.'/thumb/'.$var1.TEMP.'.jpg');
+
+		//Then make the higher images one higher.
+		rename('data/settings/modules/albums/'.$var2.'/'.NAME.$higherpagenumber.'.jpg', 'data/settings/modules/albums/'.$var2.'/'.$var1.'.jpg');
+		rename('data/settings/modules/albums/'.$var2.'/'.NAME.$higherpagenumber.'.php', 'data/settings/modules/albums/'.$var2.'/'.$var1.'.php');
+		rename('data/settings/modules/albums/'.$var2.'/thumb/'.NAME.$higherpagenumber.'.jpg', 'data/settings/modules/albums/'.$var2.'/thumb/'.$var1.'.jpg');
+
+		//Finally, give the temp-files its final name.
+		rename ('data/settings/modules/albums/'.$var2.'/'.$var1.TEMP.'.jpg', 'data/settings/modules/albums/'.$var2.'/'.NAME.$higherpagenumber.'.jpg');
+		rename ('data/settings/modules/albums/'.$var2.'/'.$var1.TEMP.'.php', 'data/settings/modules/albums/'.$var2.'/'.NAME.$higherpagenumber.'.php');
+		rename ('data/settings/modules/albums/'.$var2.'/thumb/'.$var1.TEMP.'.jpg', 'data/settings/modules/albums/'.$var2.'/thumb/'.NAME.$higherpagenumber.'.jpg');
+
+		//Show message.
+		echo $lang_updown3;
+	}
+
+	//Redirect.
+	redirect('?module=albums&page=editalbum&var1='.$var2, 0);
+}
+
+function albums_page_admin_imagedown() {
+	global $lang_footer, $lang_updown3, $lang_updown7, $var1, $var2;
+
+	//Check if images exist.
+	if (file_exists('data/settings/modules/albums/'.$var2.'/'.$var1.'.jpg') && file_exists('data/settings/modules/albums/'.$var2.'/'.$var1.'.php') && file_exists('data/settings/modules/albums/'.$var2.'/thumb/'.$var1.'.jpg')) {
+		//Determine the imagenumber
+		list($filename, $pagenumber) = explode('e', $var1);
+		$lowerpagenumber = $pagenumber + 1;
+
+		//We can't lower the last image, so we have to check:
+		if (!file_exists('data/settings/modules/albums/'.$var2.'/'.NAME.$lowerpagenumber.'.jpg')) {
+			echo $lang_updown7;
+			redirect('?module=albums&page=editalbum&var1='.$var2, 2);
+			include_once ('data/inc/footer.php');
+			exit;
+		}
+
+		//First make temporary files.
+		rename('data/settings/modules/albums/'.$var2.'/'.$var1.'.jpg', 'data/settings/modules/albums/'.$var2.'/'.$var1.TEMP.'.jpg');
+		rename('data/settings/modules/albums/'.$var2.'/'.$var1.'.php', 'data/settings/modules/albums/'.$var2.'/'.$var1.TEMP.'.php');
+		rename('data/settings/modules/albums/'.$var2.'/thumb/'.$var1.'.jpg', 'data/settings/modules/albums/'.$var2.'/thumb/'.$var1.TEMP.'.jpg');
+
+		//Then make the higher images one higher.
+		rename('data/settings/modules/albums/'.$var2.'/'.NAME.$lowerpagenumber.'.jpg', 'data/settings/modules/albums/'.$var2.'/'.$var1.'.jpg');
+		rename('data/settings/modules/albums/'.$var2.'/'.NAME.$lowerpagenumber.'.php', 'data/settings/modules/albums/'.$var2.'/'.$var1.'.php');
+		rename('data/settings/modules/albums/'.$var2.'/thumb/'.NAME.$lowerpagenumber.'.jpg', 'data/settings/modules/albums/'.$var2.'/thumb/'.$var1.'.jpg');
+
+		//Finally, give the temp-files its final name.
+		rename ('data/settings/modules/albums/'.$var2.'/'.$var1.TEMP.'.jpg', 'data/settings/modules/albums/'.$var2.'/'.NAME.$lowerpagenumber.'.jpg');
+		rename ('data/settings/modules/albums/'.$var2.'/'.$var1.TEMP.'.php', 'data/settings/modules/albums/'.$var2.'/'.NAME.$lowerpagenumber.'.php');
+		rename ('data/settings/modules/albums/'.$var2.'/thumb/'.$var1.TEMP.'.jpg', 'data/settings/modules/albums/'.$var2.'/thumb/'.NAME.$lowerpagenumber.'.jpg');
+
+		//Show message.
+		echo $lang_updown3;
+	}
+
+	//Redirect.
+	redirect('?module=albums&page=editalbum&var1='.$var2, 0);
+}
+?>
\ No newline at end of file

=== added file 'data/modules/albums/albums.php'
--- data/modules/albums/albums.php	1970-01-01 00:00:00 +0000
+++ data/modules/albums/albums.php	2009-02-04 17:49:59 +0000
@@ -0,0 +1,15 @@
+<?php
+function albums_info() {
+	global $lang_albums, $lang_albums7;
+	$module_info = array(
+		'name'          => $lang_albums,
+		'intro'         => $lang_albums7,
+		'version'       => '0.2',
+		'author'        => 'pluck development team',
+		'website'       => 'http://www.pluck-cms.org',
+		'icon'          => 'images/albums.png',
+		'compatibility' => '4.7'
+	);
+	return $module_info;
+}
+?>
\ No newline at end of file

=== added file 'data/modules/albums/albums.site.php'
--- data/modules/albums/albums.site.php	1970-01-01 00:00:00 +0000
+++ data/modules/albums/albums.site.php	2009-02-04 17:49:59 +0000
@@ -0,0 +1,102 @@
+<?php
+require_once ('data/modules/albums/functions.php');
+
+function albums_theme_main() {
+	//Open the module-folder
+	$dir_handle = @opendir('data/settings/modules/albums') or die('Unable to open data/modules. Check if it\'s readable.');
+
+	//Loop through dirs
+	while ($dir = readdir($dir_handle)) {
+		if (file_exists('data/settings/modules/albums/'.$dir.'/thumb/image1.jpg')) {
+		?>
+			<div class="album">
+				<table>
+					<tr>
+						<td>
+							<a href="?module=albums&amp;page=viewalbum&amp;album=<?php echo $dir; ?>&amp;pageback=<?php echo CURRENT_PAGE_FILENAME; ?>" title="album <?php echo $dir; ?>"><img alt="<?php echo $dir; ?>" title="<?php echo $dir; ?>" src="data/modules/albums/albums_getimage.php?image=<?php echo $dir; ?>/thumb/image1.jpg" /></a>
+						</td>
+						<td>
+							<span class="albuminfo">
+								<a href="?module=albums&amp;page=viewalbum&amp;album=<?php echo $dir; ?>&amp;pageback=<?php echo CURRENT_PAGE_FILENAME; ?>" title="album <?php echo $dir; ?>"><?php echo $dir; ?></a>
+							</span>
+						</td>
+					</tr>
+				</table>
+			</div>
+		<?php
+		}
+	}
+}
+
+function albums_theme_meta() {
+	global $module;
+
+	//Only insert LightBox when we're viewing an album
+	if (isset($module) && $module == 'albums') {
+	?>
+		<link href="data/inc/lightbox/lightbox.css" rel="stylesheet" type="text/css" media="screen" />
+		<script src="data/inc/lightbox/prototype.js" type="text/javascript"></script>
+		<script src="data/inc/lightbox/scriptaculous.js?load=effects" type="text/javascript"></script>
+		<script src="data/inc/lightbox/lightbox.js" type="text/javascript"></script>
+	<?php
+	}
+}
+
+function albums_page_site_list() {
+	$module_page_site[] = array(
+		'func'  => 'viewalbum',
+		'title' => $_GET['album']
+	);
+	return $module_page_site;
+}
+
+function albums_page_site_viewalbum() {
+	global $lang_albums18, $lang_theme12;
+
+	//Predefined variable
+	$album = $_GET['album'];
+	$pageback = $_GET['pageback'];
+
+	if (!file_exists('data/settings/modules/albums/'.$album))
+		echo '<p>'.$lang_albums18.'</p>';
+
+	//If the album exists
+	else {
+		//Start reading out those images...
+		$files = read_dir_contents('data/settings/modules/albums/'.$album, 'files');
+		if ($files) {
+			natcasesort($files);
+			foreach ($files as $file) {
+				//Check if the files are JPG
+				list($fdirname, $ext) = explode(".", $file);
+				if ($ext == 'jpg') {
+					include_once ('data/settings/modules/albums/'.$album.'/'.$fdirname.'.php');
+					?>
+						<div class="album">
+							<table>
+								<tr>
+									<td>
+										<a href="data/modules/albums/albums_getimage.php?image=<?php echo $album; ?>/<?php echo $fdirname; ?>.jpg" rel="lightbox[album]" title="<?php echo $name; ?>">
+											<img src="data/modules/albums/albums_getimage.php?image=<?php echo $album; ?>/thumb/<?php echo $fdirname; ?>.jpg" alt="<?php echo $name; ?>" title="<?php echo $name; ?>" />
+										</a>
+									</td>
+									<td>
+										<span class="albuminfo"><?php echo $name; ?></span>
+										<br />
+										<i><?php echo $info; ?></i>
+									</td>
+								</tr>
+							</table>
+						</div>
+					<?php
+				}
+			}
+		}
+	}
+	?>
+		<p>
+			<a href="?file=<?php echo $pageback; ?>" title="<?php echo $lang_theme12; ?>">&lt;&lt;&lt; <?php echo $lang_theme12; ?></a>
+		</p>
+	<?php
+}
+?>

=== renamed file 'data/modules/albums/pages_admin/albums_getimage.php' => 'data/modules/albums/albums_getimage.php'
--- data/modules/albums/pages_admin/albums_getimage.php	2008-12-28 00:03:55 +0000
+++ data/modules/albums/albums_getimage.php	2009-02-01 12:50:18 +0000
@@ -36,13 +36,13 @@
 
 //...if no hacking attempts found:
 //Check if file exists.
-if (file_exists('../../../../data/settings/modules/albums/'.$image)) {
+if (file_exists('../../settings/modules/albums/'.$image)) {
 	//Generate the image, make sure it doesn't end up in the visitors buffer.
 	header('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
 	header('Expires: Thu, 19 Nov 1981 08:52:00 GMT');
 	header('Pragma: no-cache');
 	header('Content-Type: image/jpeg');
-	echo readfile('../../../../data/settings/modules/albums/'.$image);
+	echo readfile('../../settings/modules/albums/'.$image);
 }
 
 //If image doesn't exist, send 404 header.

=== modified file 'data/modules/albums/functions.php'
--- data/modules/albums/functions.php	2008-12-28 21:30:36 +0000
+++ data/modules/albums/functions.php	2009-03-04 18:15:49 +0000
@@ -17,14 +17,14 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Two constants we use in imageup.php and imagedown.php.
 define('TEMP', '_temp');
 define('NAME', 'image');
 
-//Function: readout albums
+//Function: Readout albums.
 //------------
 function read_albums($dir) {
 	global $lang_albums5, $lang_albums6, $lang_albums14;
@@ -59,7 +59,7 @@
 }
 
 
-//Function: readout album-images
+//Function: Readout album-images.
 //------------
 function read_albumimages($dir) {
 	global $lang_albums6, $lang_albums14, $lang_kop13, $lang_updown5, $var1;
@@ -74,38 +74,38 @@
 			if ($ext == 'jpg') {
 				include ('data/settings/modules/albums/'.$var1.'/'.$fdirname.'.php');
 				?>
-				<div class="menudiv">
-					<span>
-						<a href="data/modules/albums/pages_admin/albums_getimage.php?image=<?php echo $var1.'/'.$fdirname; ?>.jpg" target="_blank">
-							<img src="data/modules/albums/pages_admin/albums_getimage.php?image=<?php echo $var1; ?>/thumb/<?php echo $fdirname; ?>.jpg" title="<?php echo $name; ?>" alt="<?php echo $name; ?>" />
-						</a>
-					</span>
-					<span style="width: 500px;">
-						<span class="kop3"><?php echo $name; ?></span>
-						<br />
-						<i><?php echo $info; ?></i>
-					</span>
-					<span>
-						<a href="?module=albums&amp;page=editimage&amp;var1=<?php echo $fdirname; ?>&amp;var2=<?php echo $var1; ?>">
-							<img src="data/image/edit.png" title="<?php echo $lang_albums6; ?>" alt="<?php echo $lang_albums6; ?>" />
-						</a>
-					</span>
-					<span>
-						<a href="?module=albums&amp;page=imageup&amp;var1=<?php echo $fdirname; ?>&amp;var2=<?php echo $var1; ?>">
-							<img src="data/image/up.png" title="<?php echo $lang_updown5; ?>" alt="<?php echo $lang_updown5; ?>" />
-						</a>
-					</span>
-					<span>
-						<a href="?module=albums&amp;page=imagedown&amp;var1=<?php echo $fdirname; ?>&amp;var2=<?php echo $var1; ?>">
-							<img src="data/image/down.png" title="<?php echo $lang_updown5; ?>" alt="<?php echo $lang_updown5; ?>" />
-						</a>
-					</span>
-					<span>
-						<a href="?module=albums&amp;page=deleteimage&amp;var1=<?php echo $fdirname; ?>&amp;var2=<?php echo $var1; ?>">
-							<img src="data/image/delete_from_trash.png" title="<?php echo $lang_kop13; ?>" alt="<?php echo $lang_kop13; ?>" />
-						</a>
-					</span>
-				</div>
+					<div class="menudiv">
+						<span>
+							<a href="data/modules/albums/albums_getimage.php?image=<?php echo $var1.'/'.$fdirname; ?>.jpg" target="_blank">
+								<img src="data/modules/albums/albums_getimage.php?image=<?php echo $var1; ?>/thumb/<?php echo $fdirname; ?>.jpg" title="<?php echo $name; ?>" alt="<?php echo $name; ?>" />
+							</a>
+						</span>
+						<span style="width: 500px;">
+							<span class="kop3"><?php echo $name; ?></span>
+							<br />
+							<i><?php echo $info; ?></i>
+						</span>
+						<span>
+							<a href="?module=albums&amp;page=editimage&amp;var1=<?php echo $fdirname; ?>&amp;var2=<?php echo $var1; ?>">
+								<img src="data/image/edit.png" title="<?php echo $lang_albums6; ?>" alt="<?php echo $lang_albums6; ?>" />
+							</a>
+						</span>
+						<span>
+							<a href="?module=albums&amp;page=imageup&amp;var1=<?php echo $fdirname; ?>&amp;var2=<?php echo $var1; ?>">
+								<img src="data/image/up.png" title="<?php echo $lang_updown5; ?>" alt="<?php echo $lang_updown5; ?>" />
+							</a>
+						</span>
+						<span>
+							<a href="?module=albums&amp;page=imagedown&amp;var1=<?php echo $fdirname; ?>&amp;var2=<?php echo $var1; ?>">
+								<img src="data/image/down.png" title="<?php echo $lang_updown5; ?>" alt="<?php echo $lang_updown5; ?>" />
+							</a>
+						</span>
+						<span>
+							<a href="?module=albums&amp;page=deleteimage&amp;var1=<?php echo $fdirname; ?>&amp;var2=<?php echo $var1; ?>">
+								<img src="data/image/delete_from_trash.png" title="<?php echo $lang_kop13; ?>" alt="<?php echo $lang_kop13; ?>" />
+							</a>
+						</span>
+					</div>
 				<?php
 			}
 		}

=== removed file 'data/modules/albums/inc_site_head.php'
--- data/modules/albums/inc_site_head.php	2008-12-28 00:03:55 +0000
+++ data/modules/albums/inc_site_head.php	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-<?php
-/*
- * This file is part of pluck, the easy content management system
- * Copyright (c) somp (www.somp.nl)
- * http://www.pluck-cms.org
-
- * Pluck is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * See docs/COPYING for the complete license.
-*/
-
-//Make sure the file isn't accessed directly.
-if (!strpos($_SERVER['SCRIPT_FILENAME'], 'index.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'admin.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'install.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'login.php')) {
-	//Give out an "Access denied!" error.
-	echo 'Access denied!';
-	//Block all other code.
-	exit();
-}
-
-global $module;
-
-//Only insert LightBox when we're viewing an album
-if (isset($module) && $module == 'albums') {
-?>
-	<link href="data/inc/lightbox/lightbox.css" rel="stylesheet" type="text/css" media="screen" />
-	<script src="data/inc/lightbox/prototype.js" type="text/javascript"></script>
-	<script src="data/inc/lightbox/scriptaculous.js?load=effects" type="text/javascript"></script>
-	<script src="data/inc/lightbox/lightbox.js" type="text/javascript"></script>
-<?php
-}
-?>
\ No newline at end of file

=== removed file 'data/modules/albums/module_info.php'
--- data/modules/albums/module_info.php	2008-12-28 21:30:36 +0000
+++ data/modules/albums/module_info.php	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-<?php
-//This is a module for pluck, an opensource content management system
-//Website: http://www.pluck-cms.org
-
-//MODULE NAME: albums
-//DESCRIPTION: this module lets the user create albums with JPEG-pictures to display on the website
-//LICENSE: GPLv3
-//This module is included with pluck
-
-global $lang_albums, $lang_albums7;
-
-//Module name
-$module_name = $lang_albums;
-
-//Short module introduction
-$module_intro = $lang_albums7;
-
-//Module dir
-$module_dir = 'albums';
-
-//Filename of the module-icon
-$module_icon = 'images/albums.png';
-
-//Version of the module
-$module_version = '0.2';
-
-//Author of the module
-$module_author = 'pluck development team';
-
-//Website of the module
-$module_website = 'http://www.pluck-cms.org';
-
-//Compatibility
-$module_compatibility = '4.6';
-?>
\ No newline at end of file

=== removed file 'data/modules/albums/module_pages_admin.php'
--- data/modules/albums/module_pages_admin.php	2008-09-28 10:46:00 +0000
+++ data/modules/albums/module_pages_admin.php	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?php
-//This is a module for pluck, an opensource content management system
-//Website: http://www.pluck-cms.org
-
-//MODULE NAME: albums
-//DESCRIPTION: this module lets the user create albums with JPEG-pictures to display on the website
-//LICENSE: GPLv3
-//This module is included with pluck
-
-$startpage = 'albums.php';
-$module_page['editalbum'] = $lang_albums6;
-$module_page['deletealbum'] = $lang_albums5;
-$module_page['deleteimage'] = $lang_kop13;
-$module_page['editimage'] = $lang_albums15;
-$module_page['imageup'] = $lang_updown5;
-$module_page['imagedown'] = $lang_updown5;
-?>
\ No newline at end of file

=== removed file 'data/modules/albums/module_pages_site.php'
--- data/modules/albums/module_pages_site.php	2008-12-28 00:03:55 +0000
+++ data/modules/albums/module_pages_site.php	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<?php
-//This is a module for pluck, an opensource content management system
-//Website: http://www.pluck-cms.org
-
-//MODULE NAME: albums
-//DESCRIPTION: this module lets the user create albums with JPEG-pictures to display on the website
-//LICENSE: GPLv3
-//This module is included with pluck
-
-//Get albumname
-if (isset($_GET['album']))
-	$module_page['viewalbum'] = $_GET['album'];
-
-$includepage = 'albums_include.php';
-?>
\ No newline at end of file

=== removed directory 'data/modules/albums/pages_admin'
=== removed file 'data/modules/albums/pages_admin/albums.php'
--- data/modules/albums/pages_admin/albums.php	2009-01-09 14:20:13 +0000
+++ data/modules/albums/pages_admin/albums.php	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-<?php
-/* 
- * This file is part of pluck, the easy content management system
- * Copyright (c) somp (www.somp.nl)
- * http://www.pluck-cms.org
-
- * Pluck is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- 
- * See docs/COPYING for the complete license.
-*/
-
-//Make sure the file isn't accessed directly.
-if (!strpos($_SERVER['SCRIPT_FILENAME'], 'index.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'admin.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'install.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'login.php')) {
-	//Give out an "Access denied!" error.
-	echo 'Access denied!';
-	//Block all other code.
-	exit();
-}
-
-//First, load the functions.
-require_once ('data/modules/albums/functions.php');
-?>
-	<p>
-		<strong><?php echo $lang_albums1; ?></strong>
-	</p>
-	<span class="kop2"><?php echo $lang_albums2; ?></span>
-	<br />
-<?php
-	read_albums('data/settings/modules/albums');
-	//Check if the PHP-gd module is installed on server.
-	if (extension_loaded('gd')) {
-	?>
-		<br /><br />
-		<label class="kop2" for="cont1"><?php echo $lang_albums3; ?></label>
-		<br />
-		<form method="post" action="">
-			<span class="kop4"><?php echo $lang_albums4; ?></span>
-			<br />
-			<input name="cont1" type="text" />
-			<input type="submit" name="Submit" value="<?php echo $lang_install13; ?>" />
-		</form>
-	<?php
-	//When form is submitted.
-	if (isset($_POST['Submit'])) {
-		if (isset($cont1) && file_exists('data/settings/modules/albums/'.$cont1))
-			echo '<span class="red">'.$lang_album19.'</span>';
-
-		elseif (isset($cont1)) {
-			//Delete unwanted characters.
-			$cont1 = str_replace ('"','', $cont1);
-			$cont1 = str_replace (' ','', $cont1);
-			$cont1 = str_replace ('\'','', $cont1);
-			$cont1 = str_replace ('.','', $cont1);
-			$cont1 = str_replace ('/','', $cont1);
-
-			//Create and chmod directories.
-			mkdir ('data/settings/modules/albums/'.$cont1);
-			mkdir ('data/settings/modules/albums/'.$cont1.'/thumb');
-			chmod ('data/settings/modules/albums/'.$cont1, 0777);
-			chmod ('data/settings/modules/albums/'.$cont1.'/thumb', 0777);
-			redirect('?module=albums', 0);
-		}
-	}
-}
-
-//If PHP-gd module is not installed.
-elseif (!extension_loaded('gd')) {
-?>
-	<p class="red"><?php echo $lang_albums16; ?></p>
-<?php
-}
-?>
-<p>
-	<a href="?action=modules">&lt;&lt;&lt; <?php echo $lang_theme12; ?></a>
-</p>
\ No newline at end of file

=== removed file 'data/modules/albums/pages_admin/deletealbum.php'
--- data/modules/albums/pages_admin/deletealbum.php	2008-12-28 00:03:55 +0000
+++ data/modules/albums/pages_admin/deletealbum.php	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-<?php
-/*
- * This file is part of pluck, the easy content management system
- * Copyright (c) somp (www.somp.nl)
- * http://www.pluck-cms.org
-
- * Pluck is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * See docs/COPYING for the complete license.
-*/
-
-//Make sure the file isn't accessed directly.
-if (!strpos($_SERVER['SCRIPT_FILENAME'], 'index.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'admin.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'install.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'login.php')) {
-	//Give out an "Access denied!" error.
-	echo 'Access denied!';
-	//Block all other code.
-	exit();
-}
-
-//Check if an album was defined, and if the album exists
-if (isset($var1) && file_exists('data/settings/modules/albums/'.$var1)) {
-	recursive_remove_directory('data/settings/modules/albums/'.$var1);
-}
-
-redirect('?module=albums', 0);
-?>
\ No newline at end of file

=== removed file 'data/modules/albums/pages_admin/deleteimage.php'
--- data/modules/albums/pages_admin/deleteimage.php	2008-12-28 00:03:55 +0000
+++ data/modules/albums/pages_admin/deleteimage.php	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-<?php
-/*
- * This file is part of pluck, the easy content management system
- * Copyright (c) somp (www.somp.nl)
- * http://www.pluck-cms.org
-
- * Pluck is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * See docs/COPYING for the complete license.
-*/
-
-//Make sure the file isn't accessed directly.
-if (!strpos($_SERVER['SCRIPT_FILENAME'], 'index.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'admin.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'install.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'login.php')) {
-	//Give out an "Access denied!" error.
-	echo 'Access denied!';
-	//Block all other code.
-	exit();
-}
-
-//Check if an image was defined, and if the image exists
-if (isset($var1) && isset($var2) && file_exists('data/settings/modules/albums/'.$var2.'/'.$var1.'.php') && file_exists('data/settings/modules/albums/'.$var2.'/thumb/'.$var1.'.jpg')) {
-	unlink('data/settings/modules/albums/'.$var2.'/'.$var1.'.php');
-	unlink('data/settings/modules/albums/'.$var2.'/'.$var1.'.jpg');
-	unlink('data/settings/modules/albums/'.$var2.'/thumb/'.$var1.'.jpg');
-}
-
-redirect('?module=albums&page=editalbum&var1='.$var2, 0);
-?>
\ No newline at end of file

=== removed file 'data/modules/albums/pages_admin/editalbum.php'
--- data/modules/albums/pages_admin/editalbum.php	2009-01-07 19:46:21 +0000
+++ data/modules/albums/pages_admin/editalbum.php	1970-01-01 00:00:00 +0000
@@ -1,190 +0,0 @@
-<?php
-/*
- * This file is part of pluck, the easy content management system
- * Copyright (c) somp (www.somp.nl)
- * http://www.pluck-cms.org
-
- * Pluck is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * See docs/COPYING for the complete license.
-*/
-
-//Make sure the file isn't accessed directly
-if (!strpos($_SERVER['SCRIPT_FILENAME'], 'index.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'admin.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'install.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'login.php')) {
-	//Give out an "Access denied!" error.
-	echo 'Access denied!';
-	//Block all other code.
-	exit();
-}
-
-//First, load the functions
-require_once ('data/modules/albums/functions.php');
-
-//Check if album exists
-if (file_exists('data/settings/modules/albums/'.$var1)) {
-	//Introduction text.
-	?>
-		<p>
-			<strong><?php echo $lang_albums8; ?></strong>
-		</p>
-	<?php
-	//Edit images
-	?>
-		<span class="kop2"><?php echo $lang_albums9; ?></span>
-		<br />
-	<?php
-	read_albumimages('data/settings/modules/albums/'.$var1);
-
-	//New images upload
-	?>
-		<p>
-			<span class="kop2"><?php echo $lang_albums10; ?></span>
-			<br />
-			<span class="kop4"><?php echo $lang_albums13; ?></span>
-		</p>
-		<form name="form1" method="post" action="" enctype="multipart/form-data">
-			<label class="kop2" for="cont1"><?php echo $lang_install17; ?></label>
-			<br />
-			<input name="cont1" id="cont1" type="text" />
-			<br /><br />
-			<label class="kop2" for="cont2"><?php echo $lang_albums11; ?></label>
-			<br />
-			<textarea cols="50" rows="5" name="cont2" id="cont2"></textarea>
-			<br /><br />
-			<input type="file" name="imagefile" id="imagefile" />
-			<br />
-			<label class="kop4" for="cont3"><?php echo $lang_albums12; ?></label>
-			<input name="cont3" id="cont3" type="text" size="3" value="85" />
-			<br /><br />
-			<input type="submit" name="Submit" value="<?php echo $lang_install13; ?>" />
-		</form>
-	<?php
-	//Let's process the image...
-	if (isset($_POST['Submit'])) {
-		//Define some variables
-		$imageme = $_FILES['imagefile']['name'];
-		list($imageze, $ext) = explode('.', $imageme);
-		$fullimage = 'data/settings/modules/albums/'.$var1.'/'.$imageme;
-		$thumbimage = 'data/settings/modules/albums/'.$var1.'/thumb/'.$imageme;
-		$tempimage = 'data/settings/modules/albums/'.$var1.'/temp.jpg';
-
-		//First: Upload the image.
-		//If file is pjpeg or jpeg: Accept.
-		if ($_FILES['imagefile']['type'] == 'image/jpeg' || $_FILES['imagefile']['type'] == 'image/pjpeg') {
-			copy($_FILES['imagefile']['tmp_name'], 'data/settings/modules/albums/'.$var1.'/'.$_FILES['imagefile']['name']) or die ('Error: Upload failed!');
-
-			//If the extension is with capitals, we have to rename it...
-			if ($ext == 'JPG') {
-				rename($fullimage, 'data/settings/modules/albums/'.$var1.'/'.$imageze.'.jpg');
-				$fullimage = 'data/settings/modules/albums/'.$var1.'/'.$imageze.'.jpg';
-				$thumbimage = 'data/settings/modules/albums/'.$var1.'/thumb/'.$imageze.'.jpg';
-			}
-
-			//Define which filenames are already in use, and define what filename we should use.
-			if (file_exists('data/settings/modules/albums/'.$var1.'/image1.jpg')) {
-				$i = 2;
-				$o = 3;
-				while (file_exists('data/settings/modules/albums/'.$var1.'/image'.$i.'.jpg') || file_exists('data/settings/modules/albums/'.$var1.'/image'.$o.'.jpg')) {
-					$i++;
-					$o++;
-				}
-				$newfile = 'image'.$i;
-			}
-			else
-				$newfile = 'image1';
-
-			//Then rename the file and give it the right filename, also define new image-variables.
-			rename($fullimage, 'data/settings/modules/albums/'.$var1.'/'.$newfile.'.jpg');
-			$fullimage = 'data/settings/modules/albums/'.$var1.'/'.$newfile.'.jpg';
-			$thumbimage = 'data/settings/modules/albums/'.$var1.'/thumb/'.$newfile.'.jpg';
-
-			//FIXME: Need to CHMOD the full image.
-		}
-
-		//Block images other then JPG.
-		else {
-			echo '<p><span class="red">'.$lang_image2.'</span></p>';
-			include_once ('data/inc/footer.php');
-			exit;
-		}
-
-		//Copy the image to the thumbdir.
-		copy ($fullimage, $thumbimage) or die ('Error: Thumb copying failed!');
-
-		//Compress the big image.
-		$ThumbWidth = 640;
-		list($width, $height) = getimagesize($fullimage);
-		$imgratio = $width / $height;
-
-		if ($imgratio > 1) {
-			$newwidth = $ThumbWidth;
-			$newheight = $ThumbWidth / $imgratio;
-		}
-
-		else {
-			$newheight = $ThumbWidth;
-			$newwidth = $ThumbWidth * $imgratio;
-		}
-
-		$resized_img = imagecreatetruecolor($newwidth, $newheight);
-		$new_img = imagecreatefromjpeg($fullimage);
-
-		imagecopyresampled($resized_img, $new_img, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
-		ImageJpeg($resized_img, $tempimage, $cont3);
-		ImageDestroy($resized_img);
-		ImageDestroy($new_img);
-		unlink($fullimage);
-		rename($tempimage, $fullimage);
-
-		//Then make a thumb from the image.
-		$ThumbWidth = 200;
-		list($width, $height) = getimagesize($thumbimage);
-		$imgratio = $width / $height;
-
-		if ($imgratio > 1) {
-			$newwidth = $ThumbWidth;
-			$newheight = $ThumbWidth / $imgratio;
-		}
-
-		else {
-			$newheight = $ThumbWidth;
-			$newwidth = $ThumbWidth * $imgratio;
-		}
-
-		$resized_img = imagecreatetruecolor($newwidth, $newheight);
-		$new_img = imagecreatefromjpeg($thumbimage);
-
-		imagecopyresampled($resized_img, $new_img, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
-		ImageJpeg($resized_img, $tempimage);
-		ImageDestroy($resized_img);
-		ImageDestroy($new_img);
-		unlink($thumbimage);
-		rename($tempimage, $thumbimage);
-		chmod($thumbimage, 0777);
-
-		//Sanitize data.
-		$cont1 = sanitize($cont1);
-		$cont2 = sanitize($cont2);
-		$cont2 = str_replace ("\n",'<br />', $cont2);
-
-		//Then save the imageinformation.
-		$data = 'data/settings/modules/albums/'.$var1.'/'.$newfile.'.php';
-		$file = fopen($data, 'w');
-		fputs($file, '<?php'."\n"
-		.'$name = \''.$cont1.'\';'."\n"
-		.'$info = \''.$cont2.'\';'."\n"
-		.'?>');
-		fclose($file);
-		chmod($data, 0777);
-
-		//Redirect.
-		redirect('?module=albums&page=editalbum&var1='.$var1, 0);
-	}
-}
-?>
-<p>
-	<a href="?module=albums">&lt;&lt;&lt; <?php echo $lang_theme12; ?></a>
-</p>
\ No newline at end of file

=== removed file 'data/modules/albums/pages_admin/editimage.php'
--- data/modules/albums/pages_admin/editimage.php	2008-12-28 00:03:55 +0000
+++ data/modules/albums/pages_admin/editimage.php	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-<?php
-/*
- * This file is part of pluck, the easy content management system
- * Copyright (c) somp (www.somp.nl)
- * http://www.pluck-cms.org
-
- * Pluck is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * See docs/COPYING for the complete license.
-*/
-
-//Make sure the file isn't accessed directly.
-if (!strpos($_SERVER['SCRIPT_FILENAME'], 'index.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'admin.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'install.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'login.php')) {
-	//Give out an "Access denied!" error.
-	echo 'Access denied!';
-	//Block all other code.
-	exit();
-}
-
-//Check if an image was defined, and if the image exists
-if (isset($var1) && file_exists('data/settings/modules/albums/'.$var2.'/'.$var1.'.php')) {
-	//Include the image-information
-	include_once ('data/settings/modules/albums/'.$var2.'/'.$var1.'.php');
-
-	//Replace html-breaks by real ones
-	$info = str_replace('<br />', "\n", $info);
-	?>
-	<br />
-	<form name="form1" method="post" action="">
-		<label class="kop2" for="cont1"><?php echo $lang_install17; ?></label>
-		<br />
-		<input name="cont1" id="cont1" type="text" value="<?php echo $name; ?>" />
-		<br /><br />
-		<label class="kop2" for="cont2"><?php echo $lang_albums11; ?></label>
-		<br />
-		<textarea cols="50" rows="5" name="cont2" id="cont2"><?php echo $info; ?></textarea>
-		<br /><br />
-		<input type="submit" name="Submit" value="<?php echo $lang_install13; ?>" />
-		<input type="button" name="Cancel" value="<?php echo $lang_install14; ?>" onclick="javascript: window.location='?module=albums&amp;page=editalbum&amp;var1=<?php echo $var2; ?>';" />
-	</form>
-	<?php
-	//When the information is posted:
-	if (isset($_POST['Submit'])) {
-		//Sanitize data.
-		$cont1 = sanitize($cont1);
-		$cont2 = sanitize($cont2);
-		$cont2 = str_replace ("\n",'<br />', $cont2);
-
-		//Then save the imageinformation
-		$data = 'data/settings/modules/albums/'.$var2.'/'.$var1.'.php';
-		$file = fopen($data, 'w');
-		fputs($file, '<?php'."\n"
-		.'$name = \''.$cont1.'\';'."\n"
-		.'$info = \''.$cont2.'\';'."\n"
-		.'?>');
-		fclose($file);
-		chmod($data, 0777);
-
-		redirect('?module=albums&page=editalbum&var1='.$var2, 0);
-	}
-}
-?>
\ No newline at end of file

=== removed file 'data/modules/albums/pages_admin/imagedown.php'
--- data/modules/albums/pages_admin/imagedown.php	2008-12-28 21:30:36 +0000
+++ data/modules/albums/pages_admin/imagedown.php	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-<?php
-/*
- * This file is part of pluck, the easy content management system
- * Copyright (c) somp (www.somp.nl)
- * http://www.pluck-cms.org
-
- * Pluck is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * See docs/COPYING for the complete license.
-*/
-
-//Make sure the file isn't accessed directly.
-if (!strpos($_SERVER['SCRIPT_FILENAME'], 'index.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'admin.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'install.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'login.php')) {
-	//Give out an "Access denied!" error.
-	echo 'Access denied!';
-	//Block all other code.
-	exit();
-}
-//First, load the functions.
-require_once ('data/modules/albums/functions.php');
-
-//Check if images exist.
-if (file_exists('data/settings/modules/albums/'.$var2.'/'.$var1.'.jpg') && file_exists('data/settings/modules/albums/'.$var2.'/'.$var1.'.php') && file_exists('data/settings/modules/albums/'.$var2.'/thumb/'.$var1.'.jpg')) {
-	//Determine the imagenumber
-	list($filename, $pagenumber) = explode('e', $var1);
-	$lowerpagenumber = $pagenumber + 1;
-
-	//We can't lower the last image, so we have to check:
-	if (!file_exists('data/settings/modules/albums/'.$var2.'/'.NAME.$lowerpagenumber.'.jpg')) {
-		echo $lang_updown7;
-		redirect('?module=albums&page=editalbum&var1='.$var2, 2);
-		include_once ('data/inc/footer.php');
-		exit;
-	}
-
-	//First make temporary files.
-	rename('data/settings/modules/albums/'.$var2.'/'.$var1.'.jpg', 'data/settings/modules/albums/'.$var2.'/'.$var1.TEMP.'.jpg');
-	rename('data/settings/modules/albums/'.$var2.'/'.$var1.'.php', 'data/settings/modules/albums/'.$var2.'/'.$var1.TEMP.'.php');
-	rename('data/settings/modules/albums/'.$var2.'/thumb/'.$var1.'.jpg', 'data/settings/modules/albums/'.$var2.'/thumb/'.$var1.TEMP.'.jpg');
-
-	//Then make the higher images one higher.
-	rename('data/settings/modules/albums/'.$var2.'/'.NAME.$lowerpagenumber.'.jpg', 'data/settings/modules/albums/'.$var2.'/'.$var1.'.jpg');
-	rename('data/settings/modules/albums/'.$var2.'/'.NAME.$lowerpagenumber.'.php', 'data/settings/modules/albums/'.$var2.'/'.$var1.'.php');
-	rename('data/settings/modules/albums/'.$var2.'/thumb/'.NAME.$lowerpagenumber.'.jpg', 'data/settings/modules/albums/'.$var2.'/thumb/'.$var1.'.jpg');
-
-	//Finally, give the temp-files its final name.
-	rename ('data/settings/modules/albums/'.$var2.'/'.$var1.TEMP.'.jpg', 'data/settings/modules/albums/'.$var2.'/'.NAME.$lowerpagenumber.'.jpg');
-	rename ('data/settings/modules/albums/'.$var2.'/'.$var1.TEMP.'.php', 'data/settings/modules/albums/'.$var2.'/'.NAME.$lowerpagenumber.'.php');
-	rename ('data/settings/modules/albums/'.$var2.'/thumb/'.$var1.TEMP.'.jpg', 'data/settings/modules/albums/'.$var2.'/thumb/'.NAME.$lowerpagenumber.'.jpg');
-
-	//Show message.
-	echo $lang_updown3;
-}
-
-//Redirect.
-redirect('?module=albums&page=editalbum&var1='.$var2, 0);
-?>
\ No newline at end of file

=== removed file 'data/modules/albums/pages_admin/imageup.php'
--- data/modules/albums/pages_admin/imageup.php	2008-12-28 21:30:36 +0000
+++ data/modules/albums/pages_admin/imageup.php	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-<?php
-/*
- * This file is part of pluck, the easy content management system
- * Copyright (c) somp (www.somp.nl)
- * http://www.pluck-cms.org
-
- * Pluck is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * See docs/COPYING for the complete license.
-*/
-
-//Make sure the file isn't accessed directly.
-if (!strpos($_SERVER['SCRIPT_FILENAME'], 'index.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'admin.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'install.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'login.php')) {
-	//Give out an "Access denied!" error.
-	echo 'Access denied!';
-	//Block all other code.
-	exit();
-}
-
-//First, load the functions.
-require_once ('data/modules/albums/functions.php');
-
-//Check if images exist.
-if (file_exists('data/settings/modules/albums/'.$var2.'/'.$var1.'.jpg') && file_exists('data/settings/modules/albums/'.$var2.'/'.$var1.'.php') && file_exists('data/settings/modules/albums/'.$var2.'/thumb/'.$var1.'.jpg')) {
-	//We can't higher image1, so we have to check:
-	if ($var1 == 'image1') {
-		echo $lang_updown6;
-		redirect('?module=albums&page=editalbum&var1='.$var2, 2);
-		include_once ('data/inc/footer.php');
-		exit;
-	}
-
-	//Determine the imagenumber.
-	list($filename, $pagenumber) = explode('e', $var1);
-	$higherpagenumber = $pagenumber - 1;
-
-	//First make temporary files.
-	rename('data/settings/modules/albums/'.$var2.'/'.$var1.'.jpg', 'data/settings/modules/albums/'.$var2.'/'.$var1.TEMP.'.jpg');
-	rename('data/settings/modules/albums/'.$var2.'/'.$var1.'.php', 'data/settings/modules/albums/'.$var2.'/'.$var1.TEMP.'.php');
-	rename('data/settings/modules/albums/'.$var2.'/thumb/'.$var1.'.jpg', 'data/settings/modules/albums/'.$var2.'/thumb/'.$var1.TEMP.'.jpg');
-
-	//Then make the higher images one higher.
-	rename('data/settings/modules/albums/'.$var2.'/'.NAME.$higherpagenumber.'.jpg', 'data/settings/modules/albums/'.$var2.'/'.$var1.'.jpg');
-	rename('data/settings/modules/albums/'.$var2.'/'.NAME.$higherpagenumber.'.php', 'data/settings/modules/albums/'.$var2.'/'.$var1.'.php');
-	rename('data/settings/modules/albums/'.$var2.'/thumb/'.NAME.$higherpagenumber.'.jpg', 'data/settings/modules/albums/'.$var2.'/thumb/'.$var1.'.jpg');
-
-	//Finally, give the temp-files its final name.
-	rename ('data/settings/modules/albums/'.$var2.'/'.$var1.TEMP.'.jpg', 'data/settings/modules/albums/'.$var2.'/'.NAME.$higherpagenumber.'.jpg');
-	rename ('data/settings/modules/albums/'.$var2.'/'.$var1.TEMP.'.php', 'data/settings/modules/albums/'.$var2.'/'.NAME.$higherpagenumber.'.php');
-	rename ('data/settings/modules/albums/'.$var2.'/thumb/'.$var1.TEMP.'.jpg', 'data/settings/modules/albums/'.$var2.'/thumb/'.NAME.$higherpagenumber.'.jpg');
-
-	//Show message.
-	echo $lang_updown3;
-}
-
-//Redirect.
-redirect('?module=albums&page=editalbum&var1='.$var2, 0);
-?>
\ No newline at end of file

=== removed directory 'data/modules/albums/pages_site'
=== removed file 'data/modules/albums/pages_site/albums_include.php'
--- data/modules/albums/pages_site/albums_include.php	2008-12-28 00:03:55 +0000
+++ data/modules/albums/pages_site/albums_include.php	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-<?php
-/*
- * This file is part of pluck, the easy content management system
- * Copyright (c) somp (www.somp.nl)
- * http://www.pluck-cms.org
-
- * Pluck is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * See docs/COPYING for the complete license.
-*/
-
-//Make sure the file isn't accessed directly.
-if (!strpos($_SERVER['SCRIPT_FILENAME'], 'index.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'admin.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'install.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'login.php')) {
-	//Give out an "Access denied!" error.
-	echo 'Access denied!';
-	//Block all other code.
-	exit();
-}
-
-//Open the module-folder
-$dir_handle = @opendir('data/settings/modules/albums') or die('Unable to open data/modules. Check if it\'s readable.');
-
-//Loop through dirs
-while ($dir = readdir($dir_handle)) {
-	if (file_exists('data/settings/modules/albums/'.$dir.'/thumb/image1.jpg')) {
-	?>
-		<div class="album">
-			<table>
-				<tr>
-					<td><a href="?module=albums&amp;page=viewalbum&amp;album=<?php echo $dir; ?>&amp;pageback=<?php echo CURRENT_PAGE_FILENAME; ?>" title="album <?php echo $dir; ?>"><img alt="<?php echo $dir; ?>" title="<?php echo $dir; ?>" src="data/modules/albums/pages_admin/albums_getimage.php?image=<?php echo $dir; ?>/thumb/image1.jpg" /></a></td>
-					<td>
-						<span class="albuminfo">
-							<a href="?module=albums&amp;page=viewalbum&amp;album=<?php echo $dir; ?>&amp;pageback=<?php echo CURRENT_PAGE_FILENAME; ?>" title="album <?php echo $dir; ?>"><?php echo $dir; ?></a>
-						</span>
-					</td>
-				</tr>
-			</table>
-		</div>
-	<?php
-	}
-}
-?>
\ No newline at end of file

=== removed file 'data/modules/albums/pages_site/viewalbum.php'
--- data/modules/albums/pages_site/viewalbum.php	2008-12-28 00:03:55 +0000
+++ data/modules/albums/pages_site/viewalbum.php	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-<?php
-/* 
- * This file is part of pluck, the easy content management system
- * Copyright (c) somp (www.somp.nl)
- * http://www.pluck-cms.org
-
- * Pluck is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- 
- * See docs/COPYING for the complete license.
-*/
-
-//Make sure the file isn't accessed directly.
-if (!strpos($_SERVER['SCRIPT_FILENAME'], 'index.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'admin.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'install.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'login.php')) {
-	//Give out an "Access denied!" error.
-	echo 'Access denied!';
-	//Block all other code.
-	exit();
-}
-
-global $lang_theme12;
-
-//Predefined variable
-$album = $_GET['album'];
-$pageback = $_GET['pageback'];
-
-if (!file_exists('data/settings/modules/albums/'.$album))
-	echo '<p>'.$lang_albums18.'</p>';
-
-//If the album exists
-else {
-	//Start reading out those images...
-	$files = read_dir_contents('data/settings/modules/albums/'.$album, 'files');
-
-	if ($files) {
-		natcasesort($files);
-
-	foreach ($files as $file) {
-		//Check if the files are JPG
-		list($fdirname, $ext) = explode(".", $file);
-		if ($ext == 'jpg') {
-			$album = $_GET['album'];
-			include_once ('data/settings/modules/albums/'.$album.'/'.$fdirname.'.php');
-			?>
-				<div class="album">
-					<table>
-						<tr>
-							<td>
-								<a href="data/modules/albums/pages_admin/albums_getimage.php?image=<?php echo $album; ?>/<?php echo $fdirname; ?>.jpg" rel="lightbox[album]" title="<?php echo $name; ?>">
-									<img src="data/modules/albums/pages_admin/albums_getimage.php?image=<?php echo $album; ?>/thumb/<?php echo $fdirname; ?>.jpg" alt="<?php echo $name; ?>" title="<?php echo $name; ?>" />
-								</a>
-							</td>
-							<td>
-								<span class="albuminfo"><?php echo $name; ?></span>
-								<br />
-								<i><?php echo $info; ?></i>
-							</td>
-						</tr>
-					</table>
-				</div>
-			<?php
-			}
-		}
-	}
-}
-?>
-<p><a href="?file=<?php echo $pageback; ?>" title="return link">&lt;&lt;&lt; <?php echo $lang_theme12; ?></a></p>
\ No newline at end of file

=== modified file 'data/modules/blog/pages_admin/blog.php'
--- data/modules/blog/pages_admin/blog.php	2009-01-10 20:58:15 +0000
+++ data/modules/blog/pages_admin/blog.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Include functions.

=== modified file 'data/modules/blog/pages_admin/deletecategory.php'
--- data/modules/blog/pages_admin/deletecategory.php	2008-12-30 23:16:02 +0000
+++ data/modules/blog/pages_admin/deletecategory.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Include functions

=== modified file 'data/modules/blog/pages_admin/deletepost.php'
--- data/modules/blog/pages_admin/deletepost.php	2008-12-30 23:16:02 +0000
+++ data/modules/blog/pages_admin/deletepost.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Include functions

=== modified file 'data/modules/blog/pages_admin/deletereactions.php'
--- data/modules/blog/pages_admin/deletereactions.php	2008-12-30 23:16:02 +0000
+++ data/modules/blog/pages_admin/deletereactions.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 if ((isset($_GET['post'])) && (isset($_GET['key']))) {

=== modified file 'data/modules/blog/pages_admin/editpost.php'
--- data/modules/blog/pages_admin/editpost.php	2008-12-30 23:16:02 +0000
+++ data/modules/blog/pages_admin/editpost.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Include functions

=== modified file 'data/modules/blog/pages_admin/editreactions.php'
--- data/modules/blog/pages_admin/editreactions.php	2008-12-30 23:16:02 +0000
+++ data/modules/blog/pages_admin/editreactions.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 ?>
 <p><b><?php echo $lang_blog20; ?></b></p>

=== modified file 'data/modules/blog/pages_admin/newpost.php'
--- data/modules/blog/pages_admin/newpost.php	2008-12-30 23:16:02 +0000
+++ data/modules/blog/pages_admin/newpost.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Include functions

=== modified file 'data/modules/blog/pages_site/blog_include.php'
--- data/modules/blog/pages_site/blog_include.php	2009-01-10 20:58:15 +0000
+++ data/modules/blog/pages_site/blog_include.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 global $lang_blog14, $lang_blog23;

=== modified file 'data/modules/blog/pages_site/viewpost.php'
--- data/modules/blog/pages_site/viewpost.php	2009-01-10 20:58:15 +0000
+++ data/modules/blog/pages_site/viewpost.php	2009-03-04 18:15:49 +0000
@@ -17,7 +17,7 @@
 	//Give out an "Access denied!" error.
 	echo 'Access denied!';
 	//Block all other code.
-	exit();
+	exit;
 }
 
 //Global language variables

=== added file 'data/modules/contactform/contactform.php'
--- data/modules/contactform/contactform.php	1970-01-01 00:00:00 +0000
+++ data/modules/contactform/contactform.php	2009-02-04 17:49:59 +0000
@@ -0,0 +1,15 @@
+<?php
+function contactform_info() {
+	global $lang_contact12, $lang_contact13;
+	$module_info = array(
+		'name'          => $lang_contact12,
+		'intro'         => $lang_contact13,
+		'version'       => '0.2',
+		'author'        => 'pluck development team',
+		'website'       => 'http://www.pluck-cms.org',
+		'icon'          => 'images/contactform.png',
+		'compatibility' => '4.7'
+	);
+	return $module_info;
+}
+?>
\ No newline at end of file

=== added file 'data/modules/contactform/contactform.site.php'
--- data/modules/contactform/contactform.site.php	1970-01-01 00:00:00 +0000
+++ data/modules/contactform/contactform.site.php	2009-02-11 19:20:01 +0000
@@ -0,0 +1,59 @@
+<?php
+function contactform_theme_main() {
+	global $lang_contact3, $lang_contact4, $lang_contact5, $lang_contact6, $lang_contact7, $lang_contact8, $lang_contact9, $lang_contact10;
+
+	//Define some variables.
+	if (isset($_POST['name']))
+		$name = $_POST['name'];
+	if (isset($_POST['sender']))
+		$sender = $_POST['sender'];
+	if (isset($_POST['message']))
+		$message = $_POST['message'];
+
+	//Then show the contactform.
+	?>
+		<form method="post" action="" id="contactform">
+			<div>
+				<label for="name"><?php echo $lang_contact3; ?></label>
+				<br />
+				<input name="name" id="name" type="text" />
+				<br />
+				<label for="sender"><?php echo $lang_contact4; ?></label>
+				<br />
+				<input name="sender" id="sender" type="text" />
+				<br />
+				<label for="message"><?php echo $lang_contact5; ?></label>
+				<br />
+				<textarea name="message" id="message" rows="7" cols="45"></textarea>
+				<br />
+				<input type="submit" name="Submit" value="<?php echo $lang_contact10; ?>" />
+			</div>
+		</form>
+	<?php
+	//If the the contactform was submitted.
+	if (isset($_POST['Submit'])) {
+		//Check if all fields were filled.
+		if ($name && $sender && $message) {
+			//TODO: We need a better way to check for spam.
+
+			//Sanitize the fields.
+			$name = sanitize($name);
+			$sender = sanitize($sender);
+			$message = sanitize($message);
+
+			//Change enters in their html-equivalents.
+			$message = str_replace ("\n",'<br>', $message);
+
+			//Now we're going to send our email.
+			if (mail(EMAIL, $lang_contact7.$name, '<html><body>'.$message.'</body></html>', 'From: '.$sender."\n".'Content-type: text/html; charset=utf-8'))
+				echo $lang_contact8;
+			//If email couldn't be send.
+			else
+				echo $lang_contact9;
+		}
+		//If not all fields were filled.
+		else
+			echo '<span class="red">'.$lang_contact6.'</span>';
+	}
+}
+?>
\ No newline at end of file

=== removed file 'data/modules/contactform/module_info.php'
--- data/modules/contactform/module_info.php	2008-12-25 14:48:00 +0000
+++ data/modules/contactform/module_info.php	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-<?php
-//This is a module for pluck, an opensource content management system
-//Website: http://www.pluck-cms.org
-
-//MODULE NAME: contact form
-//DESCRIPTION: use this module to display a contactform for your visitors 
-//LICENSE: GPLv3
-//This module is included with pluck
-
-global $lang_contact12, $lang_contact13;
-
-//Module name
-$module_name = $lang_contact12;
-
-//Short module introduction
-$module_intro = $lang_contact13;
-
-//Module dir
-$module_dir = 'contactform';
-
-//Filename of the module-icon
-$module_icon = 'images/contactform.png';
-
-//Version of the module
-$module_version = '0.2';
-
-//Author of the module
-$module_author = 'pluck development team';
-
-//Website of the module
-$module_website = 'http://www.pluck-cms.org';
-
-//Compatibility
-$module_compatibility = '4.6';
-?>
\ No newline at end of file

=== removed file 'data/modules/contactform/module_pages_site.php'
--- data/modules/contactform/module_pages_site.php	2008-12-25 14:48:00 +0000
+++ data/modules/contactform/module_pages_site.php	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-<?php
-//This is a module for pluck, an opensource content management system
-//Website: http://www.pluck-cms.org
-
-//MODULE NAME: contact form
-//DESCRIPTION: use this module to display a contactform for your visitors 
-//LICENSE: GPLv3
-//This module is included with pluck
-
-$includepage = 'contactform.php';
-?>
\ No newline at end of file

=== removed directory 'data/modules/contactform/pages_site'
=== removed file 'data/modules/contactform/pages_site/contactform.php'
--- data/modules/contactform/pages_site/contactform.php	2008-12-25 14:48:00 +0000
+++ data/modules/contactform/pages_site/contactform.php	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-<?php
-/*
- * This file is part of pluck, the easy content management system
- * Copyright (c) somp (www.somp.nl)
- * http://www.pluck-cms.org
-
- * Pluck is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * See docs/COPYING for the complete license.
-*/
-
-//Make sure the file isn't accessed directly.
-if (!strpos($_SERVER['SCRIPT_FILENAME'], 'index.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'admin.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'install.php') && !strpos($_SERVER['SCRIPT_FILENAME'], 'login.php')) {
-	//Give out an "Access denied!" error.
-	echo 'Access denied!';
-	//Block all other code.
-	exit();
-}
-
-global $lang_contact3, $lang_contact4, $lang_contact5, $lang_contact6, $lang_contact7, $lang_contact8, $lang_contact9, $lang_contact10;
-
-//Define some variables
-if (isset($_POST['name']))
-	$name = $_POST['name'];
-if (isset($_POST['sender']))
-	$sender = $_POST['sender'];
-if (isset($_POST['message']))
-	$message = $_POST['message'];
-
-//Then show the contactform
-?>
-	<form method="post" action="" id="contactform">
-		<div>
-			<label for="name"><?php echo $lang_contact3; ?></label>
-			<br />
-			<input name="name" id="name" type="text" />
-			<br />
-			<label for="sender"><?php echo $lang_contact4; ?></label>
-			<br />
-			<input name="sender" id="sender" type="text" />
-			<br />
-			<label for="message"><?php echo $lang_contact5; ?></label>
-			<br />
-			<textarea name="message" id="message" rows="7" cols="45"></textarea>
-			<br />
-			<input type="submit" name="Submit" value="<?php echo $lang_contact10; ?>" />
-		</div>
-	</form>
-<?php
-//If the the contactform was submitted
-if (isset($_POST['Submit'])) {
-	//Check if all fields were filled
-	if ($name && $sender && $message) {
-		//TODO: We need a better way to check for spam.
-
-		//Sanitize the fields.
-		$name = sanitize($name);
-		$sender = sanitize($sender);
-		$message = sanitize($message);
-
-		//Change enters in their html-equivalents
-		$message = str_replace ("\n",'<br>', $message);
-
-		//Now we're going to send our email
-		if (mail(EMAIL, $lang_contact7.$name, '<html><body>'.$message.'</body></html>', 'From: '.$sender."\n".'Content-type: text/html; charset=utf-8'))
-			echo $lang_contact8;
-		//If email couldn't be send
-		else
-			echo $lang_contact9;
-	}
-	//If not all fields were filled
-	else
-		echo '<span class="red">'.$lang_contact6.'</span>';
-}
-?>
\ No newline at end of file

=== added directory 'data/modules/hooktest'
=== added file 'data/modules/hooktest/hooktest.admin.php'
--- data/modules/hooktest/hooktest.admin.php	1970-01-01 00:00:00 +0000
+++ data/modules/hooktest/hooktest.admin.php	2009-02-04 17:49:59 +0000
@@ -0,0 +1,22 @@
+<?php
+//Admin pages. $module_page_admin[0] is the start page.
+function hooktest_page_admin_list() {
+	$module_page_admin[] = array(
+		'func'  => 'foo',
+		'title' => 'Foobar'
+	);
+	$module_page_admin[] = array(
+		'func'  => 'bar',
+		'title' => 'Barfoo'
+	);
+	return $module_page_admin;
+}
+
+function hooktest_page_admin_foo() {
+	echo 'Admin pages are working<br /><a href="?module=hooktest&amp;page=bar">Barfoo page</a>';
+}
+
+function hooktest_page_admin_bar() {
+	echo 'Also working';
+}
+?>

=== added file 'data/modules/hooktest/hooktest.php'
--- data/modules/hooktest/hooktest.php	1970-01-01 00:00:00 +0000
+++ data/modules/hooktest/hooktest.php	2009-03-04 18:15:49 +0000
@@ -0,0 +1,29 @@
+<?php
+function hooktest_info() {
+	$module_info = array(
+		'name'          => 'hooktest',
+		'intro'         => 'Created to show the new hooks.',
+		'version'       => '0.1',
+		'author'        => 'Anders Jørgensen',
+		'website'       => 'http://spirit55555.dk',
+		'icon'          => '../../image/stats.png',
+		'compatibility' => '4.7'
+	);
+	return $module_info;
+}
+
+function hooktest_admin_header_main() {
+	echo '<style type="text/css">h1:before, h1:after {content: \'"\';}</style>';
+}
+
+function hooktest_admin_menu_inside_before() {
+?>
+	<div class="menuitem">
+		<span>
+			<img src="data/image/website.png" alt="" height="22" />
+			<a href="index.php?file=kop1.php" title="view site" target="_blank">view site</a>
+		</span>
+	</div>
+<?php
+}
+?>
\ No newline at end of file

=== added file 'data/modules/hooktest/hooktest.site.php'
--- data/modules/hooktest/hooktest.site.php	1970-01-01 00:00:00 +0000
+++ data/modules/hooktest/hooktest.site.php	2009-02-11 19:20:01 +0000
@@ -0,0 +1,28 @@
+<?php
+function hooktest_theme_main() {
+	echo '<a href="?module=hooktest&amp;page=hook">Module page link</a>';
+}
+
+//Site pages.
+function hooktest_page_site_list() {
+	$module_page_site[] = array(
+		'func'  => 'hook',
+		'title' => 'Hooks are great!'
+	);
+	return $module_page_site;
+}
+
+function hooktest_page_site_hook() {
+	echo 'Hooks are great when they can have their own pages.';
+}
+
+function hooktest_site_before_redirects() {
+	global $language;
+	//NOTE: This is just to show how it works, and that's why I haven't created an admin page for it.
+	$mode = false;
+	if ($mode == true) {
+		echo $language['hooktest']['message'];
+		exit;
+	}
+}
+?>
\ No newline at end of file

=== added directory 'data/modules/hooktest/lang'
=== modified file 'data/themes/default/theme.php'
--- data/themes/default/theme.php	2009-01-09 15:44:32 +0000
+++ data/themes/default/theme.php	2009-01-24 16:37:12 +0000
@@ -15,10 +15,10 @@
 	<div id="content">
 		<h2 title="<?php theme_pagetitle(); ?>"><?php theme_pagetitle(); ?></h2>
 		<?php theme_content(); ?>
-		<?php theme_module('main'); ?>
+		<?php theme_area('main'); ?>
 	</div>
 	<div id="footer">
-		<?php theme_module('footer'); ?>
+		<?php theme_area('footer'); ?>
 		<a href="login.php">admin</a> | powered by <a href="http://www.pluck-cms.org">pluck</a>
 	</div>
 </div>

=== modified file 'data/themes/green/theme.php'
--- data/themes/green/theme.php	2009-01-07 20:59:02 +0000
+++ data/themes/green/theme.php	2009-02-01 12:50:18 +0000
@@ -6,11 +6,11 @@
 
 <body>
 <div id="container">
-	<div id="top"></div>
-	<div id="mainblok">
-		<div id="blok1">
-			<div class="binnen">          
-				<h3 class="headtext" title="<?php theme_sitetitle(); ?>"><?php theme_sitetitle(); ?></h3>
+	<div id="top"></div>
+	<div id="mainblok">
+		<div id="blok1">
+			<div class="binnen">          
+				<h3 class="headtext" title="<?php theme_sitetitle(); ?>"><?php theme_sitetitle(); ?></h3>
 				<ul class="menu1">
 					<?php theme_menu('<li class="menu1"><a href="#file">#title</a></li>'); ?>
 				</ul>
@@ -24,15 +24,15 @@
 
 			<div class="txt">
 				<?php theme_content(); ?>
-				<?php theme_module("main"); ?>
+				<?php theme_area("main"); ?>
 			</div>
-		</div> 
-	</div>
+		</div> 
+	</div>
 	
-	<div id="footer">
+	<div id="footer">
 		>> <a href="login.php">admin</a>
 		<br />powered by <a href="http://www.pluck-cms.org">pluck</a>
-	</div>  
-</div>			
-</body> 
+	</div>  
+</div>			
+</body> 
 </html>
\ No newline at end of file

=== modified file 'data/themes/oldstyle/theme.php'
--- data/themes/oldstyle/theme.php	2008-08-05 11:24:59 +0000
+++ data/themes/oldstyle/theme.php	2009-02-01 12:50:18 +0000
@@ -6,8 +6,8 @@
 
 <body>
 <div class="head">
-	<div class="header">
-		<div class="headerkop"><?php theme_sitetitle(); ?></div>
+	<div class="header">
+		<div class="headerkop"><?php theme_sitetitle(); ?></div>
 		<div class="menu">
 			<?php theme_menu('<a href="#file">#title</a> || '); ?>
 		</div>
@@ -17,14 +17,14 @@
 		<div class="kop"><?php theme_pagetitle(); ?></div><br />
 		<div class="txt">
 			<?php theme_content(); ?>
-			<?php theme_module("main"); ?>
+			<?php theme_area("main"); ?>
 			<div class="footer">
-				<?php theme_module("footer"); ?>
+				<?php theme_area("footer"); ?>
 				>> <a href="login.php">admin</a>
 				<br />powered by <a href="http://www.pluck-cms.org">pluck</a>
 			</div>
 		</div>
 	</div>
-</div>
-</body>
+</div>
+</body>
 </html>
\ No newline at end of file

=== modified file 'index.php'
--- index.php	2008-12-17 19:12:56 +0000
+++ index.php	2009-02-11 18:54:48 +0000
@@ -21,6 +21,28 @@
 	exit;
 }
 
+//Load all the modules, so we can use hooks.
+//This has to be done before anything else.
+$path = opendir('data/modules');
+while (false !== ($dir = readdir($path))) {
+	if ($dir != '.' && $dir != '..') {
+		if (is_dir('data/modules/'.$dir))
+			$modules[] = $dir;
+	}
+}
+closedir($path);
+
+foreach ($modules as $module) {
+	if (file_exists('data/modules/'.$module.'/'.$module.'.php')) {
+		require_once ('data/modules/'.$module.'/'.$module.'.php');
+
+		if (file_exists('data/modules/'.$module.'/'.$module.'.site.php'))
+			require_once ('data/modules/'.$module.'/'.$module.'.site.php');
+
+		$module_list[] = $module;
+	}
+}
+
 //Include security-enhancements.
 require_once ('data/inc/security.php');
 //Include functions.
@@ -31,31 +53,12 @@
 require_once ('data/inc/variables.site.php');
 
 //Then, if we have a RTL-language and theme hasn't been converted
-if ((isset($direction)) && ($direction == 'rtl') && (!file_exists(THEME_DIR.'/style-rtl.css'))) {
+if (isset($direction) && $direction == 'rtl' && !file_exists(THEME_DIR.'/style-rtl.css')) {
 	//Convert theme and save CSS
 	include_once ('data/inc/themes_convert-rtl.php');
 }
 
-//Include module-inclusion files (inc_site.php)
-//---------------
-//Open the folder
-$dir_handle = @opendir('data/modules') or die('Unable to open module directory. Check if it\'s readable.');
-
-//Loop through dirs
-while ($dir = readdir($dir_handle)) {
-if ($dir == '.' || $dir == '..')
-   continue;
-	//Include the inc_site.php if it exists, and if module is compatible
-	include_once ('data/modules/'.$dir.'/module_info.php');
-	if (module_is_compatible($dir)) {
-		if (file_exists('data/modules/'.$dir.'/inc_site.php')) {
-			include_once ('data/modules/'.$dir.'/inc_site.php');
-		}
-	}
-}
-
-//Close module-dir
-closedir($dir_handle);
+run_hook('site_before_redirects');
 
 //Check if a page or module has been specified, if not: redirect to kop1.php
 if (!defined('CURRENT_PAGE_FILENAME') && !defined('CURRENT_MODULE_DIR')) {
@@ -81,7 +84,7 @@
 
 		//If a page has been set, check if it exists (if not, redirect)
 		elseif (defined('CURRENT_MODULE_DIR') && defined('CURRENT_MODULE_PAGE')) {
-			if (!file_exists('data/modules/'.CURRENT_MODULE_DIR.'/pages_site/'.CURRENT_MODULE_PAGE.'.php')) {
+			if (!function_exists(CURRENT_MODULE_DIR.'_page_site_'.CURRENT_MODULE_PAGE)) {
 				header('Location: '.HOME_PAGE);
 				exit;
 			}

=== modified file 'login.php'
--- login.php	2008-11-14 09:18:01 +0000
+++ login.php	2009-02-04 17:49:59 +0000
@@ -12,14 +12,32 @@
  * See docs/COPYING for the complete license.
 */
 
-//Include security-enhancements
+//Load all the modules, so we can use hooks.
+//This has to be done before anything else.
+$path = opendir('data/modules');
+while (false !== ($dir = readdir($path))) {
+	if ($dir != '.' && $dir != '..') {
+		if (is_dir('data/modules/'.$dir))
+			$modules[] = $dir;
+	}
+}
+closedir($path);
+
+foreach ($modules as $module) {
+	if (file_exists('data/modules/'.$module.'/'.$module.'.php')) {
+		require_once ('data/modules/'.$module.'/'.$module.'.php');
+		$module_list[] = $module;
+	}
+}
+
+//Include security-enhancements.
 require_once ('data/inc/security.php');
-//Include functions
+//Include functions.
 require_once ('data/inc/functions.all.php');
-//Include variables
+//Include variables.
 require_once ('data/inc/variables.all.php');
 
-//Check if we've installed pluck
+//Check if we've installed pluck.
 if (!file_exists('data/settings/install.dat')) {
 	$titelkop = $lang_login1;
 	include_once ('data/inc/header2.php');
@@ -32,22 +50,23 @@
 else {
 	require_once ('data/settings/pass.php');
 
-	//Check if we're already logged in
+	//Check if we're already logged in.
 	session_start();
 	if (isset($_SESSION['cmssystem_loggedin']) && ($_SESSION['cmssystem_loggedin'] == 'ok')) {
 		header('Location: admin.php');
 		exit;
 	}
 
-	//If password has not yet been sent
+	//If password has not yet been sent.
 	if (!isset($_POST['Submit'])) {
-		//Include header-file
+		//Include header-file.
 		$titelkop = $lang_login1;
 		include_once ('data/inc/header2.php');
 		?>
 			<span class="kop2"><?php echo $lang_login3; ?></span><br />
 			<form action="login.php" method="post" name="passform">
 				<input name="cont1" size="25" type="password" />
+				<?php //FIXME: Do we use the bogusField for anything? ?>
 				<input type="text" name="bogusField" style="display: none;" />
 				<input type="submit" name="Submit" value="<?php echo $lang_login4; ?>" />
 			</form>
@@ -57,14 +76,14 @@
 
 	//If password has been sent...
 	elseif (isset($_POST['Submit'])) {
-		//...first MD5-encrypt password that has been posted
+		//...first MD5-encrypt password that has been posted.
 		$pass = md5($cont1);
 
 		//...and is correct:
 		if ($pass == $ww) {
-			//Save session
+			//Save session.
 			$_SESSION['cmssystem_loggedin'] = 'ok';
-			//Display successmessage
+			//Display successmessage.
 			$titelkop = $lang_login1;
 			include_once ('data/inc/header2.php');
 			echo $lang_login5;