/branches/2.8.x/wb/framework/functions.php - Annotate - WB 2.08.x - Tracking

wb-archiv283/branches/2.8.x/wb/framework/functions.php @ 1985

-            Luisehahne
+<?php
 /**
+ *
  * @category        frontend
  * @package         framework
-            Luisehahne
+ * @author          Ryan Djurovich,WebsiteBaker Project
-            Luisehahne
+ * @copyright       2009-2013, WebsiteBaker Org. e.V.
  * @link            http://www.websitebaker.org/
-            Luisehahne
+ * @license         http://www.gnu.org/licenses/gpl.html
-            Luisehahne
+ * @platform        WebsiteBaker 2.8.4
-            Luisehahne
+ * @requirements    PHP 5.2.2 and higher
-            Luisehahne
+ * @version         $Id$
-            Luisehahne
+ * @filesource      $HeadURL$
-            Luisehahne
+ * @lastmodified    $Date$
+ *
-            Luisehahne
+ */
-            DarkViper
+/* -------------------------------------------------------- */
 // Must include code to stop this file being accessed directly
-            DarkViper
+if(!defined('WB_PATH')) {
 	require_once(dirname(__FILE__).'/globalExceptionHandler.php');
 	throw new IllegalFileException();
+}
-            DarkViper
+/* -------------------------------------------------------- */
-            Luisehahne
+// Define that this file has been loaded
 define('FUNCTIONS_FILE_LOADED', true);
             Luisehahne
-            Luisehahne
+/**
-            Luisehahne
+ * Delete an Accessfiles Tree
-            Luisehahne
+ * @param  string  $sDirToDelete
  * @param  array   &$aReport  returns report if set
-            Luisehahne
+ * @return boolean true/false
  * @description    Delete all accessfiles and its depending directory tree
  *                 inside the given directory.
  */
-            Luisehahne
+function DeleteAccessFilesTree($sDirToDelete, array &$aReport = null)
             Luisehahne
-            Luisehahne
+		$aReport = array();
-            Luisehahne
+        $sBaseDir = realpath($sDirToDelete);
         if( $sBaseDir !== false) {
 		$sBaseDir = rtrim(str_replace('\\', '/', $sBaseDir), '/') . '/';
 		// scan start directory for access files
 		foreach (glob($sBaseDir . '*.php', GLOB_MARK) as $sItem) {
             $sItem = str_replace('\\', '/', $sItem);
 			try{
 				$oAccFile = new AccessFile($sItem);
 				$oAccFile->delete();
-            Luisehahne
+				$aReport = array_merge($aReport, AccessFileHelper::getDelTreeLog());
-            Luisehahne
+			}catch(AccessFileIsNoAccessfileException $e) {
 				continue;
+			}
+		}
-            Luisehahne
+        clearstatcache();
-            Luisehahne
+		return true;
+	}
 	return false;
+}
 /**
-            Luisehahne
+ * @description: recursively delete a non empty directory
  * @param string $directory :
  * @param bool $empty : true if you want the folder just emptied, but not deleted
  *                      false, or just simply leave it out, the given directory will be deleted, as well
-            Luisehahne
+ * @param array $aProtectedFiles optional list of protected files, full path needed
-            Luisehahne
+ * @return boolean: true/false
-            Luisehahne
+ * @from http://www.php.net/manual/de/function.rmdir.php#98499
  */
-            Luisehahne
+function rm_full_dir($directory, $empty = false, $aProtectedFiles = null)
             Luisehahne
-            Luisehahne
+	$directory = rtrim(str_replace('\\','/',$directory),'/');
 	if($aProtectedFiles == null) {
 		$aProtectedFiles = array();
+	}
-            Luisehahne
+    $iErrorReporting = error_reporting(0);
             Luisehahne
-            Luisehahne
+    if (is_file( $directory )&& is_writable( $directory )) {
-            Luisehahne
+		if(!in_array(($directory), $aProtectedFiles)) {
 			$retval = unlink($directory);
 			clearstatcache();
 			error_reporting($iErrorReporting);
 			return $retval;
 		}else {
 			return true;
+		}
             Luisehahne
-            Luisehahne
+    if(!is_writable($directory) || !is_dir($directory)) {
-            Luisehahne
+        error_reporting($iErrorReporting);
-            Luisehahne
+        return false;
-            DarkViper
+    } elseif(!is_readable($directory)) {
-            Luisehahne
+        error_reporting($iErrorReporting);
-            Luisehahne
+        return false;
     } else {
         $directoryHandle = opendir($directory);
         while ($contents = readdir($directoryHandle))
+		{
             if($contents != '.' && $contents != '..')
             Luisehahne
-            Luisehahne
+                $path = $directory . "/" . $contents;
-            DarkViper
+                if(is_dir($path)) {
-            Luisehahne
+                    rm_full_dir($path, false, $aProtectedFiles);
-            Luisehahne
+                } else {
-            Luisehahne
+					if(!in_array($path, $aProtectedFiles)) {
 				        unlink($path);
 						clearstatcache();
+					}
             Luisehahne
             Luisehahne
             Luisehahne
         closedir($directoryHandle);
-            DarkViper
+        if($empty == false) {
-            Luisehahne
+            if(is_dir($directory) && is_writable(dirname($directory))) {
-            Luisehahne
+                $retval = rmdir($directory);
                 error_reporting($iErrorReporting);
                 return $retval;
-            Luisehahne
+            } else {
-            Luisehahne
+                error_reporting($iErrorReporting);
-            Luisehahne
+				return false;
             Luisehahne
+        }
-            Luisehahne
+        error_reporting($iErrorReporting);
-            Luisehahne
+        return true;
+    }
             Luisehahne
 /*
  * returns a recursive list of all subdirectories from a given directory
  * @access  public
  * @param   string  $directory: from this dir the recursion will start
  * @param   bool    $show_hidden:  if set to TRUE also hidden dirs (.dir) will be shown
  * @return  array
  * example:
  *  /srv/www/httpdocs/wb/media/a/b/c/
  *  /srv/www/httpdocs/wb/media/a/b/d/
  * directory_list('/srv/www/httpdocs/wb/media/') will return:
  *  /a
  *  /a/b
  *  /a/b/c
  *  /a/b/d
  */
  function directory_list($directory, $show_hidden = false)
+{
 	$result_list = array();
 	if (is_dir($directory))
+    {
     	$dir = dir($directory); // Open the directory
     	while (false !== $entry = $dir->read()) // loop through the directory
+		{
 			if($entry == '.' || $entry == '..') { continue; } // Skip pointers
 			if($entry[0] == '.' && $show_hidden == false) { continue; } // Skip hidden files
-            DarkViper
+    		if (is_dir("$directory/$entry")) { // Add dir and contents to list
-            Luisehahne
+    			$result_list = array_merge($result_list, directory_list("$directory/$entry"));
     			$result_list[] = "$directory/$entry";
+    		}
+    	}
         $dir->close();
+    }
-            Luisehahne
+	// sorting
-            DarkViper
+	if(natcasesort($result_list)) {
-            Luisehahne
+		// new indexing
 		$result_list = array_merge($result_list);
+	}
-            Luisehahne
+	return $result_list; // Now return the list
+}
 // Function to open a directory and add to a dir list
 function chmod_directory_contents($directory, $file_mode)
+{
 	if (is_dir($directory))
+    {
     	// Set the umask to 0
     	$umask = umask(0);
     	// Open the directory then loop through its contents
     	$dir = dir($directory);
     	while (false !== $entry = $dir->read())
+		{
     		// Skip pointers
     		if($entry[0] == '.') { continue; }
     		// Chmod the sub-dirs contents
-            DarkViper
+    		if(is_dir("$directory/$entry")) {
-            Luisehahne
+    			chmod_directory_contents($directory.'/'.$entry, $file_mode);
+    		}
     		change_mode($directory.'/'.$entry);
+    	}
         $dir->close();
     	// Restore the umask
     	umask($umask);
+    }
+}
-            Luisehahne
+/**
 * Scan a given directory for dirs and files.
+*
 * usage: scan_current_dir ($root = '' )
+*
 * @param     $root   set a absolute rootpath as string. if root is empty the current path will be scan
 * @param     $search set a search pattern for files, empty search brings all files
 * @access    public
 * @return    array    returns a natsort array with keys 'path' and 'filename'
+*
 */
 if(!function_exists('scan_current_dir'))
+{
 	function scan_current_dir($root = '', $search = '/.*/')
+	{
 	    $FILE = array();
 		$array = array();
 	    clearstatcache();
 	    $root = empty ($root) ? getcwd() : $root;
 	    if (($handle = opendir($root)))
+	    {
 	    // Loop through the files and dirs an add to list  DIRECTORY_SEPARATOR
 	        while (false !== ($file = readdir($handle)))
+	        {
 	            if (substr($file, 0, 1) != '.' && $file != 'index.php')
+	            {
-            DarkViper
+	                if (is_dir($root.'/'.$file)) {
-            Luisehahne
+	                    $FILE['path'][] = $file;
-            DarkViper
+	                } elseif (preg_match($search, $file, $array) ) {
-            Luisehahne
+	                    $FILE['filename'][] = $array[0];
+	                }
+	            }
+	        }
 	        $close_verz = closedir($handle);
+	    }
 		// sorting
-            DarkViper
+	    if (isset ($FILE['path']) && natcasesort($FILE['path'])) {
-            Luisehahne
+			// new indexing
 	        $FILE['path'] = array_merge($FILE['path']);
+	    }
 		// sorting
-            DarkViper
+	    if (isset ($FILE['filename']) && natcasesort($FILE['filename'])) {
-            Luisehahne
+			// new indexing
 	        $FILE['filename'] = array_merge($FILE['filename']);
+	    }
 	    return $FILE;
+	}
+}
-            Luisehahne
+// Function to open a directory and add to a file list
 function file_list($directory, $skip = array(), $show_hidden = false)
+{
 	$result_list = array();
 	if (is_dir($directory))
+    {
     	$dir = dir($directory); // Open the directory
 		while (false !== ($entry = $dir->read())) // loop through the directory
+		{
 			if($entry == '.' || $entry == '..') { continue; } // Skip pointers
 			if($entry[0] == '.' && $show_hidden == false) { continue; } // Skip hidden files
 			if( sizeof($skip) > 0 && in_array($entry, $skip) ) { continue; } // Check if we to skip anything else
-            DarkViper
+			if(is_file( $directory.'/'.$entry)) { // Add files to list
-            Luisehahne
+				$result_list[] = $directory.'/'.$entry;
+			}
+		}
 		$dir->close(); // Now close the folder object
+	}
             Luisehahne
     // make the list nice. Not all OS do this itself
-            DarkViper
+	if(natcasesort($result_list)) {
-            Luisehahne
+		$result_list = array_merge($result_list);
             DarkViper
-            Luisehahne
+	return $result_list;
+}
-            Luisehahne
+function remove_home_subs($directory = '/', $home_folders = '')
+{
 	if( ($handle = opendir(WB_PATH.MEDIA_DIRECTORY.$directory)) )
+	{
 		// Loop through the dirs to check the home folders sub-dirs are not shown
 		while(false !== ($file = readdir($handle)))
+		{
 			if($file[0] != '.' && $file != 'index.php')
+			{
 				if(is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$file))
+				{
 					if($directory != '/') {
 						$file = $directory.'/'.$file;
 					}else {
 						$file = '/'.$file;
+					}
 					foreach($home_folders AS $hf)
+					{
 						$hf_length = strlen($hf);
 						if($hf_length > 0) {
 							if(substr($file, 0, $hf_length+1) == $hf) {
 								$home_folders[$file] = $file;
+							}
+						}
+					}
 					$home_folders = remove_home_subs($file, $home_folders);
+				}
+			}
+		}
+	}
 	return $home_folders;
+}
-            Luisehahne
+// Function to get a list of home folders not to show
 function get_home_folders()
+{
 	global $database, $admin;
 	$home_folders = array();
 	// Only return home folders is this feature is enabled
 	// and user is not admin
 //	if(HOME_FOLDERS AND ($_SESSION['GROUP_ID']!='1')) {
 	if(HOME_FOLDERS AND (!in_array('1',explode(',', $_SESSION['GROUPS_ID']))))
+	{
-            DarkViper
+		$sql  = 'SELECT `home_folder` FROM `'.TABLE_PREFIX.'users` ';
 		$sql .= 'WHERE `home_folder`!=\''.$admin->get_home_folder().'\'';
-            Luisehahne
+		$query_home_folders = $database->query($sql);
 		if($query_home_folders->numRows() > 0)
+		{
-            DarkViper
+			while($folder = $query_home_folders->fetchRow()) {
-            Luisehahne
+				$home_folders[$folder['home_folder']] = $folder['home_folder'];
+			}
+		}
 		$home_folders = remove_home_subs('/', $home_folders);
+	}
 	return $home_folders;
+}
-            Luisehahne
+/*
  * @param object &$wb: $wb from frontend or $admin from backend
  * @return array: list of new entries
  * @description: callback remove path in files/dirs stored in array
  * @example: array_walk($array,'remove_path',PATH);
  */
 //
 function remove_path(&$path, $key, $vars = '')
+{
 	$path = str_replace($vars, '', $path);
+}
 /*
  * @param object &$wb: $wb from frontend or $admin from backend
  * @return array: list of ro-dirs
  * @description: returns a list of directories beyound /wb/media which are ReadOnly for current user
  */
 function media_dirs_ro( &$wb )
+{
 	global $database;
 	// if user is admin or home-folders not activated then there are no restrictions
 	$allow_list = array();
-            DarkViper
+	if( $wb->get_user_id() == 1 || !HOME_FOLDERS ) {
-            Luisehahne
+		return array();
+	}
 	// at first read any dir and subdir from /media
 	$full_list = directory_list( WB_PATH.MEDIA_DIRECTORY );
 	// add own home_folder to allow-list
-            DarkViper
+	if( $wb->get_home_folder() ) {
-            Luisehahne
+		// old: $allow_list[] = get_home_folder();
 		$allow_list[] = $wb->get_home_folder();
+	}
 	// get groups of current user
 	$curr_groups = $wb->get_groups_id();
 	// if current user is in admin-group
-            DarkViper
+	if( ($admin_key = array_search('1', $curr_groups)) !== false)
             Luisehahne
 		// remove admin-group from list
 		unset($curr_groups[$admin_key]);
 		// search for all users where the current user is admin from
 		foreach( $curr_groups as $group)
+		{
 			$sql  = 'SELECT `home_folder` FROM `'.TABLE_PREFIX.'users` ';
 			$sql .= 'WHERE (FIND_IN_SET(\''.$group.'\', `groups_id`) > 0) AND `home_folder` <> \'\' AND `user_id` <> '.$wb->get_user_id();
-            DarkViper
+			if( ($res_hf = $database->query($sql)) != null ) {
 				while( $rec_hf = $res_hf->fetchrow() ) {
-            Luisehahne
+					$allow_list[] = $rec_hf['home_folder'];
+				}
+			}
+		}
+	}
 	$tmp_array = $full_list;
 	// create a list for readonly dir
     $array = array();
 	while( sizeof($tmp_array) > 0)
+	{
         $tmp = array_shift($tmp_array);
         $x = 0;
-            DarkViper
+		while($x < sizeof($allow_list)) {
-            Luisehahne
+			if(strpos ($tmp,$allow_list[$x])) {
 				$array[] = $tmp;
+			}
 			$x++;
+		}
+	}
 	$full_list = array_diff( $full_list, $array );
 	$tmp = array();
 	$full_list = array_merge($tmp,$full_list);
 	return $full_list;
+}
 /*
  * @param object &$wb: $wb from frontend or $admin from backend
  * @return array: list of rw-dirs
  * @description: returns a list of directories beyound /wb/media which are ReadWrite for current user
  */
 function media_dirs_rw ( &$wb )
+{
 	global $database;
 	// if user is admin or home-folders not activated then there are no restrictions
 	// at first read any dir and subdir from /media
 	$full_list = directory_list( WB_PATH.MEDIA_DIRECTORY );
     $array = array();
 	$allow_list = array();
-            DarkViper
+	if( ($wb->ami_group_member('1')) && !HOME_FOLDERS ) {
-            Luisehahne
+		return $full_list;
+	}
 	// add own home_folder to allow-list
-            DarkViper
+	if( $wb->get_home_folder() ) {
-            Luisehahne
+	  	$allow_list[] = $wb->get_home_folder();
 	} else {
 		$array = $full_list;
+	}
 	// get groups of current user
 	$curr_groups = $wb->get_groups_id();
 	// if current user is in admin-group
 	if( ($admin_key = array_search('1', $curr_groups)) == true)
+	{
 		// remove admin-group from list
 		// unset($curr_groups[$admin_key]);
 		// search for all users where the current user is admin from
 		foreach( $curr_groups as $group)
+		{
 			$sql  = 'SELECT `home_folder` FROM `'.TABLE_PREFIX.'users` ';
 			$sql .= 'WHERE (FIND_IN_SET(\''.$group.'\', `groups_id`) > 0) AND `home_folder` <> \'\' AND `user_id` <> '.$wb->get_user_id();
-            DarkViper
+			if( ($res_hf = $database->query($sql)) != null ) {
 				while( $rec_hf = $res_hf->fetchrow() ) {
-            Luisehahne
+					$allow_list[] = $rec_hf['home_folder'];
+				}
+			}
+		}
+	}
 	$tmp_array = $full_list;
 	// create a list for readwrite dir
 	while( sizeof($tmp_array) > 0)
+	{
         $tmp = array_shift($tmp_array);
         $x = 0;
-            DarkViper
+		while($x < sizeof($allow_list)) {
-            Luisehahne
+			if(strpos ($tmp,$allow_list[$x])) {
 				$array[] = $tmp;
+			}
 			$x++;
+		}
+	}
 	$tmp = array();
     $array = array_unique($array);
 	$full_list = array_merge($tmp,$array);
     unset($array);
     unset($allow_list);
 	return $full_list;
+}
-            Luisehahne
+// Function to create directories
-            Luisehahne
+function make_dir($dir_name, $dir_mode = OCTAL_DIR_MODE, $recursive=true)
             Luisehahne
-            Luisehahne
+	$bRetval = is_dir($dir_name);
 	if(!$bRetval)
             Luisehahne
-            Luisehahne
+		// To create the folder with 0777 permissions, we need to set umask to zero.
 		$oldumask = umask(0) ;
-            Luisehahne
+		$bRetval = mkdir($dir_name, $dir_mode|0711, $recursive);
-            Luisehahne
+		umask( $oldumask ) ;
             Luisehahne
-            Luisehahne
+	return $bRetval;
             Luisehahne
-            darkviper
+/**
  * Function to chmod files and/or directories
-            darkviper
+ * the function also prevents the owner to loose rw-rights
-            darkviper
+ * @param string $sName
  * @param int rights in dec-value. 0= use wb-defaults
-            Luisehahne
+ * @return bool
-            darkviper
+ */
-            Luisehahne
+function change_mode($sName, $iMode = 0 )
             Luisehahne
-            darkviper
+	$bRetval = true;
-            Luisehahne
+    $iErrorReporting = error_reporting(0);
-            darkviper
+	$iMode = intval($iMode) & 0777; // sanitize value
-            Luisehahne
+	if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
-            darkviper
+	{ // Only chmod if os is not windows
 		$bRetval = false;
 		if(!$iMode) {
 			$iMode = (is_file($sName) ? octdec(STRING_FILE_MODE) : octdec(STRING_DIR_MODE));
             Luisehahne
-            darkviper
+		$iMode |= 0600; // set o+rw
-            darkviper
+		if(is_writable($sName)) {
 			$bRetval = chmod($sName, $iMode);
             Luisehahne
+	}
-            Luisehahne
+    error_reporting($iErrorReporting);
-            darkviper
+	return $bRetval;
             Luisehahne
 // Function to figure out if a parent exists
 function is_parent($page_id)
+{
 	global $database;
 	// Get parent
 	$sql = 'SELECT `parent` FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.$page_id;
 	$parent = $database->get_one($sql);
 	// If parent isnt 0 return its ID
-            DarkViper
+	if(is_null($parent)) {
-            Luisehahne
+		return false;
-            DarkViper
+	}else {
-            Luisehahne
+		return $parent;
+	}
+}
 // Function to work out level
 function level_count($page_id)
+{
 	global $database;
 	// Get page parent
 	$sql = 'SELECT `parent` FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.$page_id;
 	$parent = $database->get_one($sql);
-            DarkViper
+	if($parent > 0)
-            Luisehahne
+	{	// Get the level of the parent
 		$sql = 'SELECT `level` FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.$parent;
 		$level = $database->get_one($sql);
 		return $level+1;
-            DarkViper
+	}else {
-            Luisehahne
+		return 0;
+	}
+}
 // Function to work out root parent
 function root_parent($page_id)
+{
 	global $database;
 	// Get page details
 	$sql = 'SELECT `parent`, `level` FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.$page_id;
             Luisehahne
-            Luisehahne
+	$query_page = $database->query($sql);
-            Luisehahne
+	$fetch_page = $query_page->fetchRow(MYSQL_ASSOC);
-            Luisehahne
+	$parent = $fetch_page['parent'];
-            DarkViper
+	$level = $fetch_page['level'];
 	if($level == 1) {
-            Luisehahne
+		return $parent;
-            Luisehahne
+	} elseif($parent == 0) {
-            Luisehahne
+		return $page_id;
-            Luisehahne
+	} else {	// Figure out what the root parents id is
-            Luisehahne
+		$parent_ids = array_reverse(get_parent_ids($page_id));
 		return $parent_ids[0];
+	}
+}
 // Function to get page title
 function get_page_title($id)
+{
 	global $database;
 	// Get title
 	$sql = 'SELECT `page_title` FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.$id;
 	$page_title = $database->get_one($sql);
 	return $page_title;
+}
 // Function to get a pages menu title
 function get_menu_title($id)
+{
 	global $database;
 	// Get title
 	$sql = 'SELECT `menu_title` FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.$id;
 	$menu_title = $database->get_one($sql);
 	return $menu_title;
+}
-            Luisehahne
+// Function to get a pages filename in sub
 function get_sub_filename($id)
+{
 	$database = WbDatabase::getInstance();
 	// Get title
 	$sql = 'SELECT `link` FROM `'.TABLE_PREFIX.'pages` '
 	      .'WHERE `page_id` = '.$id.' '
 	      .  'AND `level`>=0';
 	$sRetval = basename($database->get_one($sql));
 	return $sRetval;
+}
             Luisehahne
 // Function to get all parent page titles
 function get_parent_titles($parent_id)
+{
-            Luisehahne
+	$titles[] = get_sub_filename($parent_id);
-            DarkViper
+	if(is_parent($parent_id) != false) {
-            Luisehahne
+		$parent_titles = get_parent_titles(is_parent($parent_id));
 		$titles = array_merge($titles, $parent_titles);
+	}
 	return $titles;
+}
 // Function to get all parent page id's
 function get_parent_ids($parent_id)
+{
 	$ids[] = $parent_id;
-            DarkViper
+	if(is_parent($parent_id) != false) {
-            Luisehahne
+		$parent_ids = get_parent_ids(is_parent($parent_id));
 		$ids = array_merge($ids, $parent_ids);
+	}
 	return $ids;
+}
 // Function to genereate page trail
-            DarkViper
+function get_page_trail($page_id)
+{
-            Luisehahne
+	return implode(',', array_reverse(get_parent_ids($page_id)));
+}
 // Function to get all sub pages id's
-            Luisehahne
+function get_subs($parent, array $subs )
             Luisehahne
 	// Connect to the database
 	global $database;
 	// Get id's
 	$sql = 'SELECT `page_id` FROM `'.TABLE_PREFIX.'pages` WHERE `parent` = '.$parent;
-            Luisehahne
+	if( ($query = $database->query($sql)) ) {
-            Luisehahne
+		while($fetch = $query->fetchRow(MYSQL_ASSOC)) {
-            Luisehahne
+			$subs[] = $fetch['page_id'];
-            Luisehahne
+			// Get subs of this sub recursive
-            Luisehahne
+			$subs = get_subs($fetch['page_id'], $subs);
+		}
+	}
 	// Return subs array
 	return $subs;
+}
 // Function as replacement for php's htmlspecialchars()
 // Will not mangle HTML-entities
 function my_htmlspecialchars($string)
+{
 	$string = preg_replace('/&(?=[#a-z0-9]+;)/i', '__amp;_', $string);
 	$string = strtr($string, array('<'=>'&lt;', '>'=>'&gt;', '&'=>'&amp;', '"'=>'&quot;', '\''=>'&#39;'));
 	$string = preg_replace('/__amp;_(?=[#a-z0-9]+;)/i', '&', $string);
 	return($string);
+}
 // Convert a string from mixed html-entities/umlauts to pure $charset_out-umlauts
 // Will replace all numeric and named entities except &gt; &lt; &apos; &quot; &#039; &nbsp;
 // In case of error the returned string is unchanged, and a message is emitted.
 function entities_to_umlauts($string, $charset_out=DEFAULT_CHARSET)
+{
 	require_once(WB_PATH.'/framework/functions-utf8.php');
 	return entities_to_umlauts2($string, $charset_out);
+}
 // Will convert a string in $charset_in encoding to a pure ASCII string with HTML-entities.
 // In case of error the returned string is unchanged, and a message is emitted.
 function umlauts_to_entities($string, $charset_in=DEFAULT_CHARSET)
+{
 	require_once(WB_PATH.'/framework/functions-utf8.php');
 	return umlauts_to_entities2($string, $charset_in);
+}
 // Function to convert a page title to a page filename
 function page_filename($string)
+{
 	require_once(WB_PATH.'/framework/functions-utf8.php');
 	$string = entities_to_7bit($string);
 	// Now remove all bad characters
 	$bad = array(
 	'\'', /* /  */ '"', /* " */	'<', /* < */	'>', /* > */
 	'{', /* { */	'}', /* } */	'[', /* [ */	']', /* ] */	'`', /* ` */
 	'!', /* ! */	'@', /* @ */	'#', /* # */	'$', /* $ */	'%', /* % */
 	'^', /* ^ */	'&', /* & */	'*', /* * */	'(', /* ( */	')', /* ) */
 	'=', /* = */	'+', /* + */	'|', /* | */	'/', /* / */	'\\', /* \ */
 	';', /* ; */	':', /* : */	',', /* , */	'?' /* ? */
 	);
 	$string = str_replace($bad, '', $string);
 	// replace multiple dots in filename to single dot and (multiple) dots at the end of the filename to nothing
 	$string = preg_replace(array('/\.+/', '/\.+$/'), array('.', ''), $string);
 	// Now replace spaces with page spcacer
 	$string = trim($string);
 	$string = preg_replace('/(\s)+/', PAGE_SPACER, $string);
 	// Now convert to lower-case
 	$string = strtolower($string);
 	// If there are any weird language characters, this will protect us against possible problems they could cause
 	$string = str_replace(array('%2F', '%'), array('/', ''), urlencode($string));
 	// Finally, return the cleaned string
 	return $string;
+}
-            Luisehahne
+// Function to convert a desired media filename to a clean mediafilename
-            Luisehahne
+function media_filename($string)
+{
 	require_once(WB_PATH.'/framework/functions-utf8.php');
 	$string = entities_to_7bit($string);
 	// Now remove all bad characters
-            DarkViper
+	$bad = array('\'','"','`','!','@','#','$','%','^','&','*','=','+','|','/','\\',';',':',',','?');
-            Luisehahne
+	$string = str_replace($bad, '', $string);
 	// replace multiple dots in filename to single dot and (multiple) dots at the end of the filename to nothing
-            DarkViper
+	$string = preg_replace(array('/\.+/', '/\.+$/', '/\s/'), array('.', '', '_'), $string);
-            Luisehahne
+	// Clean any page spacers at the end of string
 	$string = trim($string);
 	// Finally, return the cleaned string
 	return $string;
+}
 // Function to work out a page link
 if(!function_exists('page_link'))
+{
 	function page_link($link)
+	{
 		global $admin;
 		return $admin->page_link($link);
+	}
+}
             Luisehahne
-            Luisehahne
+// Create a new directory and/or protected file in the given directory
-            Luisehahne
+function createFolderProtectFile($sAbsDir='',$make_dir=true)
             Luisehahne
 	global $admin, $MESSAGE;
 	$retVal = array();
-            Luisehahne
+	$wb_path   = rtrim(str_replace('\/\\', '/', WB_PATH), '/');
 	$sAppPath  = rtrim(str_replace('\/\\', '/', WB_PATH), '/').'/';
 	if( ($sAbsDir=='') || ($sAbsDir == $sAppPath) ) { return $retVal;}
             Luisehahne
 	if ( $make_dir==true ) {
 		// Check to see if the folder already exists
-            Luisehahne
+		if(is_readable($sAbsDir)) {
-            Luisehahne
+			$retVal[] = basename($sAbsDir).'::'.$MESSAGE['MEDIA_DIR_EXISTS'];
             Luisehahne
-            Luisehahne
+		if (!make_dir($sAbsDir) && !is_dir($sAbsDir) ) {
-            Luisehahne
+			$retVal[] = basename($sAbsDir).'::'.$MESSAGE['MEDIA_DIR_NOT_MADE'];
 		} else {
 			change_mode($sAbsDir);
             Luisehahne
-            Luisehahne
+		return $retVal;
             Luisehahne
-            Luisehahne
+//$retVal[] = $sAbsDir;
 //return $retVal;
-            Luisehahne
+	if( is_writable($sAbsDir) )
             Luisehahne
-            Luisehahne
+        // if(file_exists($sAbsDir.'/index.php')) { unlink($sAbsDir.'/index.php'); }
-            Luisehahne
+	    // Create default "index.php" file
-            Luisehahne
+		$iBackSteps = substr_count(str_replace($sAppPath, '', $sAbsDir), '/');
 		$sIndexFile = str_repeat('../', $iBackSteps).'index.php';
-            Luisehahne
+		$sResponse  = $_SERVER['SERVER_PROTOCOL'].' 301 Moved Permanently';
 		$content =
 			'<?php'."\n".
 			'// *** This file is generated by WebsiteBaker Ver.'.VERSION."\n".
 			'// *** Creation date: '.date('c')."\n".
 			'// *** Do not modify this file manually'."\n".
 			'// *** WB will rebuild this file from time to time!!'."\n".
 			'// *************************************************'."\n".
 			"\t".'header(\''.$sResponse.'\');'."\n".
 			"\t".'header(\'Location: '.WB_URL.'/index.php\');'."\n".
 			'// *************************************************'."\n";
-            Luisehahne
+		$filename = $sAbsDir.'/index.php';
             Luisehahne
-            Luisehahne
+		// write content into file
-            Luisehahne
+		  if(is_writable($filename) || !file_exists($filename)) {
 		      if(file_put_contents($filename, $content)) {
-            Luisehahne
+		          $retVal[] = change_mode($filename);
-            Luisehahne
+		      } else {
-            Luisehahne
+		    $retVal[] = $MESSAGE['GENERIC_BAD_PERMISSIONS'].' :: '.$filename;
+		   }
+		  }
 		 } else {
 		   $retVal[] = $MESSAGE['GENERIC_BAD_PERMISSIONS'];
+		 }
 		 return $retVal;
             Luisehahne
 function rebuildFolderProtectFile($dir='')
+{
-            Luisehahne
+	global $MESSAGE;
-            DarkViper
+	$retVal = array();
-            Luisehahne
+	$tmpVal = array();
-            DarkViper
+	$dir = rtrim(str_replace('\/\\', '/', $dir), '/');
 	try {
 		$files = array();
 		$files[] = $dir;
 		foreach(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir)) as $fileInfo) {
 			$files[] = $fileInfo->getPath();
+		}
 		$files = array_unique($files);
 		foreach( $files as $file) {
 			$protect_file = rtrim(str_replace('\/\\', '/', $file), '/');
-            Luisehahne
+			$tmpVal['file'][] = createFolderProtectFile($protect_file,false);
             DarkViper
-            Luisehahne
+		$retVal = $tmpVal['file'];
-            DarkViper
+	} catch ( Exception $e ) {
 		$retVal[] = $MESSAGE['MEDIA_DIR_ACCESS_DENIED'];
+	}
 	return $retVal;
             Luisehahne
 // Create a new file in the pages directory
-            Luisehahne
+/**
  * createAccessFile()
+ *
  * @param string The full path and filename to the new accessfile
  * @param int    Id of the page for which the file should created
  * @param mixed  an array with one or more additional statements to include in accessfile.
  * @return bool|string true or error message
  * @deprecated this function will be replaced by a core method in next version
  * @description: Create a new access file in the pages directory and subdirectory also if needed.<br />
  * Example: $aOptionalCommands = array(
  *                     '$section_id = '.$section_id,
  *                     '$mod_var_int = '.$mod_var_int,
  *                     'define(\'MOD_CONSTANT\'', '.$mod_var_int.')'
  *          );
  * forbidden commands: include|require[_once]
  * @deprecated   2013/02/19
  */
 function create_access_file($sFileName, $iPageId, $iLevel = 0, array $aOptionalCommands = array() )
             Luisehahne
-            Luisehahne
+	global $MESSAGE;
 	$sError = '';
 // sanitize pathnames for the standard 'trailing slash' scheme
 	$sAppPath  = rtrim(str_replace('\\', '/', WB_PATH), '/').'/';
 	$sFileName = str_replace('\\', '/', $sFileName);
 // try to create the whoole path to the accessfile
 	$sAccessPath = dirname($sFileName).'/';
 	if(!($bRetval = is_dir($sAccessPath))) {
 		$iOldUmask = umask(0) ;
 		// sanitize directory mode to 'o+rwx/g+x/u+x' and create path
 		$bRetval = mkdir($sAccessPath, (OCTAL_DIR_MODE |0711), true);
 		umask($iOldUmask);
+	}
 	if($bRetval) {
 	// check if accessfile is writeable
 		if(is_writable($sAccessPath) ||
 		   (file_exists($sFileName) && is_writable($sFileName)) )
             Luisehahne
-            Luisehahne
+		// build content for accessfile
 			$sContent  = '<?php'."\n"
 			           . '// *** This file is generated by WebsiteBaker Ver.'.VERSION."\n"
 			           . '// *** Creation date: '.date('c')."\n"
 			           . '// *** Do not modify this file manually'."\n"
 			           . '// *** WB will rebuild this file from time to time!!'."\n"
 			           . '// *************************************************'."\n"
 			           . "\t".'$page_id = '.$iPageId.';'."\n";
 		// analyse OptionalCommands and add it to the accessfile
 			foreach($aOptionalCommands as $sCommand) {
 			// loop through all available entries
 			// remove all leading whitespaces and chars less then \x41(A) except \x24 ($)
 			// also all trailing whitespaces and \x3B(;) too.
 				$sNewCmd  = rtrim(ltrim($sCommand, "\x00..\x23\x25..\x40"), ';');
 				if(preg_match('/^include|^require/i', $sNewCmd)) {
 				// insert forbidden include|require[_once] command and comment it out
 					$sContent .= "\t".'// *not allowed command >> * '.$sNewCmd.';'."\n";
 				}elseif(preg_match('/^define/i', $sNewCmd)) {
 				// insert active define command and comment it as set deprecated
 					$sContent .= "\t".$sNewCmd.'; // *deprecated command*'."\n";
 				}else {
 				// insert allowed active command
 					$sContent .= "\t".$sNewCmd.';'."\n";
             Luisehahne
             Luisehahne
-            Luisehahne
+		// calculate the needed backsteps and create the relative link to index.php
 			$iBackSteps = substr_count(str_replace($sAppPath, '', $sFileName), '/');
 			$sIndexFile = str_repeat('../', $iBackSteps).'index.php';
 		// insert needed require command for index.php
 			$sContent .= "\t".'require(\''.$sIndexFile.'\');'."\n"
 			           . '// *************************************************'."\n"
 			           . '// end of file'."\n";
 		// write new file out. If the file already exists overwrite its content.
 			if(file_put_contents($sFileName, $sContent) !== false ) {
 			// if OS is not windows then chmod the new file
 				if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
 				// sanitize filemode to 'o-x/g-x/u-x/o+rw' and chmod the new file
-            Luisehahne
+					$bRetval = chmod($sFileName, ((OCTAL_FILE_MODE & ~0111)|0600));
             Luisehahne
 			}else {
 		        $sError = $MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE'];
+			}
 		}else {
 			$sError = $MESSAGE['UPLOAD_ERR_CANT_WRITE'];
             Luisehahne
-            Luisehahne
+	}else {
 		$sError = $MESSAGE['UPLOAD_ERR_CANT_WRITE'];
             DarkViper
-            Luisehahne
+	// return boolean true if ok, on error return a message
 	return ($sError == '' ? true : $sError);
             Luisehahne
-            Luisehahne
+// Function for working out a file mime type (if the in-built PHP one is not enabled)
 if(!function_exists('mime_content_type'))
+{
-            Luisehahne
+    function mime_content_type($filename)
             Luisehahne
 	    $mime_types = array(
             'txt'	=> 'text/plain',
             'htm'	=> 'text/html',
             'html'	=> 'text/html',
             'php'	=> 'text/html',
             'css'	=> 'text/css',
             'js'	=> 'application/javascript',
             'json'	=> 'application/json',
             'xml'	=> 'application/xml',
             'swf'	=> 'application/x-shockwave-flash',
             'flv'	=> 'video/x-flv',
             // images
             'png'	=> 'image/png',
             'jpe'	=> 'image/jpeg',
             'jpeg'	=> 'image/jpeg',
             'jpg'	=> 'image/jpeg',
             'gif'	=> 'image/gif',
             'bmp'	=> 'image/bmp',
             'ico'	=> 'image/vnd.microsoft.icon',
             'tiff'	=> 'image/tiff',
             'tif'	=> 'image/tiff',
             'svg'	=> 'image/svg+xml',
             'svgz'	=> 'image/svg+xml',
             // archives
             'zip'	=> 'application/zip',
             'rar'	=> 'application/x-rar-compressed',
             'exe'	=> 'application/x-msdownload',
             'msi'	=> 'application/x-msdownload',
             'cab'	=> 'application/vnd.ms-cab-compressed',
             // audio/video
             'mp3'	=> 'audio/mpeg',
             'mp4'	=> 'audio/mpeg',
             'qt'	=> 'video/quicktime',
             'mov'	=> 'video/quicktime',
             // adobe
             'pdf'	=> 'application/pdf',
             'psd'	=> 'image/vnd.adobe.photoshop',
             'ai'	=> 'application/postscript',
             'eps'	=> 'application/postscript',
             'ps'	=> 'application/postscript',
             // ms office
             'doc'	=> 'application/msword',
             'rtf'	=> 'application/rtf',
             'xls'	=> 'application/vnd.ms-excel',
             'ppt'	=> 'application/vnd.ms-powerpoint',
             // open office
             'odt'	=> 'application/vnd.oasis.opendocument.text',
             'ods'	=> 'application/vnd.oasis.opendocument.spreadsheet',
         );
         $temp = explode('.',$filename);
         $ext = strtolower(array_pop($temp));
-            DarkViper
+        if (array_key_exists($ext, $mime_types)) {
-            Luisehahne
+            return $mime_types[$ext];
-            DarkViper
+        }elseif (function_exists('finfo_open')) {
-            Luisehahne
+            $finfo = finfo_open(FILEINFO_MIME);
             $mimetype = finfo_file($finfo, $filename);
             finfo_close($finfo);
             return $mimetype;
-            DarkViper
+        }else {
-            Luisehahne
+            return 'application/octet-stream';
+        }
+    }
+}
 // Generate a thumbnail from an image
 function make_thumb($source, $destination, $size)
+{
 	// Check if GD is installed
-            Luisehahne
+	if(extension_loaded('gd') && function_exists('imageCreateFromJpeg'))
             Luisehahne
 		// First figure out the size of the thumbnail
 		list($original_x, $original_y) = getimagesize($source);
-            DarkViper
+		if ($original_x > $original_y) {
-            Luisehahne
+			$thumb_w = $size;
 			$thumb_h = $original_y*($size/$original_x);
+		}
-            DarkViper
+		if ($original_x < $original_y) {
-            Luisehahne
+			$thumb_w = $original_x*($size/$original_y);
 			$thumb_h = $size;
+		}
-            DarkViper
+		if ($original_x == $original_y) {
-            Luisehahne
+			$thumb_w = $size;
-            DarkViper
+			$thumb_h = $size;
             Luisehahne
 		// Now make the thumbnail
 		$source = imageCreateFromJpeg($source);
 		$dst_img = ImageCreateTrueColor($thumb_w, $thumb_h);
 		imagecopyresampled($dst_img,$source,0,0,0,0,$thumb_w,$thumb_h,$original_x,$original_y);
 		imagejpeg($dst_img, $destination);
 		// Clear memory
 		imagedestroy($dst_img);
 		imagedestroy($source);
 	   // Return true
 		return true;
 	} else {
 		return false;
+	}
+}
 /*
  * Function to work-out a single part of an octal permission value
+ *
  * @param mixed $octal_value: an octal value as string (i.e. '0777') or real octal integer (i.e. 0777 | 777)
  * @param string $who: char or string for whom the permission is asked( U[ser] / G[roup] / O[thers] )
  * @param string $action: char or string with the requested action( r[ead..] / w[rite..] / e|x[ecute..] )
  * @return boolean
  */
 function extract_permission($octal_value, $who, $action)
+{
 	// Make sure that all arguments are set and $octal_value is a real octal-integer
-            DarkViper
+	if(($who == '') || ($action == '') || (preg_match( '/[^0-7]/', (string)$octal_value ))) {
-            Luisehahne
+		return false; // invalid argument, so return false
+	}
 	// convert $octal_value into a decimal-integer to be sure having a valid value
 	$right_mask = octdec($octal_value);
 	$action_mask = 0;
 	// set the $action related bit in $action_mask
-            DarkViper
+	switch($action[0]) { // get action from first char of $action
-            Luisehahne
+		case 'r':
 		case 'R':
 			$action_mask = 4; // set read-bit only (2^2)
 			break;
 		case 'w':
 		case 'W':
 			$action_mask = 2; // set write-bit only (2^1)
 			break;
 		case 'e':
 		case 'E':
 		case 'x':
 		case 'X':
 			$action_mask = 1; // set execute-bit only (2^0)
 			break;
 		default:
 			return false; // undefined action name, so return false
+	}
 	// shift action-mask into the right position
-            DarkViper
+	switch($who[0]) { // get who from first char of $who
-            Luisehahne
+		case 'u':
 		case 'U':
 			$action_mask <<= 3; // shift left 3 bits
 		case 'g':
 		case 'G':
 			$action_mask <<= 3; // shift left 3 bits
 		case 'o':
 		case 'O':
 			/* NOP */
 			break;
 		default:
 			return false; // undefined who, so return false
+	}
 	return( ($right_mask & $action_mask) != 0 ); // return result of binary-AND
+}
 // Function to delete a page
-            Luisehahne
+	function delete_page($page_id)
             Luisehahne
-            Luisehahne
+		global $admin, $database, $MESSAGE;
 		// Find out more about the page
-            DarkViper
+		$sql  = 'SELECT `page_id`, `menu_title`, `page_title`, `level`, ';
 		$sql .=        '`link`, `parent`, `modified_by`, `modified_when` ';
 		$sql .= 'FROM `'.TABLE_PREFIX.'pages` WHERE `page_id`='.$page_id;
-            Luisehahne
+		$results = $database->query($sql);
 		if($database->is_error())    { $admin->print_error($database->get_error()); }
-            Luisehahne
+		if($results->numRows() == 0) { $admin->print_error($MESSAGE['PAGES_NOT_FOUND']); }
 		$results_array = $results->fetchRow(MYSQL_ASSOC);
-            Luisehahne
+		$parent     = $results_array['parent'];
 		$level      = $results_array['level'];
-            Luisehahne
+		$sPageLink       = $results_array['link'];
-            Luisehahne
+		$page_title = $results_array['page_title'];
 		$menu_title = $results_array['menu_title'];
 		// Get the sections that belong to the page
-            DarkViper
+		$sql  = 'SELECT `section_id`, `module` FROM `'.TABLE_PREFIX.'sections` ';
 		$sql .= 'WHERE `page_id`='.$page_id;
-            Luisehahne
+		$query_sections = $database->query($sql);
 		if($query_sections->numRows() > 0)
             Luisehahne
-            DarkViper
+			while($section = $query_sections->fetchRow()) {
-            Luisehahne
+				// Set section id
 				$section_id = $section['section_id'];
 				// Include the modules delete file if it exists
-            DarkViper
+				if(file_exists(WB_PATH.'/modules/'.$section['module'].'/delete.php')) {
-            Luisehahne
+					include(WB_PATH.'/modules/'.$section['module'].'/delete.php');
+				}
             Luisehahne
+		}
-            Luisehahne
+		// Update the sections table
-            DarkViper
+		$sql = 'DELETE FROM `'.TABLE_PREFIX.'sections` WHERE `page_id`='.$page_id;
-            Luisehahne
+		$database->query($sql);
 		if($database->is_error()) {
 			$admin->print_error($database->get_error());
+		}
 		// Include the ordering class or clean-up ordering
 		include_once(WB_PATH.'/framework/class.order.php');
 		$order = new order(TABLE_PREFIX.'pages', 'position', 'page_id', 'parent');
 		$order->clean($parent);
 		// Unlink the page access file and directory
-            Luisehahne
+		$directory = WB_PATH.PAGES_DIRECTORY.$sPageLink;
-            Luisehahne
+		$filename = $directory.PAGE_EXTENSION;
 		$directory .= '/';
-            Luisehahne
+		if(is_writable($filename))
             Luisehahne
-            DarkViper
+			if(!is_writable(WB_PATH.PAGES_DIRECTORY.'/')) {
-            Luisehahne
+				$admin->print_error($MESSAGE['PAGES_CANNOT_DELETE_ACCESS_FILE']);
-            Luisehahne
+			} else {
-            Luisehahne
+				unlink($filename);
-            Luisehahne
+				if( is_writable($directory) && (rtrim($directory,'/') != WB_PATH.PAGES_DIRECTORY ) && (substr($sPageLink, 0, 1) != '.') )
             Luisehahne
 					rm_full_dir($directory);
+				}
+			}
+		}
-            Luisehahne
+		// Update the pages table
 		$sql = 'DELETE FROM `'.TABLE_PREFIX.'pages` WHERE `page_id`='.$page_id;
 		$database->query($sql);
 		if($database->is_error()) {
 			$admin->print_error($database->get_error());
+		}
             Luisehahne
             Luisehahne
 /*
  * @param string $file: name of the file to read
  * @param int $size: number of maximum bytes to read (0 = complete file)
  * @return string: the content as string, false on error
  */
 	function getFilePart($file, $size = 0)
             Luisehahne
-            Luisehahne
+		$file_content = '';
 		if( file_exists($file) && is_file($file) && is_readable($file))
             Luisehahne
-            DarkViper
+			if($size == 0) {
-            Luisehahne
+				$size = filesize($file);
+			}
-            DarkViper
+			if(($fh = fopen($file, 'rb'))) {
 				if( ($file_content = fread($fh, $size)) !== false ) {
-            Luisehahne
+					return $file_content;
+				}
 				fclose($fh);
+			}
             Luisehahne
-            Luisehahne
+		return false;
+	}
 	/**
 	* replace varnames with values in a string
+	*
 	* @param string $subject: stringvariable with vars placeholder
 	* @param array $replace: values to replace vars placeholder
 	* @return string
 	*/
     function replace_vars($subject = '', &$replace = null )
+    {
 		if(is_array($replace))
             Luisehahne
-            DarkViper
+			foreach ($replace  as $key => $value) {
-            Luisehahne
+				$subject = str_replace("{{".$key."}}", $value, $subject);
             Luisehahne
+		}
-            Luisehahne
+		return $subject;
+    }
             Luisehahne
-            darkviper
+function setAccessDeniedToNewTools($sModulName)
+{
 	$oDb = WbDatabase::getInstance();
 	$sql = 'UPDATE `'.$oDb->getTablePrefix.'groups` '
 		 . 'SET `module_permissions`= TRIM(LEADING \',\' FROM (CONCAT(`module_permissions`, \','.$sModulName.'\'))) '
 	     . 'WHERE `group_id`<>1 AND NOT FIND_IN_SET(\''.$sModulName.'\', `module_permissions`)';
 	$oDb->query($sql);
+}
-            Luisehahne
+// Load module into DB
 function load_module($directory, $install = false)
+{
 	global $database,$admin,$MESSAGE;
-            Luisehahne
+	$retVal = false;
 	if(is_dir($directory) && file_exists($directory.'/info.php'))
             Luisehahne
 		require($directory.'/info.php');
 		if(isset($module_name))
+		{
-            Luisehahne
+			if(!isset($module_license)) { $module_license = 'GNU General Public License'; }
 			if(!isset($module_platform) && isset($module_designed_for)) { $module_platform = $module_designed_for; }
 			if(!isset($module_function) && isset($module_type)) { $module_function = $module_type; }
-            Luisehahne
+			$module_function = strtolower($module_function);
 			// Check that it doesn't already exist
-            Luisehahne
+			$sqlwhere = 'WHERE `type` = \'module\' AND `directory` = \''.$module_directory.'\'';
 			$sql  = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'addons` '.$sqlwhere;
-            DarkViper
+			if( $database->get_one($sql) ) {
-            Luisehahne
+				$sql  = 'UPDATE `'.TABLE_PREFIX.'addons` SET ';
 			}else{
-            Luisehahne
+				// Load into DB
 				$sql  = 'INSERT INTO `'.TABLE_PREFIX.'addons` SET ';
-            Luisehahne
+				$sqlwhere = '';
+			}
-            DarkViper
+			$sql .= '`directory`=\''.$module_directory.'\', ';
 			$sql .= '`name`=\''.$module_name.'\', ';
 			$sql .= '`description`=\''.addslashes($module_description).'\', ';
 			$sql .= '`type`=\'module\', ';
 			$sql .= '`function`=\''.$module_function.'\', ';
 			$sql .= '`version`=\''.$module_version.'\', ';
 			$sql .= '`platform`=\''.$module_platform.'\', ';
 			$sql .= '`author`=\''.addslashes($module_author).'\', ';
 			$sql .= '`license`=\''.addslashes($module_license).'\'';
-            Luisehahne
+			$sql .= $sqlwhere;
-            Luisehahne
+			$retVal = intval($database->query($sql) ? true : false);
-            darkviper
+			if($retVal && !$sqlwhere &&
 			   ($module_function == 'tool' || $module_function == 'page' || $module_function == 'wysiwyg')
 			  ) {
 				setAccessDeniedToNewTools($module_directory);
+			}
-            Luisehahne
+			// Run installation script
-            DarkViper
+			if($install == true) {
 				if(file_exists($directory.'/install.php')) {
-            Luisehahne
+					require($directory.'/install.php');
             Luisehahne
+			}
+		}
-            Luisehahne
+        return $retVal;
             Luisehahne
+}
 // Load template into DB
 function load_template($directory)
+{
 	global $database, $admin;
-            Luisehahne
+	$retVal = false;
 	if(is_dir($directory) && file_exists($directory.'/info.php'))
             Luisehahne
 		require($directory.'/info.php');
 		if(isset($template_name))
+		{
-            DarkViper
+			if(!isset($template_license)) {
-            Luisehahne
+              $template_license = 'GNU General Public License';
+            }
-            DarkViper
+			if(!isset($template_platform) && isset($template_designed_for)) {
-            Luisehahne
+              $template_platform = $template_designed_for;
+            }
-            DarkViper
+			if(!isset($template_function)) {
-            Luisehahne
+              $template_function = 'template';
+            }
 			// Check that it doesn't already exist
-            DarkViper
+			$sqlwhere = 'WHERE `type`=\'template\' AND `directory`=\''.$template_directory.'\'';
-            Luisehahne
+			$sql  = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'addons` '.$sqlwhere;
-            DarkViper
+			if( $database->get_one($sql) ) {
-            Luisehahne
+				$sql  = 'UPDATE `'.TABLE_PREFIX.'addons` SET ';
 			}else{
-            Luisehahne
+				// Load into DB
 				$sql  = 'INSERT INTO `'.TABLE_PREFIX.'addons` SET ';
-            Luisehahne
+				$sqlwhere = '';
             Luisehahne
-            DarkViper
+			$sql .= '`directory`=\''.$template_directory.'\', ';
 			$sql .= '`name`=\''.$template_name.'\', ';
 			$sql .= '`description`=\''.addslashes($template_description).'\', ';
 			$sql .= '`type`=\'template\', ';
 			$sql .= '`function`=\''.$template_function.'\', ';
 			$sql .= '`version`=\''.$template_version.'\', ';
 			$sql .= '`platform`=\''.$template_platform.'\', ';
 			$sql .= '`author`=\''.addslashes($template_author).'\', ';
 			$sql .= '`license`=\''.addslashes($template_license).'\' ';
-            Luisehahne
+			$sql .= $sqlwhere;
-            Luisehahne
+			$retVal = intval($database->query($sql) ? true : false);
             Luisehahne
+	}
-            Luisehahne
+	return $retVal;
             Luisehahne
 // Load language into DB
 function load_language($file)
+{
 	global $database,$admin;
-            Luisehahne
+	$retVal = false;
-            Luisehahne
+	if (file_exists($file) && preg_match('#^([A-Z]{2}.php)#', basename($file)))
+	{
-            Luisehahne
+		// require($file);  it's to large
 		// read contents of the template language file into string
 		$data = @file_get_contents(WB_PATH.'/languages/'.str_replace('.php','',basename($file)).'.php');
 		// use regular expressions to fetch the content of the variable from the string
-            Luisehahne
+		$language_name = get_variable_content('language_name', $data, false, false);
 		$language_code = get_variable_content('language_code', $data, false, false);
 		$language_author = get_variable_content('language_author', $data, false, false);
 		$language_version = get_variable_content('language_version', $data, false, false);
 		$language_platform = get_variable_content('language_platform', $data, false, false);
             Luisehahne
-            Luisehahne
+		if(isset($language_name))
+		{
-            Luisehahne
+			if(!isset($language_license)) { $language_license = 'GNU General Public License'; }
 			if(!isset($language_platform) && isset($language_designed_for)) { $language_platform = $language_designed_for; }
-            Luisehahne
+			// Check that it doesn't already exist
-            DarkViper
+			$sqlwhere = 'WHERE `type`=\'language\' AND `directory`=\''.$language_code.'\'';
-            Luisehahne
+			$sql  = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'addons` '.$sqlwhere;
-            DarkViper
+			if( $database->get_one($sql) ) {
-            Luisehahne
+				$sql  = 'UPDATE `'.TABLE_PREFIX.'addons` SET ';
 			}else{
-            Luisehahne
+				// Load into DB
 				$sql  = 'INSERT INTO `'.TABLE_PREFIX.'addons` SET ';
-            Luisehahne
+				$sqlwhere = '';
             Luisehahne
-            DarkViper
+			$sql .= '`directory`=\''.$language_code.'\', ';
 			$sql .= '`name`=\''.$language_name.'\', ';
-            Luisehahne
+            $sql .= '`description`=\'\', ';
 			$sql .= '`function`=\'\', ';
-            DarkViper
+			$sql .= '`type`=\'language\', ';
 			$sql .= '`version`=\''.$language_version.'\', ';
 			$sql .= '`platform`=\''.$language_platform.'\', ';
 			$sql .= '`author`=\''.addslashes($language_author).'\', ';
 			$sql .= '`license`=\''.addslashes($language_license).'\' ';
-            Luisehahne
+			$sql .= $sqlwhere;
-            Luisehahne
+			$retVal = intval($database->query($sql) ? true : false);
             Luisehahne
+	}
-            Luisehahne
+	return $retVal;
             Luisehahne
 // Upgrade module info in DB, optionally start upgrade script
 function upgrade_module($directory, $upgrade = false)
+{
 	global $database, $admin, $MESSAGE, $new_module_version;
 	$mod_directory = WB_PATH.'/modules/'.$directory;
 	if(file_exists($mod_directory.'/info.php'))
+	{
 		require($mod_directory.'/info.php');
 		if(isset($module_name))
+		{
-            Luisehahne
+			if(!isset($module_license)) { $module_license = 'GNU General Public License'; }
-            Luisehahne
+			if(!isset($module_platform) && isset($module_designed_for)) { $module_platform = $module_designed_for; }
-            Luisehahne
+			if(!isset($module_function) && isset($module_type)) { $module_function = $module_type; }
-            Luisehahne
+			$module_function = strtolower($module_function);
 			// Check that it does already exist
 			$sql  = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'addons` ';
-            DarkViper
+			$sql .= 'WHERE `directory`=\''.$module_directory.'\'';
-            Luisehahne
+			if( $database->get_one($sql) )
+			{
 				// Update in DB
 				$sql  = 'UPDATE `'.TABLE_PREFIX.'addons` SET ';
-            DarkViper
+				$sql .= '`version`=\''.$module_version.'\', ';
 				$sql .= '`description`=\''.addslashes($module_description).'\', ';
 				$sql .= '`platform`=\''.$module_platform.'\', ';
 				$sql .= '`author`=\''.addslashes($module_author).'\', ';
 				$sql .= '`license`=\''.addslashes($module_license).'\' ';
 				$sql .= 'WHERE `directory`=\''.$module_directory.'\' ';
-            Luisehahne
+				$database->query($sql);
 				if($database->is_error()) {
 					$admin->print_error($database->get_error());
+				}
 				// Run upgrade script
-            DarkViper
+				if($upgrade == true) {
 					if(file_exists($mod_directory.'/upgrade.php')) {
-            Luisehahne
+						require($mod_directory.'/upgrade.php');
+					}
+				}
+			}
+		}
+	}
+}
 // extracts the content of a string variable from a string (save alternative to including files)
 if(!function_exists('get_variable_content'))
+{
 	function get_variable_content($search, $data, $striptags=true, $convert_to_entities=true)
+	{
 		$match = '';
 		// search for $variable followed by 0-n whitespace then by = then by 0-n whitespace
 		// then either " or ' then 0-n characters then either " or ' followed by 0-n whitespace and ;
 		// the variable name is returned in $match[1], the content in $match[3]
 		if (preg_match('/(\$' .$search .')\s*=\s*("|\')(.*)\2\s*;/', $data, $match))
+		{
-            DarkViper
+			if(strip_tags(trim($match[1])) == '$' .$search) {
-            Luisehahne
+				// variable name matches, return it's value
 				$match[3] = ($striptags == true) ? strip_tags($match[3]) : $match[3];
 				$match[3] = ($convert_to_entities == true) ? htmlentities($match[3]) : $match[3];
 				return $match[3];
+			}
+		}
 		return false;
+	}
+}
-            Luisehahne
+/*
  * @param string $modulname: like saved in addons.directory
  * @param boolean $source: true reads from database, false from info.php
  * @return string:  the version as string, if not found returns null
  */
 	function get_modul_version($modulname, $source = true)
+	{
 		global $database;
 		$version = null;
 		if( $source != true )
+		{
-            DarkViper
+			$sql  = 'SELECT `version` FROM `'.TABLE_PREFIX.'addons` ';
 			$sql .= 'WHERE `directory`=\''.$modulname.'\'';
-            Luisehahne
+			$version = $database->get_one($sql);
 		} else {
 			$info_file = WB_PATH.'/modules/'.$modulname.'/info.php';
-            DarkViper
+			if(file_exists($info_file)) {
 				if(($info_file = file_get_contents($info_file))) {
-            Luisehahne
+					$version = get_variable_content('module_version', $info_file, false, false);
 					$version = ($version !== false) ? $version : null;
+				}
+			}
+		}
 		return $version;
+	}
 /*
  * @param string $varlist: commaseperated list of varnames to move into global space
  * @return bool:  false if one of the vars already exists in global space (error added to msgQueue)
  */
 	function vars2globals_wrapper($varlist)
+	{
 		$retval = true;
 		if( $varlist != '')
+		{
 			$vars = explode(',', $varlist);
 			foreach( $vars as $var)
+			{
-            DarkViper
+				if( isset($GLOBALS[$var]) ){
-            Luisehahne
+					ErrorLog::write( 'variabe $'.$var.' already defined in global space!!',__FILE__, __FUNCTION__, __LINE__);
 					$retval = false;
-            DarkViper
+				}else {
-            Luisehahne
+					global $$var;
+				}
+			}
+		}
 		return $retval;
+	}
-            FrankH
+/*
  * filter directory traversal more thoroughly, thanks to hal 9000
  * @param string $dir: directory relative to MEDIA_DIRECTORY
  * @param bool $with_media_dir: true when to include MEDIA_DIRECTORY
  * @return: false if directory traversal detected, real path if not
  */
 	function check_media_path($directory, $with_media_dir = true)
+	{
-            DarkViper
+		$md = ($with_media_dir) ? MEDIA_DIRECTORY : '';
-            FrankH
+		$dir = realpath(WB_PATH . $md . '/' . utf8_decode($directory));
 		$required = realpath(WB_PATH . MEDIA_DIRECTORY);
 		if (strstr($dir, $required)) {
 			return $dir;
 		} else {
 			return false;
+		}
+	}
             Luisehahne
 /*
 urlencode function and rawurlencode are mostly based on RFC 1738.
 However, since 2005 the current RFC in use for URIs standard is RFC 3986.
 Here is a function to encode URLs according to RFC 3986.
 */
 if(!function_exists('url_encode')){
 	function url_encode($string) {
 	    $string = html_entity_decode($string,ENT_QUOTES,'UTF-8');
-            Luisehahne
+	    $entities = array('%21', '%2A', '%27', '%28', '%29', '%3B', '%3A', '%40', '%26', '%3D', '%2B', '%24', '%2C', '%2F', '%3F', '%25', '%23', '%5B', '%5D');
 	    $replacements = array('!', '*', "'", "(", ")", ";", ":", "@", "&", "=", "+", "$", ",", "/", "?", "%", "#", "[", "]");
 	    return str_replace($entities,$replacements, rawurlencode($string));
             Luisehahne
             Luisehahne
             Luisehahne
-            Luisehahne
+if(!function_exists('rebuild_all_accessfiles'))
+{
 	function rebuild_all_accessfiles($bShowDetails=false )
+	{
 		$oDb = WbDatabase::getInstance();
 		$oReg = WbAdaptor::getInstance();
-            Luisehahne
+		$aRetval = array();
-            Luisehahne
+	// try to remove access files and build new folder protect files
         $sTreeToDelete = $oReg->AppPath.$oReg->PagesDir;
             Luisehahne
-            Luisehahne
+    	if(($sTreeToDelete!='') && is_writeable($sTreeToDelete)==true)
+		{
 			$aDeleteLog = array();
             DeleteAccessFilesTree($sTreeToDelete, $aDeleteLog);
 		// show details if debug is set
             if($bShowDetails) { $aRetval = $aDeleteLog; }
             Luisehahne
-            Luisehahne
+	// Reformat/rebuild all existing access files
 		$sql  = 'SELECT `page_id`,`root_parent`,`parent`,`link`,`level`,`page_trail` '
 		      . 'FROM `'.$oDb->TablePrefix.'pages` '
 		      . 'WHERE `link` != \'\' '
 		      . 'ORDER BY `link`';
         if (($oPage = $oDb->query($sql)))
             Luisehahne
-            Luisehahne
+            $iFileCounter = 0;
 		// iterate over all existing page records
             while (($aPageRecord = $oPage->fetchRow(MYSQL_ASSOC)))
             Luisehahne
-            Luisehahne
+		// --- begin reorg tree structure ------------------------------------------------
 			// rebuild level entries
 				$sql = 'SELECT `level`+1 AS `level`, `page_trail` '
 				     . 'FROM `'.$oDb->TablePrefix.'pages` '
 					 . 'WHERE `page_id`='.$aPageRecord['parent'];
 			// search for parent record
 				$oParent = $oDb->query($sql);
 				if(($aParentRecord = $oParent->fetchRow(MYSQLI_ASSOC)))
+				{
 				// get values from existing parent record
 					$aPageRecord['level'] = intval($aParentRecord['level']);
 					$aPageRecord['root_parent'] = intval($aParentRecord['page_trail']);
 					$aPageRecord['page_trail'] = (string)$aParentRecord['page_trail'].','.(string)$aPageRecord['page_id'];
 				}else
+				{
 				// set as root record if no parentrecord exists
 					$aPageRecord['level'] = 0;
 					$aPageRecord['root_parent'] = $aPageRecord['page_id'];
 					$aPageRecord['page_trail'] = (string)$aPageRecord['page_id'];
+				}
 			// update current record with regenerated values
                 $sql  = 'UPDATE `'.$oDb->TablePrefix.'pages` '
 				      . 'SET `root_parent`='.$aPageRecord['root_parent'].', '
 				      .     '`level`='.$aPageRecord['level'].', '
 				      .     '`page_trail`=\''.$aPageRecord['page_trail'].'\' '
 				      . 'WHERE `page_id`='.$aPageRecord['page_id'];
 				$oDb->query($sql);
 		// --- end reorg tree structure --------------------------------------------------
-            Luisehahne
+                $sFilename = $oReg->AppPath.$oReg->PagesDir.ltrim($aPageRecord['link'],'/').$oReg->PageExtension;
-            Luisehahne
+				$oAccessFile = new AccessFile($sFilename, $aPageRecord['page_id']);
 				$oAccessFile->write();
 				unset($oAccessFile);
                 $iFileCounter++;
             Luisehahne
-            Luisehahne
+            $aRetval[] = 'Number of new formated access files: '.$iFileCounter;
             Luisehahne
-            Luisehahne
+		return $aRetval;
 	} // end of function rebuild_all_accessfiles()
 } // endif
             Luisehahne
 if(!function_exists('upgrade_modules')){
 	function upgrade_modules($aModuleList) {
         global $database;
     	foreach($aModuleList as $sModul) {
     		if(file_exists(WB_PATH.'/modules/'.$sModul.'/upgrade.php')) {
     			$currModulVersion = get_modul_version ($sModul, false);
     			$newModulVersion =  get_modul_version ($sModul, true);
     			if((version_compare($currModulVersion, $newModulVersion) <= 0)) {
-            Luisehahne
+    				require(WB_PATH.'/modules/'.$sModul.'/upgrade.php');
             Luisehahne
+    		}
+    	}
+    }
+}

Project

General

Profile

WB 2.08.x

wb-archiv283/branches/2.8.x/wb/framework/functions.php @ 1985