thorsten / phpMyFAQ

phpmyfaq/admin/editor/plugins/ajaxfilemanager/ajax_image_save.php

Indentation +178 added lines, -178 removed lines

@@ -1,201 +1,201 @@
 <?php
-	/**
-	 * image save function
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
-	 * @since 22/May/2007
-	 *
-	 */
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");	
+    /**
+     * image save function
+     * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+     * @link www.phpletter.com
+     * @since 22/May/2007
+     *
+     */
+    require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");	
 	
 
-	$error = "";
-	$info = "";
-	if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_EDITABLE)
-	{
-		$error = SYS_DISABLED;
-	}
-	elseif(empty($_POST['path']))
-	{
-		$error  =  IMG_SAVE_EMPTY_PATH;
-	}elseif(!file_exists($_POST['path']))
-	{		
-		$error  =  IMG_SAVE_NOT_EXISTS;
-	}elseif(!isUnderRoot($_POST['path']))
-	{
-		$error = IMG_SAVE_PATH_DISALLOWED;
-	}elseif(($sessionDir = $session->getSessionDir()) == '')
-	{
-		$error = SESSION_PERSONAL_DIR_NOT_FOUND;
-	}
-	else
-	{	
-		require_once(CLASS_HISTORY);
-		$history = new History($_POST['path'], $session);
-		if(!empty($_POST['mode']))
-		{
-			//get the original image which is the lastest session image if any when the system is in demo
-			$lastestSessionImageInfo = $history->getLastestRestorable();
-			if(sizeof($lastestSessionImageInfo) && CONFIG_SYS_DEMO_ENABLE)
-			{				
-				$originalSessionImageInfo = $history->getOriginalImage();
-				if(sizeof($originalSessionImageInfo))
-				{					
-					$originalImage = $sessionDir . $originalSessionImageInfo['info']['name'];
-				}				
-			}
-			if(empty($originalImage))
-			{
-				$originalImage = $_POST['path'];
-			}
+    $error = "";
+    $info = "";
+    if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_EDITABLE)
+    {
+        $error = SYS_DISABLED;
+    }
+    elseif(empty($_POST['path']))
+    {
+        $error  =  IMG_SAVE_EMPTY_PATH;
+    }elseif(!file_exists($_POST['path']))
+    {		
+        $error  =  IMG_SAVE_NOT_EXISTS;
+    }elseif(!isUnderRoot($_POST['path']))
+    {
+        $error = IMG_SAVE_PATH_DISALLOWED;
+    }elseif(($sessionDir = $session->getSessionDir()) == '')
+    {
+        $error = SESSION_PERSONAL_DIR_NOT_FOUND;
+    }
+    else
+    {	
+        require_once(CLASS_HISTORY);
+        $history = new History($_POST['path'], $session);
+        if(!empty($_POST['mode']))
+        {
+            //get the original image which is the lastest session image if any when the system is in demo
+            $lastestSessionImageInfo = $history->getLastestRestorable();
+            if(sizeof($lastestSessionImageInfo) && CONFIG_SYS_DEMO_ENABLE)
+            {				
+                $originalSessionImageInfo = $history->getOriginalImage();
+                if(sizeof($originalSessionImageInfo))
+                {					
+                    $originalImage = $sessionDir . $originalSessionImageInfo['info']['name'];
+                }				
+            }
+            if(empty($originalImage))
+            {
+                $originalImage = $_POST['path'];
+            }
 			
-			include_once(CLASS_IMAGE);
-			$image = new Image();
-			if($image->loadImage($originalImage))
-			{				
+            include_once(CLASS_IMAGE);
+            $image = new Image();
+            if($image->loadImage($originalImage))
+            {				
 				
-				switch($_POST['mode'])
-				{
-					case "resize":					
-						if(!$image->resize($_POST['width'], $_POST['height'], (!empty($_POST['constraint'])?true:false)))
-						{
-							$error = IMG_SAVE_RESIZE_FAILED;
-						}					
-						break;
-					case "crop":	
-						if(!$image->crop($_POST['x'], $_POST['y'], $_POST['width'], $_POST['height']))
-						{
-							$error = IMG_SAVE_CROP_FAILED;
-						}
-						break;
-					case "flip":
-						if(!$image->flip($_POST['flip_angle']))
-						{
-							$error = IMG_SAVE_FLIP_FAILED;
-						}
-						break;
-					case "rotate":
+                switch($_POST['mode'])
+                {
+                    case "resize":					
+                        if(!$image->resize($_POST['width'], $_POST['height'], (!empty($_POST['constraint'])?true:false)))
+                        {
+                            $error = IMG_SAVE_RESIZE_FAILED;
+                        }					
+                        break;
+                    case "crop":	
+                        if(!$image->crop($_POST['x'], $_POST['y'], $_POST['width'], $_POST['height']))
+                        {
+                            $error = IMG_SAVE_CROP_FAILED;
+                        }
+                        break;
+                    case "flip":
+                        if(!$image->flip($_POST['flip_angle']))
+                        {
+                            $error = IMG_SAVE_FLIP_FAILED;
+                        }
+                        break;
+                    case "rotate":
 						
-						if(!$image->rotate(intval($_POST['angle'])))
-						{
-							$error = IMG_SAVE_ROTATE_FAILED;
-						}
+                        if(!$image->rotate(intval($_POST['angle'])))
+                        {
+                            $error = IMG_SAVE_ROTATE_FAILED;
+                        }
 						
-						break;
-					default:
-						$error = IMG_SAVE_UNKNOWN_MODE;
-				}
+                        break;
+                    default:
+                        $error = IMG_SAVE_UNKNOWN_MODE;
+                }
 				
 				
-				if(empty($error))
-				{					
-					$sessionNewPath = $sessionDir  . uniqid(md5(time())) . "." . getFileExt($_POST['path']);					
-					if(!@copy($originalImage, $sessionNewPath))
-					{//keep a copy under the session folder
-						$error = IMG_SAVE_BACKUP_FAILED;						
-					}else 
-					{
+                if(empty($error))
+                {					
+                    $sessionNewPath = $sessionDir  . uniqid(md5(time())) . "." . getFileExt($_POST['path']);					
+                    if(!@copy($originalImage, $sessionNewPath))
+                    {//keep a copy under the session folder
+                        $error = IMG_SAVE_BACKUP_FAILED;						
+                    }else 
+                    {
 						
-						$isSaveAsRequest = (!empty($_POST['new_name']) && !empty($_POST['save_to'])?true:false);
-						//save the modified image
-						$sessionImageInfo = array('name'=>basename($sessionNewPath), 'restorable'=>1);
-						$history->add($sessionImageInfo);
-						if(CONFIG_SYS_DEMO_ENABLE)
-						{//demo only
-							if(isset($originalSessionImageInfo) && sizeof($originalSessionImageInfo))
-							{
-								$imagePath = $sessionDir . $originalSessionImageInfo['info']['name'];
-							}else 
-							{	
-								$imagePath = $sessionDir  . uniqid(md5(time())) . "." . getFileExt($_POST['path']);
-							}
-						}else 
-						{	
-							if($isSaveAsRequest)
-							{//save as request
-								//check save to folder if exists
-								if(isset($_POST['save_to']) && strlen($_POST['save_to']))
-								{
-									$imagePath = $originalImage;
-								}else 
-								{
-									$imagePath = addTrailingSlash(backslashToSlash($_POST['save_to'])) . $_POST['new_name'] . "." . getFileExt($_POST['path']); 
-								}
+                        $isSaveAsRequest = (!empty($_POST['new_name']) && !empty($_POST['save_to'])?true:false);
+                        //save the modified image
+                        $sessionImageInfo = array('name'=>basename($sessionNewPath), 'restorable'=>1);
+                        $history->add($sessionImageInfo);
+                        if(CONFIG_SYS_DEMO_ENABLE)
+                        {//demo only
+                            if(isset($originalSessionImageInfo) && sizeof($originalSessionImageInfo))
+                            {
+                                $imagePath = $sessionDir . $originalSessionImageInfo['info']['name'];
+                            }else 
+                            {	
+                                $imagePath = $sessionDir  . uniqid(md5(time())) . "." . getFileExt($_POST['path']);
+                            }
+                        }else 
+                        {	
+                            if($isSaveAsRequest)
+                            {//save as request
+                                //check save to folder if exists
+                                if(isset($_POST['save_to']) && strlen($_POST['save_to']))
+                                {
+                                    $imagePath = $originalImage;
+                                }else 
+                                {
+                                    $imagePath = addTrailingSlash(backslashToSlash($_POST['save_to'])) . $_POST['new_name'] . "." . getFileExt($_POST['path']); 
+                                }
 								
-								if(!file_exists($_POST['save_to']) || !is_dir($_POST['save_to']))
-								{
-									$error = IMG_SAVE_AS_FOLDER_NOT_FOUND;
-								}elseif(file_exists($imagePath)) 
-								{
-									$error = IMG_SAVE_AS_NEW_IMAGE_EXISTS;
-								}elseif(!preg_match("/^[a-zA-Z0-9_\- ]+$/", $_POST['new_name']))
-								{
-									$error = IMG_SAVE_AS_ERR_NAME_INVALID;
-								}
+                                if(!file_exists($_POST['save_to']) || !is_dir($_POST['save_to']))
+                                {
+                                    $error = IMG_SAVE_AS_FOLDER_NOT_FOUND;
+                                }elseif(file_exists($imagePath)) 
+                                {
+                                    $error = IMG_SAVE_AS_NEW_IMAGE_EXISTS;
+                                }elseif(!preg_match("/^[a-zA-Z0-9_\- ]+$/", $_POST['new_name']))
+                                {
+                                    $error = IMG_SAVE_AS_ERR_NAME_INVALID;
+                                }
 								
-							}else 
-							{//save request
-								$imagePath = $originalImage;	
-							}
+                            }else 
+                            {//save request
+                                $imagePath = $originalImage;	
+                            }
 												
-						}
+                        }
 
-						if($image->saveImage($imagePath))
-						{		
+                        if($image->saveImage($imagePath))
+                        {		
 									
-							if(CONFIG_SYS_DEMO_ENABLE)
-							{
-								if(!isset($originalSessionImageInfo) || !sizeof($originalSessionImageInfo))
-								{//keep this original image information on session for future reference if demo only	
-									$originalSessionImageInfo = array('name'=>basename($imagePath), 'restorable'=>0, 'is_original'=>1);
-									$history->add($originalSessionImageInfo);
-								}
-							}
-							$imageInfo = $image->getFinalImageInfo();								
-						}else 
-						{
-							$error = IMG_SAVE_FAILED;
+                            if(CONFIG_SYS_DEMO_ENABLE)
+                            {
+                                if(!isset($originalSessionImageInfo) || !sizeof($originalSessionImageInfo))
+                                {//keep this original image information on session for future reference if demo only	
+                                    $originalSessionImageInfo = array('name'=>basename($imagePath), 'restorable'=>0, 'is_original'=>1);
+                                    $history->add($originalSessionImageInfo);
+                                }
+                            }
+                            $imageInfo = $image->getFinalImageInfo();								
+                        }else 
+                        {
+                            $error = IMG_SAVE_FAILED;
 							
-						}							
-						if(isset($imageInfo))
-						{
-								$info .= ",width:" . $imageInfo['width'] . "";
-								$info .= ",height:" . $imageInfo['height'] . "";
-								$info .= ",size:'" . transformFileSize($imageInfo['size']) . "'";
-								if($isSaveAsRequest)
-								{
-									$info .= ",save_as:'1'";
-								}else 
-								{
-									$info .= ",save_as:'0'";
-								}
-								$info .= ",folder_path:'" . dirname($imagePath) . "'";
-								$info .= ",path:'" . backslashToSlash($imagePath) . "'";	
+                        }							
+                        if(isset($imageInfo))
+                        {
+                                $info .= ",width:" . $imageInfo['width'] . "";
+                                $info .= ",height:" . $imageInfo['height'] . "";
+                                $info .= ",size:'" . transformFileSize($imageInfo['size']) . "'";
+                                if($isSaveAsRequest)
+                                {
+                                    $info .= ",save_as:'1'";
+                                }else 
+                                {
+                                    $info .= ",save_as:'0'";
+                                }
+                                $info .= ",folder_path:'" . dirname($imagePath) . "'";
+                                $info .= ",path:'" . backslashToSlash($imagePath) . "'";	
 													
-						}				
+                        }				
 			
-					}				
+                    }				
 								
-				}			
-			}else 
-			{
-				$error = IMG_SAVE_IMG_OPEN_FAILED . $originalImage;
-			}		
+                }			
+            }else 
+            {
+                $error = IMG_SAVE_IMG_OPEN_FAILED . $originalImage;
+            }		
 
-		}else 
-		{
-			$error = IMG_SAVE_UNKNOWN_MODE;
-		}
-	}
-	echo "{";	
-	echo "error:'" . $error . "'";
-	if(isset($image) && is_object($image))
-	{
-		$image->DestroyImages();
-	}
-	echo $info;
-	echo ",history:" . (isset($history) && is_object($history)?($history->getNumRestorable()):0)  . "";
-	echo "}";
+        }else 
+        {
+            $error = IMG_SAVE_UNKNOWN_MODE;
+        }
+    }
+    echo "{";	
+    echo "error:'" . $error . "'";
+    if(isset($image) && is_object($image))
+    {
+        $image->DestroyImages();
+    }
+    echo $info;
+    echo ",history:" . (isset($history) && is_object($history)?($history->getNumRestorable()):0)  . "";
+    echo "}";
 	
 	
 ?>
\ No newline at end of file

Spacing +56 added lines, -56 removed lines

@@ -6,25 +6,25 @@ 
 	 * @since 22/May/2007
 	 *
 	 */
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");	
+	require_once(dirname(__FILE__).DIRECTORY_SEPARATOR."inc".DIRECTORY_SEPARATOR."config.php");	
 	
 
 	$error = "";
 	$info = "";
-	if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_EDITABLE)
+	if (CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_EDITABLE)
 	{
 		$error = SYS_DISABLED;
 	}
-	elseif(empty($_POST['path']))
+	elseif (empty($_POST['path']))
 	{
-		$error  =  IMG_SAVE_EMPTY_PATH;
-	}elseif(!file_exists($_POST['path']))
+		$error  = IMG_SAVE_EMPTY_PATH;
+	}elseif (!file_exists($_POST['path']))
 	{		
-		$error  =  IMG_SAVE_NOT_EXISTS;
-	}elseif(!isUnderRoot($_POST['path']))
+		$error  = IMG_SAVE_NOT_EXISTS;
+	}elseif (!isUnderRoot($_POST['path']))
 	{
 		$error = IMG_SAVE_PATH_DISALLOWED;
-	}elseif(($sessionDir = $session->getSessionDir()) == '')
+	}elseif (($sessionDir = $session->getSessionDir()) == '')
 	{
 		$error = SESSION_PERSONAL_DIR_NOT_FOUND;
 	}
@@ -32,51 +32,51 @@ 
 	{	
 		require_once(CLASS_HISTORY);
 		$history = new History($_POST['path'], $session);
-		if(!empty($_POST['mode']))
+		if (!empty($_POST['mode']))
 		{
 			//get the original image which is the lastest session image if any when the system is in demo
 			$lastestSessionImageInfo = $history->getLastestRestorable();
-			if(sizeof($lastestSessionImageInfo) && CONFIG_SYS_DEMO_ENABLE)
+			if (sizeof($lastestSessionImageInfo) && CONFIG_SYS_DEMO_ENABLE)
 			{				
 				$originalSessionImageInfo = $history->getOriginalImage();
-				if(sizeof($originalSessionImageInfo))
+				if (sizeof($originalSessionImageInfo))
 				{					
-					$originalImage = $sessionDir . $originalSessionImageInfo['info']['name'];
+					$originalImage = $sessionDir.$originalSessionImageInfo['info']['name'];
 				}				
 			}
-			if(empty($originalImage))
+			if (empty($originalImage))
 			{
 				$originalImage = $_POST['path'];
 			}
 			
 			include_once(CLASS_IMAGE);
 			$image = new Image();
-			if($image->loadImage($originalImage))
+			if ($image->loadImage($originalImage))
 			{				
 				
-				switch($_POST['mode'])
+				switch ($_POST['mode'])
 				{
 					case "resize":					
-						if(!$image->resize($_POST['width'], $_POST['height'], (!empty($_POST['constraint'])?true:false)))
+						if (!$image->resize($_POST['width'], $_POST['height'], (!empty($_POST['constraint']) ? true : false)))
 						{
 							$error = IMG_SAVE_RESIZE_FAILED;
 						}					
 						break;
 					case "crop":	
-						if(!$image->crop($_POST['x'], $_POST['y'], $_POST['width'], $_POST['height']))
+						if (!$image->crop($_POST['x'], $_POST['y'], $_POST['width'], $_POST['height']))
 						{
 							$error = IMG_SAVE_CROP_FAILED;
 						}
 						break;
 					case "flip":
-						if(!$image->flip($_POST['flip_angle']))
+						if (!$image->flip($_POST['flip_angle']))
 						{
 							$error = IMG_SAVE_FLIP_FAILED;
 						}
 						break;
 					case "rotate":
 						
-						if(!$image->rotate(intval($_POST['angle'])))
+						if (!$image->rotate(intval($_POST['angle'])))
 						{
 							$error = IMG_SAVE_ROTATE_FAILED;
 						}
@@ -87,114 +87,114 @@ 
 				}
 				
 				
-				if(empty($error))
+				if (empty($error))
 				{					
-					$sessionNewPath = $sessionDir  . uniqid(md5(time())) . "." . getFileExt($_POST['path']);					
-					if(!@copy($originalImage, $sessionNewPath))
+					$sessionNewPath = $sessionDir.uniqid(md5(time())).".".getFileExt($_POST['path']);					
+					if (!@copy($originalImage, $sessionNewPath))
 					{//keep a copy under the session folder
 						$error = IMG_SAVE_BACKUP_FAILED;						
-					}else 
+					} else 
 					{
 						
-						$isSaveAsRequest = (!empty($_POST['new_name']) && !empty($_POST['save_to'])?true:false);
+						$isSaveAsRequest = (!empty($_POST['new_name']) && !empty($_POST['save_to']) ? true : false);
 						//save the modified image
 						$sessionImageInfo = array('name'=>basename($sessionNewPath), 'restorable'=>1);
 						$history->add($sessionImageInfo);
-						if(CONFIG_SYS_DEMO_ENABLE)
+						if (CONFIG_SYS_DEMO_ENABLE)
 						{//demo only
-							if(isset($originalSessionImageInfo) && sizeof($originalSessionImageInfo))
+							if (isset($originalSessionImageInfo) && sizeof($originalSessionImageInfo))
 							{
-								$imagePath = $sessionDir . $originalSessionImageInfo['info']['name'];
-							}else 
+								$imagePath = $sessionDir.$originalSessionImageInfo['info']['name'];
+							} else 
 							{	
-								$imagePath = $sessionDir  . uniqid(md5(time())) . "." . getFileExt($_POST['path']);
+								$imagePath = $sessionDir.uniqid(md5(time())).".".getFileExt($_POST['path']);
 							}
-						}else 
+						} else 
 						{	
-							if($isSaveAsRequest)
+							if ($isSaveAsRequest)
 							{//save as request
 								//check save to folder if exists
-								if(isset($_POST['save_to']) && strlen($_POST['save_to']))
+								if (isset($_POST['save_to']) && strlen($_POST['save_to']))
 								{
 									$imagePath = $originalImage;
-								}else 
+								} else 
 								{
-									$imagePath = addTrailingSlash(backslashToSlash($_POST['save_to'])) . $_POST['new_name'] . "." . getFileExt($_POST['path']); 
+									$imagePath = addTrailingSlash(backslashToSlash($_POST['save_to'])).$_POST['new_name'].".".getFileExt($_POST['path']); 
 								}
 								
-								if(!file_exists($_POST['save_to']) || !is_dir($_POST['save_to']))
+								if (!file_exists($_POST['save_to']) || !is_dir($_POST['save_to']))
 								{
 									$error = IMG_SAVE_AS_FOLDER_NOT_FOUND;
-								}elseif(file_exists($imagePath)) 
+								}elseif (file_exists($imagePath)) 
 								{
 									$error = IMG_SAVE_AS_NEW_IMAGE_EXISTS;
-								}elseif(!preg_match("/^[a-zA-Z0-9_\- ]+$/", $_POST['new_name']))
+								}elseif (!preg_match("/^[a-zA-Z0-9_\- ]+$/", $_POST['new_name']))
 								{
 									$error = IMG_SAVE_AS_ERR_NAME_INVALID;
 								}
 								
-							}else 
+							} else 
 							{//save request
 								$imagePath = $originalImage;	
 							}
 												
 						}
 
-						if($image->saveImage($imagePath))
+						if ($image->saveImage($imagePath))
 						{		
 									
-							if(CONFIG_SYS_DEMO_ENABLE)
+							if (CONFIG_SYS_DEMO_ENABLE)
 							{
-								if(!isset($originalSessionImageInfo) || !sizeof($originalSessionImageInfo))
+								if (!isset($originalSessionImageInfo) || !sizeof($originalSessionImageInfo))
 								{//keep this original image information on session for future reference if demo only	
 									$originalSessionImageInfo = array('name'=>basename($imagePath), 'restorable'=>0, 'is_original'=>1);
 									$history->add($originalSessionImageInfo);
 								}
 							}
 							$imageInfo = $image->getFinalImageInfo();								
-						}else 
+						} else 
 						{
 							$error = IMG_SAVE_FAILED;
 							
 						}							
-						if(isset($imageInfo))
+						if (isset($imageInfo))
 						{
-								$info .= ",width:" . $imageInfo['width'] . "";
-								$info .= ",height:" . $imageInfo['height'] . "";
-								$info .= ",size:'" . transformFileSize($imageInfo['size']) . "'";
-								if($isSaveAsRequest)
+								$info .= ",width:".$imageInfo['width']."";
+								$info .= ",height:".$imageInfo['height']."";
+								$info .= ",size:'".transformFileSize($imageInfo['size'])."'";
+								if ($isSaveAsRequest)
 								{
 									$info .= ",save_as:'1'";
-								}else 
+								} else 
 								{
 									$info .= ",save_as:'0'";
 								}
-								$info .= ",folder_path:'" . dirname($imagePath) . "'";
-								$info .= ",path:'" . backslashToSlash($imagePath) . "'";	
+								$info .= ",folder_path:'".dirname($imagePath)."'";
+								$info .= ",path:'".backslashToSlash($imagePath)."'";	
 													
 						}				
 			
 					}				
 								
 				}			
-			}else 
+			} else 
 			{
-				$error = IMG_SAVE_IMG_OPEN_FAILED . $originalImage;
+				$error = IMG_SAVE_IMG_OPEN_FAILED.$originalImage;
 			}		
 
-		}else 
+		} else 
 		{
 			$error = IMG_SAVE_UNKNOWN_MODE;
 		}
 	}
 	echo "{";	
-	echo "error:'" . $error . "'";
-	if(isset($image) && is_object($image))
+	echo "error:'".$error."'";
+	if (isset($image) && is_object($image))
 	{
 		$image->DestroyImages();
 	}
 	echo $info;
-	echo ",history:" . (isset($history) && is_object($history)?($history->getNumRestorable()):0)  . "";
+	echo ",history:".(isset($history) && is_object($history) ? ($history->getNumRestorable()) : 0)."";
 	echo "}";
 	
 	

Braces +16 added lines, -18 removed lines

@@ -14,21 +14,19 @@ 
 	if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_EDITABLE)
 	{
 		$error = SYS_DISABLED;
-	}
-	elseif(empty($_POST['path']))
+	} elseif(empty($_POST['path']))
 	{
 		$error  =  IMG_SAVE_EMPTY_PATH;
-	}elseif(!file_exists($_POST['path']))
+	} elseif(!file_exists($_POST['path']))
 	{		
 		$error  =  IMG_SAVE_NOT_EXISTS;
-	}elseif(!isUnderRoot($_POST['path']))
+	} elseif(!isUnderRoot($_POST['path']))
 	{
 		$error = IMG_SAVE_PATH_DISALLOWED;
-	}elseif(($sessionDir = $session->getSessionDir()) == '')
+	} elseif(($sessionDir = $session->getSessionDir()) == '')
 	{
 		$error = SESSION_PERSONAL_DIR_NOT_FOUND;
-	}
-	else
+	} else
 	{	
 		require_once(CLASS_HISTORY);
 		$history = new History($_POST['path'], $session);
@@ -93,7 +91,7 @@ 
 					if(!@copy($originalImage, $sessionNewPath))
 					{//keep a copy under the session folder
 						$error = IMG_SAVE_BACKUP_FAILED;						
-					}else 
+					} else 
 					{
 						
 						$isSaveAsRequest = (!empty($_POST['new_name']) && !empty($_POST['save_to'])?true:false);
@@ -105,11 +103,11 @@ 
 							if(isset($originalSessionImageInfo) && sizeof($originalSessionImageInfo))
 							{
 								$imagePath = $sessionDir . $originalSessionImageInfo['info']['name'];
-							}else 
+							} else 
 							{	
 								$imagePath = $sessionDir  . uniqid(md5(time())) . "." . getFileExt($_POST['path']);
 							}
-						}else 
+						} else 
 						{	
 							if($isSaveAsRequest)
 							{//save as request
@@ -117,7 +115,7 @@ 
 								if(isset($_POST['save_to']) && strlen($_POST['save_to']))
 								{
 									$imagePath = $originalImage;
-								}else 
+								} else 
 								{
 									$imagePath = addTrailingSlash(backslashToSlash($_POST['save_to'])) . $_POST['new_name'] . "." . getFileExt($_POST['path']); 
 								}
@@ -125,15 +123,15 @@ 
 								if(!file_exists($_POST['save_to']) || !is_dir($_POST['save_to']))
 								{
 									$error = IMG_SAVE_AS_FOLDER_NOT_FOUND;
-								}elseif(file_exists($imagePath)) 
+								} elseif(file_exists($imagePath)) 
 								{
 									$error = IMG_SAVE_AS_NEW_IMAGE_EXISTS;
-								}elseif(!preg_match("/^[a-zA-Z0-9_\- ]+$/", $_POST['new_name']))
+								} elseif(!preg_match("/^[a-zA-Z0-9_\- ]+$/", $_POST['new_name']))
 								{
 									$error = IMG_SAVE_AS_ERR_NAME_INVALID;
 								}
 								
-							}else 
+							} else 
 							{//save request
 								$imagePath = $originalImage;	
 							}
@@ -152,7 +150,7 @@ 
 								}
 							}
 							$imageInfo = $image->getFinalImageInfo();								
-						}else 
+						} else 
 						{
 							$error = IMG_SAVE_FAILED;
 							
@@ -165,7 +163,7 @@ 
 								if($isSaveAsRequest)
 								{
 									$info .= ",save_as:'1'";
-								}else 
+								} else 
 								{
 									$info .= ",save_as:'0'";
 								}
@@ -177,12 +175,12 @@ 
 					}				
 								
 				}			
-			}else 
+			} else 
 			{
 				$error = IMG_SAVE_IMG_OPEN_FAILED . $originalImage;
 			}		
 
-		}else 
+		} else 
 		{
 			$error = IMG_SAVE_UNKNOWN_MODE;
 		}

phpmyfaq/admin/editor/plugins/ajaxfilemanager/ajax_get_folder_listing.php

Indentation +9 added lines, -9 removed lines

@@ -1,13 +1,13 @@
 <?php
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
-	echo '{';
-	$count = 1;
-	foreach(getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
-	{
+    require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+    echo '{';
+    $count = 1;
+    foreach(getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
+    {
 		
 
-		echo (($count > 1)?', ':''). "'" . $v . "':'" . $k . "'"; 
-		$count++;
-	}
-	echo "}";
+        echo (($count > 1)?', ':''). "'" . $v . "':'" . $k . "'"; 
+        $count++;
+    }
+    echo "}";
 ?>

Spacing +3 added lines, -3 removed lines

@@ -1,12 +1,12 @@
 <?php
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+	require_once(dirname(__FILE__).DIRECTORY_SEPARATOR."inc".DIRECTORY_SEPARATOR."config.php");
 	echo '{';
 	$count = 1;
-	foreach(getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
+	foreach (getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
 	{
 		
 
-		echo (($count > 1)?', ':''). "'" . $v . "':'" . $k . "'"; 
+		echo (($count > 1) ? ', ' : '')."'".$v."':'".$k."'"; 
 		$count++;
 	}
 	echo "}";

phpmyfaq/admin/editor/plugins/ajaxfilemanager/_ajax_load_folders.php

Indentation +10 added lines, -10 removed lines

@@ -1,20 +1,20 @@
 <?php
-	if(!defined('AJAX_INIT_DONE'))
-	{
-		die('Permission denied');
-	}
+    if(!defined('AJAX_INIT_DONE'))
+    {
+        die('Permission denied');
+    }
 ?><?php
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+    require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
 ?>
 <select class="input inputSearch" name="search_folder" id="search_folder">
 	<?php 
 	
-					foreach(getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
-					{
-						?>
+                    foreach(getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
+                    {
+                        ?>
       <option value="<?php echo $v; ?>" ><?php echo shortenFileName($k, 30); ?></option>
       <?php 
-					}
+                    }
 		
-				?>            	
+                ?>            	
 </select>
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -1,15 +1,15 @@
 <?php
-	if(!defined('AJAX_INIT_DONE'))
+	if (!defined('AJAX_INIT_DONE'))
 	{
 		die('Permission denied');
 	}
 ?><?php
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+	require_once(dirname(__FILE__).DIRECTORY_SEPARATOR."inc".DIRECTORY_SEPARATOR."config.php");
 ?>
 <select class="input inputSearch" name="search_folder" id="search_folder">
 	<?php 
 	
-					foreach(getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
+					foreach (getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
 					{
 						?>
       <option value="<?php echo $v; ?>" ><?php echo shortenFileName($k, 30); ?></option>

phpmyfaq/admin/editor/plugins/ajaxfilemanager/ajax_save_name.php

Indentation +74 added lines, -74 removed lines

@@ -1,81 +1,81 @@
 <?php
-	/**
-	 * ajax save name
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
-	 * @since 22/May/2007
-	 *
-	 */
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
-	$error = '';
-	$fileInfo = array();
-	if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_RENAME)
-	{
-		$error = SYS_DISABLED;
-	}
-	elseif(empty($_POST['name']))
-	{
-		$error = ERR_RENAME_EMPTY;
-	}elseif(!preg_match("/^[a-zA-Z0-9 _\-.]+$/", $_POST['name']))
-	{
-		$error = ERR_RENAME_FORMAT;
-	}elseif(empty($_POST['original_path']) || !file_exists($_POST['original_path']))
-	{
-		$error = ERR_RENAME_FILE_NOT_EXISTS;
-	}elseif(substr(slashToBackslash(removeTrailingSlash($_POST['original_path'])), strrpos(slashToBackslash(removeTrailingSlash($_POST['original_path'])), "/") + 1) == $_POST['name'])
-	{
-		$error = ERR_NO_CHANGES_MADE;
-	}elseif(file_exists(addTrailingSlash(getParentPath($_POST['original_path'])) . $_POST['name']))
-	{
-		$error = ERR_RENAME_EXISTS;
-	}elseif(is_file($_POST['original_path']) && !isValidExt($_POST['name'], explode(",", CONFIG_UPLOAD_VALID_EXTS), explode(",", CONFIG_UPLOAD_INVALID_EXTS)))
-	{
-		$error = ERR_RENAME_FILE_TYPE_NOT_PERMITED;
-	}elseif(!rename(removeTrailingSlash($_POST['original_path']), addTrailingSlash(getParentPath($_POST['original_path'])) . $_POST['name']))
-	{
-		$error = ERR_RENAME_FAILED;
-	}else 
-	{
-		//update record of session if image exists in session for cut or copy
-		include_once(CLASS_SESSION_ACTION);
-		$sessionAction = new SessionAction();		
-		$selectedDocuments = $sessionAction->get();
-		if(removeTrailingSlash($sessionAction->getFolder()) == getParentPath($_POST['original_path']) && sizeof($selectedDocuments))
-		{
-			if(($key = array_search(basename($_POST['original_path']), $selectedDocuments)) !== false)
-			{
-				$selectedDocuments[$key] = $_POST['name'];
-				$sessionAction->set($selectedDocuments);
+    /**
+     * ajax save name
+     * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+     * @link www.phpletter.com
+     * @since 22/May/2007
+     *
+     */
+    require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+    $error = '';
+    $fileInfo = array();
+    if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_RENAME)
+    {
+        $error = SYS_DISABLED;
+    }
+    elseif(empty($_POST['name']))
+    {
+        $error = ERR_RENAME_EMPTY;
+    }elseif(!preg_match("/^[a-zA-Z0-9 _\-.]+$/", $_POST['name']))
+    {
+        $error = ERR_RENAME_FORMAT;
+    }elseif(empty($_POST['original_path']) || !file_exists($_POST['original_path']))
+    {
+        $error = ERR_RENAME_FILE_NOT_EXISTS;
+    }elseif(substr(slashToBackslash(removeTrailingSlash($_POST['original_path'])), strrpos(slashToBackslash(removeTrailingSlash($_POST['original_path'])), "/") + 1) == $_POST['name'])
+    {
+        $error = ERR_NO_CHANGES_MADE;
+    }elseif(file_exists(addTrailingSlash(getParentPath($_POST['original_path'])) . $_POST['name']))
+    {
+        $error = ERR_RENAME_EXISTS;
+    }elseif(is_file($_POST['original_path']) && !isValidExt($_POST['name'], explode(",", CONFIG_UPLOAD_VALID_EXTS), explode(",", CONFIG_UPLOAD_INVALID_EXTS)))
+    {
+        $error = ERR_RENAME_FILE_TYPE_NOT_PERMITED;
+    }elseif(!rename(removeTrailingSlash($_POST['original_path']), addTrailingSlash(getParentPath($_POST['original_path'])) . $_POST['name']))
+    {
+        $error = ERR_RENAME_FAILED;
+    }else 
+    {
+        //update record of session if image exists in session for cut or copy
+        include_once(CLASS_SESSION_ACTION);
+        $sessionAction = new SessionAction();		
+        $selectedDocuments = $sessionAction->get();
+        if(removeTrailingSlash($sessionAction->getFolder()) == getParentPath($_POST['original_path']) && sizeof($selectedDocuments))
+        {
+            if(($key = array_search(basename($_POST['original_path']), $selectedDocuments)) !== false)
+            {
+                $selectedDocuments[$key] = $_POST['name'];
+                $sessionAction->set($selectedDocuments);
 				
-			}
+            }
 			
-		}elseif(removeTrailingSlash($sessionAction->getFolder()) == removeTrailingSlash($_POST['original_path']))
-		{
-			$sessionAction->setFolder($_POST['original_path']);
-		}	
-		$path = addTrailingSlash(getParentPath($_POST['original_path'])) . $_POST['name'];
-		if(is_file($path))
-		{
-			include_once(CLASS_FILE);
-			$file = new file($path);
-			$fileInfo = $file->getFileInfo();
-			$fileInfo['mtime'] = date(DATE_TIME_FORMAT,$fileInfo['mtime']);
-		}else
-		{
-			include_once(CLASS_MANAGER);
-			$manager = new manager($path, false);
-			$fileInfo = $manager->getFolderInfo();
-			$fileInfo['mtime'] = date(DATE_TIME_FORMAT,$fileInfo['mtime']);
-		}
-	}
+        }elseif(removeTrailingSlash($sessionAction->getFolder()) == removeTrailingSlash($_POST['original_path']))
+        {
+            $sessionAction->setFolder($_POST['original_path']);
+        }	
+        $path = addTrailingSlash(getParentPath($_POST['original_path'])) . $_POST['name'];
+        if(is_file($path))
+        {
+            include_once(CLASS_FILE);
+            $file = new file($path);
+            $fileInfo = $file->getFileInfo();
+            $fileInfo['mtime'] = date(DATE_TIME_FORMAT,$fileInfo['mtime']);
+        }else
+        {
+            include_once(CLASS_MANAGER);
+            $manager = new manager($path, false);
+            $fileInfo = $manager->getFolderInfo();
+            $fileInfo['mtime'] = date(DATE_TIME_FORMAT,$fileInfo['mtime']);
+        }
+    }
 	
-	echo "{";
-	echo "error:'" . $error . "' ";
-	foreach ($fileInfo as $k=>$v)
-	{
-		echo "," . $k . ":'" . $v . "' ";
-	}
-	echo "}";
+    echo "{";
+    echo "error:'" . $error . "' ";
+    foreach ($fileInfo as $k=>$v)
+    {
+        echo "," . $k . ":'" . $v . "' ";
+    }
+    echo "}";
 	
 	
 ?>
\ No newline at end of file

Spacing +20 added lines, -20 removed lines

@@ -6,74 +6,74 @@
 	 * @since 22/May/2007
 	 *
 	 */
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+	require_once(dirname(__FILE__).DIRECTORY_SEPARATOR."inc".DIRECTORY_SEPARATOR."config.php");
 	$error = '';
 	$fileInfo = array();
-	if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_RENAME)
+	if (CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_RENAME)
 	{
 		$error = SYS_DISABLED;
 	}
-	elseif(empty($_POST['name']))
+	elseif (empty($_POST['name']))
 	{
 		$error = ERR_RENAME_EMPTY;
-	}elseif(!preg_match("/^[a-zA-Z0-9 _\-.]+$/", $_POST['name']))
+	}elseif (!preg_match("/^[a-zA-Z0-9 _\-.]+$/", $_POST['name']))
 	{
 		$error = ERR_RENAME_FORMAT;
-	}elseif(empty($_POST['original_path']) || !file_exists($_POST['original_path']))
+	}elseif (empty($_POST['original_path']) || !file_exists($_POST['original_path']))
 	{
 		$error = ERR_RENAME_FILE_NOT_EXISTS;
-	}elseif(substr(slashToBackslash(removeTrailingSlash($_POST['original_path'])), strrpos(slashToBackslash(removeTrailingSlash($_POST['original_path'])), "/") + 1) == $_POST['name'])
+	}elseif (substr(slashToBackslash(removeTrailingSlash($_POST['original_path'])), strrpos(slashToBackslash(removeTrailingSlash($_POST['original_path'])), "/") + 1) == $_POST['name'])
 	{
 		$error = ERR_NO_CHANGES_MADE;
-	}elseif(file_exists(addTrailingSlash(getParentPath($_POST['original_path'])) . $_POST['name']))
+	}elseif (file_exists(addTrailingSlash(getParentPath($_POST['original_path'])).$_POST['name']))
 	{
 		$error = ERR_RENAME_EXISTS;
-	}elseif(is_file($_POST['original_path']) && !isValidExt($_POST['name'], explode(",", CONFIG_UPLOAD_VALID_EXTS), explode(",", CONFIG_UPLOAD_INVALID_EXTS)))
+	}elseif (is_file($_POST['original_path']) && !isValidExt($_POST['name'], explode(",", CONFIG_UPLOAD_VALID_EXTS), explode(",", CONFIG_UPLOAD_INVALID_EXTS)))
 	{
 		$error = ERR_RENAME_FILE_TYPE_NOT_PERMITED;
-	}elseif(!rename(removeTrailingSlash($_POST['original_path']), addTrailingSlash(getParentPath($_POST['original_path'])) . $_POST['name']))
+	}elseif (!rename(removeTrailingSlash($_POST['original_path']), addTrailingSlash(getParentPath($_POST['original_path'])).$_POST['name']))
 	{
 		$error = ERR_RENAME_FAILED;
-	}else 
+	} else 
 	{
 		//update record of session if image exists in session for cut or copy
 		include_once(CLASS_SESSION_ACTION);
 		$sessionAction = new SessionAction();		
 		$selectedDocuments = $sessionAction->get();
-		if(removeTrailingSlash($sessionAction->getFolder()) == getParentPath($_POST['original_path']) && sizeof($selectedDocuments))
+		if (removeTrailingSlash($sessionAction->getFolder()) == getParentPath($_POST['original_path']) && sizeof($selectedDocuments))
 		{
-			if(($key = array_search(basename($_POST['original_path']), $selectedDocuments)) !== false)
+			if (($key = array_search(basename($_POST['original_path']), $selectedDocuments)) !== false)
 			{
 				$selectedDocuments[$key] = $_POST['name'];
 				$sessionAction->set($selectedDocuments);
 				
 			}
 			
-		}elseif(removeTrailingSlash($sessionAction->getFolder()) == removeTrailingSlash($_POST['original_path']))
+		}elseif (removeTrailingSlash($sessionAction->getFolder()) == removeTrailingSlash($_POST['original_path']))
 		{
 			$sessionAction->setFolder($_POST['original_path']);
 		}	
-		$path = addTrailingSlash(getParentPath($_POST['original_path'])) . $_POST['name'];
-		if(is_file($path))
+		$path = addTrailingSlash(getParentPath($_POST['original_path'])).$_POST['name'];
+		if (is_file($path))
 		{
 			include_once(CLASS_FILE);
 			$file = new file($path);
 			$fileInfo = $file->getFileInfo();
-			$fileInfo['mtime'] = date(DATE_TIME_FORMAT,$fileInfo['mtime']);
-		}else
+			$fileInfo['mtime'] = date(DATE_TIME_FORMAT, $fileInfo['mtime']);
+		} else
 		{
 			include_once(CLASS_MANAGER);
 			$manager = new manager($path, false);
 			$fileInfo = $manager->getFolderInfo();
-			$fileInfo['mtime'] = date(DATE_TIME_FORMAT,$fileInfo['mtime']);
+			$fileInfo['mtime'] = date(DATE_TIME_FORMAT, $fileInfo['mtime']);
 		}
 	}
 	
 	echo "{";
-	echo "error:'" . $error . "' ";
+	echo "error:'".$error."' ";
 	foreach ($fileInfo as $k=>$v)
 	{
-		echo "," . $k . ":'" . $v . "' ";
+		echo ",".$k.":'".$v."' ";
 	}
 	echo "}";
 	

Braces +10 added lines, -11 removed lines

@@ -12,29 +12,28 @@ 
 	if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_RENAME)
 	{
 		$error = SYS_DISABLED;
-	}
-	elseif(empty($_POST['name']))
+	} elseif(empty($_POST['name']))
 	{
 		$error = ERR_RENAME_EMPTY;
-	}elseif(!preg_match("/^[a-zA-Z0-9 _\-.]+$/", $_POST['name']))
+	} elseif(!preg_match("/^[a-zA-Z0-9 _\-.]+$/", $_POST['name']))
 	{
 		$error = ERR_RENAME_FORMAT;
-	}elseif(empty($_POST['original_path']) || !file_exists($_POST['original_path']))
+	} elseif(empty($_POST['original_path']) || !file_exists($_POST['original_path']))
 	{
 		$error = ERR_RENAME_FILE_NOT_EXISTS;
-	}elseif(substr(slashToBackslash(removeTrailingSlash($_POST['original_path'])), strrpos(slashToBackslash(removeTrailingSlash($_POST['original_path'])), "/") + 1) == $_POST['name'])
+	} elseif(substr(slashToBackslash(removeTrailingSlash($_POST['original_path'])), strrpos(slashToBackslash(removeTrailingSlash($_POST['original_path'])), "/") + 1) == $_POST['name'])
 	{
 		$error = ERR_NO_CHANGES_MADE;
-	}elseif(file_exists(addTrailingSlash(getParentPath($_POST['original_path'])) . $_POST['name']))
+	} elseif(file_exists(addTrailingSlash(getParentPath($_POST['original_path'])) . $_POST['name']))
 	{
 		$error = ERR_RENAME_EXISTS;
-	}elseif(is_file($_POST['original_path']) && !isValidExt($_POST['name'], explode(",", CONFIG_UPLOAD_VALID_EXTS), explode(",", CONFIG_UPLOAD_INVALID_EXTS)))
+	} elseif(is_file($_POST['original_path']) && !isValidExt($_POST['name'], explode(",", CONFIG_UPLOAD_VALID_EXTS), explode(",", CONFIG_UPLOAD_INVALID_EXTS)))
 	{
 		$error = ERR_RENAME_FILE_TYPE_NOT_PERMITED;
-	}elseif(!rename(removeTrailingSlash($_POST['original_path']), addTrailingSlash(getParentPath($_POST['original_path'])) . $_POST['name']))
+	} elseif(!rename(removeTrailingSlash($_POST['original_path']), addTrailingSlash(getParentPath($_POST['original_path'])) . $_POST['name']))
 	{
 		$error = ERR_RENAME_FAILED;
-	}else 
+	} else 
 	{
 		//update record of session if image exists in session for cut or copy
 		include_once(CLASS_SESSION_ACTION);
@@ -49,7 +48,7 @@ 
 				
 			}
 			
-		}elseif(removeTrailingSlash($sessionAction->getFolder()) == removeTrailingSlash($_POST['original_path']))
+		} elseif(removeTrailingSlash($sessionAction->getFolder()) == removeTrailingSlash($_POST['original_path']))
 		{
 			$sessionAction->setFolder($_POST['original_path']);
 		}	
@@ -60,7 +59,7 @@ 
 			$file = new file($path);
 			$fileInfo = $file->getFileInfo();
 			$fileInfo['mtime'] = date(DATE_TIME_FORMAT,$fileInfo['mtime']);
-		}else
+		} else
 		{
 			include_once(CLASS_MANAGER);
 			$manager = new manager($path, false);

phpmyfaq/admin/editor/plugins/ajaxfilemanager/ajax_save_text.php

Indentation +80 added lines, -80 removed lines

@@ -1,88 +1,88 @@
 <?php
-	/**
-	 * ajax save name
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
-	 * @since 22/May/2007
-	 *
-	 */
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
-	$error = '';
-	$path = addTrailingSlash(backslashToSlash($_POST['folder'])) . $_POST['name'];
-	if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_EDITABLE)
-	{
-		$error = SYS_DISABLED;
-	}
-	elseif(isset($_POST['save_as_request']))
-	{		
-		if(!preg_match('/^[a-zA-Z0-9_\-.]+$/', $_POST['name']))
-		{
-			$error = TXT_SAVE_AS_ERR_NAME_INVALID;
-		}elseif(array_search(strtolower(getFileExt($_POST['name'])), getValidTextEditorExts()) === false)
-		{
-			$error = TXT_DISALLOWED_EXT;
-		}elseif(!isUnderRoot($_POST['folder']))
-		{
-			$error = ERR_FOLDER_PATH_NOT_ALLOWED;
-		}
-		else
-		{
+    /**
+     * ajax save name
+     * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+     * @link www.phpletter.com
+     * @since 22/May/2007
+     *
+     */
+    require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+    $error = '';
+    $path = addTrailingSlash(backslashToSlash($_POST['folder'])) . $_POST['name'];
+    if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_EDITABLE)
+    {
+        $error = SYS_DISABLED;
+    }
+    elseif(isset($_POST['save_as_request']))
+    {		
+        if(!preg_match('/^[a-zA-Z0-9_\-.]+$/', $_POST['name']))
+        {
+            $error = TXT_SAVE_AS_ERR_NAME_INVALID;
+        }elseif(array_search(strtolower(getFileExt($_POST['name'])), getValidTextEditorExts()) === false)
+        {
+            $error = TXT_DISALLOWED_EXT;
+        }elseif(!isUnderRoot($_POST['folder']))
+        {
+            $error = ERR_FOLDER_PATH_NOT_ALLOWED;
+        }
+        else
+        {
 			
-			if(!empty($_POST['save_as_request']))
-			{//save as request
-				if(file_exists($path))
-				{
-					$error = TXT_FILE_EXIST;
-				}else 
-				{
-					if(($fp = @fopen($path, 'w+')) !== false)
-					{
-						if(@fwrite($fp, $_POST['text']))
-						{
-							@fclose($fp);
-						}else 
-						{
-							$error = TXT_CONTENT_WRITE_FAILED;
-						}
-					}else 
-					{
-						$error = TXT_CREATE_FAILED;
-					}					
-				}
+            if(!empty($_POST['save_as_request']))
+            {//save as request
+                if(file_exists($path))
+                {
+                    $error = TXT_FILE_EXIST;
+                }else 
+                {
+                    if(($fp = @fopen($path, 'w+')) !== false)
+                    {
+                        if(@fwrite($fp, $_POST['text']))
+                        {
+                            @fclose($fp);
+                        }else 
+                        {
+                            $error = TXT_CONTENT_WRITE_FAILED;
+                        }
+                    }else 
+                    {
+                        $error = TXT_CREATE_FAILED;
+                    }					
+                }
 
 				
-			}else 
-			{
-				if(!file_exists($path))
-				{
-					$error = TXT_FILE_NOT_EXIST;
-				}else 
-				{
-					if(($fp = @fopen($path, 'w')) !== false)
-					{
-						if(@fwrite($fp, $_POST['text']))
-						{
-							@fclose($fp);
-						}else 
-						{
-							$error = TXT_CONTENT_UPDATE_FAILED;
-						}
-					}else 
-					{
-						$error = TXT_FILE_OPEN_FAILED;
-					}						
-				}
-			}
+            }else 
+            {
+                if(!file_exists($path))
+                {
+                    $error = TXT_FILE_NOT_EXIST;
+                }else 
+                {
+                    if(($fp = @fopen($path, 'w')) !== false)
+                    {
+                        if(@fwrite($fp, $_POST['text']))
+                        {
+                            @fclose($fp);
+                        }else 
+                        {
+                            $error = TXT_CONTENT_UPDATE_FAILED;
+                        }
+                    }else 
+                    {
+                        $error = TXT_FILE_OPEN_FAILED;
+                    }						
+                }
+            }
 			
-		}
+        }
 
-	}else 
-	{
-		$error = TXT_UNKNOWN_REQUEST;
-	}
-		echo "{";
-		echo "error:'" . $error . "',\n";
-		echo  "path:'" . $path . "'";
-		echo "}";
+    }else 
+    {
+        $error = TXT_UNKNOWN_REQUEST;
+    }
+        echo "{";
+        echo "error:'" . $error . "',\n";
+        echo  "path:'" . $path . "'";
+        echo "}";
 	
 ?>
\ No newline at end of file

Spacing +24 added lines, -24 removed lines

@@ -6,68 +6,68 @@ 
 	 * @since 22/May/2007
 	 *
 	 */
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+	require_once(dirname(__FILE__).DIRECTORY_SEPARATOR."inc".DIRECTORY_SEPARATOR."config.php");
 	$error = '';
-	$path = addTrailingSlash(backslashToSlash($_POST['folder'])) . $_POST['name'];
-	if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_EDITABLE)
+	$path = addTrailingSlash(backslashToSlash($_POST['folder'])).$_POST['name'];
+	if (CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_EDITABLE)
 	{
 		$error = SYS_DISABLED;
 	}
-	elseif(isset($_POST['save_as_request']))
+	elseif (isset($_POST['save_as_request']))
 	{		
-		if(!preg_match('/^[a-zA-Z0-9_\-.]+$/', $_POST['name']))
+		if (!preg_match('/^[a-zA-Z0-9_\-.]+$/', $_POST['name']))
 		{
 			$error = TXT_SAVE_AS_ERR_NAME_INVALID;
-		}elseif(array_search(strtolower(getFileExt($_POST['name'])), getValidTextEditorExts()) === false)
+		}elseif (array_search(strtolower(getFileExt($_POST['name'])), getValidTextEditorExts()) === false)
 		{
 			$error = TXT_DISALLOWED_EXT;
-		}elseif(!isUnderRoot($_POST['folder']))
+		}elseif (!isUnderRoot($_POST['folder']))
 		{
 			$error = ERR_FOLDER_PATH_NOT_ALLOWED;
 		}
 		else
 		{
 			
-			if(!empty($_POST['save_as_request']))
+			if (!empty($_POST['save_as_request']))
 			{//save as request
-				if(file_exists($path))
+				if (file_exists($path))
 				{
 					$error = TXT_FILE_EXIST;
-				}else 
+				} else 
 				{
-					if(($fp = @fopen($path, 'w+')) !== false)
+					if (($fp = @fopen($path, 'w+')) !== false)
 					{
-						if(@fwrite($fp, $_POST['text']))
+						if (@fwrite($fp, $_POST['text']))
 						{
 							@fclose($fp);
-						}else 
+						} else 
 						{
 							$error = TXT_CONTENT_WRITE_FAILED;
 						}
-					}else 
+					} else 
 					{
 						$error = TXT_CREATE_FAILED;
 					}					
 				}
 
 				
-			}else 
+			} else 
 			{
-				if(!file_exists($path))
+				if (!file_exists($path))
 				{
 					$error = TXT_FILE_NOT_EXIST;
-				}else 
+				} else 
 				{
-					if(($fp = @fopen($path, 'w')) !== false)
+					if (($fp = @fopen($path, 'w')) !== false)
 					{
-						if(@fwrite($fp, $_POST['text']))
+						if (@fwrite($fp, $_POST['text']))
 						{
 							@fclose($fp);
-						}else 
+						} else 
 						{
 							$error = TXT_CONTENT_UPDATE_FAILED;
 						}
-					}else 
+					} else 
 					{
 						$error = TXT_FILE_OPEN_FAILED;
 					}						
@@ -76,13 +76,13 @@ 
 			
 		}
 
-	}else 
+	} else 
 	{
 		$error = TXT_UNKNOWN_REQUEST;
 	}
 		echo "{";
-		echo "error:'" . $error . "',\n";
-		echo  "path:'" . $path . "'";
+		echo "error:'".$error."',\n";
+		echo  "path:'".$path."'";
 		echo "}";
 	
 ?>
\ No newline at end of file

Braces +12 added lines, -14 removed lines

@@ -12,20 +12,18 @@ 
 	if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_EDITABLE)
 	{
 		$error = SYS_DISABLED;
-	}
-	elseif(isset($_POST['save_as_request']))
+	} elseif(isset($_POST['save_as_request']))
 	{		
 		if(!preg_match('/^[a-zA-Z0-9_\-.]+$/', $_POST['name']))
 		{
 			$error = TXT_SAVE_AS_ERR_NAME_INVALID;
-		}elseif(array_search(strtolower(getFileExt($_POST['name'])), getValidTextEditorExts()) === false)
+		} elseif(array_search(strtolower(getFileExt($_POST['name'])), getValidTextEditorExts()) === false)
 		{
 			$error = TXT_DISALLOWED_EXT;
-		}elseif(!isUnderRoot($_POST['folder']))
+		} elseif(!isUnderRoot($_POST['folder']))
 		{
 			$error = ERR_FOLDER_PATH_NOT_ALLOWED;
-		}
-		else
+		} else
 		{
 			
 			if(!empty($_POST['save_as_request']))
@@ -33,41 +31,41 @@ 
 				if(file_exists($path))
 				{
 					$error = TXT_FILE_EXIST;
-				}else 
+				} else 
 				{
 					if(($fp = @fopen($path, 'w+')) !== false)
 					{
 						if(@fwrite($fp, $_POST['text']))
 						{
 							@fclose($fp);
-						}else 
+						} else 
 						{
 							$error = TXT_CONTENT_WRITE_FAILED;
 						}
-					}else 
+					} else 
 					{
 						$error = TXT_CREATE_FAILED;
 					}					
 				}
 
 				
-			}else 
+			} else 
 			{
 				if(!file_exists($path))
 				{
 					$error = TXT_FILE_NOT_EXIST;
-				}else 
+				} else 
 				{
 					if(($fp = @fopen($path, 'w')) !== false)
 					{
 						if(@fwrite($fp, $_POST['text']))
 						{
 							@fclose($fp);
-						}else 
+						} else 
 						{
 							$error = TXT_CONTENT_UPDATE_FAILED;
 						}
-					}else 
+					} else 
 					{
 						$error = TXT_FILE_OPEN_FAILED;
 					}						
@@ -76,7 +74,7 @@ 
 			
 		}
 
-	}else 
+	} else 
 	{
 		$error = TXT_UNKNOWN_REQUEST;
 	}

phpmyfaq/admin/editor/plugins/phpmyfaq/dialog.php

Spacing +2 added lines, -2 removed lines

@@ -18,10 +18,10 @@
 define('PMF_ROOT_DIR', dirname(dirname(dirname(dirname(__DIR__)))));
 define('IS_VALID_PHPMYFAQ', null);
 
-require PMF_ROOT_DIR . '/inc/Bootstrap.php';
+require PMF_ROOT_DIR.'/inc/Bootstrap.php';
 
 $user = PMF_User_CurrentUser::getFromCookie($faqConfig);
-if (! $user instanceof PMF_User_CurrentUser) {
+if (!$user instanceof PMF_User_CurrentUser) {
     $user = PMF_User_CurrentUser::getFromSession($faqConfig);
 }
 

phpmyfaq/admin/ajax.config_list.php

Indentation +4 added lines, -4 removed lines

@@ -98,8 +98,8 @@ 
                         echo PMF_Language::languageOptions(
                             str_replace(
                                 array(
-                                     'language_',
-                                     '.php'
+                                        'language_',
+                                        '.php'
                                 ),
                                 '',
                                 $faqConfig->get('main.language')
@@ -110,7 +110,7 @@ 
                     } else {
                         echo '<option value="language_en.php">English</option>';
                     }
-                   break;
+                    break;
                 
                 case 'records.orderby':
                     echo PMF_Configuration::sortingOptions($faqConfig->get($key));
@@ -147,7 +147,7 @@ 
                                   ? ' selected="selected"'
                                   : '';
                         printf('<option value="%d"%s>%s</option>',
-                               $i, $selected, $item);
+                                $i, $selected, $item);
                     }
                     break;
                     

Spacing +11 added lines, -11 removed lines

@@ -20,14 +20,14 @@ 
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
         $protocol = 'https';
     }
-    header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 
-require PMF_ROOT_DIR . '/inc/libs/twitteroauth/twitteroauth.php';
+require PMF_ROOT_DIR.'/inc/libs/twitteroauth/twitteroauth.php';
 
 if (!empty($_SESSION['access_token'])) {
     $connection = new TwitterOAuth(
@@ -134,7 +134,7 @@ 
                     $templates = $faqSystem->getAvailableTemplates();
 
                     foreach ($templates as $template => $selected) {
-                        printf ("<option%s>%s</option>",
+                        printf("<option%s>%s</option>",
                             ($selected === true ? ' selected="selected"' : ''),
                             $template
                         );
@@ -142,7 +142,7 @@ 
                     break;
                     
                 case "records.attachmentsStorageType":
-                    foreach($PMF_LANG['att_storage_type'] as $i => $item) {
+                    foreach ($PMF_LANG['att_storage_type'] as $i => $item) {
                         $selected = $faqConfig->get($key) == $i
                                   ? ' selected="selected"'
                                   : '';
@@ -226,18 +226,18 @@ 
 
                 echo '<a target="_blank" href="https://dev.twitter.com/apps/new">Create Twitter App for your FAQ</a>';
                 echo "<br />\n";
-                echo "Your Callback URL is: " .$faqConfig->get('main.referenceURL') . "/services/twitter/callback.php";
+                echo "Your Callback URL is: ".$faqConfig->get('main.referenceURL')."/services/twitter/callback.php";
             }
 
             if (!isset($content)) {
                 echo '<a target="_blank" href="../services/twitter/redirect.php">';
                 echo '<img src="../assets/img/twitter.signin.png" alt="Sign in with Twitter"/></a>';
             } elseif (isset($content)) {
-                echo $content->screen_name . "<br />\n";
-                echo "<img src='" . $content->profile_image_url_https . "'><br />\n";
-                echo "Follower: " . $content->followers_count . "<br />\n";
-                echo "Status Count: " . $content->statuses_count . "<br />\n";
-                echo "Status: " . $content->status->text;
+                echo $content->screen_name."<br />\n";
+                echo "<img src='".$content->profile_image_url_https."'><br />\n";
+                echo "Follower: ".$content->followers_count."<br />\n";
+                echo "Status Count: ".$content->statuses_count."<br />\n";
+                echo "Status: ".$content->status->text;
             }
             echo '</div>';
             echo '</div>';

phpmyfaq/admin/ajax.records.php

Indentation +17 added lines, -17 removed lines

@@ -1,22 +1,22 @@
 <?php
 /**
- * AJAX: handling of Ajax record calls
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Administration
- * @author    Anatoliy Belsky <anatoliy.belsky@mayflower.de>
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2009-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2009-03-31
- */
+     * AJAX: handling of Ajax record calls
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Administration
+     * @author    Anatoliy Belsky <anatoliy.belsky@mayflower.de>
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2009-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2009-03-31
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';

Switch Indentation +74 added lines, -74 removed lines

@@ -51,102 +51,102 @@
 switch($ajax_action) {
 
     // save active FAQs
-    case 'save_active_records':
-        if ($permission['approverec']) {
-            if (!empty($items)) {
-                $faq = new PMF_Faq($faqConfig);
+        case 'save_active_records':
+            if ($permission['approverec']) {
+                if (!empty($items)) {
+                    $faq = new PMF_Faq($faqConfig);
                 
-                foreach ($items as $item) {
-                    if (is_array($item) && count($item) == 3 && PMF_Language::isASupportedLanguage($item[1])) {
-                        echo $faq->updateRecordFlag((int)$item[0], addslashes($item[1]), $item[2], 'active');
+                    foreach ($items as $item) {
+                        if (is_array($item) && count($item) == 3 && PMF_Language::isASupportedLanguage($item[1])) {
+                            echo $faq->updateRecordFlag((int)$item[0], addslashes($item[1]), $item[2], 'active');
+                        }
                     }
                 }
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
             }
-        } else {
-            echo $PMF_LANG['err_NotAuth'];
-        }
-        break;
+            break;
 
-    // save sticky FAQs
-    case 'save_sticky_records':
-        if ($permission['editbt']) {
+        // save sticky FAQs
+        case 'save_sticky_records':
+            if ($permission['editbt']) {
 
-            if (!empty($items)) {
-                $faq = new PMF_Faq($faqConfig);
+                if (!empty($items)) {
+                    $faq = new PMF_Faq($faqConfig);
 
-                foreach ($items as $item) {
-                    if (is_array($item) && count($item) == 3 && PMF_Language::isASupportedLanguage($item[1])) {
-                        echo $faq->updateRecordFlag((int)$item[0], addslashes($item[1]), $item[2], 'sticky');
+                    foreach ($items as $item) {
+                        if (is_array($item) && count($item) == 3 && PMF_Language::isASupportedLanguage($item[1])) {
+                            echo $faq->updateRecordFlag((int)$item[0], addslashes($item[1]), $item[2], 'sticky');
+                        }
                     }
                 }
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
             }
-        } else {
-            echo $PMF_LANG['err_NotAuth'];
-        }
-        break;
+            break;
 
-    // search FAQs for suggestions
-    case 'search_records':
-        if ($permission['editbt']) {
+        // search FAQs for suggestions
+        case 'search_records':
+            if ($permission['editbt']) {
 
-            $faq             = new PMF_Faq($faqConfig);
-            $faqSearch       = new PMF_Search($faqConfig);
-            $faqSearchResult = new PMF_Search_Resultset($user, $faq, $faqConfig);
-            $searchResult    = '';
-            $searchString    = PMF_Filter::filterInput(INPUT_POST, 'search', FILTER_SANITIZE_STRIPPED);
+                $faq             = new PMF_Faq($faqConfig);
+                $faqSearch       = new PMF_Search($faqConfig);
+                $faqSearchResult = new PMF_Search_Resultset($user, $faq, $faqConfig);
+                $searchResult    = '';
+                $searchString    = PMF_Filter::filterInput(INPUT_POST, 'search', FILTER_SANITIZE_STRIPPED);
 
-            if (!is_null($searchString)) {
-                $searchResult = $faqSearch->search($searchString, false);
+                if (!is_null($searchString)) {
+                    $searchResult = $faqSearch->search($searchString, false);
 
-                $faqSearchResult->reviewResultset($searchResult);
+                    $faqSearchResult->reviewResultset($searchResult);
 
-                $searchHelper = new PMF_Helper_Search($faqConfig);
-                $searchHelper->setSearchterm($searchString);
+                    $searchHelper = new PMF_Helper_Search($faqConfig);
+                    $searchHelper->setSearchterm($searchString);
 
-                echo $searchHelper->renderAdminSuggestionResult($faqSearchResult);
-            }
+                    echo $searchHelper->renderAdminSuggestionResult($faqSearchResult);
+                }
             
-        } else {
-            echo $PMF_LANG['err_NotAuth'];
-        }
-        break;
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
+            }
+            break;
 
-    // delete FAQs
-    case 'delete_record':
-        if ($permission['delbt']) {
+        // delete FAQs
+        case 'delete_record':
+            if ($permission['delbt']) {
 
-            $recordId   = PMF_Filter::filterInput(INPUT_POST, 'record_id', FILTER_VALIDATE_INT);
-            $recordLang = PMF_Filter::filterInput(INPUT_POST, 'record_lang', FILTER_SANITIZE_STRING);
+                $recordId   = PMF_Filter::filterInput(INPUT_POST, 'record_id', FILTER_VALIDATE_INT);
+                $recordLang = PMF_Filter::filterInput(INPUT_POST, 'record_lang', FILTER_SANITIZE_STRING);
 
-            $logging = new PMF_Logging($faqConfig);
-            $logging->logAdmin($user, 'Deleted FAQ ID ' . $recordId);
+                $logging = new PMF_Logging($faqConfig);
+                $logging->logAdmin($user, 'Deleted FAQ ID ' . $recordId);
 
-            $faq->deleteRecord($recordId, $recordLang);
-            echo $PMF_LANG['ad_entry_delsuc'];
+                $faq->deleteRecord($recordId, $recordLang);
+                echo $PMF_LANG['ad_entry_delsuc'];
             
-        } else {
-            echo $PMF_LANG['err_NotAuth'];
-        }
-        break;
-
-    // delete open questions
-    case 'delete_question':
-        if ($permission['delquestion']) {
-
-            $checks  = array(
-                'filter'  => FILTER_VALIDATE_INT,
-                'flags'   => FILTER_REQUIRE_ARRAY
-            );
-            $questionIds = PMF_Filter::filterInputArray(INPUT_POST, array('questions' => $checks));
-
-            if (!is_null($questionIds['questions'])) {
-                foreach ($questionIds['questions'] as $questionId) {
-                    $faq->deleteQuestion((int)$questionId);
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
+            }
+            break;
+
+        // delete open questions
+        case 'delete_question':
+            if ($permission['delquestion']) {
+
+                $checks  = array(
+                    'filter'  => FILTER_VALIDATE_INT,
+                    'flags'   => FILTER_REQUIRE_ARRAY
+                );
+                $questionIds = PMF_Filter::filterInputArray(INPUT_POST, array('questions' => $checks));
+
+                if (!is_null($questionIds['questions'])) {
+                    foreach ($questionIds['questions'] as $questionId) {
+                        $faq->deleteQuestion((int)$questionId);
+                    }
                 }
+                echo $PMF_LANG['ad_entry_delsuc'];
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
             }
-            echo $PMF_LANG['ad_entry_delsuc'];
-        } else {
-            echo $PMF_LANG['err_NotAuth'];
-        }
-        break;
+            break;
 }

Spacing +5 added lines, -5 removed lines

@@ -20,10 +20,10 @@ 
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
         $protocol = 'https';
     }
-    header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 
@@ -48,7 +48,7 @@ 
     $items[0][2] = 0;
 }
 
-switch($ajax_action) {
+switch ($ajax_action) {
 
     // save active FAQs
     case 'save_active_records':
@@ -119,7 +119,7 @@ 
             $recordLang = PMF_Filter::filterInput(INPUT_POST, 'record_lang', FILTER_SANITIZE_STRING);
 
             $logging = new PMF_Logging($faqConfig);
-            $logging->logAdmin($user, 'Deleted FAQ ID ' . $recordId);
+            $logging->logAdmin($user, 'Deleted FAQ ID '.$recordId);
 
             $faq->deleteRecord($recordId, $recordLang);
             echo $PMF_LANG['ad_entry_delsuc'];
@@ -133,7 +133,7 @@ 
     case 'delete_question':
         if ($permission['delquestion']) {
 
-            $checks  = array(
+            $checks = array(
                 'filter'  => FILTER_VALIDATE_INT,
                 'flags'   => FILTER_REQUIRE_ARRAY
             );

phpmyfaq/admin/attachment.php

Indentation +17 added lines, -17 removed lines

@@ -1,22 +1,22 @@
 <?php
 /**
- * Select an attachment and save it
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Administration
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @author    Anatoliy Belsky <ab@php.net>
- * @copyright 2002-2015 phpMyFAQ
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2002-09-17
- */
+         * Select an attachment and save it
+         *
+         * PHP Version 5.3
+         *
+         * This Source Code Form is subject to the terms of the Mozilla Public License,
+         * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+         * obtain one at http://mozilla.org/MPL/2.0/.
+         *
+         * @category  phpMyFAQ
+         * @package   Administration
+         * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+         * @author    Anatoliy Belsky <ab@php.net>
+         * @copyright 2002-2015 phpMyFAQ
+         * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+         * @link      http://www.phpmyfaq.de
+         * @since     2002-09-17
+         */
 
 define('PMF_ROOT_DIR', dirname(__DIR__));
 

Spacing +8 added lines, -8 removed lines

@@ -28,7 +28,7 @@ 
 //
 // Bootstrapping
 //
-require PMF_ROOT_DIR . '/inc/Bootstrap.php';
+require PMF_ROOT_DIR.'/inc/Bootstrap.php';
 
 /**
  * Initialize attachment factory
@@ -46,17 +46,17 @@ 
 $Language = new PMF_Language($faqConfig);
 $LANGCODE = $Language->setLanguage($faqConfig->get('main.languageDetection'), $faqConfig->get('main.language'));
 
-require_once PMF_ROOT_DIR . '/lang/language_en.php';
+require_once PMF_ROOT_DIR.'/lang/language_en.php';
 
 if (isset($LANGCODE) && PMF_Language::isASupportedLanguage($LANGCODE)) {
-    require_once PMF_ROOT_DIR . '/lang/language_'.$LANGCODE.'.php';
+    require_once PMF_ROOT_DIR.'/lang/language_'.$LANGCODE.'.php';
 } else {
     $LANGCODE = 'en';
 }
 
 $auth = false;
 $user = PMF_User_CurrentUser::getFromCookie($faqConfig);
-if (! $user instanceof PMF_User_CurrentUser) {
+if (!$user instanceof PMF_User_CurrentUser) {
     $user = PMF_User_CurrentUser::getFromSession($faqConfig);
 }
 if ($user) {
@@ -119,14 +119,14 @@ 
 <?php
 }
 if (is_null($currentAction) && $auth && $permission['addattachment']) {
-    $recordId   = filter_input(INPUT_GET, 'record_id',   FILTER_VALIDATE_INT);
+    $recordId   = filter_input(INPUT_GET, 'record_id', FILTER_VALIDATE_INT);
     $recordLang = filter_input(INPUT_GET, 'record_lang', FILTER_SANITIZE_STRING);
 ?>
         <form action="attachment.php?action=save" enctype="multipart/form-data" method="post" accept-charset="utf-8">
             <fieldset>
             <legend>
                 <?php echo $PMF_LANG["ad_att_addto"]." ".$PMF_LANG["ad_att_addto_2"]; ?>
-                (max <?php echo round($faqConfig->get('records.maxAttachmentSize') / pow(1024, 2), 2) ?> MB)
+                (max <?php echo round($faqConfig->get('records.maxAttachmentSize')/pow(1024, 2), 2) ?> MB)
             </legend>
                 <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $faqConfig->get('records.maxAttachmentSize'); ?>" />
                 <input type="hidden" name="record_id" value="<?php echo $recordId; ?>" />
@@ -152,7 +152,7 @@ 
 }
 
 if (!is_null($currentSave) && $currentSave == true && $auth && $permission['addattachment']) {
-    $recordId   = filter_input(INPUT_POST, 'record_id',   FILTER_VALIDATE_INT);
+    $recordId   = filter_input(INPUT_POST, 'record_id', FILTER_VALIDATE_INT);
     $recordLang = filter_input(INPUT_POST, 'record_lang', FILTER_SANITIZE_STRING);
 ?>
 <p><strong><?php echo $PMF_LANG["ad_att_addto"]." ".$PMF_LANG["ad_att_addto_2"]; ?></strong></p>
@@ -194,7 +194,7 @@ 
             '<p>%s</p>',
             sprintf(
                 $PMF_LANG['ad_attach_4'],
-                round($faqConfig->get('records.maxAttachmentSize') / pow(1024, 2), 2)
+                round($faqConfig->get('records.maxAttachmentSize')/pow(1024, 2), 2)
             )
         );
 

Braces +3 added lines, -2 removed lines

@@ -75,8 +75,9 @@
     // check user rights, set them TRUE
     $allUserRights = $user->perm->getAllUserRights($user->getUserId());
     foreach ($allRights as $right) {
-        if (in_array($right['right_id'], $allUserRights))
-            $permission[$right['name']] = true;
+        if (in_array($right['right_id'], $allUserRights)) {
+                    $permission[$right['name']] = true;
+        }
     }
 }