evolution-cms / evolution

manager/media/browser/mcpuk/lib/class_image_gmagick.php

Braces +81 added lines, -40 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_gmagick extends image {
+class image_gmagick extends image
+{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,9 +22,15 @@ 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {//
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resize($width, $height)
+    {
+//
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
         try {
             $this->image->scaleImage($width, $height);
         } catch (Exception $e) {
@@ -34,9 +41,15 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resizeFit($width, $height, $background=false)
+    {
+//
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
 
         try {
             $this->image->scaleImage($width, $height, true);
@@ -69,43 +82,58 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resizeCrop($width, $height, $offset=false)
+    {
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
 
         if (($this->width / $this->height) > ($width / $height)) {
             $h = $height;
             $w = ($this->width * $h) / $this->height;
             $y = 0;
             if ($offset !== false) {
-                if ($offset > 0)
-                    $offset = -$offset;
-                if (($w + $offset) <= $width)
-                    $offset = $width - $w;
+                if ($offset > 0) {
+                                    $offset = -$offset;
+                }
+                if (($w + $offset) <= $width) {
+                                    $offset = $width - $w;
+                }
                 $x = $offset;
-            } else
-                $x = ($width - $w) / 2;
+            } else {
+                            $x = ($width - $w) / 2;
+            }
 
         } else {
             $w = $width;
             $h = ($this->height * $w) / $this->width;
             $x = 0;
             if ($offset !== false) {
-                if ($offset > 0)
-                    $offset = -$offset;
-                if (($h + $offset) <= $height)
-                    $offset = $height - $h;
+                if ($offset > 0) {
+                                    $offset = -$offset;
+                }
+                if (($h + $offset) <= $height) {
+                                    $offset = $height - $h;
+                }
                 $y = $offset;
-            } else
-                $y = ($height - $h) / 2;
+            } else {
+                            $y = ($height - $h) / 2;
+            }
         }
 
         $x = round($x);
         $y = round($y);
         $w = round($w);
         $h = round($h);
-        if (!$w) $w = 1;
-        if (!$h) $h = 1;
+        if (!$w) {
+            $w = 1;
+        }
+        if (!$h) {
+            $h = 1;
+        }
 
         try {
             $this->image->scaleImage($w, $h);
@@ -119,7 +147,8 @@ 
         return true;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background="#000000")
+    {
         try {
             $this->image->rotateImage($background, $angle);
             $w = $this->image->getImageWidth();
@@ -132,7 +161,8 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal()
+    {
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -141,7 +171,8 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical()
+    {
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -150,7 +181,8 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left=false, $top=false)
+    {
         try {
             $wm = new Gmagick($file);
             $w = $wm->getImageWidth();
@@ -171,8 +203,9 @@ 
         if ((($x + $w) > $this->width) ||
             (($y + $h) > $this->height) ||
             ($x < 0) || ($y < 0)
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
         try {
             $this->image->compositeImage($wm, 1, $x, $y);
@@ -185,7 +218,8 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height)
+    {
         try {
             $img = new Gmagick();
             $img->newImage($width, $height, "none");
@@ -195,7 +229,8 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height)
+    {
 
         if (is_object($image) && ($image instanceof image_gmagick)) {
             $width = $image->width;
@@ -225,18 +260,21 @@ 
             $height = $h;
             return $image;
 
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available()
+    {
         return class_exists("Gmagick");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file)
+    {
         try {
             new Gmagick($file);
         } catch (Exception $e) {
@@ -248,7 +286,8 @@ 
 
     // INHERIT METHODS
 
-    public function output($type="jpeg", array $options=array()) {
+    public function output($type="jpeg", array $options=array())
+    {
         $type = strtolower($type);
         try {
             $this->image->setImageFormat($type);
@@ -256,8 +295,9 @@ 
             return false;
         }
         $method = "optimize_$type";
-        if (method_exists($this, $method) && !$this->$method($options))
-            return false;
+        if (method_exists($this, $method) && !$this->$method($options)) {
+                    return false;
+        }
 
         if (!isset($options['file'])) {
             if (!headers_sent()) {
@@ -287,7 +327,8 @@ 
 
     // OWN METHODS
 
-    protected function optimize_jpeg(array $options=array()) {
+    protected function optimize_jpeg(array $options=array())
+    {
         $quality = isset($options['quality']) ? $options['quality'] : self::DEFAULT_JPEG_QUALITY;
         try {
             $this->image->setCompressionQuality($quality);

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

Braces +26 added lines, -36 removed lines

@@ -21,13 +21,17 @@ 
 
 	public function __construct($uri = null)
 	{
-		if ($uri) $this->load($uri);
+		if ($uri) {
+		    $this->load($uri);
+		}
 	}
 
 
 	public function load($uri)
 	{
-		if ($this->handle) $this->close();
+		if ($this->handle) {
+		    $this->close();
+		}
 
 		$this->uri = $uri;
 		$this->handle = fopen($uri, 'r');
@@ -36,15 +40,16 @@ 
 
 	public function close()
 	{
-		if (is_resource($this->handle)) fclose($this->handle);
+		if (is_resource($this->handle)) {
+		    fclose($this->handle);
+		}
 	}
 
 
 	public function getSize()
 	{
 		$this->strpos = 0;
-		if ($this->getType())
-		{
+		if ($this->getType()) {
 			return array_values($this->parseSize());
 		}
 
@@ -56,10 +61,8 @@ 
 	{
 		$this->strpos = 0;
 
-		if (!$this->type)
-		{
-			switch ($this->getChars(2))
-			{
+		if (!$this->type) {
+			switch ($this->getChars(2)) {
 				case "BM":
 					return $this->type = 'bmp';
 				case "GI":
@@ -81,8 +84,7 @@ 
 	{
 		$this->strpos = 0;
 
-		switch ($this->type)
-		{
+		switch ($this->type) {
 			case 'png':
 				return $this->parseSizeForPNG();
 			case 'gif':
@@ -127,10 +129,8 @@ 
 	{
 		$state = null;
 
-		while (true)
-		{
-			switch ($state)
-			{
+		while (true) {
+			switch ($state) {
 				default:
 					$this->getChars(2);
 					$state = 'started';
@@ -138,27 +138,22 @@ 
 
 				case 'started':
 					$b = $this->getByte();
-					if ($b === false) return false;
+					if ($b === false) {
+					    return false;
+					}
 
 					$state = $b == 0xFF ? 'sof' : 'started';
 					break;
 
 				case 'sof':
 					$b = $this->getByte();
-					if (in_array($b, range(0xe0, 0xef)))
-					{
+					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))))
-					{
+					} elseif (in_array($b, array_merge(range(0xC0,0xC3), range(0xC5,0xC7), range(0xC9,0xCB), range(0xCD,0xCF)))) {
 						$state = 'readsize';
-					}
-					elseif ($b == 0xFF)
-					{
+					} elseif ($b == 0xFF) {
 						$state = 'sof';
-					}
-					else
-					{
+					} else {
 						$state = 'skipframe';
 					}
 					break;
@@ -187,21 +182,16 @@ 
 		$response = null;
 
 		// do we need more data?
-		if ($this->strpos + $n -1 >= strlen($this->str))
-		{
+		if ($this->strpos + $n -1 >= strlen($this->str)) {
 			$end = ($this->strpos + $n);
 
-			while (strlen($this->str) < $end && $response !== false)
-			{
+			while (strlen($this->str) < $end && $response !== false) {
 				// read more from the file handle
 				$need = $end - ftell($this->handle);
 
-				if ($response = fread($this->handle, $need))
-				{
+				if ($response = fread($this->handle, $need)) {
 					$this->str .= $response;
-				}
-				else
-				{
+				} else {
 					return false;
 				}
 			}

manager/actions/site_schedule.static.php

Braces +11 added lines, -11 removed lines

@@ -1,8 +1,8 @@ 
 <?php

-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

-if(!$modx->hasPermission('view_eventlog')) {

+if(!$modx->hasPermission('view_eventlog')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 ?>

@@ -19,11 +19,11 @@ 
 			<?php

 			$rs = $modx->db->select('id, pagetitle, pub_date', $modx->getFullTableName('site_content'), "pub_date > " . time() . "", 'pub_date ASC');

 			$limit = $modx->db->getRecordCount($rs);

-			if($limit < 1) {

+			if($limit < 1) {
 				?>

 				<p><?= $_lang["no_docs_pending_publishing"] ?></p>

 				<?php

-			} else {

+			} else {
 				?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-1">

@@ -36,7 +36,7 @@ 
 						</thead>

 						<tbody>

 						<?php

-						while($row = $modx->db->getRow($rs)) {

+						while($row = $modx->db->getRow($rs)) {
 							?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

@@ -58,11 +58,11 @@ 
 			<?php

 			$rs = $modx->db->select('id, pagetitle, unpub_date', $modx->getFullTableName('site_content'), "unpub_date > " . time() . "", 'unpub_date ASC');

 			$limit = $modx->db->getRecordCount($rs);

-			if($limit < 1) {

+			if($limit < 1) {
 				?>

 				<p><?= $_lang["no_docs_pending_unpublishing"] ?></p>

 				<?php

-			} else {

+			} else {
 				?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-2">

@@ -75,7 +75,7 @@ 
 						</thead>

 						<tbody>

 						<?php

-						while($row = $modx->db->getRow($rs)) {

+						while($row = $modx->db->getRow($rs)) {
 							?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

@@ -97,11 +97,11 @@ 
 			<?php

 			$rs = $modx->db->select('id, pagetitle, pub_date, unpub_date', $modx->getFullTableName('site_content'), "pub_date > 0 OR unpub_date > 0", "pub_date DESC");

 			$limit = $modx->db->getRecordCount($rs);

-			if($limit < 1) {

+			if($limit < 1) {
 				?>

 				<p><?= $_lang["no_docs_pending_pubunpub"] ?></p>

 				<?php

-			} else {

+			} else {
 				?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-3">

@@ -115,7 +115,7 @@ 
 						</thead>

 						<tbody>

 						<?php

-						while($row = $modx->db->getRow($rs)) {

+						while($row = $modx->db->getRow($rs)) {
 							?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

manager/actions/modules.static.php

Braces +12 added lines, -12 removed lines

@@ -1,8 +1,8 @@ 
 <?php

-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

-if (!($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) {

+if (!($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

@@ -10,10 +10,10 @@ 
 $modx->manager->initPageViewState();

 

 // get and save search string

-if ($_REQUEST['op'] == 'reset') {

+if ($_REQUEST['op'] == 'reset') {
     $query = '';

     $_PAGE['vs']['search'] = '';

-} else {

+} else {
     $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];

     $sqlQuery = $modx->db->escape($query);

     $_PAGE['vs']['search'] = $query;

@@ -28,7 +28,7 @@ 
 include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php";

 $cm = new ContextMenu("cntxm", 150);

 $cm->addItem($_lang["run_module"], "js:menuAction(1)", $_style['actions_run'], (!$modx->hasPermission('exec_module') ? 1 : 0));

-if ($modx->hasPermission('edit_module') || $modx->hasPermission('new_module') || $modx->hasPermission('delete_module')) {

+if ($modx->hasPermission('edit_module') || $modx->hasPermission('new_module') || $modx->hasPermission('delete_module')) {
     $cm->addSeparator();

 }

 $cm->addItem($_lang["edit"], "js:menuAction(2)", $_style['actions_edit'], (!$modx->hasPermission('edit_module') ? 1 : 0));

@@ -107,21 +107,21 @@ 
 <div class="tab-page">

     <div class="table-responsive">

         <?php

-        if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

+        if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
             $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.description, mg.member, IF(disabled,"' . $_lang['yes'] . '","-") as disabled, IF(sm.icon<>"",sm.icon,"' . $_style['icons_modules'] . '") as icon

 				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm

 				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

 				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

                 WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

-            if ($modx->hasPermission('edit_module')) {

+            if ($modx->hasPermission('edit_module')) {
                 $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

-            } else if ($modx->hasPermission('exec_module')) {

+            } else if ($modx->hasPermission('exec_module')) {
                 $title = "<a href='index.php?a=112&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

-            } else {

+            } else {
                 $title = '[+value+]';

             }

-        } else {

+        } else {
             $rs = $modx->db->select("id, name, description, IF(locked,'{$_lang['yes']}','-') as locked, IF(disabled,'{$_lang['yes']}','-') as disabled, IF(icon<>'',icon,'{$_style['icons_module']}') as icon", $modx->getFullTableName("site_modules"), (!empty($sqlQuery) ? "(name LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "name");

             $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

         }

@@ -137,10 +137,10 @@ 
         $grd->colWidths = "34,,,60,60";

         $grd->colAligns = "center,,,center,center";

         $grd->colTypes = "template:<a class='tableRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='[+value+]'></i></a>||template:" . $title;

-        if ($listmode == '1') {

+        if ($listmode == '1') {
             $grd->pageSize = 0;

         }

-        if ($_REQUEST['op'] == 'reset') {

+        if ($_REQUEST['op'] == 'reset') {
             $grd->pageNumber = 1;

         }

         // render grid

manager/actions/sysinfo.static.php

Braces +8 added lines, -8 removed lines

@@ -1,8 +1,8 @@ 
 <?php

-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

-if (!$modx->hasPermission('logs')) {

+if (!$modx->hasPermission('logs')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

@@ -55,7 +55,7 @@ 
                 <table class="table data table-sm nowrap">

                     <tbody>

                     <?php

-                    foreach ($serverArr as $key => $value) {

+                    foreach ($serverArr as $key => $value) {
                         ?>

                         <tr>

                             <td width="1%"><?= $key ?></td>

@@ -98,7 +98,7 @@ 
                     $sql = "SHOW TABLE STATUS FROM $dbase LIKE '" . $modx->db->escape($modx->db->config['table_prefix']) . "%';";

                     $rs = $modx->db->query($sql);

                     $i = 0;

-                    while ($log_status = $modx->db->getRow($rs)) {

+                    while ($log_status = $modx->db->getRow($rs)) {
                         ?>

                         <tr>

                             <td class="text-primary"><b><?= $log_status['Name'] ?></b></td>

@@ -110,17 +110,17 @@ 
                                 $modx->db->config['table_prefix'] . 'event_log',

                                 $modx->db->config['table_prefix'] . 'manager_log',

                             );

-                            if ($modx->hasPermission('settings') && in_array($log_status['Name'], $truncateable)) {

+                            if ($modx->hasPermission('settings') && in_array($log_status['Name'], $truncateable)) {
                                 echo "<td class=\"text-xs-right\">";

                                 echo "<a class=\"text-danger\" href='index.php?a=54&mode=$action&u=" . $log_status['Name'] . "' title='" . $_lang['truncate_table'] . "'>" . $modx->nicesize($log_status['Data_length'] + $log_status['Data_free']) . "</a>";

                                 echo "</td>";

-                            } else {

+                            } else {
                                 echo "<td class=\"text-xs-right\">" . $modx->nicesize($log_status['Data_length'] + $log_status['Data_free']) . "</td>";

                             }

 

-                            if ($modx->hasPermission('settings')) {

+                            if ($modx->hasPermission('settings')) {
                                 echo "<td class=\"text-xs-right\">" . ($log_status['Data_free'] > 0 ? "<a class=\"text-danger\" href='index.php?a=54&mode=$action&t=" . $log_status['Name'] . "' title='" . $_lang['optimize_table'] . "' ><span>" . $modx->nicesize($log_status['Data_free']) . "</span></a>" : "-") . "</td>";

-                            } else {

+                            } else {
                                 echo "<td class=\"text-xs-right\">" . ($log_status['Data_free'] > 0 ? $modx->nicesize($log_status['Data_free']) : "-") . "</td>";

                             }

                             ?>

manager/actions/help.static.php

Braces +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php

-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 $helpBasePath = "actions/help/";

@@ -16,9 +16,9 @@ 
 		</script>

 

 		<?php

-		if($handle = opendir('actions/help')) {

-			while(false !== ($file = readdir($handle))) {

-				if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {

+		if($handle = opendir('actions/help')) {
+			while(false !== ($file = readdir($handle))) {
+				if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
 					$help[] = $file;

 				}

 			}

@@ -27,12 +27,12 @@ 
 

 		natcasesort($help);

 

-		foreach($help as $k => $v) {

+		foreach($help as $k => $v) {
 

 			$helpname = substr($v, 0, strrpos($v, '.'));

 

 			$prefix = substr($helpname, 0, 2);

-			if(is_numeric($prefix)) {

+			if(is_numeric($prefix)) {
 				$helpname = substr($helpname, 2, strlen($helpname) - 1);

 			}

 

manager/actions/help/03Version_Notices.php

Braces +1 added lines, -2 removed lines

@@ -18,8 +18,7 @@
     foreach($notices as $v) {
         if ($v >= '1.3.0') {
             $cms = 'EVO';
-        }
-        else {
+        } else {
             $cms = 'MODX EVO';
         }
         echo '<div class="sectionHeader"> '.$cms.' '.$v.'</div><div class="sectionBody">';

manager/actions/help/04Changelog.php

Braces +4 added lines, -3 removed lines

@@ -8,7 +8,8 @@
 <div class="sectionBody">
 <?php
 	$changeLog = MODX_BASE_PATH . 'assets/docs/changelog.txt';
-	if(is_readable($changeLog))
-		echo str_replace("\n",'<br>',file_get_contents($changeLog));
-?>
+	if(is_readable($changeLog)) {
+			echo str_replace("\n",'<br>',file_get_contents($changeLog));
+	}
+	?>
 </div>

manager/actions/mutate_password.dynamic.php

Braces +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php

-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

-if(!$modx->hasPermission('change_password')) {

+if(!$modx->hasPermission('change_password')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 ?>