Inspection of "Merge pull request #740 from evolution-cms/issue-#..." - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — develop ( 80f130...524d8a )

by Maxim

created 2018-06-26 11:47 UTC

Status

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -1,17 +1,17 @@
 block discarded – undo
 <?php
 
 /** This file is part of KCFinder project. The class are taken from
-  * http://www.php.net/manual/en/function.ziparchive-addemptydir.php
-  *
-  *      @desc Directory to ZIP file archivator
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <[email protected]>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ * http://www.php.net/manual/en/function.ziparchive-addemptydir.php
+ *
+ *      @desc Directory to ZIP file archivator
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <[email protected]>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class zipFolder {
     protected $zip;

Please login to merge, or discard this patch.

manager/media/browser/mcpuk/browse.php 1 patch

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -1,23 +1,23 @@
 block discarded – undo
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Browser calling script
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <[email protected]>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc Browser calling script
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <[email protected]>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 require "core/autoload.php"; // Init MODX
 
 function returnNoPermissionsMessage($role) {
-	global $_lang;
-	echo sprintf($_lang['files_management_no_permission'], $role);
-	exit;
+    global $_lang;
+    echo sprintf($_lang['files_management_no_permission'], $role);
+    exit;
 }
 
 if( $_GET['type'] == 'images' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_images')) returnNoPermissionsMessage('assets_images');

Please login to merge, or discard this patch.

manager/media/rss/rss_fetch.inc 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -166,7 +166,7 @@
 block discarded – undo
         $resp = _fetch_remote_file( $url, $request_headers );
         
         if (isset($resp) and $resp) {
-          if ($resp->status == '304' ) {
+            if ($resp->status == '304' ) {
                 // we have the most current copy
                 if ( MAGPIE_DEBUG > 1) {
                     debug("Got 304 for $url");

Please login to merge, or discard this patch.

manager/includes/debug.inc.php 1 patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
 
 // show debug information
 if(isset($enable_debug) && $enable_debug==true) {
-	?>
+    ?>
 	<script language="javascript">
 	//document.onload = removeDebug();
 	
@@ -33,8 +33,8 @@  discard block
 block discarded – undo
 	}
 	</style>
 	<?php
-	$mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $tend = $mtime; $totaltime = ($tend - $tstart);
-	?>
+    $mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $tend = $mtime; $totaltime = ($tend - $tstart);
+    ?>
 	<div class='debug' id='debug' name='debug' onClick="removeDebugDiv();">
 		<table border="0" cellspacing="0" cellpadding="0">
 		  <tr>

Please login to merge, or discard this patch.

manager/includes/extenders/message.quit.inc.php 1 patch

Indentation +34 added lines, -34 removed lines patch added patch discarded remove patch

@@ -19,60 +19,60 @@
 block discarded – undo
 </head><body>
 ";
 if($is_error) {
-	$parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'>&nbsp;MODX Parse Error </h3>
+    $parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'>&nbsp;MODX Parse Error </h3>
 	<table border='0' cellpadding='1' cellspacing='0'>
 	<tr><td colspan='3'>MODX encountered the following error while attempting to parse the requested resource:</td></tr>
 	<tr><td colspan='3'><b style='color:red;'>&laquo; $msg &raquo;</b></td></tr>";
 } else {
-	$parsedMessageString .= "<h3 style='color:#003399; background:#eeeeee;padding:2px;'>&nbsp;MODX Debug/ stop message </h3>
+    $parsedMessageString .= "<h3 style='color:#003399; background:#eeeeee;padding:2px;'>&nbsp;MODX Debug/ stop message </h3>
 	<table border='0' cellpadding='1' cellspacing='0'>
 	<tr><td colspan='3'>The MODX parser recieved the following debug/ stop message:</td></tr>
 	<tr><td colspan='3'><b style='color:#003399;'>&laquo; $msg &raquo;</b></td></tr>";
 }
 
 if(!empty($query)) {
-	$parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SQL:&nbsp;<span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/>
+    $parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SQL:&nbsp;<span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/>
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='javascript:copyToClip();' style='color:#821517;font-size: 9px; text-decoration: none'>[Copy SQL to ClipBoard]</a><textarea id='holdtext' style='display:none;'></textarea></td></tr>";
 }
 
 if($text!='') {
 
-	$errortype = array (
-		E_ERROR          => "Error",
-		E_WARNING        => "Warning",
-		E_PARSE          => "Parsing Error",
-		E_NOTICE          => "Notice",
-		E_CORE_ERROR      => "Core Error",
-		E_CORE_WARNING    => "Core Warning",
-		E_COMPILE_ERROR  => "Compile Error",
-		E_COMPILE_WARNING => "Compile Warning",
-		E_USER_ERROR      => "User Error",
-		E_USER_WARNING    => "User Warning",
-		E_USER_NOTICE    => "User Notice",
-	);
+    $errortype = array (
+        E_ERROR          => "Error",
+        E_WARNING        => "Warning",
+        E_PARSE          => "Parsing Error",
+        E_NOTICE          => "Notice",
+        E_CORE_ERROR      => "Core Error",
+        E_CORE_WARNING    => "Core Warning",
+        E_COMPILE_ERROR  => "Compile Error",
+        E_COMPILE_WARNING => "Compile Warning",
+        E_USER_ERROR      => "User Error",
+        E_USER_WARNING    => "User Warning",
+        E_USER_NOTICE    => "User Notice",
+    );
 
-	$parsedMessageString .= "<tr><td>&nbsp;</td></tr><tr><td colspan='3'><b>PHP error debug</b></td></tr>";
+    $parsedMessageString .= "<tr><td>&nbsp;</td></tr><tr><td colspan='3'><b>PHP error debug</b></td></tr>";
 
-	$parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Error: </td>";
-	$parsedMessageString .= "<td colspan='2'>$text</td><td>&nbsp;</td>";
-	$parsedMessageString .= "</tr>";
+    $parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Error: </td>";
+    $parsedMessageString .= "<td colspan='2'>$text</td><td>&nbsp;</td>";
+    $parsedMessageString .= "</tr>";
 
-	$parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Error type/ Nr.: </td>";
-	$parsedMessageString .= "<td colspan='2'>".$errortype[$nr]." - $nr</b></td><td>&nbsp;</td>";
-	$parsedMessageString .= "</tr>";
+    $parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Error type/ Nr.: </td>";
+    $parsedMessageString .= "<td colspan='2'>".$errortype[$nr]." - $nr</b></td><td>&nbsp;</td>";
+    $parsedMessageString .= "</tr>";
 
-	$parsedMessageString .= "<tr><td>&nbsp;&nbsp;File: </td>";
-	$parsedMessageString .= "<td colspan='2'>$file</td><td>&nbsp;</td>";
-	$parsedMessageString .= "</tr>";
+    $parsedMessageString .= "<tr><td>&nbsp;&nbsp;File: </td>";
+    $parsedMessageString .= "<td colspan='2'>$file</td><td>&nbsp;</td>";
+    $parsedMessageString .= "</tr>";
 
-	$parsedMessageString .= "<tr><td>&nbsp;&nbsp;Line: </td>";
-	$parsedMessageString .= "<td colspan='2'>$line</td><td>&nbsp;</td>";
-	$parsedMessageString .= "</tr>";
-	if($source!='') {
-		$parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Line $line source: </td>";
-		$parsedMessageString .= "<td colspan='2'>$source</td><td>&nbsp;</td>";
-		$parsedMessageString .= "</tr>";
-	}
+    $parsedMessageString .= "<tr><td>&nbsp;&nbsp;Line: </td>";
+    $parsedMessageString .= "<td colspan='2'>$line</td><td>&nbsp;</td>";
+    $parsedMessageString .= "</tr>";
+    if($source!='') {
+        $parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Line $line source: </td>";
+        $parsedMessageString .= "<td colspan='2'>$source</td><td>&nbsp;</td>";
+        $parsedMessageString .= "</tr>";
+    }
 }
 
 $parsedMessageString .= "<tr><td>&nbsp;</td></tr><tr><td colspan='3'><b>Parser timing</b></td></tr>";

Please login to merge, or discard this patch.

manager/includes/manager.lockout.inc.php 1 patch

Indentation +35 added lines, -35 removed lines patch added patch discarded remove patch

@@ -22,7 +22,7 @@  discard block
 block discarded – undo
 
     // load template
     if(!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
-    	$modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
+        $modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
     }
 
     $target = $modx->config['manager_lockout_tpl'];
@@ -30,40 +30,40 @@  discard block
 block discarded – undo
     $target = $modx->mergeSettingsContent($target);
 
     if(substr($target,0,1)==='@') {
-    	if(substr($target,0,6)==='@CHUNK') {
-    		$target = trim(substr($target,7));
-    		$lockout_tpl = $modx->getChunk($target);
-    	}
-    	elseif(substr($target,0,5)==='@FILE') {
-    		$target = trim(substr($target,6));
-    		$lockout_tpl = file_get_contents($target);
-    	}
-	} else {
-    	$chunk = $modx->getChunk($target);
-    	if($chunk!==false && !empty($chunk)) {
-    		$lockout_tpl = $chunk;
-    	}
-    	elseif(is_file(MODX_BASE_PATH . $target)) {
-    		$target = MODX_BASE_PATH . $target;
-    		$lockout_tpl = file_get_contents($target);
-    	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
-    		$lockout_tpl = file_get_contents($target);
-    	}
-	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
-		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
-		$login_tpl = file_get_contents($target);
-	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
-    		$lockout_tpl = file_get_contents($target);
-    	}
-    	else {
-    		$target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
-    		$lockout_tpl = file_get_contents($target);
-    	}
-	}
+        if(substr($target,0,6)==='@CHUNK') {
+            $target = trim(substr($target,7));
+            $lockout_tpl = $modx->getChunk($target);
+        }
+        elseif(substr($target,0,5)==='@FILE') {
+            $target = trim(substr($target,6));
+            $lockout_tpl = file_get_contents($target);
+        }
+    } else {
+        $chunk = $modx->getChunk($target);
+        if($chunk!==false && !empty($chunk)) {
+            $lockout_tpl = $chunk;
+        }
+        elseif(is_file(MODX_BASE_PATH . $target)) {
+            $target = MODX_BASE_PATH . $target;
+            $lockout_tpl = file_get_contents($target);
+        }
+        elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
+            $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
+            $lockout_tpl = file_get_contents($target);
+        }
+    elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
+        $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
+        $login_tpl = file_get_contents($target);
+    }
+        elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
+            $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
+            $lockout_tpl = file_get_contents($target);
+        }
+        else {
+            $target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
+            $lockout_tpl = file_get_contents($target);
+        }
+    }
 
     // merge placeholders
     $lockout_tpl = $modx->mergePlaceholderContent($lockout_tpl);

Please login to merge, or discard this patch.

manager/media/rss/rss_cache.inc 1 patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -94,13 +94,13 @@  discard block
 block discarded – undo
         }
 
         if ($filesize = filesize($cache_file) ) {
-        	$data = fread( $fp, filesize($cache_file) );
-        	$rss = $this->unserialize( $data );
+            $data = fread( $fp, filesize($cache_file) );
+            $rss = $this->unserialize( $data );
 
-        	return $rss;
-    	}
+            return $rss;
+        }
 
-    	return 0;
+        return 0;
     }
 
 /*=======================================================================*\
@@ -134,17 +134,17 @@  discard block
 block discarded – undo
         }
     }
 
-	function cache_age( $cache_key ) {
-		$filename = $this->file_name( $url );
-		if ( file_exists( $filename ) ) {
-			$mtime = filemtime( $filename );
+    function cache_age( $cache_key ) {
+        $filename = $this->file_name( $url );
+        if ( file_exists( $filename ) ) {
+            $mtime = filemtime( $filename );
             $age = time() - $mtime;
-			return $age;
-		}
-		else {
-			return -1;
-		}
-	}
+            return $age;
+        }
+        else {
+            return -1;
+        }
+    }
 
 /*=======================================================================*\
     Function:   serialize

Please login to merge, or discard this patch.

manager/media/browser/mcpuk/lib/class_gd.php 1 patch

Indentation +92 added lines, -92 removed lines patch added patch discarded remove patch

@@ -1,44 +1,44 @@  discard block
 block discarded – undo
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc GD extension class
-  *   @package KCFinder
-  *   @version 2.51
-  *    @author Pavel Tzonkov <[email protected]>
-  * @copyright 2010, 2011 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc GD extension class
+ *   @package KCFinder
+ *   @version 2.51
+ *    @author Pavel Tzonkov <[email protected]>
+ * @copyright 2010, 2011 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class gd {
 
-  /** GD resource
-    * @var resource */
+    /** GD resource
+     * @var resource */
     protected $image;
 
-  /** Image width
-    * @var integer */
+    /** Image width
+     * @var integer */
     protected $width;
 
-  /** Image height
-    * @var integer */
+    /** Image height
+     * @var integer */
     protected $height;
 
-  /** Init error
-    * @var bool */
+    /** Init error
+     * @var bool */
     public $init_error = false;
 
-  /** Last builded image type constant (IMAGETYPE_XXX)
-    * @var integer */
+    /** Last builded image type constant (IMAGETYPE_XXX)
+     * @var integer */
     public $type;
 
-  /** Returns an array. Element 0 - GD resource. Element 1 - width. Element 2 - height.
-    * Returns FALSE on failure. The only one parameter $image can be an instance of this class,
-    * a GD resource, an array(width, height) or path to image file.
-    * @param mixed $image
-    * @return array */
+    /** Returns an array. Element 0 - GD resource. Element 1 - width. Element 2 - height.
+     * Returns FALSE on failure. The only one parameter $image can be an instance of this class,
+     * a GD resource, an array(width, height) or path to image file.
+     * @param mixed $image
+     * @return array */
 
     protected function build_image($image) {
 
@@ -87,16 +87,16 @@  discard block
 block discarded – undo
         return $return;
     }
 
-  /** Parameter $image can be:
-    *   1. An instance of this class (copy instance).
-    *   2. A GD resource.
-    *   3. An array with two elements. First - width, second - height. Create a blank image.
-    *   4. A filename string. Get image form file.
-    * The non-required parameter $bigger_size is the bigger dimension (width or height) the image
-    * will be resized to. The other dimension (height or width) will be calculated autamaticaly
-    * @param mixed $image
-    * @param integer $bigger_size
-    * @return gd */
+    /** Parameter $image can be:
+     *   1. An instance of this class (copy instance).
+     *   2. A GD resource.
+     *   3. An array with two elements. First - width, second - height. Create a blank image.
+     *   4. A filename string. Get image form file.
+     * The non-required parameter $bigger_size is the bigger dimension (width or height) the image
+     * will be resized to. The other dimension (height or width) will be calculated autamaticaly
+     * @param mixed $image
+     * @param integer $bigger_size
+     * @return gd */
 
     public function __construct($image, $bigger_size=null) {
         $this->image = $this->width = $this->height = null;
@@ -123,30 +123,30 @@  discard block
 block discarded – undo
         }
     }
 
-  /** Returns the GD resource
-    * @return resource */
+    /** Returns the GD resource
+     * @return resource */
 
     public function get_image() {
         return $this->image;
     }
 
-  /** Returns the image width
-    * @return integer */
+    /** Returns the image width
+     * @return integer */
 
     public function get_width() {
         return $this->width;
     }
 
-  /** Returns the image height
-    * @return integer */
+    /** Returns the image height
+     * @return integer */
 
     public function get_height() {
         return $this->height;
     }
 
-  /** Returns calculated proportional width from the given height
-    * @param integer $resized_height
-    * @return integer */
+    /** Returns calculated proportional width from the given height
+     * @param integer $resized_height
+     * @return integer */
 
     public function get_prop_width($resized_height) {
         $width = intval(($this->width * $resized_height) / $this->height);
@@ -154,9 +154,9 @@  discard block
 block discarded – undo
         return $width;
     }
 
-  /** Returns calculated proportional height from the given width
-    * @param integer $resized_width
-    * @return integer */
+    /** Returns calculated proportional height from the given width
+     * @param integer $resized_width
+     * @return integer */
 
     public function get_prop_height($resized_width) {
         $height = intval(($this->height * $resized_width) / $this->width);
@@ -164,11 +164,11 @@  discard block
 block discarded – undo
         return $height;
     }
 
-  /** Returns an array with calculated proportional width & height.
-    * The parameter $bigger_size is the bigger dimension (width or height) of calculated sizes.
-    * The other dimension (height or width) will be calculated autamaticaly
-    * @param integer $bigger_size
-    * @return array */
+    /** Returns an array with calculated proportional width & height.
+     * The parameter $bigger_size is the bigger dimension (width or height) of calculated sizes.
+     * The other dimension (height or width) will be calculated autamaticaly
+     * @param integer $bigger_size
+     * @return array */
 
     public function get_prop_size($bigger_size) {
 
@@ -186,10 +186,10 @@  discard block
 block discarded – undo
         return array($width, $height);
     }
 
-  /** Resize image. Returns TRUE on success or FALSE on failure
-    * @param integer $width
-    * @param integer $height
-    * @return bool */
+    /** Resize image. Returns TRUE on success or FALSE on failure
+     * @param integer $width
+     * @param integer $height
+     * @return bool */
 
     public function resize($width, $height) {
         if (!$width) $width = 1;
@@ -203,10 +203,10 @@  discard block
 block discarded – undo
         );
     }
 
-  /** Resize the given image source (GD, gd object or image file path) to fit in the own image.
-    * The outside ares will be cropped out. Returns TRUE on success or FALSE on failure
-    * @param mixed $src
-    * @return bool */
+    /** Resize the given image source (GD, gd object or image file path) to fit in the own image.
+     * The outside ares will be cropped out. Returns TRUE on success or FALSE on failure
+     * @param mixed $src
+     * @return bool */
 
     public function resize_crop($src) {
         $image_details = $this->build_image($src);
@@ -233,10 +233,10 @@  discard block
 block discarded – undo
             return false;
     }
 
-  /** Resize image to fit in given resolution. Returns TRUE on success or FALSE on failure
-    * @param integer $width
-    * @param integer $height
-    * @return bool */
+    /** Resize image to fit in given resolution. Returns TRUE on success or FALSE on failure
+     * @param integer $width
+     * @param integer $height
+     * @return bool */
 
     public function resize_fit($width, $height) {
         if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height)))
@@ -250,12 +250,12 @@  discard block
 block discarded – undo
         return $this->resize($width, $height);
     }
 
-  /** Neka si predstavim vyobrazhaem pravoygylnik s razmeri $width i $height.
-    * Izobrazhenieto shte se preorazmeri taka che to shte izliza ot tozi pravoygylnik,
-    * no samo po edno (x ili y) izmerenie
-    * @param integer $width
-    * @param integer $height
-    * @return bool */
+    /** Neka si predstavim vyobrazhaem pravoygylnik s razmeri $width i $height.
+     * Izobrazhenieto shte se preorazmeri taka che to shte izliza ot tozi pravoygylnik,
+     * no samo po edno (x ili y) izmerenie
+     * @param integer $width
+     * @param integer $height
+     * @return bool */
 
     public function resize_overflow($width, $height) {
 
@@ -368,30 +368,30 @@  discard block
 block discarded – undo
 
 
 
-			/*** gif transparent fix - 1.10.2013 ***/
+            /*** gif transparent fix - 1.10.2013 ***/
 
-			$transindex = imagecolortransparent($src);
-			$palletsize = imagecolorstotal($src);
-			if($transindex >= 0 && $transindex < $palletsize) {
-				$transcol = imagecolorsforindex($src, $transindex);
+            $transindex = imagecolortransparent($src);
+            $palletsize = imagecolorstotal($src);
+            if($transindex >= 0 && $transindex < $palletsize) {
+                $transcol = imagecolorsforindex($src, $transindex);
 
-			/*** end gif transparent fix ***/
+            /*** end gif transparent fix ***/
 
-				$transindex = imagecolorallocatealpha($this->image, $transcol['red'], $transcol['green'], $transcol['blue'], 127);
-				imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transindex);
-				imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
-				imagecolortransparent($this->image, $transindex);
-				for($y=0; $y<$dst_h; ++$y)
-					for($x=0; $x<$dst_w; ++$x)
-						if(((imagecolorat($this->image, $x, $y)>>24) & 0x7F) >= 100) imagesetpixel($this->image, $x, $y, $transindex);
-				imagetruecolortopalette($this->image, true, 255);
-			}
-			else {
-				$transparent = imagecolorallocatealpha($this->image, 255, 255, 255, 127);
-				imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transparent);
-				imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
-			}
-			return $this->image;
+                $transindex = imagecolorallocatealpha($this->image, $transcol['red'], $transcol['green'], $transcol['blue'], 127);
+                imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transindex);
+                imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
+                imagecolortransparent($this->image, $transindex);
+                for($y=0; $y<$dst_h; ++$y)
+                    for($x=0; $x<$dst_w; ++$x)
+                        if(((imagecolorat($this->image, $x, $y)>>24) & 0x7F) >= 100) imagesetpixel($this->image, $x, $y, $transindex);
+                imagetruecolortopalette($this->image, true, 255);
+            }
+            else {
+                $transparent = imagecolorallocatealpha($this->image, 255, 255, 255, 127);
+                imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transparent);
+                imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
+            }
+            return $this->image;
 
         } else
             return false;
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
     public function imagegif($filename=null) {
         if (is_null($filename) && !headers_sent())
             header("Content-Type: image/gif");
-			@imagesavealpha($this->image, true);
+            @imagesavealpha($this->image, true);
         return imagegif($this->image, $filename);
     }
 }

Please login to merge, or discard this patch.

manager/media/browser/mcpuk/lib/class_fastImage.php 1 patch

Indentation +218 added lines, -218 removed lines patch added patch discarded remove patch

@@ -13,227 +13,227 @@
 block discarded – undo
 
 class fastImage
 {
-	private $strpos = 0;
-	private $str;
-	private $uri;
-	private $type;
-	private $handle;
+    private $strpos = 0;
+    private $str;
+    private $uri;
+    private $type;
+    private $handle;
 
-	public function __construct($uri = null)
-	{
-		if ($uri) $this->load($uri);
-	}
+    public function __construct($uri = null)
+    {
+        if ($uri) $this->load($uri);
+    }
 
 
-	public function load($uri)
-	{
-		if ($this->handle) $this->close();
-
-		$this->uri = $uri;
-		$this->handle = fopen($uri, 'r');
-	}
-
-
-	public function close()
-	{
-		if (is_resource($this->handle)) fclose($this->handle);
-	}
+    public function load($uri)
+    {
+        if ($this->handle) $this->close();
+
+        $this->uri = $uri;
+        $this->handle = fopen($uri, 'r');
+    }
+
+
+    public function close()
+    {
+        if (is_resource($this->handle)) fclose($this->handle);
+    }
 
 
-	public function getSize()
-	{
-		$this->strpos = 0;
-		if ($this->getType())
-		{
-			return array_values($this->parseSize());
-		}
-
-		return false;
-	}
-
-
-	public function getType()
-	{
-		$this->strpos = 0;
-
-		if (!$this->type)
-		{
-			switch ($this->getChars(2))
-			{
-				case "BM":
-					return $this->type = 'bmp';
-				case "GI":
-					return $this->type = 'gif';
-				case chr(0xFF).chr(0xd8):
-					return $this->type = 'jpeg';
-				case chr(0x89).'P':
-					return $this->type = 'png';
-				default:
-					return false;
-			}
-		}
-
-		return $this->type;
-	}
-
-
-	private function parseSize()
-	{
-		$this->strpos = 0;
-
-		switch ($this->type)
-		{
-			case 'png':
-				return $this->parseSizeForPNG();
-			case 'gif':
-				return $this->parseSizeForGIF();
-			case 'bmp':
-				return $this->parseSizeForBMP();
-			case 'jpeg':
-				return $this->parseSizeForJPEG();
-		}
-
-		return null;
-	}
-
-
-	private function parseSizeForPNG()
-	{
-		$chars = $this->getChars(25);
-
-		return unpack("N*", substr($chars, 16, 8));
-	}
-
-
-	private function parseSizeForGIF()
-	{
-		$chars = $this->getChars(11);
-
-		return unpack("S*", substr($chars, 6, 4));
-	}
-
-
-	private function parseSizeForBMP()
-	{
-		$chars = $this->getChars(29);
-	 	$chars = substr($chars, 14, 14);
-		$type = unpack('C', $chars);
-
-		return (reset($type) == 40) ? unpack('L*', substr($chars, 4)) : unpack('L*', substr($chars, 4, 8));
-	}
-
-
-	private function parseSizeForJPEG()
-	{
-		$state = null;
-
-		while (true)
-		{
-			switch ($state)
-			{
-				default:
-					$this->getChars(2);
-					$state = 'started';
-					break;
-
-				case 'started':
-					$b = $this->getByte();
-					if ($b === false) return false;
-
-					$state = $b == 0xFF ? 'sof' : 'started';
-					break;
-
-				case 'sof':
-					$b = $this->getByte();
-					if (in_array($b, range(0xe0, 0xef)))
-					{
-						$state = 'skipframe';
-					}
-					elseif (in_array($b, array_merge(range(0xC0,0xC3), range(0xC5,0xC7), range(0xC9,0xCB), range(0xCD,0xCF))))
-					{
-						$state = 'readsize';
-					}
-					elseif ($b == 0xFF)
-					{
-						$state = 'sof';
-					}
-					else
-					{
-						$state = 'skipframe';
-					}
-					break;
-
-				case 'skipframe':
-					$skip = $this->readInt($this->getChars(2)) - 2;
-					$state = 'doskip';
-					break;
-
-				case 'doskip':
-					$this->getChars($skip);
-					$state = 'started';
-					break;
-
-				case 'readsize':
-					$c = $this->getChars(7);
-
-					return array($this->readInt(substr($c, 5, 2)), $this->readInt(substr($c, 3, 2)));
-			}
-		}
-	}
-
-
-	private function getChars($n)
-	{
-		$response = null;
-
-		// do we need more data?
-		if ($this->strpos + $n -1 >= strlen($this->str))
-		{
-			$end = ($this->strpos + $n);
-
-			while (strlen($this->str) < $end && $response !== false)
-			{
-				// read more from the file handle
-				$need = $end - ftell($this->handle);
-
-				if ($response = fread($this->handle, $need))
-				{
-					$this->str .= $response;
-				}
-				else
-				{
-					return false;
-				}
-			}
-		}
-
-		$result = substr($this->str, $this->strpos, $n);
-		$this->strpos += $n;
-
-		// we are dealing with bytes here, so force the encoding
-		return mb_convert_encoding($result, "8BIT");
-	}
-
-
-	private function getByte()
-	{
-		$c = $this->getChars(1);
-		$b = unpack("C", $c);
-
-		return reset($b);
-	}
-
-
-	private function readInt($str)
-	{
-		$size = unpack("C*", $str);
-
-	    	return ($size[1] << 8) + $size[2];
-	}
-
-
-	public function __destruct()
-	{
-		$this->close();
-	}
+    public function getSize()
+    {
+        $this->strpos = 0;
+        if ($this->getType())
+        {
+            return array_values($this->parseSize());
+        }
+
+        return false;
+    }
+
+
+    public function getType()
+    {
+        $this->strpos = 0;
+
+        if (!$this->type)
+        {
+            switch ($this->getChars(2))
+            {
+                case "BM":
+                    return $this->type = 'bmp';
+                case "GI":
+                    return $this->type = 'gif';
+                case chr(0xFF).chr(0xd8):
+                    return $this->type = 'jpeg';
+                case chr(0x89).'P':
+                    return $this->type = 'png';
+                default:
+                    return false;
+            }
+        }
+
+        return $this->type;
+    }
+
+
+    private function parseSize()
+    {
+        $this->strpos = 0;
+
+        switch ($this->type)
+        {
+            case 'png':
+                return $this->parseSizeForPNG();
+            case 'gif':
+                return $this->parseSizeForGIF();
+            case 'bmp':
+                return $this->parseSizeForBMP();
+            case 'jpeg':
+                return $this->parseSizeForJPEG();
+        }
+
+        return null;
+    }
+
+
+    private function parseSizeForPNG()
+    {
+        $chars = $this->getChars(25);
+
+        return unpack("N*", substr($chars, 16, 8));
+    }
+
+
+    private function parseSizeForGIF()
+    {
+        $chars = $this->getChars(11);
+
+        return unpack("S*", substr($chars, 6, 4));
+    }
+
+
+    private function parseSizeForBMP()
+    {
+        $chars = $this->getChars(29);
+            $chars = substr($chars, 14, 14);
+        $type = unpack('C', $chars);
+
+        return (reset($type) == 40) ? unpack('L*', substr($chars, 4)) : unpack('L*', substr($chars, 4, 8));
+    }
+
+
+    private function parseSizeForJPEG()
+    {
+        $state = null;
+
+        while (true)
+        {
+            switch ($state)
+            {
+                default:
+                    $this->getChars(2);
+                    $state = 'started';
+                    break;
+
+                case 'started':
+                    $b = $this->getByte();
+                    if ($b === false) return false;
+
+                    $state = $b == 0xFF ? 'sof' : 'started';
+                    break;
+
+                case 'sof':
+                    $b = $this->getByte();
+                    if (in_array($b, range(0xe0, 0xef)))
+                    {
+                        $state = 'skipframe';
+                    }
+                    elseif (in_array($b, array_merge(range(0xC0,0xC3), range(0xC5,0xC7), range(0xC9,0xCB), range(0xCD,0xCF))))
+                    {
+                        $state = 'readsize';
+                    }
+                    elseif ($b == 0xFF)
+                    {
+                        $state = 'sof';
+                    }
+                    else
+                    {
+                        $state = 'skipframe';
+                    }
+                    break;
+
+                case 'skipframe':
+                    $skip = $this->readInt($this->getChars(2)) - 2;
+                    $state = 'doskip';
+                    break;
+
+                case 'doskip':
+                    $this->getChars($skip);
+                    $state = 'started';
+                    break;
+
+                case 'readsize':
+                    $c = $this->getChars(7);
+
+                    return array($this->readInt(substr($c, 5, 2)), $this->readInt(substr($c, 3, 2)));
+            }
+        }
+    }
+
+
+    private function getChars($n)
+    {
+        $response = null;
+
+        // do we need more data?
+        if ($this->strpos + $n -1 >= strlen($this->str))
+        {
+            $end = ($this->strpos + $n);
+
+            while (strlen($this->str) < $end && $response !== false)
+            {
+                // read more from the file handle
+                $need = $end - ftell($this->handle);
+
+                if ($response = fread($this->handle, $need))
+                {
+                    $this->str .= $response;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
+
+        $result = substr($this->str, $this->strpos, $n);
+        $this->strpos += $n;
+
+        // we are dealing with bytes here, so force the encoding
+        return mb_convert_encoding($result, "8BIT");
+    }
+
+
+    private function getByte()
+    {
+        $c = $this->getChars(1);
+        $b = unpack("C", $c);
+
+        return reset($b);
+    }
+
+
+    private function readInt($str)
+    {
+        $size = unpack("C*", $str);
+
+            return ($size[1] << 8) + $size[2];
+    }
+
+
+    public function __destruct()
+    {
+        $this->close();
+    }
 }

Please login to merge, or discard this patch.

		@@ -166,7 +166,7 @@
		block discarded – undo
166	166	$resp = _fetch_remote_file( $url, $request_headers );
167	167
168	168	if (isset($resp) and $resp) {
169		- if ($resp->status == '304' ) {
	169	+ if ($resp->status == '304' ) {
170	170	// we have the most current copy
171	171	if ( MAGPIE_DEBUG > 1) {
172	172	debug("Got 304 for $url");

		@@ -94,13 +94,13 @@ discard block
		block discarded – undo
94	94	}
95	95
96	96	if ($filesize = filesize($cache_file) ) {
97		- $data = fread( $fp, filesize($cache_file) );
98		- $rss = $this->unserialize( $data );
	97	+ $data = fread( $fp, filesize($cache_file) );
	98	+ $rss = $this->unserialize( $data );
99	99
100		- return $rss;
101		- }
	100	+ return $rss;
	101	+ }
102	102
103		- return 0;
	103	+ return 0;
104	104	}
105	105
106	106	/=======================================================================\
		@@ -134,17 +134,17 @@ discard block
		block discarded – undo
134	134	}
135	135	}
136	136
137		- function cache_age( $cache_key ) {
138		- $filename = $this->file_name( $url );
139		- if ( file_exists( $filename ) ) {
140		- $mtime = filemtime( $filename );
	137	+ function cache_age( $cache_key ) {
	138	+ $filename = $this->file_name( $url );
	139	+ if ( file_exists( $filename ) ) {
	140	+ $mtime = filemtime( $filename );
141	141	$age = time() - $mtime;
142		- return $age;
143		- }
144		- else {
145		- return -1;
146		- }
147		- }
	142	+ return $age;
	143	+ }
	144	+ else {
	145	+ return -1;
	146	+ }
	147	+ }
148	148
149	149	/=======================================================================\
150	150	Function: serialize

		@@ -1,17 +1,17 @@
		block discarded – undo
1	1	<?php
2	2
3	3	/** This file is part of KCFinder project. The class are taken from
4		- * http://www.php.net/manual/en/function.ziparchive-addemptydir.php
5		- *
6		- * @desc Directory to ZIP file archivator
7		- * @package KCFinder
8		- * @version 2.54
9		- * @author Pavel Tzonkov <[email protected]>
10		- * @copyright 2010-2014 KCFinder Project
11		- * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
12		- * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
13		- * @link http://kcfinder.sunhater.com
14		- */
	4	+ * http://www.php.net/manual/en/function.ziparchive-addemptydir.php
	5	+ *
	6	+ * @desc Directory to ZIP file archivator
	7	+ * @package KCFinder
	8	+ * @version 2.54
	9	+ * @author Pavel Tzonkov <[email protected]>
	10	+ * @copyright 2010-2014 KCFinder Project
	11	+ * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
	12	+ * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
	13	+ * @link http://kcfinder.sunhater.com
	14	+ */
15	15
16	16	class zipFolder {
17	17	protected $zip;

		@@ -1,23 +1,23 @@
		block discarded – undo
1	1	<?php
2	2
3	3	/** This file is part of KCFinder project
4		- *
5		- * @desc Browser calling script
6		- * @package KCFinder
7		- * @version 2.54
8		- * @author Pavel Tzonkov <[email protected]>
9		- * @copyright 2010-2014 KCFinder Project
10		- * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
11		- * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
12		- * @link http://kcfinder.sunhater.com
13		- */
	4	+ *
	5	+ * @desc Browser calling script
	6	+ * @package KCFinder
	7	+ * @version 2.54
	8	+ * @author Pavel Tzonkov <[email protected]>
	9	+ * @copyright 2010-2014 KCFinder Project
	10	+ * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
	11	+ * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
	12	+ * @link http://kcfinder.sunhater.com
	13	+ */
14	14
15	15	require "core/autoload.php"; // Init MODX
16	16
17	17	function returnNoPermissionsMessage($role) {
18		- global $_lang;
19		- echo sprintf($_lang['files_management_no_permission'], $role);
20		- exit;
	18	+ global $_lang;
	19	+ echo sprintf($_lang['files_management_no_permission'], $role);
	20	+ exit;
21	21	}
22	22
23	23	if( $_GET['type'] == 'images' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_images')) returnNoPermissionsMessage('assets_images');

		@@ -3,7 +3,7 @@ discard block
		block discarded – undo
3	3
4	4	// show debug information
5	5	if(isset($enable_debug) && $enable_debug==true) {
6		- ?>
	6	+ ?>
7	7	<script language="javascript">
8	8	//document.onload = removeDebug();
9	9
		@@ -33,8 +33,8 @@ discard block
		block discarded – undo
33	33	}
34	34	</style>
35	35	<?php
36		- $mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $tend = $mtime; $totaltime = ($tend - $tstart);
37		- ?>
	36	+ $mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $tend = $mtime; $totaltime = ($tend - $tstart);
	37	+ ?>
38	38	<div class='debug' id='debug' name='debug' onClick="removeDebugDiv();">
39	39	<table border="0" cellspacing="0" cellpadding="0">
40	40	<tr>

		@@ -19,60 +19,60 @@
		block discarded – undo
19	19	</head><body>
20	20	";
21	21	if($is_error) {
22		- $parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'> MODX Parse Error </h3>
	22	+ $parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'> MODX Parse Error </h3>
23	23	<table border='0' cellpadding='1' cellspacing='0'>
24	24	<tr><td colspan='3'>MODX encountered the following error while attempting to parse the requested resource:</td></tr>
25	25	<tr><td colspan='3'><b style='color:red;'>« $msg »</b></td></tr>";
26	26	} else {
27		- $parsedMessageString .= "<h3 style='color:#003399; background:#eeeeee;padding:2px;'> MODX Debug/ stop message </h3>
	27	+ $parsedMessageString .= "<h3 style='color:#003399; background:#eeeeee;padding:2px;'> MODX Debug/ stop message </h3>
28	28	<table border='0' cellpadding='1' cellspacing='0'>
29	29	<tr><td colspan='3'>The MODX parser recieved the following debug/ stop message:</td></tr>
30	30	<tr><td colspan='3'><b style='color:#003399;'>« $msg »</b></td></tr>";
31	31	}
32	32
33	33	if(!empty($query)) {
34		- $parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'>      SQL: <span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/>
	34	+ $parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'>      SQL: <span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/>
35	35	<a href='javascript:copyToClip();' style='color:#821517;font-size: 9px; text-decoration: none'>[Copy SQL to ClipBoard]</a><textarea id='holdtext' style='display:none;'></textarea></td></tr>";
36	36	}
37	37
38	38	if($text!='') {
39	39
40		- $errortype = array (
41		- E_ERROR => "Error",
42		- E_WARNING => "Warning",
43		- E_PARSE => "Parsing Error",
44		- E_NOTICE => "Notice",
45		- E_CORE_ERROR => "Core Error",
46		- E_CORE_WARNING => "Core Warning",
47		- E_COMPILE_ERROR => "Compile Error",
48		- E_COMPILE_WARNING => "Compile Warning",
49		- E_USER_ERROR => "User Error",
50		- E_USER_WARNING => "User Warning",
51		- E_USER_NOTICE => "User Notice",
52		- );
	40	+ $errortype = array (
	41	+ E_ERROR => "Error",
	42	+ E_WARNING => "Warning",
	43	+ E_PARSE => "Parsing Error",
	44	+ E_NOTICE => "Notice",
	45	+ E_CORE_ERROR => "Core Error",
	46	+ E_CORE_WARNING => "Core Warning",
	47	+ E_COMPILE_ERROR => "Compile Error",
	48	+ E_COMPILE_WARNING => "Compile Warning",
	49	+ E_USER_ERROR => "User Error",
	50	+ E_USER_WARNING => "User Warning",
	51	+ E_USER_NOTICE => "User Notice",
	52	+ );
53	53
54		- $parsedMessageString .= "<tr><td> </td></tr><tr><td colspan='3'><b>PHP error debug</b></td></tr>";
	54	+ $parsedMessageString .= "<tr><td> </td></tr><tr><td colspan='3'><b>PHP error debug</b></td></tr>";
55	55
56		- $parsedMessageString .= "<tr><td valign='top'>  Error: </td>";
57		- $parsedMessageString .= "<td colspan='2'>$text</td><td> </td>";
58		- $parsedMessageString .= "</tr>";
	56	+ $parsedMessageString .= "<tr><td valign='top'>  Error: </td>";
	57	+ $parsedMessageString .= "<td colspan='2'>$text</td><td> </td>";
	58	+ $parsedMessageString .= "</tr>";
59	59
60		- $parsedMessageString .= "<tr><td valign='top'>  Error type/ Nr.: </td>";
61		- $parsedMessageString .= "<td colspan='2'>".$errortype[$nr]." - $nr</b></td><td> </td>";
62		- $parsedMessageString .= "</tr>";
	60	+ $parsedMessageString .= "<tr><td valign='top'>  Error type/ Nr.: </td>";
	61	+ $parsedMessageString .= "<td colspan='2'>".$errortype[$nr]." - $nr</b></td><td> </td>";
	62	+ $parsedMessageString .= "</tr>";
63	63
64		- $parsedMessageString .= "<tr><td>  File: </td>";
65		- $parsedMessageString .= "<td colspan='2'>$file</td><td> </td>";
66		- $parsedMessageString .= "</tr>";
	64	+ $parsedMessageString .= "<tr><td>  File: </td>";
	65	+ $parsedMessageString .= "<td colspan='2'>$file</td><td> </td>";
	66	+ $parsedMessageString .= "</tr>";
67	67
68		- $parsedMessageString .= "<tr><td>  Line: </td>";
69		- $parsedMessageString .= "<td colspan='2'>$line</td><td> </td>";
70		- $parsedMessageString .= "</tr>";
71		- if($source!='') {
72		- $parsedMessageString .= "<tr><td valign='top'>  Line $line source: </td>";
73		- $parsedMessageString .= "<td colspan='2'>$source</td><td> </td>";
74		- $parsedMessageString .= "</tr>";
75		- }
	68	+ $parsedMessageString .= "<tr><td>  Line: </td>";
	69	+ $parsedMessageString .= "<td colspan='2'>$line</td><td> </td>";
	70	+ $parsedMessageString .= "</tr>";
	71	+ if($source!='') {
	72	+ $parsedMessageString .= "<tr><td valign='top'>  Line $line source: </td>";
	73	+ $parsedMessageString .= "<td colspan='2'>$source</td><td> </td>";
	74	+ $parsedMessageString .= "</tr>";
	75	+ }
76	76	}
77	77
78	78	$parsedMessageString .= "<tr><td> </td></tr><tr><td colspan='3'><b>Parser timing</b></td></tr>";

		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22
23	23	// load template
24	24	if(!isset($modx->config['manager_lockout_tpl']) \|\| empty($modx->config['manager_lockout_tpl'])) {
25		- $modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
	25	+ $modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
26	26	}
27	27
28	28	$target = $modx->config['manager_lockout_tpl'];
		@@ -30,40 +30,40 @@ discard block
		block discarded – undo
30	30	$target = $modx->mergeSettingsContent($target);
31	31
32	32	if(substr($target,0,1)==='@') {
33		- if(substr($target,0,6)==='@CHUNK') {
34		- $target = trim(substr($target,7));
35		- $lockout_tpl = $modx->getChunk($target);
36		- }
37		- elseif(substr($target,0,5)==='@FILE') {
38		- $target = trim(substr($target,6));
39		- $lockout_tpl = file_get_contents($target);
40		- }
41		- } else {
42		- $chunk = $modx->getChunk($target);
43		- if($chunk!==false && !empty($chunk)) {
44		- $lockout_tpl = $chunk;
45		- }
46		- elseif(is_file(MODX_BASE_PATH . $target)) {
47		- $target = MODX_BASE_PATH . $target;
48		- $lockout_tpl = file_get_contents($target);
49		- }
50		- elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
51		- $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
52		- $lockout_tpl = file_get_contents($target);
53		- }
54		- elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
55		- $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
56		- $login_tpl = file_get_contents($target);
57		- }
58		- elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
59		- $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
60		- $lockout_tpl = file_get_contents($target);
61		- }
62		- else {
63		- $target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
64		- $lockout_tpl = file_get_contents($target);
65		- }
66		- }
	33	+ if(substr($target,0,6)==='@CHUNK') {
	34	+ $target = trim(substr($target,7));
	35	+ $lockout_tpl = $modx->getChunk($target);
	36	+ }
	37	+ elseif(substr($target,0,5)==='@FILE') {
	38	+ $target = trim(substr($target,6));
	39	+ $lockout_tpl = file_get_contents($target);
	40	+ }
	41	+ } else {
	42	+ $chunk = $modx->getChunk($target);
	43	+ if($chunk!==false && !empty($chunk)) {
	44	+ $lockout_tpl = $chunk;
	45	+ }
	46	+ elseif(is_file(MODX_BASE_PATH . $target)) {
	47	+ $target = MODX_BASE_PATH . $target;
	48	+ $lockout_tpl = file_get_contents($target);
	49	+ }
	50	+ elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
	51	+ $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
	52	+ $lockout_tpl = file_get_contents($target);
	53	+ }
	54	+ elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
	55	+ $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
	56	+ $login_tpl = file_get_contents($target);
	57	+ }
	58	+ elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
	59	+ $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
	60	+ $lockout_tpl = file_get_contents($target);
	61	+ }
	62	+ else {
	63	+ $target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
	64	+ $lockout_tpl = file_get_contents($target);
	65	+ }
	66	+ }
67	67
68	68	// merge placeholders
69	69	$lockout_tpl = $modx->mergePlaceholderContent($lockout_tpl);

		@@ -1,44 +1,44 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3	3	/** This file is part of KCFinder project
4		- *
5		- * @desc GD extension class
6		- * @package KCFinder
7		- * @version 2.51
8		- * @author Pavel Tzonkov <[email protected]>
9		- * @copyright 2010, 2011 KCFinder Project
10		- * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
11		- * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
12		- * @link http://kcfinder.sunhater.com
13		- */
	4	+ *
	5	+ * @desc GD extension class
	6	+ * @package KCFinder
	7	+ * @version 2.51
	8	+ * @author Pavel Tzonkov <[email protected]>
	9	+ * @copyright 2010, 2011 KCFinder Project
	10	+ * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
	11	+ * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
	12	+ * @link http://kcfinder.sunhater.com
	13	+ */
14	14
15	15	class gd {
16	16
17		- /** GD resource
18		- * @var resource */
	17	+ /** GD resource
	18	+ * @var resource */
19	19	protected $image;
20	20
21		- /** Image width
22		- * @var integer */
	21	+ /** Image width
	22	+ * @var integer */
23	23	protected $width;
24	24
25		- /** Image height
26		- * @var integer */
	25	+ /** Image height
	26	+ * @var integer */
27	27	protected $height;
28	28
29		- /** Init error
30		- * @var bool */
	29	+ /** Init error
	30	+ * @var bool */
31	31	public $init_error = false;
32	32
33		- /** Last builded image type constant (IMAGETYPE_XXX)
34		- * @var integer */
	33	+ /** Last builded image type constant (IMAGETYPE_XXX)
	34	+ * @var integer */
35	35	public $type;
36	36
37		- /** Returns an array. Element 0 - GD resource. Element 1 - width. Element 2 - height.
38		- * Returns FALSE on failure. The only one parameter $image can be an instance of this class,
39		- * a GD resource, an array(width, height) or path to image file.
40		- * @param mixed $image
41		- * @return array */
	37	+ /** Returns an array. Element 0 - GD resource. Element 1 - width. Element 2 - height.
	38	+ * Returns FALSE on failure. The only one parameter $image can be an instance of this class,
	39	+ * a GD resource, an array(width, height) or path to image file.
	40	+ * @param mixed $image
	41	+ * @return array */
42	42
43	43	protected function build_image($image) {
44	44
		@@ -87,16 +87,16 @@ discard block
		block discarded – undo
87	87	return $return;
88	88	}
89	89
90		- /** Parameter $image can be:
91		- * 1. An instance of this class (copy instance).
92		- * 2. A GD resource.
93		- * 3. An array with two elements. First - width, second - height. Create a blank image.
94		- * 4. A filename string. Get image form file.
95		- * The non-required parameter $bigger_size is the bigger dimension (width or height) the image
96		- * will be resized to. The other dimension (height or width) will be calculated autamaticaly
97		- * @param mixed $image
98		- * @param integer $bigger_size
99		- * @return gd */
	90	+ /** Parameter $image can be:
	91	+ * 1. An instance of this class (copy instance).
	92	+ * 2. A GD resource.
	93	+ * 3. An array with two elements. First - width, second - height. Create a blank image.
	94	+ * 4. A filename string. Get image form file.
	95	+ * The non-required parameter $bigger_size is the bigger dimension (width or height) the image
	96	+ * will be resized to. The other dimension (height or width) will be calculated autamaticaly
	97	+ * @param mixed $image
	98	+ * @param integer $bigger_size
	99	+ * @return gd */
100	100
101	101	public function __construct($image, $bigger_size=null) {
102	102	$this->image = $this->width = $this->height = null;
		@@ -123,30 +123,30 @@ discard block
		block discarded – undo
123	123	}
124	124	}
125	125
126		- /** Returns the GD resource
127		- * @return resource */
	126	+ /** Returns the GD resource
	127	+ * @return resource */
128	128
129	129	public function get_image() {
130	130	return $this->image;
131	131	}
132	132
133		- /** Returns the image width
134		- * @return integer */
	133	+ /** Returns the image width
	134	+ * @return integer */
135	135
136	136	public function get_width() {
137	137	return $this->width;
138	138	}
139	139
140		- /** Returns the image height
141		- * @return integer */
	140	+ /** Returns the image height
	141	+ * @return integer */
142	142
143	143	public function get_height() {
144	144	return $this->height;
145	145	}
146	146
147		- /** Returns calculated proportional width from the given height
148		- * @param integer $resized_height
149		- * @return integer */
	147	+ /** Returns calculated proportional width from the given height
	148	+ * @param integer $resized_height
	149	+ * @return integer */
150	150
151	151	public function get_prop_width($resized_height) {
152	152	$width = intval(($this->width * $resized_height) / $this->height);
		@@ -154,9 +154,9 @@ discard block
		block discarded – undo
154	154	return $width;
155	155	}
156	156
157		- /** Returns calculated proportional height from the given width
158		- * @param integer $resized_width
159		- * @return integer */
	157	+ /** Returns calculated proportional height from the given width
	158	+ * @param integer $resized_width
	159	+ * @return integer */
160	160
161	161	public function get_prop_height($resized_width) {
162	162	$height = intval(($this->height * $resized_width) / $this->width);
		@@ -164,11 +164,11 @@ discard block
		block discarded – undo
164	164	return $height;
165	165	}
166	166
167		- /** Returns an array with calculated proportional width & height.
168		- * The parameter $bigger_size is the bigger dimension (width or height) of calculated sizes.
169		- * The other dimension (height or width) will be calculated autamaticaly
170		- * @param integer $bigger_size
171		- * @return array */
	167	+ /** Returns an array with calculated proportional width & height.
	168	+ * The parameter $bigger_size is the bigger dimension (width or height) of calculated sizes.
	169	+ * The other dimension (height or width) will be calculated autamaticaly
	170	+ * @param integer $bigger_size
	171	+ * @return array */
172	172
173	173	public function get_prop_size($bigger_size) {
174	174
		@@ -186,10 +186,10 @@ discard block
		block discarded – undo
186	186	return array($width, $height);
187	187	}
188	188
189		- /** Resize image. Returns TRUE on success or FALSE on failure
190		- * @param integer $width
191		- * @param integer $height
192		- * @return bool */
	189	+ /** Resize image. Returns TRUE on success or FALSE on failure
	190	+ * @param integer $width
	191	+ * @param integer $height
	192	+ * @return bool */
193	193
194	194	public function resize($width, $height) {
195	195	if (!$width) $width = 1;
		@@ -203,10 +203,10 @@ discard block
		block discarded – undo
203	203	);
204	204	}
205	205
206		- /** Resize the given image source (GD, gd object or image file path) to fit in the own image.
207		- * The outside ares will be cropped out. Returns TRUE on success or FALSE on failure
208		- * @param mixed $src
209		- * @return bool */
	206	+ /** Resize the given image source (GD, gd object or image file path) to fit in the own image.
	207	+ * The outside ares will be cropped out. Returns TRUE on success or FALSE on failure
	208	+ * @param mixed $src
	209	+ * @return bool */
210	210
211	211	public function resize_crop($src) {
212	212	$image_details = $this->build_image($src);
		@@ -233,10 +233,10 @@ discard block
		block discarded – undo
233	233	return false;
234	234	}
235	235
236		- /** Resize image to fit in given resolution. Returns TRUE on success or FALSE on failure
237		- * @param integer $width
238		- * @param integer $height
239		- * @return bool */
	236	+ /** Resize image to fit in given resolution. Returns TRUE on success or FALSE on failure
	237	+ * @param integer $width
	238	+ * @param integer $height
	239	+ * @return bool */
240	240
241	241	public function resize_fit($width, $height) {
242	242	if ((!$width && !$height) \|\| (($width == $this->width) && ($height == $this->height)))
		@@ -250,12 +250,12 @@ discard block
		block discarded – undo
250	250	return $this->resize($width, $height);
251	251	}
252	252
253		- /** Neka si predstavim vyobrazhaem pravoygylnik s razmeri $width i $height.
254		- * Izobrazhenieto shte se preorazmeri taka che to shte izliza ot tozi pravoygylnik,
255		- * no samo po edno (x ili y) izmerenie
256		- * @param integer $width
257		- * @param integer $height
258		- * @return bool */
	253	+ /** Neka si predstavim vyobrazhaem pravoygylnik s razmeri $width i $height.
	254	+ * Izobrazhenieto shte se preorazmeri taka che to shte izliza ot tozi pravoygylnik,
	255	+ * no samo po edno (x ili y) izmerenie
	256	+ * @param integer $width
	257	+ * @param integer $height
	258	+ * @return bool */
259	259
260	260	public function resize_overflow($width, $height) {
261	261
		@@ -368,30 +368,30 @@ discard block
		block discarded – undo
368	368
369	369
370	370
371		- /* gif transparent fix - 1.10.2013 */
	371	+ /* gif transparent fix - 1.10.2013 */
372	372
373		- $transindex = imagecolortransparent($src);
374		- $palletsize = imagecolorstotal($src);
375		- if($transindex >= 0 && $transindex < $palletsize) {
376		- $transcol = imagecolorsforindex($src, $transindex);
	373	+ $transindex = imagecolortransparent($src);
	374	+ $palletsize = imagecolorstotal($src);
	375	+ if($transindex >= 0 && $transindex < $palletsize) {
	376	+ $transcol = imagecolorsforindex($src, $transindex);
377	377
378		- /* end gif transparent fix */
	378	+ /* end gif transparent fix */
379	379
380		- $transindex = imagecolorallocatealpha($this->image, $transcol['red'], $transcol['green'], $transcol['blue'], 127);
381		- imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transindex);
382		- imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
383		- imagecolortransparent($this->image, $transindex);
384		- for($y=0; $y<$dst_h; ++$y)
385		- for($x=0; $x<$dst_w; ++$x)
386		- if(((imagecolorat($this->image, $x, $y)>>24) & 0x7F) >= 100) imagesetpixel($this->image, $x, $y, $transindex);
387		- imagetruecolortopalette($this->image, true, 255);
388		- }
389		- else {
390		- $transparent = imagecolorallocatealpha($this->image, 255, 255, 255, 127);
391		- imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transparent);
392		- imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
393		- }
394		- return $this->image;
	380	+ $transindex = imagecolorallocatealpha($this->image, $transcol['red'], $transcol['green'], $transcol['blue'], 127);
	381	+ imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transindex);
	382	+ imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
	383	+ imagecolortransparent($this->image, $transindex);
	384	+ for($y=0; $y<$dst_h; ++$y)
	385	+ for($x=0; $x<$dst_w; ++$x)
	386	+ if(((imagecolorat($this->image, $x, $y)>>24) & 0x7F) >= 100) imagesetpixel($this->image, $x, $y, $transindex);
	387	+ imagetruecolortopalette($this->image, true, 255);
	388	+ }
	389	+ else {
	390	+ $transparent = imagecolorallocatealpha($this->image, 255, 255, 255, 127);
	391	+ imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transparent);
	392	+ imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
	393	+ }
	394	+ return $this->image;
395	395
396	396	} else
397	397	return false;
		@@ -419,7 +419,7 @@ discard block
		block discarded – undo
419	419	public function imagegif($filename=null) {
420	420	if (is_null($filename) && !headers_sent())
421	421	header("Content-Type: image/gif");
422		- @imagesavealpha($this->image, true);
	422	+ @imagesavealpha($this->image, true);
423	423	return imagegif($this->image, $filename);
424	424	}
425	425	}

		@@ -13,227 +13,227 @@
		block discarded – undo
13	13
14	14	class fastImage
15	15	{
16		- private $strpos = 0;
17		- private $str;
18		- private $uri;
19		- private $type;
20		- private $handle;
	16	+ private $strpos = 0;
	17	+ private $str;
	18	+ private $uri;
	19	+ private $type;
	20	+ private $handle;
21	21
22		- public function __construct($uri = null)
23		- {
24		- if ($uri) $this->load($uri);
25		- }
	22	+ public function __construct($uri = null)
	23	+ {
	24	+ if ($uri) $this->load($uri);
	25	+ }
26	26
27	27
28		- public function load($uri)
29		- {
30		- if ($this->handle) $this->close();
31		-
32		- $this->uri = $uri;
33		- $this->handle = fopen($uri, 'r');
34		- }
35		-
36		-
37		- public function close()
38		- {
39		- if (is_resource($this->handle)) fclose($this->handle);
40		- }
	28	+ public function load($uri)
	29	+ {
	30	+ if ($this->handle) $this->close();
	31	+
	32	+ $this->uri = $uri;
	33	+ $this->handle = fopen($uri, 'r');
	34	+ }
	35	+
	36	+
	37	+ public function close()
	38	+ {
	39	+ if (is_resource($this->handle)) fclose($this->handle);
	40	+ }
41	41
42	42
43		- public function getSize()
44		- {
45		- $this->strpos = 0;
46		- if ($this->getType())
47		- {
48		- return array_values($this->parseSize());
49		- }
50		-
51		- return false;
52		- }
53		-
54		-
55		- public function getType()
56		- {
57		- $this->strpos = 0;
58		-
59		- if (!$this->type)
60		- {
61		- switch ($this->getChars(2))
62		- {
63		- case "BM":
64		- return $this->type = 'bmp';
65		- case "GI":
66		- return $this->type = 'gif';
67		- case chr(0xFF).chr(0xd8):
68		- return $this->type = 'jpeg';
69		- case chr(0x89).'P':
70		- return $this->type = 'png';
71		- default:
72		- return false;
73		- }
74		- }
75		-
76		- return $this->type;
77		- }
78		-
79		-
80		- private function parseSize()
81		- {
82		- $this->strpos = 0;
83		-
84		- switch ($this->type)
85		- {
86		- case 'png':
87		- return $this->parseSizeForPNG();
88		- case 'gif':
89		- return $this->parseSizeForGIF();
90		- case 'bmp':
91		- return $this->parseSizeForBMP();
92		- case 'jpeg':
93		- return $this->parseSizeForJPEG();
94		- }
95		-
96		- return null;
97		- }
98		-
99		-
100		- private function parseSizeForPNG()
101		- {
102		- $chars = $this->getChars(25);
103		-
104		- return unpack("N*", substr($chars, 16, 8));
105		- }
106		-
107		-
108		- private function parseSizeForGIF()
109		- {
110		- $chars = $this->getChars(11);
111		-
112		- return unpack("S*", substr($chars, 6, 4));
113		- }
114		-
115		-
116		- private function parseSizeForBMP()
117		- {
118		- $chars = $this->getChars(29);
119		- $chars = substr($chars, 14, 14);
120		- $type = unpack('C', $chars);
121		-
122		- return (reset($type) == 40) ? unpack('L', substr($chars, 4)) : unpack('L', substr($chars, 4, 8));
123		- }
124		-
125		-
126		- private function parseSizeForJPEG()
127		- {
128		- $state = null;
129		-
130		- while (true)
131		- {
132		- switch ($state)
133		- {
134		- default:
135		- $this->getChars(2);
136		- $state = 'started';
137		- break;
138		-
139		- case 'started':
140		- $b = $this->getByte();
141		- if ($b === false) return false;
142		-
143		- $state = $b == 0xFF ? 'sof' : 'started';
144		- break;
145		-
146		- case 'sof':
147		- $b = $this->getByte();
148		- if (in_array($b, range(0xe0, 0xef)))
149		- {
150		- $state = 'skipframe';
151		- }
152		- elseif (in_array($b, array_merge(range(0xC0,0xC3), range(0xC5,0xC7), range(0xC9,0xCB), range(0xCD,0xCF))))
153		- {
154		- $state = 'readsize';
155		- }
156		- elseif ($b == 0xFF)
157		- {
158		- $state = 'sof';
159		- }
160		- else
161		- {
162		- $state = 'skipframe';
163		- }
164		- break;
165		-
166		- case 'skipframe':
167		- $skip = $this->readInt($this->getChars(2)) - 2;
168		- $state = 'doskip';
169		- break;
170		-
171		- case 'doskip':
172		- $this->getChars($skip);
173		- $state = 'started';
174		- break;
175		-
176		- case 'readsize':
177		- $c = $this->getChars(7);
178		-
179		- return array($this->readInt(substr($c, 5, 2)), $this->readInt(substr($c, 3, 2)));
180		- }
181		- }
182		- }
183		-
184		-
185		- private function getChars($n)
186		- {
187		- $response = null;
188		-
189		- // do we need more data?
190		- if ($this->strpos + $n -1 >= strlen($this->str))
191		- {
192		- $end = ($this->strpos + $n);
193		-
194		- while (strlen($this->str) < $end && $response !== false)
195		- {
196		- // read more from the file handle
197		- $need = $end - ftell($this->handle);
198		-
199		- if ($response = fread($this->handle, $need))
200		- {
201		- $this->str .= $response;
202		- }
203		- else
204		- {
205		- return false;
206		- }
207		- }
208		- }
209		-
210		- $result = substr($this->str, $this->strpos, $n);
211		- $this->strpos += $n;
212		-
213		- // we are dealing with bytes here, so force the encoding
214		- return mb_convert_encoding($result, "8BIT");
215		- }
216		-
217		-
218		- private function getByte()
219		- {
220		- $c = $this->getChars(1);
221		- $b = unpack("C", $c);
222		-
223		- return reset($b);
224		- }
225		-
226		-
227		- private function readInt($str)
228		- {
229		- $size = unpack("C*", $str);
230		-
231		- return ($size[1] << 8) + $size[2];
232		- }
233		-
234		-
235		- public function __destruct()
236		- {
237		- $this->close();
238		- }
	43	+ public function getSize()
	44	+ {
	45	+ $this->strpos = 0;
	46	+ if ($this->getType())
	47	+ {
	48	+ return array_values($this->parseSize());
	49	+ }
	50	+
	51	+ return false;
	52	+ }
	53	+
	54	+
	55	+ public function getType()
	56	+ {
	57	+ $this->strpos = 0;
	58	+
	59	+ if (!$this->type)
	60	+ {
	61	+ switch ($this->getChars(2))
	62	+ {
	63	+ case "BM":
	64	+ return $this->type = 'bmp';
	65	+ case "GI":
	66	+ return $this->type = 'gif';
	67	+ case chr(0xFF).chr(0xd8):
	68	+ return $this->type = 'jpeg';
	69	+ case chr(0x89).'P':
	70	+ return $this->type = 'png';
	71	+ default:
	72	+ return false;
	73	+ }
	74	+ }
	75	+
	76	+ return $this->type;
	77	+ }
	78	+
	79	+
	80	+ private function parseSize()
	81	+ {
	82	+ $this->strpos = 0;
	83	+
	84	+ switch ($this->type)
	85	+ {
	86	+ case 'png':
	87	+ return $this->parseSizeForPNG();
	88	+ case 'gif':
	89	+ return $this->parseSizeForGIF();
	90	+ case 'bmp':
	91	+ return $this->parseSizeForBMP();
	92	+ case 'jpeg':
	93	+ return $this->parseSizeForJPEG();
	94	+ }
	95	+
	96	+ return null;
	97	+ }
	98	+
	99	+
	100	+ private function parseSizeForPNG()
	101	+ {
	102	+ $chars = $this->getChars(25);
	103	+
	104	+ return unpack("N*", substr($chars, 16, 8));
	105	+ }
	106	+
	107	+
	108	+ private function parseSizeForGIF()
	109	+ {
	110	+ $chars = $this->getChars(11);
	111	+
	112	+ return unpack("S*", substr($chars, 6, 4));
	113	+ }
	114	+
	115	+
	116	+ private function parseSizeForBMP()
	117	+ {
	118	+ $chars = $this->getChars(29);
	119	+ $chars = substr($chars, 14, 14);
	120	+ $type = unpack('C', $chars);
	121	+
	122	+ return (reset($type) == 40) ? unpack('L', substr($chars, 4)) : unpack('L', substr($chars, 4, 8));
	123	+ }
	124	+
	125	+
	126	+ private function parseSizeForJPEG()
	127	+ {
	128	+ $state = null;
	129	+
	130	+ while (true)
	131	+ {
	132	+ switch ($state)
	133	+ {
	134	+ default:
	135	+ $this->getChars(2);
	136	+ $state = 'started';
	137	+ break;
	138	+
	139	+ case 'started':
	140	+ $b = $this->getByte();
	141	+ if ($b === false) return false;
	142	+
	143	+ $state = $b == 0xFF ? 'sof' : 'started';
	144	+ break;
	145	+
	146	+ case 'sof':
	147	+ $b = $this->getByte();
	148	+ if (in_array($b, range(0xe0, 0xef)))
	149	+ {
	150	+ $state = 'skipframe';
	151	+ }
	152	+ elseif (in_array($b, array_merge(range(0xC0,0xC3), range(0xC5,0xC7), range(0xC9,0xCB), range(0xCD,0xCF))))
	153	+ {
	154	+ $state = 'readsize';
	155	+ }
	156	+ elseif ($b == 0xFF)
	157	+ {
	158	+ $state = 'sof';
	159	+ }
	160	+ else
	161	+ {
	162	+ $state = 'skipframe';
	163	+ }
	164	+ break;
	165	+
	166	+ case 'skipframe':
	167	+ $skip = $this->readInt($this->getChars(2)) - 2;
	168	+ $state = 'doskip';
	169	+ break;
	170	+
	171	+ case 'doskip':
	172	+ $this->getChars($skip);
	173	+ $state = 'started';
	174	+ break;
	175	+
	176	+ case 'readsize':
	177	+ $c = $this->getChars(7);
	178	+
	179	+ return array($this->readInt(substr($c, 5, 2)), $this->readInt(substr($c, 3, 2)));
	180	+ }
	181	+ }
	182	+ }
	183	+
	184	+
	185	+ private function getChars($n)
	186	+ {
	187	+ $response = null;
	188	+
	189	+ // do we need more data?
	190	+ if ($this->strpos + $n -1 >= strlen($this->str))
	191	+ {
	192	+ $end = ($this->strpos + $n);
	193	+
	194	+ while (strlen($this->str) < $end && $response !== false)
	195	+ {
	196	+ // read more from the file handle
	197	+ $need = $end - ftell($this->handle);
	198	+
	199	+ if ($response = fread($this->handle, $need))
	200	+ {
	201	+ $this->str .= $response;
	202	+ }
	203	+ else
	204	+ {
	205	+ return false;
	206	+ }
	207	+ }
	208	+ }
	209	+
	210	+ $result = substr($this->str, $this->strpos, $n);
	211	+ $this->strpos += $n;
	212	+
	213	+ // we are dealing with bytes here, so force the encoding
	214	+ return mb_convert_encoding($result, "8BIT");
	215	+ }
	216	+
	217	+
	218	+ private function getByte()
	219	+ {
	220	+ $c = $this->getChars(1);
	221	+ $b = unpack("C", $c);
	222	+
	223	+ return reset($b);
	224	+ }
	225	+
	226	+
	227	+ private function readInt($str)
	228	+ {
	229	+ $size = unpack("C*", $str);
	230	+
	231	+ return ($size[1] << 8) + $size[2];
	232	+ }
	233	+
	234	+
	235	+ public function __destruct()
	236	+ {
	237	+ $this->close();
	238	+ }
239	239	}

evolution-cms / evolution

Push — develop ( 80f130...524d8a )

Status

Category

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +34 added lines, -34 removed lines patch added patch discarded remove patch

Indentation +35 added lines, -35 removed lines patch added patch discarded remove patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +92 added lines, -92 removed lines patch added patch discarded remove patch

Indentation +218 added lines, -218 removed lines patch added patch discarded remove patch