Inspection of "Merge pull request #701 from bossloper/patch-69" - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — develop ( 0132ab...e45b08 )

by Dmytro

created 2018-05-25 08:20 UTC

Status

Spacing +39 added lines, -39 removed lines patch added patch discarded remove patch

@@ -12,7 +12,7 @@  discard block
 block discarded – undo
   *      @link http://kcfinder.sunhater.com
   */
 
-class gd {
+class gd{
 
   /** GD resource
     * @var resource */
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
     * @param mixed $image
     * @return array */
 
-    protected function build_image($image) {
+    protected function build_image($image){
 
         if ($image instanceof gd) {
             $width = $image->get_width();
@@ -58,12 +58,12 @@  discard block
 block discarded – undo
 
         } elseif (false !== (list($width, $height, $type) = @getimagesize($image))) {
             $image =
-                ($type == IMAGETYPE_GIF)      ? @imagecreatefromgif($image)  : (
-                ($type == IMAGETYPE_WBMP)     ? @imagecreatefromwbmp($image) : (
-                ($type == IMAGETYPE_JPEG)     ? @imagecreatefromjpeg($image) : (
+                ($type == IMAGETYPE_GIF) ? @imagecreatefromgif($image) : (
+                ($type == IMAGETYPE_WBMP) ? @imagecreatefromwbmp($image) : (
+                ($type == IMAGETYPE_JPEG) ? @imagecreatefromjpeg($image) : (
                 ($type == IMAGETYPE_JPEG2000) ? @imagecreatefromjpeg($image) : (
-                ($type == IMAGETYPE_PNG)      ? @imagecreatefrompng($image)  : (
-                ($type == IMAGETYPE_XBM)      ? @imagecreatefromxbm($image)  : false
+                ($type == IMAGETYPE_PNG) ? @imagecreatefrompng($image) : (
+                ($type == IMAGETYPE_XBM) ? @imagecreatefromxbm($image) : false
             )))));
 
             if ($type == IMAGETYPE_PNG)
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
     * @param integer $bigger_size
     * @return gd */
 
-    public function __construct($image, $bigger_size=null) {
+    public function __construct($image, $bigger_size = null){
         $this->image = $this->width = $this->height = null;
 
         $image_details = $this->build_image($image);
@@ -126,21 +126,21 @@  discard block
 block discarded – undo
   /** Returns the GD resource
     * @return resource */
 
-    public function get_image() {
+    public function get_image(){
         return $this->image;
     }
 
   /** Returns the image width
     * @return integer */
 
-    public function get_width() {
+    public function get_width(){
         return $this->width;
     }
 
   /** Returns the image height
     * @return integer */
 
-    public function get_height() {
+    public function get_height(){
         return $this->height;
     }
 
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
     * @param integer $resized_height
     * @return integer */
 
-    public function get_prop_width($resized_height) {
+    public function get_prop_width($resized_height){
         $width = intval(($this->width * $resized_height) / $this->height);
         if (!$width) $width = 1;
         return $width;
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
     * @param integer $resized_width
     * @return integer */
 
-    public function get_prop_height($resized_width) {
+    public function get_prop_height($resized_width){
         $height = intval(($this->height * $resized_width) / $this->width);
         if (!$height) $height = 1;
         return $height;
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
     * @param integer $bigger_size
     * @return array */
 
-    public function get_prop_size($bigger_size) {
+    public function get_prop_size($bigger_size){
 
         if ($this->width > $this->height) {
             $width = $bigger_size;
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
     * @param integer $height
     * @return bool */
 
-    public function resize($width, $height) {
+    public function resize($width, $height){
         if (!$width) $width = 1;
         if (!$height) $height = 1;
         return (
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
     * @param mixed $src
     * @return bool */
 
-    public function resize_crop($src) {
+    public function resize_crop($src){
         $image_details = $this->build_image($src);
 
         if ($image_details !== false) {
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
     * @param integer $height
     * @return bool */
 
-    public function resize_fit($width, $height) {
+    public function resize_fit($width, $height){
         if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height)))
             return true;
         if (!$width || (($height / $width) < ($this->height / $this->width)))
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
     * @param integer $height
     * @return bool */
 
-    public function resize_overflow($width, $height) {
+    public function resize_overflow($width, $height){
 
         $big = (($this->width / $this->height) > ($width / $height))
             ? ($this->width * $height) / $this->height
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
         return $return;
     }
 
-    public function gd_color() {
+    public function gd_color(){
         $args = func_get_args();
 
         $expr_rgb = '/^rgb\(\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\)$/i';
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
         return imagecolorallocate($this->image, $r, $g, $b);
     }
 
-    public function fill_color($color) {
+    public function fill_color($color){
         return $this->imagefilledrectangle(0, 0, $this->width - 1, $this->height - 1, $color);
     }
 
@@ -326,11 +326,11 @@  discard block
 block discarded – undo
 
     public function imagecopy(
         $src,
-        $dst_x=0, $dst_y=0,
-        $src_x=0, $src_y=0,
-        $dst_w=null, $dst_h=null,
-        $src_w=null, $src_h=null
-    ) {
+        $dst_x = 0, $dst_y = 0,
+        $src_x = 0, $src_y = 0,
+        $dst_w = null, $dst_h = null,
+        $src_w = null, $src_h = null
+    ){
         $image_details = $this->build_image($src);
 
         if ($image_details !== false) {
@@ -348,11 +348,11 @@  discard block
 block discarded – undo
 
     public function imagecopyresampled(
         $src,
-        $dst_x=0, $dst_y=0,
-        $src_x=0, $src_y=0,
-        $dst_w=null, $dst_h=null,
-        $src_w=null, $src_h=null
-    ) {
+        $dst_x = 0, $dst_y = 0,
+        $src_x = 0, $src_y = 0,
+        $dst_w = null, $dst_h = null,
+        $src_w = null, $src_h = null
+    ){
         $image_details = $this->build_image($src);
 
         if ($image_details !== false) {
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
             if (is_null($src_w)) $src_w = $src_width - $src_x;
             if (is_null($src_h)) $src_h = $src_height - $src_y;
             imagealphablending($this->image, false);
-            imagesavealpha($this->image,true);
+            imagesavealpha($this->image, true);
 
 
 
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
 
 			$transindex = imagecolortransparent($src);
 			$palletsize = imagecolorstotal($src);
-			if($transindex >= 0 && $transindex < $palletsize) {
+			if ($transindex >= 0 && $transindex < $palletsize) {
 				$transcol = imagecolorsforindex($src, $transindex);
 
 			/*** end gif transparent fix ***/
@@ -381,9 +381,9 @@  discard block
 block discarded – undo
 				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);
+				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 {
@@ -397,26 +397,26 @@  discard block
 block discarded – undo
             return false;
     }
 
-    public function imagefilledrectangle($x1, $y1, $x2, $y2, $color) {
+    public function imagefilledrectangle($x1, $y1, $x2, $y2, $color){
         $color = $this->gd_color($color);
         if ($color === false) return false;
         return imagefilledrectangle($this->image, $x1, $y1, $x2, $y2, $color);
     }
 
-    public function imagepng($filename=null, $quality=null, $filters=null) {
+    public function imagepng($filename = null, $quality = null, $filters = null){
         if (is_null($filename) && !headers_sent())
             header("Content-Type: image/png");
         @imagesavealpha($this->image, true);
         return imagepng($this->image, $filename, $quality, $filters);
     }
 
-    public function imagejpeg($filename=null, $quality=75) {
+    public function imagejpeg($filename = null, $quality = 75){
         if (is_null($filename) && !headers_sent())
             header("Content-Type: image/jpeg");
         return imagejpeg($this->image, $filename, $quality);
     }
 
-    public function imagegif($filename=null) {
+    public function imagegif($filename = null){
         if (is_null($filename) && !headers_sent())
             header("Content-Type: image/gif");
 			@imagesavealpha($this->image, true);

Please login to merge, or discard this patch.

install/lang.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -10,12 +10,12 @@  discard block
 block discarded – undo
  * Filename:       /install/lang.php
  */
 
-$_lang = array ();
+$_lang = array();
 
 #default fallback language file - english
 $install_language = "english";
 
-$_langFiles= array (
+$_langFiles = array(
  "en" => "english",
  "bg" => "bulgarian",
  "cs" => "czech",
@@ -36,14 +36,14 @@  discard block
 block discarded – undo
  "es" => "spanish-utf8",
  "sv" => "svenska"
 );
-$_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
+$_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2);
 if (!empty($_langFiles[$_langISO6391]))  $install_language = $_langFiles[$_langISO6391];
 
 
-if (isset($_POST['language']) && !stristr($_POST['language'],"..")) {
+if (isset($_POST['language']) && !stristr($_POST['language'], "..")) {
 	$install_language = $_POST['language'];
 } else {
-	if (isset($_GET['language']) && !stristr($_GET['language'],".."))
+	if (isset($_GET['language']) && !stristr($_GET['language'], ".."))
 		$install_language = $_GET['language'];
 }
 # load language file
@@ -52,15 +52,15 @@  discard block
 block discarded – undo
 
 $manager_language = $install_language;
 
-if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'],"..")) {
+if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'], "..")) {
 	$manager_language = $_POST['managerlanguage'];
 } else {
-	if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'],".."))
+	if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'], ".."))
 		$manager_language = $_GET['managerlanguage'];
 }
 
-foreach($_lang as $k=>$v)
+foreach ($_lang as $k=>$v)
 {
-	if(strpos($v,'[+MGR_DIR+]')!==false)
+	if (strpos($v, '[+MGR_DIR+]') !== false)
 		$_lang[$k] = str_replace('[+MGR_DIR+]', MGR_DIR, $v);
 }

Please login to merge, or discard this patch.

install/actions/action_language.php 1 patch

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

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if( ! function_exists('getLangOptions')) {
+if (!function_exists('getLangOptions')) {
     /**
      * @param string $install_language
      * @return string
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
             $abrv_language = explode('-', $language);
             $selected = ($language === $install_language) ? 'selected' : '';
             $_[] = sprintf('<option value="%s" %s>%s</option>', $language, $selected,
-                    ucwords($abrv_language[0])) . "\n";
+                    ucwords($abrv_language[0]))."\n";
         }
 
         return implode("\n", $_);
@@ -32,6 +32,6 @@  discard block
 block discarded – undo
 $content = parse($content, array(
     'langOptions' => getLangOptions($install_language))
 );
-$content = parse($content, $_lang,'[%','%]');
+$content = parse($content, $_lang, '[%', '%]');
 
 echo $content;

Please login to merge, or discard this patch.

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

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

@@ -12,7 +12,7 @@  discard block
 block discarded – undo
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_imagick extends image {
+class image_imagick extends image{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {//
+    public function resize($width, $height){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
         try {
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
+    public function resizeFit($width, $height, $background = false){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
+    public function resizeCrop($width, $height, $offset = false){
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
         return true;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background = "#000000"){
         try {
             $this->image->rotateImage(new ImagickPixel($background), $angle);
             $size = $this->image->getImageGeometry();
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal(){
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical(){
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left = false, $top = false){
         try {
             $wm = new Imagick($file);
             $size = $wm->getImageGeometry();
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height){
         try {
             $img = new Imagick();
             $img->newImage($width, $height, "none");
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height){
 
         if (is_object($image) && ($image instanceof image_imagick)) {
             try {
@@ -234,11 +234,11 @@  discard block
 block discarded – undo
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available(){
         return class_exists("Imagick");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file){
         try {
             new Imagick($file);
         } catch (Exception $e) {
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
 
     // 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);
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
             echo $this->image;
 
         } else {
-            $file = $options['file'] . ".$type";
+            $file = $options['file'].".$type";
             try {
                 $this->image->writeImage($file);
             } catch (Exception $e) {
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
 
     // 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->setImageCompression(Imagick::COMPRESSION_JPEG);

Please login to merge, or discard this patch.

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

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

@@ -12,7 +12,7 @@  discard block
 block discarded – undo
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_gmagick extends image {
+class image_gmagick extends image{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {//
+    public function resize($width, $height){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
         try {
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
+    public function resizeFit($width, $height, $background = false){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
+    public function resizeCrop($width, $height, $offset = false){
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
         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 +132,7 @@  discard block
 block discarded – undo
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal(){
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical(){
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
         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();
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height){
         try {
             $img = new Gmagick();
             $img->newImage($width, $height, "none");
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
         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;
@@ -232,11 +232,11 @@  discard block
 block discarded – undo
 
     // 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 +248,7 @@  discard block
 block discarded – undo
 
     // 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);
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
             echo $this->image;
 
         } else {
-            $file = $options['file'] . ".$type";
+            $file = $options['file'].".$type";
             try {
                 $this->image->writeImage($file);
             } catch (Exception $e) {
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
 
     // 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);

Please login to merge, or discard this patch.

manager/actions/site_schedule.static.php 1 patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -1,8 +1,8 @@  discard block
 block discarded – undo
 <?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"]);
 }
 ?>
@@ -17,9 +17,9 @@  discard block
 block discarded – undo
 		<div class="form-group" id="lyr1">
 			<b><?= $_lang["publish_events"] ?></b>
 			<?php
-			$rs = $modx->db->select('id, pagetitle, pub_date', $modx->getFullTableName('site_content'), "pub_date > " . time() . "", 'pub_date ASC');
+			$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
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
 						</thead>
 						<tbody>
 						<?php
-						while($row = $modx->db->getRow($rs)) {
+						while ($row = $modx->db->getRow($rs)) {
 							?>
 							<tr>
 								<td class="text-right"><?= $row['id'] ?></td>
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
 		<div class="form-group" id="lyr2">
 			<b><?= $_lang["unpublish_events"] ?></b>
 			<?php
-			$rs = $modx->db->select('id, pagetitle, unpub_date', $modx->getFullTableName('site_content'), "unpub_date > " . time() . "", 'unpub_date ASC');
+			$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
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
 						</thead>
 						<tbody>
 						<?php
-						while($row = $modx->db->getRow($rs)) {
+						while ($row = $modx->db->getRow($rs)) {
 							?>
 							<tr>
 								<td class="text-right"><?= $row['id'] ?></td>
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
 			<?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
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
 						</thead>
 						<tbody>
 						<?php
-						while($row = $modx->db->getRow($rs)) {
+						while ($row = $modx->db->getRow($rs)) {
 							?>
 							<tr>
 								<td class="text-right"><?= $row['id'] ?></td>

Please login to merge, or discard this patch.

manager/actions/mutate_plugin_priority.dynamic.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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('save_plugin')) {
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
 $updateMsg = '';
 
 if (isset($_POST['listSubmitted'])) {
-    $updateMsg .= '<span class="text-success" id="updated">' . $_lang['sort_updated'] . '</span>';
+    $updateMsg .= '<span class="text-success" id="updated">'.$_lang['sort_updated'].'</span>';
     $tbl = $modx->getFullTableName('site_plugin_events');
 
     foreach ($_POST as $listName => $listValue) {
@@ -34,9 +34,9 @@  discard block
 block discarded – undo
     $modx->clearCache('full');
 }
 
-$rs = $modx->db->select("sysevt.name as evtname, sysevt.id as evtid, pe.pluginid, plugs.name, pe.priority, plugs.disabled", $modx->getFullTableName('system_eventnames') . " sysevt
-		INNER JOIN " . $modx->getFullTableName('site_plugin_events') . " pe ON pe.evtid = sysevt.id
-		INNER JOIN " . $modx->getFullTableName('site_plugins') . " plugs ON plugs.id = pe.pluginid", '', 'sysevt.name,pe.priority');
+$rs = $modx->db->select("sysevt.name as evtname, sysevt.id as evtid, pe.pluginid, plugs.name, pe.priority, plugs.disabled", $modx->getFullTableName('system_eventnames')." sysevt
+		INNER JOIN " . $modx->getFullTableName('site_plugin_events')." pe ON pe.evtid = sysevt.id
+		INNER JOIN " . $modx->getFullTableName('site_plugins')." plugs ON plugs.id = pe.pluginid", '', 'sysevt.name,pe.priority');
 
 $insideUl = 0;
 $preEvt = '';
@@ -47,17 +47,17 @@  discard block
 block discarded – undo
     if ($preEvt !== $plugins['evtid']) {
         $sortables[] = $plugins['evtid'];
         $sortableList .= $insideUl ? '</ul></div>' : '';
-        $sortableList .= '<div class="form-group clearfix"><strong>' . $plugins['evtname'] . '</strong><ul id="' . $plugins['evtid'] . '" class="sortableList">';
+        $sortableList .= '<div class="form-group clearfix"><strong>'.$plugins['evtname'].'</strong><ul id="'.$plugins['evtid'].'" class="sortableList">';
         $insideUl = 1;
     }
-    $sortableList .= '<li id="item_' . $plugins['pluginid'] . '"' . ($plugins['disabled'] ? ' class="disabledPlugin"' : '') . '><i class="fa fa-plug"></i> ' . $plugins['name'] . ($plugins['disabled'] ? ' (hide)' : '') . '</li>';
+    $sortableList .= '<li id="item_'.$plugins['pluginid'].'"'.($plugins['disabled'] ? ' class="disabledPlugin"' : '').'><i class="fa fa-plug"></i> '.$plugins['name'].($plugins['disabled'] ? ' (hide)' : '').'</li>';
     $preEvt = $plugins['evtid'];
 }
 if ($insideUl) {
     $sortableList .= '</ul></div>';
 }
 
-require_once(MODX_MANAGER_PATH . 'includes/header.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/header.inc.php');
 ?>
 
 <script type="text/javascript">

Please login to merge, or discard this patch.

manager/actions/modules.static.php 1 patch

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

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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'))) {
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 
 
 // context menu
-include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php";
+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')) {
@@ -108,24 +108,24 @@  discard block
 block discarded – undo
     <div class="table-responsive">
         <?php
         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
+            $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')) {
-                $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";
+                $title = "<a href='index.php?a=108&id=[+id+]' title='".$_lang["module_edit_click_title"]."'>[+value+]</a>";
             } else if ($modx->hasPermission('exec_module')) {
-                $title = "<a href='index.php?a=112&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";
+                $title = "<a href='index.php?a=112&id=[+id+]' title='".$_lang["module_edit_click_title"]."'>[+value+]</a>";
             } else {
                 $title = '[+value+]';
             }
         } 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>";
+            $title = "<a href='index.php?a=108&id=[+id+]' title='".$_lang["module_edit_click_title"]."'>[+value+]</a>";
         }
-        include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+        include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
         $grd = new DataGrid('', $rs, $number_of_results); // set page size to 0 t show all items
         $grd->noRecordMsg = $_lang["no_records_found"];
         $grd->cssClass = "table data";
@@ -133,10 +133,10 @@  discard block
 block discarded – undo
         $grd->itemClass = "tableItem";
         $grd->altItemClass = "tableAltItem";
         $grd->fields = "icon,name,description,locked,disabled";
-        $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["description"] . " ," . $_lang["locked"] . " ," . $_lang["disabled"];
+        $grd->columns = $_lang["icon"]." ,".$_lang["name"]." ,".$_lang["description"]." ,".$_lang["locked"]." ,".$_lang["disabled"];
         $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;
+        $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') {
             $grd->pageSize = 0;
         }

Please login to merge, or discard this patch.

manager/actions/sysinfo.static.php 1 patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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')) {
@@ -12,14 +12,14 @@  discard block
 block discarded – undo
 $collation = $modx->db->getRow($res, 'num');
 
 $serverArr = array(
-    $_lang['modx_version'] => $modx->getVersionData('version') . ' ' . $newversiontext,
+    $_lang['modx_version'] => $modx->getVersionData('version').' '.$newversiontext,
     $_lang['release_date'] => $modx->getVersionData('release_date'),
     'PHP Version' => phpversion(),
-    'phpInfo()' => '<a class="text-underline" href="javascript:;" onclick="viewPHPInfo();return false;">' . $_lang['view'] . '</a>',
+    'phpInfo()' => '<a class="text-underline" href="javascript:;" onclick="viewPHPInfo();return false;">'.$_lang['view'].'</a>',
     $_lang['access_permissions'] => ($use_udperms == 1 ? $_lang['enabled'] : $_lang['disabled']),
     $_lang['servertime'] => strftime('%H:%M:%S', time()),
     $_lang['localtime'] => strftime('%H:%M:%S', time() + $server_offset_time),
-    $_lang['serveroffset'] => $server_offset_time / (60 * 60) . ' h',
+    $_lang['serveroffset'] => $server_offset_time / (60 * 60).' h',
     $_lang['database_name'] => trim($dbase, '`'),
     $_lang['database_server'] => $database_server,
     $_lang['database_version'] => $modx->db->getVersion(),
@@ -95,33 +95,33 @@  discard block
 block discarded – undo
                     </thead>
                     <tbody>
                     <?php
-                    $sql = "SHOW TABLE STATUS FROM $dbase LIKE '" . $modx->db->escape($modx->db->config['table_prefix']) . "%';";
+                    $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)) {
                         ?>
                         <tr>
                             <td class="text-primary"><b><?= $log_status['Name'] ?></b></td>
-                            <td class="text-xs-center"><?= (!empty($log_status['Comment']) ? '<i class="' . $_style['actions_help'] . '" data-tooltip="' . $log_status['Comment'] . '"></i>' : '') ?></td>
+                            <td class="text-xs-center"><?= (!empty($log_status['Comment']) ? '<i class="'.$_style['actions_help'].'" data-tooltip="'.$log_status['Comment'].'"></i>' : '') ?></td>
                             <td class="text-xs-right"><?= $log_status['Rows'] ?></td>
 
                             <?php
                             $truncateable = array(
-                                $modx->db->config['table_prefix'] . 'event_log',
-                                $modx->db->config['table_prefix'] . 'manager_log',
+                                $modx->db->config['table_prefix'].'event_log',
+                                $modx->db->config['table_prefix'].'manager_log',
                             );
                             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 "<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 {
-                                echo "<td class=\"text-xs-right\">" . $modx->nicesize($log_status['Data_length'] + $log_status['Data_free']) . "</td>";
+                                echo "<td class=\"text-xs-right\">".$modx->nicesize($log_status['Data_length'] + $log_status['Data_free'])."</td>";
                             }
 
                             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>";
+                                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 {
-                                echo "<td class=\"text-xs-right\">" . ($log_status['Data_free'] > 0 ? $modx->nicesize($log_status['Data_free']) : "-") . "</td>";
+                                echo "<td class=\"text-xs-right\">".($log_status['Data_free'] > 0 ? $modx->nicesize($log_status['Data_free']) : "-")."</td>";
                             }
                             ?>
                             <td class="text-xs-right"><?= $modx->nicesize($log_status['Data_length'] - $log_status['Data_free']) ?></td>
@@ -136,9 +136,9 @@  discard block
 block discarded – undo
                     <tr class="unstyled">
                         <td class="text-xs-right"><?= $_lang['database_table_totals'] ?></td>
                         <td colspan="3">&nbsp;</td>
-                        <td class="text-xs-right"><?= $totaloverhead > 0 ? "<b class=\"text-danger\">" . $modx->nicesize($totaloverhead) . "</b><br />(" . number_format($totaloverhead) . " B)" : "-" ?></td>
+                        <td class="text-xs-right"><?= $totaloverhead > 0 ? "<b class=\"text-danger\">".$modx->nicesize($totaloverhead)."</b><br />(".number_format($totaloverhead)." B)" : "-" ?></td>
                         <td colspan="2">&nbsp;</td>
-                        <td class="text-xs-right"><?= "<b>" . $modx->nicesize($total) . "</b><br />(" . number_format($total) . " B)" ?></td>
+                        <td class="text-xs-right"><?= "<b>".$modx->nicesize($total)."</b><br />(".number_format($total)." B)" ?></td>
                     </tr>
                     </tbody>
                 </table>

Please login to merge, or discard this patch.

		@@ -12,7 +12,7 @@ discard block
		block discarded – undo
12	12	* @link http://kcfinder.sunhater.com
13	13	*/
14	14
15		-class gd {
	15	+class gd{
16	16
17	17	/** GD resource
18	18	* @var resource */
		@@ -40,7 +40,7 @@ discard block
		block discarded – undo
40	40	* @param mixed $image
41	41	* @return array */
42	42
43		- protected function build_image($image) {
	43	+ protected function build_image($image){
44	44
45	45	if ($image instanceof gd) {
46	46	$width = $image->get_width();
		@@ -58,12 +58,12 @@ discard block
		block discarded – undo
58	58
59	59	} elseif (false !== (list($width, $height, $type) = @getimagesize($image))) {
60	60	$image =
61		- ($type == IMAGETYPE_GIF) ? @imagecreatefromgif($image) : (
62		- ($type == IMAGETYPE_WBMP) ? @imagecreatefromwbmp($image) : (
63		- ($type == IMAGETYPE_JPEG) ? @imagecreatefromjpeg($image) : (
	61	+ ($type == IMAGETYPE_GIF) ? @imagecreatefromgif($image) : (
	62	+ ($type == IMAGETYPE_WBMP) ? @imagecreatefromwbmp($image) : (
	63	+ ($type == IMAGETYPE_JPEG) ? @imagecreatefromjpeg($image) : (
64	64	($type == IMAGETYPE_JPEG2000) ? @imagecreatefromjpeg($image) : (
65		- ($type == IMAGETYPE_PNG) ? @imagecreatefrompng($image) : (
66		- ($type == IMAGETYPE_XBM) ? @imagecreatefromxbm($image) : false
	65	+ ($type == IMAGETYPE_PNG) ? @imagecreatefrompng($image) : (
	66	+ ($type == IMAGETYPE_XBM) ? @imagecreatefromxbm($image) : false
67	67	)))));
68	68
69	69	if ($type == IMAGETYPE_PNG)
		@@ -98,7 +98,7 @@ discard block
		block discarded – undo
98	98	* @param integer $bigger_size
99	99	* @return gd */
100	100
101		- public function __construct($image, $bigger_size=null) {
	101	+ public function __construct($image, $bigger_size = null){
102	102	$this->image = $this->width = $this->height = null;
103	103
104	104	$image_details = $this->build_image($image);
		@@ -126,21 +126,21 @@ discard block
		block discarded – undo
126	126	/** Returns the GD resource
127	127	* @return resource */
128	128
129		- public function get_image() {
	129	+ public function get_image(){
130	130	return $this->image;
131	131	}
132	132
133	133	/** Returns the image width
134	134	* @return integer */
135	135
136		- public function get_width() {
	136	+ public function get_width(){
137	137	return $this->width;
138	138	}
139	139
140	140	/** Returns the image height
141	141	* @return integer */
142	142
143		- public function get_height() {
	143	+ public function get_height(){
144	144	return $this->height;
145	145	}
146	146
		@@ -148,7 +148,7 @@ discard block
		block discarded – undo
148	148	* @param integer $resized_height
149	149	* @return integer */
150	150
151		- public function get_prop_width($resized_height) {
	151	+ public function get_prop_width($resized_height){
152	152	$width = intval(($this->width * $resized_height) / $this->height);
153	153	if (!$width) $width = 1;
154	154	return $width;
		@@ -158,7 +158,7 @@ discard block
		block discarded – undo
158	158	* @param integer $resized_width
159	159	* @return integer */
160	160
161		- public function get_prop_height($resized_width) {
	161	+ public function get_prop_height($resized_width){
162	162	$height = intval(($this->height * $resized_width) / $this->width);
163	163	if (!$height) $height = 1;
164	164	return $height;
		@@ -170,7 +170,7 @@ discard block
		block discarded – undo
170	170	* @param integer $bigger_size
171	171	* @return array */
172	172
173		- public function get_prop_size($bigger_size) {
	173	+ public function get_prop_size($bigger_size){
174	174
175	175	if ($this->width > $this->height) {
176	176	$width = $bigger_size;
		@@ -191,7 +191,7 @@ discard block
		block discarded – undo
191	191	* @param integer $height
192	192	* @return bool */
193	193
194		- public function resize($width, $height) {
	194	+ public function resize($width, $height){
195	195	if (!$width) $width = 1;
196	196	if (!$height) $height = 1;
197	197	return (
		@@ -208,7 +208,7 @@ discard block
		block discarded – undo
208	208	* @param mixed $src
209	209	* @return bool */
210	210
211		- public function resize_crop($src) {
	211	+ public function resize_crop($src){
212	212	$image_details = $this->build_image($src);
213	213
214	214	if ($image_details !== false) {
		@@ -238,7 +238,7 @@ discard block
		block discarded – undo
238	238	* @param integer $height
239	239	* @return bool */
240	240
241		- public function resize_fit($width, $height) {
	241	+ public function resize_fit($width, $height){
242	242	if ((!$width && !$height) \|\| (($width == $this->width) && ($height == $this->height)))
243	243	return true;
244	244	if (!$width \|\| (($height / $width) < ($this->height / $this->width)))
		@@ -257,7 +257,7 @@ discard block
		block discarded – undo
257	257	* @param integer $height
258	258	* @return bool */
259	259
260		- public function resize_overflow($width, $height) {
	260	+ public function resize_overflow($width, $height){
261	261
262	262	$big = (($this->width / $this->height) > ($width / $height))
263	263	? ($this->width * $height) / $this->height
		@@ -275,7 +275,7 @@ discard block
		block discarded – undo
275	275	return $return;
276	276	}
277	277
278		- public function gd_color() {
	278	+ public function gd_color(){
279	279	$args = func_get_args();
280	280
281	281	$expr_rgb = '/^rgb\(\s(\d{1,3})\s\,\s(\d{1,3})\s\,\s(\d{1,3})\s\)$/i';
		@@ -317,7 +317,7 @@ discard block
		block discarded – undo
317	317	return imagecolorallocate($this->image, $r, $g, $b);
318	318	}
319	319
320		- public function fill_color($color) {
	320	+ public function fill_color($color){
321	321	return $this->imagefilledrectangle(0, 0, $this->width - 1, $this->height - 1, $color);
322	322	}
323	323
		@@ -326,11 +326,11 @@ discard block
		block discarded – undo
326	326
327	327	public function imagecopy(
328	328	$src,
329		- $dst_x=0, $dst_y=0,
330		- $src_x=0, $src_y=0,
331		- $dst_w=null, $dst_h=null,
332		- $src_w=null, $src_h=null
333		- ) {
	329	+ $dst_x = 0, $dst_y = 0,
	330	+ $src_x = 0, $src_y = 0,
	331	+ $dst_w = null, $dst_h = null,
	332	+ $src_w = null, $src_h = null
	333	+ ){
334	334	$image_details = $this->build_image($src);
335	335
336	336	if ($image_details !== false) {
		@@ -348,11 +348,11 @@ discard block
		block discarded – undo
348	348
349	349	public function imagecopyresampled(
350	350	$src,
351		- $dst_x=0, $dst_y=0,
352		- $src_x=0, $src_y=0,
353		- $dst_w=null, $dst_h=null,
354		- $src_w=null, $src_h=null
355		- ) {
	351	+ $dst_x = 0, $dst_y = 0,
	352	+ $src_x = 0, $src_y = 0,
	353	+ $dst_w = null, $dst_h = null,
	354	+ $src_w = null, $src_h = null
	355	+ ){
356	356	$image_details = $this->build_image($src);
357	357
358	358	if ($image_details !== false) {
		@@ -363,7 +363,7 @@ discard block
		block discarded – undo
363	363	if (is_null($src_w)) $src_w = $src_width - $src_x;
364	364	if (is_null($src_h)) $src_h = $src_height - $src_y;
365	365	imagealphablending($this->image, false);
366		- imagesavealpha($this->image,true);
	366	+ imagesavealpha($this->image, true);
367	367
368	368
369	369
		@@ -372,7 +372,7 @@ discard block
		block discarded – undo
372	372
373	373	$transindex = imagecolortransparent($src);
374	374	$palletsize = imagecolorstotal($src);
375		- if($transindex >= 0 && $transindex < $palletsize) {
	375	+ if ($transindex >= 0 && $transindex < $palletsize) {
376	376	$transcol = imagecolorsforindex($src, $transindex);
377	377
378	378	/* end gif transparent fix */
		@@ -381,9 +381,9 @@ discard block
		block discarded – undo
381	381	imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transindex);
382	382	imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
383	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);
	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	387	imagetruecolortopalette($this->image, true, 255);
388	388	}
389	389	else {
		@@ -397,26 +397,26 @@ discard block
		block discarded – undo
397	397	return false;
398	398	}
399	399
400		- public function imagefilledrectangle($x1, $y1, $x2, $y2, $color) {
	400	+ public function imagefilledrectangle($x1, $y1, $x2, $y2, $color){
401	401	$color = $this->gd_color($color);
402	402	if ($color === false) return false;
403	403	return imagefilledrectangle($this->image, $x1, $y1, $x2, $y2, $color);
404	404	}
405	405
406		- public function imagepng($filename=null, $quality=null, $filters=null) {
	406	+ public function imagepng($filename = null, $quality = null, $filters = null){
407	407	if (is_null($filename) && !headers_sent())
408	408	header("Content-Type: image/png");
409	409	@imagesavealpha($this->image, true);
410	410	return imagepng($this->image, $filename, $quality, $filters);
411	411	}
412	412
413		- public function imagejpeg($filename=null, $quality=75) {
	413	+ public function imagejpeg($filename = null, $quality = 75){
414	414	if (is_null($filename) && !headers_sent())
415	415	header("Content-Type: image/jpeg");
416	416	return imagejpeg($this->image, $filename, $quality);
417	417	}
418	418
419		- public function imagegif($filename=null) {
	419	+ public function imagegif($filename = null){
420	420	if (is_null($filename) && !headers_sent())
421	421	header("Content-Type: image/gif");
422	422	@imagesavealpha($this->image, true);

		@@ -10,12 +10,12 @@ discard block
		block discarded – undo
10	10	* Filename: /install/lang.php
11	11	*/
12	12
13		-$_lang = array ();
	13	+$_lang = array();
14	14
15	15	#default fallback language file - english
16	16	$install_language = "english";
17	17
18		-$_langFiles= array (
	18	+$_langFiles = array(
19	19	"en" => "english",
20	20	"bg" => "bulgarian",
21	21	"cs" => "czech",
		@@ -36,14 +36,14 @@ discard block
		block discarded – undo
36	36	"es" => "spanish-utf8",
37	37	"sv" => "svenska"
38	38	);
39		-$_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
	39	+$_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2);
40	40	if (!empty($_langFiles[$_langISO6391])) $install_language = $_langFiles[$_langISO6391];
41	41
42	42
43		-if (isset($_POST['language']) && !stristr($_POST['language'],"..")) {
	43	+if (isset($_POST['language']) && !stristr($_POST['language'], "..")) {
44	44	$install_language = $_POST['language'];
45	45	} else {
46		- if (isset($_GET['language']) && !stristr($_GET['language'],".."))
	46	+ if (isset($_GET['language']) && !stristr($_GET['language'], ".."))
47	47	$install_language = $_GET['language'];
48	48	}
49	49	# load language file
		@@ -52,15 +52,15 @@ discard block
		block discarded – undo
52	52
53	53	$manager_language = $install_language;
54	54
55		-if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'],"..")) {
	55	+if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'], "..")) {
56	56	$manager_language = $_POST['managerlanguage'];
57	57	} else {
58		- if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'],".."))
	58	+ if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'], ".."))
59	59	$manager_language = $_GET['managerlanguage'];
60	60	}
61	61
62		-foreach($_lang as $k=>$v)
	62	+foreach ($_lang as $k=>$v)
63	63	{
64		- if(strpos($v,'[+MGR_DIR+]')!==false)
	64	+ if (strpos($v, '[+MGR_DIR+]') !== false)
65	65	$_lang[$k] = str_replace('[+MGR_DIR+]', MGR_DIR, $v);
66	66	}

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! function_exists('getLangOptions')) {
	2	+if (!function_exists('getLangOptions')) {
3	3	/**
4	4	* @param string $install_language
5	5	* @return string
		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	$abrv_language = explode('-', $language);
22	22	$selected = ($language === $install_language) ? 'selected' : '';
23	23	$_[] = sprintf('<option value="%s" %s>%s</option>', $language, $selected,
24		- ucwords($abrv_language[0])) . "\n";
	24	+ ucwords($abrv_language[0]))."\n";
25	25	}
26	26
27	27	return implode("\n", $_);
		@@ -32,6 +32,6 @@ discard block
		block discarded – undo
32	32	$content = parse($content, array(
33	33	'langOptions' => getLangOptions($install_language))
34	34	);
35		-$content = parse($content, $_lang,'[%','%]');
	35	+$content = parse($content, $_lang, '[%', '%]');
36	36
37	37	echo $content;

		@@ -1,8 +1,8 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5		-if(!$modx->hasPermission('view_eventlog')) {
	5	+if (!$modx->hasPermission('view_eventlog')) {
6	6	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8	?>
		@@ -17,9 +17,9 @@ discard block
		block discarded – undo
17	17	<div class="form-group" id="lyr1">
18	18	<b><?= $_lang["publish_events"] ?></b>
19	19	<?php
20		- $rs = $modx->db->select('id, pagetitle, pub_date', $modx->getFullTableName('site_content'), "pub_date > " . time() . "", 'pub_date ASC');
	20	+ $rs = $modx->db->select('id, pagetitle, pub_date', $modx->getFullTableName('site_content'), "pub_date > ".time()."", 'pub_date ASC');
21	21	$limit = $modx->db->getRecordCount($rs);
22		- if($limit < 1) {
	22	+ if ($limit < 1) {
23	23	?>
24	24	<p><?= $_lang["no_docs_pending_publishing"] ?></p>
25	25	<?php
		@@ -36,7 +36,7 @@ discard block
		block discarded – undo
36	36	</thead>
37	37	<tbody>
38	38	<?php
39		- while($row = $modx->db->getRow($rs)) {
	39	+ while ($row = $modx->db->getRow($rs)) {
40	40	?>
41	41	<tr>
42	42	<td class="text-right"><?= $row['id'] ?></td>
		@@ -56,9 +56,9 @@ discard block
		block discarded – undo
56	56	<div class="form-group" id="lyr2">
57	57	<b><?= $_lang["unpublish_events"] ?></b>
58	58	<?php
59		- $rs = $modx->db->select('id, pagetitle, unpub_date', $modx->getFullTableName('site_content'), "unpub_date > " . time() . "", 'unpub_date ASC');
	59	+ $rs = $modx->db->select('id, pagetitle, unpub_date', $modx->getFullTableName('site_content'), "unpub_date > ".time()."", 'unpub_date ASC');
60	60	$limit = $modx->db->getRecordCount($rs);
61		- if($limit < 1) {
	61	+ if ($limit < 1) {
62	62	?>
63	63	<p><?= $_lang["no_docs_pending_unpublishing"] ?></p>
64	64	<?php
		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	</thead>
76	76	<tbody>
77	77	<?php
78		- while($row = $modx->db->getRow($rs)) {
	78	+ while ($row = $modx->db->getRow($rs)) {
79	79	?>
80	80	<tr>
81	81	<td class="text-right"><?= $row['id'] ?></td>
		@@ -97,7 +97,7 @@ discard block
		block discarded – undo
97	97	<?php
98	98	$rs = $modx->db->select('id, pagetitle, pub_date, unpub_date', $modx->getFullTableName('site_content'), "pub_date > 0 OR unpub_date > 0", "pub_date DESC");
99	99	$limit = $modx->db->getRecordCount($rs);
100		- if($limit < 1) {
	100	+ if ($limit < 1) {
101	101	?>
102	102	<p><?= $_lang["no_docs_pending_pubunpub"] ?></p>
103	103	<?php
		@@ -115,7 +115,7 @@ discard block
		block discarded – undo
115	115	</thead>
116	116	<tbody>
117	117	<?php
118		- while($row = $modx->db->getRow($rs)) {
	118	+ while ($row = $modx->db->getRow($rs)) {
119	119	?>
120	120	<tr>
121	121	<td class="text-right"><?= $row['id'] ?></td>

evolution-cms / evolution

Push — develop ( 0132ab...e45b08 )

Status

Category

Spacing +39 added lines, -39 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

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

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

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

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

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

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch