RooCMS / RooCMS

captcha.php

Indentation +5 added lines, -5 removed lines

@@ -19,17 +19,17 @@
 
 # checked captcha
 if(isset($roocms->sess['captcha']) && mb_strlen($roocms->sess['captcha']) == 5) {
-	$captcha_code = $roocms->sess['captcha'];
+        $captcha_code = $roocms->sess['captcha'];
 }
 else {
-	$captcha_code  = randcode(5,"123456789ABCEFHJKLMNPRSTVUWXZ");
-	$_SESSION['captcha'] = $captcha_code;
+        $captcha_code  = randcode(5,"123456789ABCEFHJKLMNPRSTVUWXZ");
+        $_SESSION['captcha'] = $captcha_code;
 }
 
 #renew code
 if(isset($get->_I_have_bad_sight)) {
-	$captcha_code  = randcode(5,"123456789ABCEFHJKLMNPRSTVUWXZ");
-	$_SESSION['captcha'] = $captcha_code;
+        $captcha_code  = randcode(5,"123456789ABCEFHJKLMNPRSTVUWXZ");
+        $_SESSION['captcha'] = $captcha_code;
 }
 
 # no cache

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
 # no cache
 header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0");
-header("Cache-Control: post-check=0, pre-check=0", false);
+header("Cache-Control: post-check=0, pre-check=0", FALSE);
 
 # load aRCaptcha
 require_once(_LIB."/captcha.php");

roocms/functions.php

Indentation +53 added lines, -53 removed lines

@@ -15,7 +15,7 @@ 
 // Anti Hack

 //---------------------------------------------------------

 if(!defined('RooCMS')) {

-	die('Access Denied');

+        die('Access Denied');

 }

 //#########################################################

 

@@ -30,24 +30,24 @@ 
  */

 function randcode($ns, $symbols="ABCEFHKLMNPRSTVXYZ123456789") {

 

-	if(trim($symbols) == "") {

-		$symbols = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";

-	}

+        if(trim($symbols) == "") {

+                $symbols = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";

+        }

 

-	settype($symbols, "string");

+        settype($symbols, "string");

 

-	$code = ""; $i = 0;

+        $code = ""; $i = 0;

 

-	while ($i < $ns) {

-		$a = rand(0,1);

-		mt_srand(); srand();

-		$code .= ($a == 1)

-			? $symbols[mt_rand(0, mb_strlen($symbols) - 1)]

-			: $symbols[rand(0, mb_strlen($symbols) - 1)]	;

-		$i++;

-	}

+        while ($i < $ns) {

+                $a = rand(0,1);

+                mt_srand(); srand();

+                $code .= ($a == 1)

+                        ? $symbols[mt_rand(0, mb_strlen($symbols) - 1)]

+                        : $symbols[rand(0, mb_strlen($symbols) - 1)]	;

+                $i++;

+        }

 

-	return $code;

+        return $code;

 }

 

 /**

@@ -58,7 +58,7 @@ 
  * @return string

  */

 function mb_ucfirst($string) {

-	return mb_strtoupper(mb_substr($string, 0, 1)).mb_strtolower(mb_substr($string, 1));

+        return mb_strtoupper(mb_substr($string, 0, 1)).mb_strtolower(mb_substr($string, 1));

 }

 

 /**

@@ -69,34 +69,34 @@ 
  */

 function go($address, $code=301) {

 

-	switch($code) {

-		case 300:

-			header($_SERVER['SERVER_PROTOCOL'].' 300 Multiple Choices');

-			break;

+        switch($code) {

+                case 300:

+                        header($_SERVER['SERVER_PROTOCOL'].' 300 Multiple Choices');

+                        break;

 

-		case 302:

-			header($_SERVER['SERVER_PROTOCOL'].' 302 Found');

-			break;

+                case 302:

+                        header($_SERVER['SERVER_PROTOCOL'].' 302 Found');

+                        break;

 

-		case 303:

-			header($_SERVER['SERVER_PROTOCOL'].' 303 See Other');

-			break;

+                case 303:

+                        header($_SERVER['SERVER_PROTOCOL'].' 303 See Other');

+                        break;

 

-		case 304:

-			header($_SERVER['SERVER_PROTOCOL'].' 304 Not Modified');

-			break;

+                case 304:

+                        header($_SERVER['SERVER_PROTOCOL'].' 304 Not Modified');

+                        break;

 

-		case 307:

-			header($_SERVER['SERVER_PROTOCOL'].' 307 Temporary Redirect');

-			break;

+                case 307:

+                        header($_SERVER['SERVER_PROTOCOL'].' 307 Temporary Redirect');

+                        break;

 

-		default:

-			header($_SERVER['SERVER_PROTOCOL'].' 301 Moved Permanently');

-			break;

-	}

+                default:

+                        header($_SERVER['SERVER_PROTOCOL'].' 301 Moved Permanently');

+                        break;

+        }

 

-	header("Location: ".$address);

-	exit;

+        header("Location: ".$address);

+        exit;

 }

 

 

@@ -104,8 +104,8 @@ 
  * Move back

  */

 function goback() {

-	go(getenv("HTTP_REFERER"));

-	exit;

+        go(getenv("HTTP_REFERER"));

+        exit;

 }

 

 

@@ -114,13 +114,13 @@ 
  */

 function nocache() {

 

-	$expires = time() + (60*60*24);

+        $expires = time() + (60*60*24);

 

-	header("Expires: ".gmdate("D, d M Y H:i:s", $expires)." GMT");

-	header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");

-	header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0");

-	header("Cache-Control: post-check=0, pre-check=0", false);

-	header("Pragma: no-cache");

+        header("Expires: ".gmdate("D, d M Y H:i:s", $expires)." GMT");

+        header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");

+        header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0");

+        header("Cache-Control: post-check=0, pre-check=0", false);

+        header("Pragma: no-cache");

 }

 

 /**

@@ -131,8 +131,8 @@ 
  * @return string - code response

  */

 function get_http_response_code($url) {

-	$headers = get_headers($url);

-	return mb_substr($headers[0], 9, 3);

+        $headers = get_headers($url);

+        return mb_substr($headers[0], 9, 3);

 }

 

 /**

@@ -143,11 +143,11 @@ 
  * @return string - data from file

  */

 function file_read($file) {

-	$buffer = "";

+        $buffer = "";

 

-	if(is_file($file)) {

-		$buffer .= file_get_contents($file);

-	}

+        if(is_file($file)) {

+                $buffer .= file_get_contents($file);

+        }

 

-	return $buffer;

+        return $buffer;

 }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
 	header("Expires: ".gmdate("D, d M Y H:i:s", $expires)." GMT");

 	header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");

 	header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0");

-	header("Cache-Control: post-check=0, pre-check=0", false);

+	header("Cache-Control: post-check=0, pre-check=0", FALSE);

 	header("Pragma: no-cache");

 }

 

roocms/lib/arcaptcha/arcaptcha.php

Indentation +226 added lines, -226 removed lines

@@ -17,154 +17,154 @@ 
 
 class aRCaptcha {
 
-	# code
-	private static $code = "00000";
-	private static $code_length = 5;
-	private static $letter_width = 0;
+        # code
+        private static $code = "00000";
+        private static $code_length = 5;
+        private static $letter_width = 0;
 
-	# options for string
-	private static $use_number       = true;
-	private static $use_upper_letter = true;
-	private static $use_lower_letter = false;
+        # options for string
+        private static $use_number       = true;
+        private static $use_upper_letter = true;
+        private static $use_lower_letter = false;
 
-	# options for images
+        # options for images
 
-	# bg color
-	private static $bgcolor = array(254, 254, 254);
+        # bg color
+        private static $bgcolor = array(254, 254, 254);
 
-	# sizes
-	private static $width   = 180;
-	private static $height  = 85;
+        # sizes
+        private static $width   = 180;
+        private static $height  = 85;
 
-	# user settings
-	private static $use_polygons   = false;
-	private static $use_fontsnoise = true;
-	private static $shuffle_font   = false;
+        # user settings
+        private static $use_polygons   = false;
+        private static $use_fontsnoise = true;
+        private static $shuffle_font   = false;
 
-	# palette
-	private static $palette = "aR-Captcha";
-	private static $randoms = array(0,20);
+        # palette
+        private static $palette = "aR-Captcha";
+        private static $randoms = array(0,20);
 
-	# fonts path
-	private static $font_path = "fonts";
+        # fonts path
+        private static $font_path = "fonts";
 
 
-	/**
-	 * Show
-	 *
-	 * @param string $code
-	 */
-	public static function show($code="000000") {
+        /**
+         * Show
+         *
+         * @param string $code
+         */
+        public static function show($code="000000") {
 
-		self::set_code($code);
+                self::set_code($code);
 
-		# get
-		$captcha = self::captcha();
+                # get
+                $captcha = self::captcha();
 
-		# draw
-		header("Content-type: image/jpeg");
-		imagejpeg($captcha);
-		imagedestroy($captcha);
-	}
+                # draw
+                header("Content-type: image/jpeg");
+                imagejpeg($captcha);
+                imagedestroy($captcha);
+        }
 
 
-	/**
-	 * CRAFT CAPTCHA
-	 *
-	 * @return false|mixed|resource
-	 */
-	private static function captcha() {
+        /**
+         * CRAFT CAPTCHA
+         *
+         * @return false|mixed|resource
+         */
+        private static function captcha() {
 
-		$captcha = imagecreatetruecolor(self::$width, self::$height);
-		$bg = imagecolorallocate($captcha, self::$bgcolor[0], self::$bgcolor[1], self::$bgcolor[2]);
-		imagefill($captcha, 0, 0, $bg);
+                $captcha = imagecreatetruecolor(self::$width, self::$height);
+                $bg = imagecolorallocate($captcha, self::$bgcolor[0], self::$bgcolor[1], self::$bgcolor[2]);
+                imagefill($captcha, 0, 0, $bg);
 
 
-		# NOISE
-		if(self::$use_polygons && is_resource($captcha)) {
-			$captcha = self::polygons($captcha);
-		}
+                # NOISE
+                if(self::$use_polygons && is_resource($captcha)) {
+                        $captcha = self::polygons($captcha);
+                }
 
-		if(self::$use_fontsnoise && is_resource($captcha)) {
-			$captcha = self::fontsnoise($captcha);
-		}
+                if(self::$use_fontsnoise && is_resource($captcha)) {
+                        $captcha = self::fontsnoise($captcha);
+                }
 
 
-		# letters
-		$captcha = self::letters($captcha);
+                # letters
+                $captcha = self::letters($captcha);
 
-		return $captcha;
-	}
+                return $captcha;
+        }
 
 
-	/**
-	 * Set code string on image (use ttf font)
-	 *
-	 * @param resource $captcha 	- resource image
-	 *
-	 * @return resource|false
-	 */
-	private static function letters($captcha) {
+        /**
+         * Set code string on image (use ttf font)
+         *
+         * @param resource $captcha 	- resource image
+         *
+         * @return resource|false
+         */
+        private static function letters($captcha) {
 
-		# get font
-		$font = self::get_font();
+                # get font
+                $font = self::get_font();
 
-		$shift = 4;
-		for($l=0;$l<=self::$code_length-1;$l++) {
-			list($r,$g,$b) = self::get_random_rgb();
-			$color  = imagecolorallocatealpha($captcha, $r, $g, $b, mt_rand(0,25));
-			//$colorsh  = imagecolorallocatealpha($captcha, $r/2, $g/2, $b/2, mt_rand(25,50));
+                $shift = 4;
+                for($l=0;$l<=self::$code_length-1;$l++) {
+                        list($r,$g,$b) = self::get_random_rgb();
+                        $color  = imagecolorallocatealpha($captcha, $r, $g, $b, mt_rand(0,25));
+                        //$colorsh  = imagecolorallocatealpha($captcha, $r/2, $g/2, $b/2, mt_rand(25,50));
 
-			$angle = mt_rand(-15,15);
+                        $angle = mt_rand(-15,15);
 
-			$y = mt_rand(round(self::$height/1.4), self::$height);
-			$size = mt_rand(floor(self::$height/2.25), ceil(self::$height/1.20));
+                        $y = mt_rand(round(self::$height/1.4), self::$height);
+                        $size = mt_rand(floor(self::$height/2.25), ceil(self::$height/1.20));
 
-			$letter = mb_substr(self::$code, $l, 1);
+                        $letter = mb_substr(self::$code, $l, 1);
 
-			switch($l) {
-				case 0:
-					$position = mt_rand($shift - round(self::$letter_width * .05), $shift + round(self::$letter_width * .25));
-					break;
+                        switch($l) {
+                                case 0:
+                                        $position = mt_rand($shift - round(self::$letter_width * .05), $shift + round(self::$letter_width * .25));
+                                        break;
 
-				case self::$code_length-1:
-					$position = mt_rand($shift - round(self::$letter_width * .25), $shift + round(self::$letter_width * .05));
-					break;
+                                case self::$code_length-1:
+                                        $position = mt_rand($shift - round(self::$letter_width * .25), $shift + round(self::$letter_width * .05));
+                                        break;
 
-				default:
-					$position = mt_rand($shift - round(self::$letter_width * .25), $shift + round(self::$letter_width * .25));
-					break;
-			}
+                                default:
+                                        $position = mt_rand($shift - round(self::$letter_width * .25), $shift + round(self::$letter_width * .25));
+                                        break;
+                        }
 
-			//imagettftext($captcha, $size, $angle, $position, $y-1, $colorsh, $font['file'], $letter);
-			imagettftext($captcha, $size, $angle, $position, $y, $color, $font['file'], $letter);
+                        //imagettftext($captcha, $size, $angle, $position, $y-1, $colorsh, $font['file'], $letter);
+                        imagettftext($captcha, $size, $angle, $position, $y, $color, $font['file'], $letter);
 
-			if(self::$shuffle_font) {
-				$font = self::get_font();
-			}
+                        if(self::$shuffle_font) {
+                                $font = self::get_font();
+                        }
 
-			$shift += self::$letter_width;
-		}
+                        $shift += self::$letter_width;
+                }
 
-		return $captcha;
-	}
+                return $captcha;
+        }
 
 
-	/**
-	 * Draw lines on captcha background
-	 *
-	 * @param resource $captcha
-	 *
-	 * @return resource|false
-	 */
-	private static function polygons($captcha) {
+        /**
+         * Draw lines on captcha background
+         *
+         * @param resource $captcha
+         *
+         * @return resource|false
+         */
+        private static function polygons($captcha) {
 
-		$min = min(self::$width, self::$height);
-		$max = max(self::$width, self::$height);
+                $min = min(self::$width, self::$height);
+                $max = max(self::$width, self::$height);
 
-		$scream = mt_rand(1,self::$code_length);
+                $scream = mt_rand(1,self::$code_length);
 
-		/*for($i=0;$i<=$scream;$i++) {
+                /*for($i=0;$i<=$scream;$i++) {
 			list($r,$g,$b) = self::get_random_rgb();
 			$color = imagecolorallocatealpha($captcha, $r, $g, $b, 10);
 
@@ -178,165 +178,165 @@ 
 			imagepolygon($captcha, $points, $p, $color);
 		}*/
 
-		for($i=0;$i<=$scream;$i++) {
-			list($r,$g,$b) = self::get_random_rgb();
-			$color = imagecolorallocatealpha($captcha, $r, $g, $b, 10);
+                for($i=0;$i<=$scream;$i++) {
+                        list($r,$g,$b) = self::get_random_rgb();
+                        $color = imagecolorallocatealpha($captcha, $r, $g, $b, 10);
 
-			$points = array();
-			for($s=0;$s<=2;$s++) {
-				$points[] = mt_rand(0,self::$width); mt_srand();
-				$points[] = mt_rand(0,self::$height); mt_srand();
-			}
-			imagesetthickness($captcha, mt_rand(3,5));
-			imagepolygon($captcha, $points, 2, $color);
-		}
+                        $points = array();
+                        for($s=0;$s<=2;$s++) {
+                                $points[] = mt_rand(0,self::$width); mt_srand();
+                                $points[] = mt_rand(0,self::$height); mt_srand();
+                        }
+                        imagesetthickness($captcha, mt_rand(3,5));
+                        imagepolygon($captcha, $points, 2, $color);
+                }
 
-		return $captcha;
-	}
+                return $captcha;
+        }
 
 
-	/**
-	 * Draw letters on BG Captcha
-	 *
-	 * @param resource $captcha
-	 *
-	 * @return resource
-	 */
-	private static function fontsnoise($captcha) {
+        /**
+         * Draw letters on BG Captcha
+         *
+         * @param resource $captcha
+         *
+         * @return resource
+         */
+        private static function fontsnoise($captcha) {
 
-		# get font
-		$font = self::get_font();
+                # get font
+                $font = self::get_font();
 
-		$shift = 4;
-		for($l=0;$l<=self::$code_length-1;$l++) {
-			list($r,$g,$b) = self::get_random_rgb();
-			$color  = imagecolorallocatealpha($captcha, $r, $g, $b, mt_rand(85,95));
+                $shift = 4;
+                for($l=0;$l<=self::$code_length-1;$l++) {
+                        list($r,$g,$b) = self::get_random_rgb();
+                        $color  = imagecolorallocatealpha($captcha, $r, $g, $b, mt_rand(85,95));
 
-			$angle = mt_rand(-5,5);
+                        $angle = mt_rand(-5,5);
 
-			$y = mt_rand(round(self::$height/1.5), ceil(self::$height*2));
-			$size = mt_rand(floor(self::$height/1.1), ceil(self::$height*1.5));
+                        $y = mt_rand(round(self::$height/1.5), ceil(self::$height*2));
+                        $size = mt_rand(floor(self::$height/1.1), ceil(self::$height*1.5));
 
-			$letter = mb_substr(self::$code, mt_rand(0,self::$code_length-1), 1);
+                        $letter = mb_substr(self::$code, mt_rand(0,self::$code_length-1), 1);
 
-			$position = mt_rand($shift - round(self::$letter_width * .5), $shift + round(self::$letter_width * .5));
+                        $position = mt_rand($shift - round(self::$letter_width * .5), $shift + round(self::$letter_width * .5));
 
-			imagettftext($captcha, $size, $angle, $position, $y, $color, $font['file'], $letter);
+                        imagettftext($captcha, $size, $angle, $position, $y, $color, $font['file'], $letter);
 
-			if(self::$shuffle_font) {
-				$font = self::get_font();
-			}
+                        if(self::$shuffle_font) {
+                                $font = self::get_font();
+                        }
 
-			$shift += self::$letter_width;
-		}
+                        $shift += self::$letter_width;
+                }
 
-		return $captcha;
-	}
+                return $captcha;
+        }
 
 
-	/**
-	 * Valid and set code string
-	 *
-	 * @param string $code
-	 */
-	private static function set_code($code) {
+        /**
+         * Valid and set code string
+         *
+         * @param string $code
+         */
+        private static function set_code($code) {
 
-		$condition = self::get_condition();
+                $condition = self::get_condition();
 
-		$code = preg_replace(array('(\W+)','([^'.$condition.'])'), array('',''), $code);
+                $code = preg_replace(array('(\W+)','([^'.$condition.'])'), array('',''), $code);
 
-		self::$code = $code;
-		self::$code_length = mb_strlen(self::$code);
-		self::$letter_width = (self::$width / self::$code_length >= self::$height) ? self::$height : (self::$width / self::$code_length) - 4 ;
-	}
+                self::$code = $code;
+                self::$code_length = mb_strlen(self::$code);
+                self::$letter_width = (self::$width / self::$code_length >= self::$height) ? self::$height : (self::$width / self::$code_length) - 4 ;
+        }
 
 
-	/**
-	 * Get random ttf font
-	 *
-	 * @return array
-	 */
-	private static function get_font() {
+        /**
+         * Get random ttf font
+         *
+         * @return array
+         */
+        private static function get_font() {
 
-		# Select random fonts
-		$fonts = glob(dirname(__FILE__)."/".self::$font_path."/*.ttf", GLOB_BRACE);
+                # Select random fonts
+                $fonts = glob(dirname(__FILE__)."/".self::$font_path."/*.ttf", GLOB_BRACE);
 
-		# choice font
-		$font = array();
-		$font['file'] = $fonts[mt_rand(0,count($fonts)-1)];
+                # choice font
+                $font = array();
+                $font['file'] = $fonts[mt_rand(0,count($fonts)-1)];
 
-		return $font;
-	}
+                return $font;
+        }
 
 
-	/**
-	 * Get random HEX RGB color
-	 *
-	 * @return array
-	 */
-	private static function get_random_rgb() {
+        /**
+         * Get random HEX RGB color
+         *
+         * @return array
+         */
+        private static function get_random_rgb() {
 
-		mt_srand();
-		$colorvariator = md5(self::$palette . mt_rand(self::$randoms[0], self::$randoms[1]));
+                mt_srand();
+                $colorvariator = md5(self::$palette . mt_rand(self::$randoms[0], self::$randoms[1]));
 
-		return array(
-			hexdec(substr($colorvariator, 0, 2)),
-			hexdec(substr($colorvariator, 2, 2)),
-			hexdec(substr($colorvariator, 4, 2))
-		);
-	}
+                return array(
+                        hexdec(substr($colorvariator, 0, 2)),
+                        hexdec(substr($colorvariator, 2, 2)),
+                        hexdec(substr($colorvariator, 4, 2))
+                );
+        }
 
 
-	/**
-	 * Get pcre condition for code string
-	 *
-	 * @return string
-	 */
-	private static function get_condition() {
+        /**
+         * Get pcre condition for code string
+         *
+         * @return string
+         */
+        private static function get_condition() {
 
-		$condition = "";
+                $condition = "";
 
-		if(self::$use_lower_letter) {
-			$condition .= "a-z";
-		}
-		if(self::$use_upper_letter) {
-			$condition .= "A-Z";
-		}
-		if(self::$use_number) {
-			$condition .= "0-9";
-		}
+                if(self::$use_lower_letter) {
+                        $condition .= "a-z";
+                }
+                if(self::$use_upper_letter) {
+                        $condition .= "A-Z";
+                }
+                if(self::$use_number) {
+                        $condition .= "0-9";
+                }
 
-		return $condition;
-	}
+                return $condition;
+        }
 
 
-	/**
-	 * Debug function for view palette
-	 */
-	public static function palette() {
+        /**
+         * Debug function for view palette
+         */
+        public static function palette() {
 
-		$nums = range(self::$randoms[0], self::$randoms[1]);
+                $nums = range(self::$randoms[0], self::$randoms[1]);
 
-		$scale = 30;
+                $scale = 30;
 
-		$im = imagecreatetruecolor($scale * count($nums), $scale);
+                $im = imagecreatetruecolor($scale * count($nums), $scale);
 
-		$shift = 0;
-		foreach ($nums as $num) {
+                $shift = 0;
+                foreach ($nums as $num) {
 
-			$color = md5(self::$palette . $num);
+                        $color = md5(self::$palette . $num);
 
-			$r = hexdec(substr($color, 0, 2));
-			$g = hexdec(substr($color, 2, 2));
-			$b = hexdec(substr($color, 4, 2));
+                        $r = hexdec(substr($color, 0, 2));
+                        $g = hexdec(substr($color, 2, 2));
+                        $b = hexdec(substr($color, 4, 2));
 
-			$c = imagecolorallocate($im, $r, $g, $b);
-			imagefilledrectangle($im, $scale * $shift, 0, $scale * ($shift + 1), $scale, $c);
-			$shift++;
-		}
+                        $c = imagecolorallocate($im, $r, $g, $b);
+                        imagefilledrectangle($im, $scale * $shift, 0, $scale * ($shift + 1), $scale, $c);
+                        $shift++;
+                }
 
-		header('Content-Type: image/png');
-		imagepng($im);
-		imagedestroy($im);
-	}
+                header('Content-Type: image/png');
+                imagepng($im);
+                imagedestroy($im);
+        }
 }

Spacing +30 added lines, -30 removed lines

@@ -43,7 +43,7 @@ 
 
 	# palette
 	private static $palette = "aR-Captcha";
-	private static $randoms = array(0,20);
+	private static $randoms = array(0, 20);
 
 	# fonts path
 	private static $font_path = "fonts";
@@ -54,7 +54,7 @@ 
 	 *
 	 * @param string $code
 	 */
-	public static function show($code="000000") {
+	public static function show($code = "000000") {
 
 		self::set_code($code);
 
@@ -110,24 +110,24 @@ 
 		$font = self::get_font();
 
 		$shift = 4;
-		for($l=0;$l<=self::$code_length-1;$l++) {
-			list($r,$g,$b) = self::get_random_rgb();
-			$color  = imagecolorallocatealpha($captcha, $r, $g, $b, mt_rand(0,25));
+		for($l = 0; $l <= self::$code_length - 1; $l++) {
+			list($r, $g, $b) = self::get_random_rgb();
+			$color = imagecolorallocatealpha($captcha, $r, $g, $b, mt_rand(0, 25));
 			//$colorsh  = imagecolorallocatealpha($captcha, $r/2, $g/2, $b/2, mt_rand(25,50));
 
-			$angle = mt_rand(-15,15);
+			$angle = mt_rand(-15, 15);
 
-			$y = mt_rand(round(self::$height/1.4), self::$height);
-			$size = mt_rand(floor(self::$height/2.25), ceil(self::$height/1.20));
+			$y = mt_rand(round(self::$height / 1.4), self::$height);
+			$size = mt_rand(floor(self::$height / 2.25), ceil(self::$height / 1.20));
 
 			$letter = mb_substr(self::$code, $l, 1);
 
-			switch($l) {
+			switch ($l) {
 				case 0:
 					$position = mt_rand($shift - round(self::$letter_width * .05), $shift + round(self::$letter_width * .25));
 					break;
 
-				case self::$code_length-1:
+				case self::$code_length - 1:
 					$position = mt_rand($shift - round(self::$letter_width * .25), $shift + round(self::$letter_width * .05));
 					break;
 
@@ -162,7 +162,7 @@ 
 		$min = min(self::$width, self::$height);
 		$max = max(self::$width, self::$height);
 
-		$scream = mt_rand(1,self::$code_length);
+		$scream = mt_rand(1, self::$code_length);
 
 		/*for($i=0;$i<=$scream;$i++) {
 			list($r,$g,$b) = self::get_random_rgb();
@@ -178,16 +178,16 @@ 
 			imagepolygon($captcha, $points, $p, $color);
 		}*/
 
-		for($i=0;$i<=$scream;$i++) {
-			list($r,$g,$b) = self::get_random_rgb();
+		for($i = 0; $i <= $scream; $i++) {
+			list($r, $g, $b) = self::get_random_rgb();
 			$color = imagecolorallocatealpha($captcha, $r, $g, $b, 10);
 
 			$points = array();
-			for($s=0;$s<=2;$s++) {
-				$points[] = mt_rand(0,self::$width); mt_srand();
-				$points[] = mt_rand(0,self::$height); mt_srand();
+			for($s = 0; $s <= 2; $s++) {
+				$points[] = mt_rand(0, self::$width); mt_srand();
+				$points[] = mt_rand(0, self::$height); mt_srand();
 			}
-			imagesetthickness($captcha, mt_rand(3,5));
+			imagesetthickness($captcha, mt_rand(3, 5));
 			imagepolygon($captcha, $points, 2, $color);
 		}
 
@@ -208,16 +208,16 @@ 
 		$font = self::get_font();
 
 		$shift = 4;
-		for($l=0;$l<=self::$code_length-1;$l++) {
-			list($r,$g,$b) = self::get_random_rgb();
-			$color  = imagecolorallocatealpha($captcha, $r, $g, $b, mt_rand(85,95));
+		for($l = 0; $l <= self::$code_length - 1; $l++) {
+			list($r, $g, $b) = self::get_random_rgb();
+			$color = imagecolorallocatealpha($captcha, $r, $g, $b, mt_rand(85, 95));
 
-			$angle = mt_rand(-5,5);
+			$angle = mt_rand(-5, 5);
 
-			$y = mt_rand(round(self::$height/1.5), ceil(self::$height*2));
-			$size = mt_rand(floor(self::$height/1.1), ceil(self::$height*1.5));
+			$y = mt_rand(round(self::$height / 1.5), ceil(self::$height * 2));
+			$size = mt_rand(floor(self::$height / 1.1), ceil(self::$height * 1.5));
 
-			$letter = mb_substr(self::$code, mt_rand(0,self::$code_length-1), 1);
+			$letter = mb_substr(self::$code, mt_rand(0, self::$code_length - 1), 1);
 
 			$position = mt_rand($shift - round(self::$letter_width * .5), $shift + round(self::$letter_width * .5));
 
@@ -243,11 +243,11 @@ 
 
 		$condition = self::get_condition();
 
-		$code = preg_replace(array('(\W+)','([^'.$condition.'])'), array('',''), $code);
+		$code = preg_replace(array('(\W+)', '([^'.$condition.'])'), array('', ''), $code);
 
 		self::$code = $code;
 		self::$code_length = mb_strlen(self::$code);
-		self::$letter_width = (self::$width / self::$code_length >= self::$height) ? self::$height : (self::$width / self::$code_length) - 4 ;
+		self::$letter_width = (self::$width / self::$code_length >= self::$height) ? self::$height : (self::$width / self::$code_length) - 4;
 	}
 
 
@@ -263,7 +263,7 @@ 
 
 		# choice font
 		$font = array();
-		$font['file'] = $fonts[mt_rand(0,count($fonts)-1)];
+		$font['file'] = $fonts[mt_rand(0, count($fonts) - 1)];
 
 		return $font;
 	}
@@ -277,7 +277,7 @@ 
 	private static function get_random_rgb() {
 
 		mt_srand();
-		$colorvariator = md5(self::$palette . mt_rand(self::$randoms[0], self::$randoms[1]));
+		$colorvariator = md5(self::$palette.mt_rand(self::$randoms[0], self::$randoms[1]));
 
 		return array(
 			hexdec(substr($colorvariator, 0, 2)),
@@ -322,9 +322,9 @@ 
 		$im = imagecreatetruecolor($scale * count($nums), $scale);
 
 		$shift = 0;
-		foreach ($nums as $num) {
+		foreach($nums as $num) {
 
-			$color = md5(self::$palette . $num);
+			$color = md5(self::$palette.$num);
 
 			$r = hexdec(substr($color, 0, 2));
 			$g = hexdec(substr($color, 2, 2));

Upper-Lower-Casing +6 added lines, -6 removed lines

@@ -23,9 +23,9 @@ 
 	private static $letter_width = 0;
 
 	# options for string
-	private static $use_number       = true;
-	private static $use_upper_letter = true;
-	private static $use_lower_letter = false;
+	private static $use_number       = TRUE;
+	private static $use_upper_letter = TRUE;
+	private static $use_lower_letter = FALSE;
 
 	# options for images
 
@@ -37,9 +37,9 @@ 
 	private static $height  = 85;
 
 	# user settings
-	private static $use_polygons   = false;
-	private static $use_fontsnoise = true;
-	private static $shuffle_font   = false;
+	private static $use_polygons   = FALSE;
+	private static $use_fontsnoise = TRUE;
+	private static $shuffle_font   = FALSE;
 
 	# palette
 	private static $palette = "aR-Captcha";

roocms/class/class_users.php

Indentation +407 added lines, -407 removed lines

@@ -15,7 +15,7 @@ 
 // Anti Hack

 //---------------------------------------------------------

 if(!defined('RooCMS')) {

-	die('Access Denied');

+        die('Access Denied');

 }

 //#########################################################

 

@@ -25,436 +25,436 @@ 
  */

 class Users extends Security {

 

-	use UserGroups;

-	use UserAvatar;

+        use UserGroups;

+        use UserAvatar;

 

-	# user uniq data

-	public	$uid		= 0;		# user id

-	public	$login		= "";		# user login

-	public	$nickname	= "";		# user nickname

-	public	$avatar		= "";		# user avatar

-	public	$email		= "";		# user nickname

-	public	$title		= "u";		# user title

-	public	$gid		= 0;		# user group id

-	public	$gtitle		= "";		# user group title

-	public	$token		= "";		# user security token

+        # user uniq data

+        public	$uid		= 0;		# user id

+        public	$login		= "";		# user login

+        public	$nickname	= "";		# user nickname

+        public	$avatar		= "";		# user avatar

+        public	$email		= "";		# user nickname

+        public	$title		= "u";		# user title

+        public	$gid		= 0;		# user group id

+        public	$gtitle		= "";		# user group title

+        public	$token		= "";		# user security token

 

-	# user ban status

-	public  $ban		= 0;		# ban status

-	public  $ban_reason	= "";		# ban reason

-	public  $ban_expiried	= 0;		# ban date expiried (unixtimestamp)

+        # user ban status

+        public  $ban		= 0;		# ban status

+        public  $ban_reason	= "";		# ban reason

+        public  $ban_expiried	= 0;		# ban date expiried (unixtimestamp)

 

-	# user data array

-	public	$userdata	= array('uid'=>0, 'gid'=>0, 'title'=>'u');

+        # user data array

+        public	$userdata	= array('uid'=>0, 'gid'=>0, 'title'=>'u');

 

-	# user global data

-	private	$usersession	= "";		# user session

-	private $userip		= "";		# user ip address

-	private	$useragent	= "";		# user agent string

-	private $referer	= "";		# user referer

+        # user global data

+        private	$usersession	= "";		# user session

+        private $userip		= "";		# user ip address

+        private	$useragent	= "";		# user agent string

+        private $referer	= "";		# user referer

 

 

 

-	/**

-	 * Work your magic

-	 */

-	public function __construct() {

+        /**

+         * Work your magic

+         */

+        public function __construct() {

 

-		global $roocms;

+                global $roocms;

 

-		# get user data

-		$this->usersession &= $roocms->usersession;

-		$this->userip      &= $roocms->userip;

-		$this->referer     &= $roocms->referer;

+                # get user data

+                $this->usersession &= $roocms->usersession;

+                $this->userip      &= $roocms->userip;

+                $this->referer     &= $roocms->referer;

 

-		# init useragent

-		$this->get_useragent();

+                # init useragent

+                $this->get_useragent();

 

-		# check useragent  for detect spider bot

-		$roocms->check_spider_bot($this->useragent);

+                # check useragent  for detect spider bot

+                $roocms->check_spider_bot($this->useragent);

 

-		# init user

-		$this->init_user();

+                # init user

+                $this->init_user();

 

-		if($this->uid != 0) {

-			# control user data for security

-			$this->control_userdata();

+                if($this->uid != 0) {

+                        # control user data for security

+                        $this->control_userdata();

 

-			# update users info

-			$this->update_user_time_last_visit($this->uid);

-		}

-	}

+                        # update users info

+                        $this->update_user_time_last_visit($this->uid);

+                }

+        }

 

 

-	/**

-	 * Получаем персональные данные пользователя

-	 */

-	private function init_user() {

+        /**

+         * Получаем персональные данные пользователя

+         */

+        private function init_user() {

 

-		global $db, $roocms, $parse;

+                global $db, $roocms, $parse;

 

-		if(isset($roocms->sess['login']) && $db->check_id($roocms->sess['login'], USERS_TABLE, "login", "status='1'") && isset($roocms->sess['token']) && mb_strlen($roocms->sess['token']) == 32) {

+                if(isset($roocms->sess['login']) && $db->check_id($roocms->sess['login'], USERS_TABLE, "login", "status='1'") && isset($roocms->sess['token']) && mb_strlen($roocms->sess['token']) == 32) {

 

-			# get data

-			$q    = $db->query("SELECT u.uid, u.gid, u.login, u.nickname, u.avatar, u.email, u.mailing,

+                        # get data

+                        $q    = $db->query("SELECT u.uid, u.gid, u.login, u.nickname, u.avatar, u.email, u.mailing,

  							u.user_name, u.user_surname, u.user_last_name, u.user_birthdate, u.user_sex, u.user_slogan,

 							u.title, u.password, u.salt, u.ban, u.ban_reason, u.ban_expiried, u.date_create, u.secret_key,

 							g.title as gtitle

 						FROM ".USERS_TABLE." AS u

 						LEFT JOIN ".USERS_GROUP_TABLE." AS g ON (g.gid = u.gid)

 						WHERE u.login='".$roocms->sess['login']."' AND u.status='1'");

-			$data = $db->fetch_assoc($q);

-

-			# uid

-			$this->uid	= (int) $data['uid'];

-			# gid

-			$this->gid	= (int) $data['gid'];

-			# gtitle

-			$this->gtitle	= $data['gtitle'];

-			# login

-			$this->login	= $data['login'];

-			# title

-			$this->title	= $data['title'];

-			# nickname

-			$this->nickname	= $data['nickname'];

-			# avatar

-			$this->avatar	= $data['avatar'];

-			# email

-			$this->email	= $data['email'];

-			# ban

-			$this->ban		= $data['ban'];

-			$this->ban_reason	= $data['ban_reason'];

-			$this->ban_expiried	= $data['ban_expiried'];

-

-			# array userdata

-			$this->userdata = array(

-				'uid'             => (int) $data['uid'],

-				'gid'             => (int) $data['gid'],

-				'gtitle'          => $data['gtitle'],

-				'login'           => $data['login'],

-				'nickname'        => $data['nickname'],

-				'avatar'          => $data['avatar'],

-				'email'           => $data['email'],

-				'mailing'         => $data['mailing'],

-				'title'           => $data['title'],

-				'user_name'       => $data['user_name'],

-				'user_surname'    => $data['user_surname'],

-				'user_last_name'  => $data['user_last_name'],

-				'user_birthdate'  => $parse->date->jd_to_rus($data['user_birthdate']),

-				'user_birthdaten' => $parse->date->jd_to_rusint($data['user_birthdate']),

-				'user_sex'        => $data['user_sex'],

-				'user_slogan'     => $parse->text->br($data['user_slogan']),

-				'ban'             => $data['ban'],

-				'ban_reason'      => $data['ban_reason'],

-				'ban_expiried'    => $parse->date->unix_to_rus($data['ban_expiried']),

-				'secret_key'      => $data['secret_key'],

-				'date_create'     => $parse->date->unix_to_rus($data['date_create'])

-			);

-

-

-			# security token

-			$this->token = $this->get_token($roocms->sess['login'], $data['password'], $data['salt']);

-		}

-	}

-

-

-	/**

-	 * Обновляем простую информацию пользователя, вроде времени последнего визита на сайт.

-	 *

-	 * @param int $uid - уникальные идентификатор пользователя

-	 */

-	private function update_user_time_last_visit($uid) {

-

-		global $db, $roocms;

-

-		# update time last visited

-		$db->query("UPDATE ".USERS_TABLE." SET last_visit='".time()."', user_ip='".$roocms->userip."' WHERE uid='".$uid."' AND status='1'");

-	}

-

-

-	/**

-	 * Get user data

-	 *

-	 * @param int $uid - user id

-	 *

-	 * @return array user data

-	 */

-	public function get_user_data($uid) {

-

-		global $db, $parse;

-

-		# default

-		$row = array(

-			'uid' => 0,

-		);

-

-		# check and get data

-		if($db->check_id($uid, USERS_TABLE, "uid")) {

-			$q = $db->query("SELECT uid, nickname, email, user_sex, user_slogan, avatar, user_birthdate, status, ban, ban_expiried, ban_reason, secret_key FROM ".USERS_TABLE." WHERE uid='".$uid."'");

-			$row = $db->fetch_assoc($q);

-

-			$row['slogan'] = $parse->text->br($row['user_slogan']);

-			$row['user_birthdate'] = $parse->date->jd_to_rus($row['user_birthdate']);

-		}

-

-		return $row;

-	}

-

-

-	/**

-	 * Get users list

-	 *

-	 * @param int   $status  - current user status: 1 active user, 0 unactive user, -1 all user

-	 * @param int   $ban     - ban status: 0 without ban, 1 with ban, -1 all

-	 * @param int   $mailing - subscrib status: 0 no, 1 yes, -1 all

-	 * @param array $users   - array id's users

-	 *

-	 * @return array

-	 */

-	public function get_userlist($status=-1, $ban=-1, $mailing=-1, $users=[]) {

-

-		global $db, $parse;

-

-		# condition

-		$cond = "";

-

-		$arcond = array("status"=>$status, "ban"=>$ban, "mailing"=>$mailing);

-

-		foreach($arcond AS $k=>$v) {

-

-			if($v == 0 || $v == 1) {

-				$cond = $db->qcond_and($cond);

-				$cond .= " ".$k."='".$v."' ";

-			}

-		}

-

-		if(!empty($users)) {

-

-			$cond = $db->qcond_and($cond);

-

-			$uids = [];

-			foreach($users AS $k=>$v) {

-				$uids[] = " uid='".$v."' ";

-			}

-

-			$cond .= " ( ".implode(" OR ", $uids)." ) ";

-		}

-

-		# condition formating

-		if($cond != "") {

-			$cond = "WHERE".$cond;

-		}

-

-		# Get user list

-		$userlist = [];

-		$q = $db->query("SELECT uid, nickname, email, user_sex, user_slogan, avatar, user_birthdate, status, ban, ban_expiried, ban_reason, secret_key FROM ".USERS_TABLE." ".$cond." ORDER BY nickname ASC");

-		while($row = $db->fetch_assoc($q)) {

-			$row['slogan'] = $parse->text->br($row['user_slogan']);

+                        $data = $db->fetch_assoc($q);

+

+                        # uid

+                        $this->uid	= (int) $data['uid'];

+                        # gid

+                        $this->gid	= (int) $data['gid'];

+                        # gtitle

+                        $this->gtitle	= $data['gtitle'];

+                        # login

+                        $this->login	= $data['login'];

+                        # title

+                        $this->title	= $data['title'];

+                        # nickname

+                        $this->nickname	= $data['nickname'];

+                        # avatar

+                        $this->avatar	= $data['avatar'];

+                        # email

+                        $this->email	= $data['email'];

+                        # ban

+                        $this->ban		= $data['ban'];

+                        $this->ban_reason	= $data['ban_reason'];

+                        $this->ban_expiried	= $data['ban_expiried'];

+

+                        # array userdata

+                        $this->userdata = array(

+                                'uid'             => (int) $data['uid'],

+                                'gid'             => (int) $data['gid'],

+                                'gtitle'          => $data['gtitle'],

+                                'login'           => $data['login'],

+                                'nickname'        => $data['nickname'],

+                                'avatar'          => $data['avatar'],

+                                'email'           => $data['email'],

+                                'mailing'         => $data['mailing'],

+                                'title'           => $data['title'],

+                                'user_name'       => $data['user_name'],

+                                'user_surname'    => $data['user_surname'],

+                                'user_last_name'  => $data['user_last_name'],

+                                'user_birthdate'  => $parse->date->jd_to_rus($data['user_birthdate']),

+                                'user_birthdaten' => $parse->date->jd_to_rusint($data['user_birthdate']),

+                                'user_sex'        => $data['user_sex'],

+                                'user_slogan'     => $parse->text->br($data['user_slogan']),

+                                'ban'             => $data['ban'],

+                                'ban_reason'      => $data['ban_reason'],

+                                'ban_expiried'    => $parse->date->unix_to_rus($data['ban_expiried']),

+                                'secret_key'      => $data['secret_key'],

+                                'date_create'     => $parse->date->unix_to_rus($data['date_create'])

+                        );

+

+

+                        # security token

+                        $this->token = $this->get_token($roocms->sess['login'], $data['password'], $data['salt']);

+                }

+        }

+

+

+        /**

+         * Обновляем простую информацию пользователя, вроде времени последнего визита на сайт.

+         *

+         * @param int $uid - уникальные идентификатор пользователя

+         */

+        private function update_user_time_last_visit($uid) {

+

+                global $db, $roocms;

+

+                # update time last visited

+                $db->query("UPDATE ".USERS_TABLE." SET last_visit='".time()."', user_ip='".$roocms->userip."' WHERE uid='".$uid."' AND status='1'");

+        }

+

+

+        /**

+         * Get user data

+         *

+         * @param int $uid - user id

+         *

+         * @return array user data

+         */

+        public function get_user_data($uid) {

+

+                global $db, $parse;

+

+                # default

+                $row = array(

+                        'uid' => 0,

+                );

+

+                # check and get data

+                if($db->check_id($uid, USERS_TABLE, "uid")) {

+                        $q = $db->query("SELECT uid, nickname, email, user_sex, user_slogan, avatar, user_birthdate, status, ban, ban_expiried, ban_reason, secret_key FROM ".USERS_TABLE." WHERE uid='".$uid."'");

+                        $row = $db->fetch_assoc($q);

+

+                        $row['slogan'] = $parse->text->br($row['user_slogan']);

+                        $row['user_birthdate'] = $parse->date->jd_to_rus($row['user_birthdate']);

+                }

+

+                return $row;

+        }

+

+

+        /**

+         * Get users list

+         *

+         * @param int   $status  - current user status: 1 active user, 0 unactive user, -1 all user

+         * @param int   $ban     - ban status: 0 without ban, 1 with ban, -1 all

+         * @param int   $mailing - subscrib status: 0 no, 1 yes, -1 all

+         * @param array $users   - array id's users

+         *

+         * @return array

+         */

+        public function get_userlist($status=-1, $ban=-1, $mailing=-1, $users=[]) {

+

+                global $db, $parse;

+

+                # condition

+                $cond = "";

+

+                $arcond = array("status"=>$status, "ban"=>$ban, "mailing"=>$mailing);

+

+                foreach($arcond AS $k=>$v) {

+

+                        if($v == 0 || $v == 1) {

+                                $cond = $db->qcond_and($cond);

+                                $cond .= " ".$k."='".$v."' ";

+                        }

+                }

+

+                if(!empty($users)) {

+

+                        $cond = $db->qcond_and($cond);

+

+                        $uids = [];

+                        foreach($users AS $k=>$v) {

+                                $uids[] = " uid='".$v."' ";

+                        }

+

+                        $cond .= " ( ".implode(" OR ", $uids)." ) ";

+                }

+

+                # condition formating

+                if($cond != "") {

+                        $cond = "WHERE".$cond;

+                }

+

+                # Get user list

+                $userlist = [];

+                $q = $db->query("SELECT uid, nickname, email, user_sex, user_slogan, avatar, user_birthdate, status, ban, ban_expiried, ban_reason, secret_key FROM ".USERS_TABLE." ".$cond." ORDER BY nickname ASC");

+                while($row = $db->fetch_assoc($q)) {

+                        $row['slogan'] = $parse->text->br($row['user_slogan']);

 

-			$userlist[$row['uid']] = $row;

-		}

-

-		return $userlist;

-	}

-

-

-	/**

-	 * Проверяем поля на уникальность

-	 *

-	 * ВНИМАНИЕ! Не расчитывайте на эту функцию, она временная.

-	 *

-	 * @param string $field   - поле

-	 * @param string $name    - значение поля

-	 * @param string $without - Выражение исключения для mysql запроса

-	 * @param string $table	  - Таблица для проверки

-	 *

-	 * @return bool $res - true - если значение не уникально, false - если значение уникально

-	 */

-	public function check_field($field, $name, $without="", $table=USERS_TABLE) {

-

-		global $db;

-

-		$res = false;

-

-		if(trim($without) != trim($name)) {

-			$w = $field."!='".trim($without)."'";

-

-			if(!$db->check_id($name, $table, $field, $w)) {

-				$res = true;

-			}

-		}

-		else {

-			$res = true;

-		}

-

-		return $res;

-	}

-

-

-	/**

-	 * Функция проверки почты пользователя.

-	 * Проверяем на дубли и корректность.

-	 *

-	 * @param string $email - адрес электронной почты пользователя.

-	 */

-	public function valid_user_email($email) {

-

-		global $db, $logger, $parse;

-

-		if(trim($email) != "") {

-			if(!$parse->valid_email($email)) {

-				$logger->error("Некорректный адрес электронной почты", false);

-			}

-

-			if($db->check_id($email, USERS_TABLE, "email")) {

-				$logger->error("Пользователь с таким адресом почты уже есть в нашей базе данных", false);

-			}

-		}

-		else {

-			$logger->error("Электронная почта обязательная для каждого пользователя", false);

-		}

-	}

-

-

-	/**

-	 * Функция проверяет Никнейм на уникальность.

-	 * В случае повторения добавляет к никнейму несколько цифр.

-	 *

-	 * ВНИМАНИЕ! Не расчитывайте на эту функцию. Она временная.

-	 *

-	 * @param string $nickname - Никнейм

-	 *

-	 * @return string

-	 */

-	public function uniq_nickname($nickname) {

-

-		global $db, $logger;

-

-		static $nick = NULL;

-

-		if(!isset($nick)) {

-			$nick = $nickname;

-		}

-

-		# Проверяем на уникальность

-		if($db->check_id($nickname, USERS_TABLE, "nickname")) {

-			$nickname = $this->uniq_nickname($nickname.randcode(2,"0123456789"));

-			$notice = "Псевдоним ".$nick." недоступен. Был присвоен псевдоним ".$nickname;

-		}

-

-		# уведомление если оно есть

-		if(isset($notice)) {

-			$logger->info($notice, false);

-		}

-

-		return $nickname;

-	}

-

-

-	/**

-	 * Проверяем персональные данные пользователя при попытки их создания и обновления

-	 */

-	public function correct_personal_data() {

-

-		global $post, $parse;

-

-		# user name/surname/last_name

-		if(!isset($post->user_name)) {

-			$post->user_name = "";

-		}

-		if(!isset($post->user_surname)) {

-			$post->user_surname = "";

-		}

-		if(!isset($post->user_last_name)) {

-			$post->user_last_name = "";

-		}

-

-		# user birthdate

-		if(isset($post->user_birthdate) && $post->user_birthdate != "") {

-			$post->user_birthdate = $parse->date->rusint_to_jd($post->user_birthdate);

-		}

-		else {

-			$post->user_birthdate = 0;

-		}

-

-		#check user sex

-		switch($post->user_sex) {

-			case 'm':

-				$post->user_sex = "m";

-				break;

-			case 'f':

-				$post->user_sex = "f";

-				break;

-			default:

-				$post->user_sex = "n";

-				break;

-		}

-

-		# mailing

-		if(!isset($post->mailing) || round($post->mailing) != 1) {

-			$post->mailing = 0;

-		}

-

-		# check slogan

-		if(!isset($post->user_slogan)) {

-			$post->user_slogan = "";

-		}

-

-		$post->user_slogan = $parse->text->clearhtml($post->user_slogan);

-	}

-

-

-	/**

-	 * Функция проверяет никнейм пользователя указанный во время создания учетной записи

-	 */

-	public function check_create_nickname() {

-

-		global $post;

-

-		# Если никнейм не ввведен, делаем никнем из логина

-		if(!isset($post->nickname) && isset($post->login)) {

-			$post->nickname = mb_ucfirst($post->nickname);

-		}

-

-		# теперь проверяем на никальность

-		if(isset($post->nickname)) {

-			$post->nickname = $this->uniq_nickname($post->nickname);

-		}

-	}

-

-

-	/**

-	 * Функция проверяет логин пользователя указанный во время создания учетной записи

-	 */

-	public function check_create_login() {

-

-		global $db, $post, $parse, $logger;

-

-		if(!isset($post->login)) {

-			if(isset($post->nickname)) {

-				$post->login = mb_strtolower($parse->text->transliterate($post->nickname));

-			}

-			else {

-				$logger->error("У пользователя должен быть логин!", false);

-			}

-		}

-		else {

-			$post->login = mb_strtolower($parse->text->transliterate($post->login));

-		}

-

-		if(isset($post->login) && $db->check_id($post->login, USERS_TABLE, "login")) {

-			$logger->error("Логин ".$post->login." недоступен.", false);

-		}

-	}

-

-

-	/**

-	 * Get useragent string from user

-	 */

-	public function  get_useragent() {

-

-		if(!empty($_SERVER['HTTP_USER_AGENT'])) {

-			$this->useragent = mb_strtolower($_SERVER['HTTP_USER_AGENT']);

-		}

-	}

+                        $userlist[$row['uid']] = $row;

+                }

+

+                return $userlist;

+        }

+

+

+        /**

+         * Проверяем поля на уникальность

+         *

+         * ВНИМАНИЕ! Не расчитывайте на эту функцию, она временная.

+         *

+         * @param string $field   - поле

+         * @param string $name    - значение поля

+         * @param string $without - Выражение исключения для mysql запроса

+         * @param string $table	  - Таблица для проверки

+         *

+         * @return bool $res - true - если значение не уникально, false - если значение уникально

+         */

+        public function check_field($field, $name, $without="", $table=USERS_TABLE) {

+

+                global $db;

+

+                $res = false;

+

+                if(trim($without) != trim($name)) {

+                        $w = $field."!='".trim($without)."'";

+

+                        if(!$db->check_id($name, $table, $field, $w)) {

+                                $res = true;

+                        }

+                }

+                else {

+                        $res = true;

+                }

+

+                return $res;

+        }

+

+

+        /**

+         * Функция проверки почты пользователя.

+         * Проверяем на дубли и корректность.

+         *

+         * @param string $email - адрес электронной почты пользователя.

+         */

+        public function valid_user_email($email) {

+

+                global $db, $logger, $parse;

+

+                if(trim($email) != "") {

+                        if(!$parse->valid_email($email)) {

+                                $logger->error("Некорректный адрес электронной почты", false);

+                        }

+

+                        if($db->check_id($email, USERS_TABLE, "email")) {

+                                $logger->error("Пользователь с таким адресом почты уже есть в нашей базе данных", false);

+                        }

+                }

+                else {

+                        $logger->error("Электронная почта обязательная для каждого пользователя", false);

+                }

+        }

+

+

+        /**

+         * Функция проверяет Никнейм на уникальность.

+         * В случае повторения добавляет к никнейму несколько цифр.

+         *

+         * ВНИМАНИЕ! Не расчитывайте на эту функцию. Она временная.

+         *

+         * @param string $nickname - Никнейм

+         *

+         * @return string

+         */

+        public function uniq_nickname($nickname) {

+

+                global $db, $logger;

+

+                static $nick = NULL;

+

+                if(!isset($nick)) {

+                        $nick = $nickname;

+                }

+

+                # Проверяем на уникальность

+                if($db->check_id($nickname, USERS_TABLE, "nickname")) {

+                        $nickname = $this->uniq_nickname($nickname.randcode(2,"0123456789"));

+                        $notice = "Псевдоним ".$nick." недоступен. Был присвоен псевдоним ".$nickname;

+                }

+

+                # уведомление если оно есть

+                if(isset($notice)) {

+                        $logger->info($notice, false);

+                }

+

+                return $nickname;

+        }

+

+

+        /**

+         * Проверяем персональные данные пользователя при попытки их создания и обновления

+         */

+        public function correct_personal_data() {

+

+                global $post, $parse;

+

+                # user name/surname/last_name

+                if(!isset($post->user_name)) {

+                        $post->user_name = "";

+                }

+                if(!isset($post->user_surname)) {

+                        $post->user_surname = "";

+                }

+                if(!isset($post->user_last_name)) {

+                        $post->user_last_name = "";

+                }

+

+                # user birthdate

+                if(isset($post->user_birthdate) && $post->user_birthdate != "") {

+                        $post->user_birthdate = $parse->date->rusint_to_jd($post->user_birthdate);

+                }

+                else {

+                        $post->user_birthdate = 0;

+                }

+

+                #check user sex

+                switch($post->user_sex) {

+                        case 'm':

+                                $post->user_sex = "m";

+                                break;

+                        case 'f':

+                                $post->user_sex = "f";

+                                break;

+                        default:

+                                $post->user_sex = "n";

+                                break;

+                }

+

+                # mailing

+                if(!isset($post->mailing) || round($post->mailing) != 1) {

+                        $post->mailing = 0;

+                }

+

+                # check slogan

+                if(!isset($post->user_slogan)) {

+                        $post->user_slogan = "";

+                }

+

+                $post->user_slogan = $parse->text->clearhtml($post->user_slogan);

+        }

+

+

+        /**

+         * Функция проверяет никнейм пользователя указанный во время создания учетной записи

+         */

+        public function check_create_nickname() {

+

+                global $post;

+

+                # Если никнейм не ввведен, делаем никнем из логина

+                if(!isset($post->nickname) && isset($post->login)) {

+                        $post->nickname = mb_ucfirst($post->nickname);

+                }

+

+                # теперь проверяем на никальность

+                if(isset($post->nickname)) {

+                        $post->nickname = $this->uniq_nickname($post->nickname);

+                }

+        }

+

+

+        /**

+         * Функция проверяет логин пользователя указанный во время создания учетной записи

+         */

+        public function check_create_login() {

+

+                global $db, $post, $parse, $logger;

+

+                if(!isset($post->login)) {

+                        if(isset($post->nickname)) {

+                                $post->login = mb_strtolower($parse->text->transliterate($post->nickname));

+                        }

+                        else {

+                                $logger->error("У пользователя должен быть логин!", false);

+                        }

+                }

+                else {

+                        $post->login = mb_strtolower($parse->text->transliterate($post->login));

+                }

+

+                if(isset($post->login) && $db->check_id($post->login, USERS_TABLE, "login")) {

+                        $logger->error("Логин ".$post->login." недоступен.", false);

+                }

+        }

+

+

+        /**

+         * Get useragent string from user

+         */

+        public function  get_useragent() {

+

+                if(!empty($_SERVER['HTTP_USER_AGENT'])) {

+                        $this->useragent = mb_strtolower($_SERVER['HTTP_USER_AGENT']);

+                }

+        }

 }

Spacing +29 added lines, -29 removed lines

@@ -29,29 +29,29 @@ 
 	use UserAvatar;

 

 	# user uniq data

-	public	$uid		= 0;		# user id

-	public	$login		= "";		# user login

-	public	$nickname	= "";		# user nickname

-	public	$avatar		= "";		# user avatar

-	public	$email		= "";		# user nickname

-	public	$title		= "u";		# user title

-	public	$gid		= 0;		# user group id

-	public	$gtitle		= "";		# user group title

-	public	$token		= "";		# user security token

+	public	$uid = 0; # user id

+	public	$login		= ""; # user login

+	public	$nickname = ""; # user nickname

+	public	$avatar = ""; # user avatar

+	public	$email		= ""; # user nickname

+	public	$title		= "u"; # user title

+	public	$gid = 0; # user group id

+	public	$gtitle = ""; # user group title

+	public	$token		= ""; # user security token

 

 	# user ban status

-	public  $ban		= 0;		# ban status

-	public  $ban_reason	= "";		# ban reason

-	public  $ban_expiried	= 0;		# ban date expiried (unixtimestamp)

+	public  $ban = 0; # ban status

+	public  $ban_reason = ""; # ban reason

+	public  $ban_expiried = 0; # ban date expiried (unixtimestamp)

 

 	# user data array

-	public	$userdata	= array('uid'=>0, 'gid'=>0, 'title'=>'u');

+	public	$userdata = array('uid'=>0, 'gid'=>0, 'title'=>'u');

 

 	# user global data

-	private	$usersession	= "";		# user session

-	private $userip		= "";		# user ip address

-	private	$useragent	= "";		# user agent string

-	private $referer	= "";		# user referer

+	private	$usersession = ""; # user session

+	private $userip		= ""; # user ip address

+	private	$useragent = ""; # user agent string

+	private $referer	= ""; # user referer

 

 

 

@@ -96,7 +96,7 @@ 
 		if(isset($roocms->sess['login']) && $db->check_id($roocms->sess['login'], USERS_TABLE, "login", "status='1'") && isset($roocms->sess['token']) && mb_strlen($roocms->sess['token']) == 32) {

 

 			# get data

-			$q    = $db->query("SELECT u.uid, u.gid, u.login, u.nickname, u.avatar, u.email, u.mailing,

+			$q = $db->query("SELECT u.uid, u.gid, u.login, u.nickname, u.avatar, u.email, u.mailing,

  							u.user_name, u.user_surname, u.user_last_name, u.user_birthdate, u.user_sex, u.user_slogan,

 							u.title, u.password, u.salt, u.ban, u.ban_reason, u.ban_expiried, u.date_create, u.secret_key,

 							g.title as gtitle

@@ -110,21 +110,21 @@ 
 			# gid

 			$this->gid	= (int) $data['gid'];

 			# gtitle

-			$this->gtitle	= $data['gtitle'];

+			$this->gtitle = $data['gtitle'];

 			# login

 			$this->login	= $data['login'];

 			# title

 			$this->title	= $data['title'];

 			# nickname

-			$this->nickname	= $data['nickname'];

+			$this->nickname = $data['nickname'];

 			# avatar

-			$this->avatar	= $data['avatar'];

+			$this->avatar = $data['avatar'];

 			# email

-			$this->email	= $data['email'];

+			$this->email = $data['email'];

 			# ban

-			$this->ban		= $data['ban'];

-			$this->ban_reason	= $data['ban_reason'];

-			$this->ban_expiried	= $data['ban_expiried'];

+			$this->ban = $data['ban'];

+			$this->ban_reason = $data['ban_reason'];

+			$this->ban_expiried = $data['ban_expiried'];

 

 			# array userdata

 			$this->userdata = array(

@@ -211,7 +211,7 @@ 
 	 *

 	 * @return array

 	 */

-	public function get_userlist($status=-1, $ban=-1, $mailing=-1, $users=[]) {

+	public function get_userlist($status = -1, $ban = -1, $mailing = -1, $users = []) {

 

 		global $db, $parse;

 

@@ -270,7 +270,7 @@ 
 	 *

 	 * @return bool $res - true - если значение не уникально, false - если значение уникально

 	 */

-	public function check_field($field, $name, $without="", $table=USERS_TABLE) {

+	public function check_field($field, $name, $without = "", $table = USERS_TABLE) {

 

 		global $db;

 

@@ -338,7 +338,7 @@ 
 

 		# Проверяем на уникальность

 		if($db->check_id($nickname, USERS_TABLE, "nickname")) {

-			$nickname = $this->uniq_nickname($nickname.randcode(2,"0123456789"));

+			$nickname = $this->uniq_nickname($nickname.randcode(2, "0123456789"));

 			$notice = "Псевдоним ".$nick." недоступен. Был присвоен псевдоним ".$nickname;

 		}

 

@@ -378,7 +378,7 @@ 
 		}

 

 		#check user sex

-		switch($post->user_sex) {

+		switch ($post->user_sex) {

 			case 'm':

 				$post->user_sex = "m";

 				break;

roocms/acp/feeds_feed.php

Indentation +493 added lines, -493 removed lines

@@ -15,109 +15,109 @@ 
 // Anti Hack

 //---------------------------------------------------------

 if(!defined('RooCMS') || !defined('ACP')) {

-	die('Access Denied');

+        die('Access Denied');

 }

 //#########################################################

 

 

 class ACP_Feeds_Feed {

 

-	use FeedExtends;

+        use FeedExtends;

 

-	# vars

-	private $feed     = [];	# structure parametrs

-	private $userlist = [];

+        # vars

+        private $feed     = [];	# structure parametrs

+        private $userlist = [];

 

 

 

-	/**

-	 * Key on "start" (c)

-	 *

-	 * @param $structure_data

-	 */

-	public function __construct($structure_data=[]) {

-		$this->feed =& $structure_data;

-	}

+        /**

+         * Key on "start" (c)

+         *

+         * @param $structure_data

+         */

+        public function __construct($structure_data=[]) {

+                $this->feed =& $structure_data;

+        }

 

 

-	/**

-	 * feed view

-	 */

-	public function control() {

+        /**

+         * feed view

+         */

+        public function control() {

 

-		global $db, $parse, $tags, $tpl, $smarty;

+                global $db, $parse, $tags, $tpl, $smarty;

 

-		# order request

-		$order = $this->feed_order($this->feed['items_sorting']);

+                # order request

+                $order = $this->feed_order($this->feed['items_sorting']);

 

-		$smarty->assign("feed", $this->feed);

+                $smarty->assign("feed", $this->feed);

 

 

-		# feed items

-		$taglinks = [];

-		$feedlist = [];

-		$q = $db->query("SELECT id, status, group_access, title, date_publications, date_end_publications, date_update, views FROM ".PAGES_FEED_TABLE." WHERE sid='".$this->feed['id']."' ORDER BY ".$order);

-		while($row = $db->fetch_assoc($q)) {

+                # feed items

+                $taglinks = [];

+                $feedlist = [];

+                $q = $db->query("SELECT id, status, group_access, title, date_publications, date_end_publications, date_update, views FROM ".PAGES_FEED_TABLE." WHERE sid='".$this->feed['id']."' ORDER BY ".$order);

+                while($row = $db->fetch_assoc($q)) {

 

-			# flag future publications

-			$row['publication_future'] = ($row['date_publications'] > time()) ? true : false ;

+                        # flag future publications

+                        $row['publication_future'] = ($row['date_publications'] > time()) ? true : false ;

 

-			# flag show/hide

-			$row['publication_status'] = "show";

+                        # flag show/hide

+                        $row['publication_status'] = "show";

 

-			if($row['date_end_publications'] != 0) {

+                        if($row['date_end_publications'] != 0) {

 

-				# hide publications if ending period

-				if($row['date_end_publications'] < time()) {

-					$row['publication_status'] = "hide";

-				}

+                                # hide publications if ending period

+                                if($row['date_end_publications'] < time()) {

+                                        $row['publication_status'] = "hide";

+                                }

 

-				# formated date

-				$row['date_end_publications'] = $parse->date->unix_to_rus($row['date_end_publications']);

-			}

+                                # formated date

+                                $row['date_end_publications'] = $parse->date->unix_to_rus($row['date_end_publications']);

+                        }

 

-			# formated date

-			$row['date_publications'] = $parse->date->unix_to_rus($row['date_publications']);

-			$row['date_update'] = $parse->date->unix_to_rus($row['date_update'], false, true, true);

+                        # formated date

+                        $row['date_publications'] = $parse->date->unix_to_rus($row['date_publications']);

+                        $row['date_update'] = $parse->date->unix_to_rus($row['date_update'], false, true, true);

 

-			$taglinks[$row['id']] = "feeditemid=".$row['id'];

-			$feedlist[$row['id']] = $row;

-		}

+                        $taglinks[$row['id']] = "feeditemid=".$row['id'];

+                        $feedlist[$row['id']] = $row;

+                }

 

 

-		# tags collect

-		$feedlist = $tags->collect_tags($feedlist, $taglinks);

+                # tags collect

+                $feedlist = $tags->collect_tags($feedlist, $taglinks);

 

-		# smarty

-		$smarty->assign("subfeeds", $this->feed['subfeeds']);

-		$smarty->assign("feedlist", $feedlist);

+                # smarty

+                $smarty->assign("subfeeds", $this->feed['subfeeds']);

+                $smarty->assign("feedlist", $feedlist);

 

-		$content = $tpl->load_template("feeds_control_feed", true);

-		$smarty->assign("content",  $content);

-	}

+                $content = $tpl->load_template("feeds_control_feed", true);

+                $smarty->assign("content",  $content);

+        }

 

 

-	/**

-	 * Create new record to feed

-	 */

-	public function create_item() {

+        /**

+         * Create new record to feed

+         */

+        public function create_item() {

 

-		global $db, $users, $logger, $tags, $files, $img, $post, $tpl, $smarty;

+                global $db, $users, $logger, $tags, $files, $img, $post, $tpl, $smarty;

 

-		# insert db

-		if(isset($post->create_item)) {

+                # insert db

+                if(isset($post->create_item)) {

 

-			# Check post data

-			$this->check_post_data_fields();

-			$this->control_post_data_date();

+                        # Check post data

+                        $this->check_post_data_fields();

+                        $this->control_post_data_date();

 

-			if(!isset($_SESSION['error'])) {

+                        if(!isset($_SESSION['error'])) {

 

-				# Check secondary fields

-				$this->correct_post_fields();

+                                # Check secondary fields

+                                $this->correct_post_fields();

 

-				# insert

-				$db->query("INSERT INTO ".PAGES_FEED_TABLE." (title, meta_title, meta_description, meta_keywords,

+                                # insert

+                                $db->query("INSERT INTO ".PAGES_FEED_TABLE." (title, meta_title, meta_description, meta_keywords,

 									      brief_item, full_item, author_id,

 									      date_create, date_update, date_publications, date_end_publications,

 									      group_access,

@@ -128,159 +128,159 @@ 
 									      '".$post->gids."',

 									      '".$post->itemsort."', '".$this->feed['id']."')");

 

-				# get feed item id

-				$fiid = $db->insert_id();

+                                # get feed item id

+                                $fiid = $db->insert_id();

 

-				# save tags

-				$tags->save_tags($post->tags, "feeditemid=".$fiid);

+                                # save tags

+                                $tags->save_tags($post->tags, "feeditemid=".$fiid);

 

 

-				# attachment images

-				$images = $img->upload_image("images", "", array($this->feed['thumb_img_width'], $this->feed['thumb_img_height']));

-				if($images) {

-					foreach($images AS $image) {

-						$img->insert_images($image, "feeditemid=".$fiid, $post->title);

-					}

-				}

+                                # attachment images

+                                $images = $img->upload_image("images", "", array($this->feed['thumb_img_width'], $this->feed['thumb_img_height']));

+                                if($images) {

+                                        foreach($images AS $image) {

+                                                $img->insert_images($image, "feeditemid=".$fiid, $post->title);

+                                        }

+                                }

 

-				# attachment files

-				$files->upload("files", "feeditemid=".$fiid);

+                                # attachment files

+                                $files->upload("files", "feeditemid=".$fiid);

 

-				# recount items

-				$this->count_items($this->feed['id']);

+                                # recount items

+                                $this->count_items($this->feed['id']);

 

-				# notice

-				$logger->info("Запись #".$fiid." <".$post->title."> успешно создана.");

+                                # notice

+                                $logger->info("Запись #".$fiid." <".$post->title."> успешно создана.");

 

-				// TODO: Переделать!

-				# mailling

-				if($post->date_publications <= time() && $post->mailing == 1) {

-					$this->mailing($fiid, $post->title, $post->brief_item);

-				}

-			}

+                                // TODO: Переделать!

+                                # mailling

+                                if($post->date_publications <= time() && $post->mailing == 1) {

+                                        $this->mailing($fiid, $post->title, $post->brief_item);

+                                }

+                        }

 

-			# go

-			go(CP."?act=feeds&part=control&page=".$this->feed['id']);

-		}

+                        # go

+                        go(CP."?act=feeds&part=control&page=".$this->feed['id']);

+                }

 

-		# userlist

-		$this->userlist = $users->get_userlist();

+                # userlist

+                $this->userlist = $users->get_userlist();

 

-		# grouplist

-		$groups = $users->get_usergroups();

+                # grouplist

+                $groups = $users->get_usergroups();

 

-		# popular tags

-		$poptags = $tags->list_tags(true);

+                # popular tags

+                $poptags = $tags->list_tags(true);

 

-		# show upload files & images form

-		$tpl->load_image_upload_tpl("imagesupload");

-		$tpl->load_files_upload_tpl("filesupload");

+                # show upload files & images form

+                $tpl->load_image_upload_tpl("imagesupload");

+                $tpl->load_files_upload_tpl("filesupload");

 

-		# smarty vars

-		$smarty->assign("feed",     $this->feed);      # feed data

-		$smarty->assign("poptags",  $poptags);         # tags

-		$smarty->assign("userlist", $this->userlist);  # users

-		$smarty->assign("groups",   $groups);          # groups

+                # smarty vars

+                $smarty->assign("feed",     $this->feed);      # feed data

+                $smarty->assign("poptags",  $poptags);         # tags

+                $smarty->assign("userlist", $this->userlist);  # users

+                $smarty->assign("groups",   $groups);          # groups

 

-		# tpl

-		$content = $tpl->load_template("feeds_create_item_feed", true);

-		$smarty->assign("content",  $content);

-	}

+                # tpl

+                $content = $tpl->load_template("feeds_create_item_feed", true);

+                $smarty->assign("content",  $content);

+        }

 

 

-	/**

-	 * Edit record from feed

-	 *

-	 * @param int $id - record identificator from feed

-	 */

-	public function edit_item($id) {

+        /**

+         * Edit record from feed

+         *

+         * @param int $id - record identificator from feed

+         */

+        public function edit_item($id) {

 

-		global $db, $users, $tags, $files, $img, $tpl, $smarty, $parse;

+                global $db, $users, $tags, $files, $img, $tpl, $smarty, $parse;

 

-		# userlist

-		$this->userlist = $users->get_userlist();

+                # userlist

+                $this->userlist = $users->get_userlist();

 

-		# grouplist

-		$groups = $users->get_usergroups();

+                # grouplist

+                $groups = $users->get_usergroups();

 

-		# get data

-		$q = $db->query("SELECT id, sid, status, group_access, sort, title, meta_title, meta_description, meta_keywords, brief_item, full_item, author_id, date_publications, date_end_publications FROM ".PAGES_FEED_TABLE." WHERE id='".$id."'");

-		$item = $db->fetch_assoc($q);

+                # get data

+                $q = $db->query("SELECT id, sid, status, group_access, sort, title, meta_title, meta_description, meta_keywords, brief_item, full_item, author_id, date_publications, date_end_publications FROM ".PAGES_FEED_TABLE." WHERE id='".$id."'");

+                $item = $db->fetch_assoc($q);

 

-		$item['date_publications'] = $parse->date->unix_to_rusint($item['date_publications']);

+                $item['date_publications'] = $parse->date->unix_to_rusint($item['date_publications']);

 

-		if($item['date_end_publications'] != 0) {

-			$item['date_end_publications'] = $parse->date->unix_to_rusint($item['date_end_publications']);

-		}

+                if($item['date_end_publications'] != 0) {

+                        $item['date_end_publications'] = $parse->date->unix_to_rusint($item['date_end_publications']);

+                }

 

-		# check access granted for groups

-		$gids = $users->get_gid_access_granted($item['group_access']);

+                # check access granted for groups

+                $gids = $users->get_gid_access_granted($item['group_access']);

 

-		# item tags

-		$item['tags'] = implode(", ", array_map(array("Tags", "get_tag_title"), $tags->read_tags("feeditemid=".$id)));

+                # item tags

+                $item['tags'] = implode(", ", array_map(array("Tags", "get_tag_title"), $tags->read_tags("feeditemid=".$id)));

 

-		# popular tags

-		$poptags = $tags->list_tags(true);

+                # popular tags

+                $poptags = $tags->list_tags(true);

 

 

-		# download attached images

-		$attachimg = $img->load_images("feeditemid=".$id);

-		$smarty->assign("attachimg", $attachimg);

+                # download attached images

+                $attachimg = $img->load_images("feeditemid=".$id);

+                $smarty->assign("attachimg", $attachimg);

 

-		# show attached images

-		$attachedimages = $tpl->load_template("attached_images", true);

-		$smarty->assign("attachedimages", $attachedimages);

+                # show attached images

+                $attachedimages = $tpl->load_template("attached_images", true);

+                $smarty->assign("attachedimages", $attachedimages);

 

 

-		# download attached files

-		$attachfile = $files->load_files("feeditemid=".$id);

-		$smarty->assign("attachfile", $attachfile);

+                # download attached files

+                $attachfile = $files->load_files("feeditemid=".$id);

+                $smarty->assign("attachfile", $attachfile);

 

-		# show attached files

-		$attachedfiles = $tpl->load_template("attached_files", true);

-		$smarty->assign("attachedfiles", $attachedfiles);

+                # show attached files

+                $attachedfiles = $tpl->load_template("attached_files", true);

+                $smarty->assign("attachedfiles", $attachedfiles);

 

 

-		# show upload files & images form

-		$tpl->load_image_upload_tpl("imagesupload");

-		$tpl->load_files_upload_tpl("filesupload");

+                # show upload files & images form

+                $tpl->load_image_upload_tpl("imagesupload");

+                $tpl->load_files_upload_tpl("filesupload");

 

 

-		# smarty vars

-		$smarty->assign("item",     $item);            # item data

-		$smarty->assign("feed",     $this->feed);      # feed data

-		$smarty->assign("poptags",  $poptags);         # tags

-		$smarty->assign("userlist", $this->userlist);  # users list

-		$smarty->assign("gids",     $gids);            # group id access granted

-		$smarty->assign("groups",   $groups);          # group list

+                # smarty vars

+                $smarty->assign("item",     $item);            # item data

+                $smarty->assign("feed",     $this->feed);      # feed data

+                $smarty->assign("poptags",  $poptags);         # tags

+                $smarty->assign("userlist", $this->userlist);  # users list

+                $smarty->assign("gids",     $gids);            # group id access granted

+                $smarty->assign("groups",   $groups);          # group list

 

-		# tpl

-		$content = $tpl->load_template("feeds_edit_item_feed", true);

-		$smarty->assign("content", $content);

-	}

+                # tpl

+                $content = $tpl->load_template("feeds_edit_item_feed", true);

+                $smarty->assign("content", $content);

+        }

 

 

-	/**

-	 * Update record

-	 *

-	 * @param int $id - record identificator from feed

-	 */

-	public function update_item($id) {

+        /**

+         * Update record

+         *

+         * @param int $id - record identificator from feed

+         */

+        public function update_item($id) {

 

-		global $db, $logger, $tags, $files, $img, $post, $get;

+                global $db, $logger, $tags, $files, $img, $post, $get;

 

-		# Проверяем вводимые поля на ошибки

-		$this->check_post_data_fields();

-		$this->control_post_data_date();

+                # Проверяем вводимые поля на ошибки

+                $this->check_post_data_fields();

+                $this->control_post_data_date();

 

-		# update

-		if(!isset($_SESSION['error'])) {

+                # update

+                if(!isset($_SESSION['error'])) {

 

                         # Check secondary fields

-			$this->correct_post_fields();

+                        $this->correct_post_fields();

 

-			# update

-		        $db->query("UPDATE ".PAGES_FEED_TABLE."

+                        # update

+                        $db->query("UPDATE ".PAGES_FEED_TABLE."

 		        		SET

 		        			status = '".$post->status."',

 		        			group_access = '".$post->gids."',

@@ -298,269 +298,269 @@ 
 					WHERE

 						id = '".$id."'");

 

-			# save tags

-			$tags->save_tags($post->tags, "feeditemid=".$id);

+                        # save tags

+                        $tags->save_tags($post->tags, "feeditemid=".$id);

 

-			# notice

-			$logger->info("Запись #".$id." <".$post->title."> успешно отредактирована.");

+                        # notice

+                        $logger->info("Запись #".$id." <".$post->title."> успешно отредактирована.");

 

-			# update images

-			$img->update_images_info("feeditemid", $id);

+                        # update images

+                        $img->update_images_info("feeditemid", $id);

 

-			# attachment images

-			$images = $img->upload_image("images", "", array($this->feed['thumb_img_width'], $this->feed['thumb_img_height']));

-			if($images) {

-				foreach($images AS $image) {

-					$img->insert_images($image, "feeditemid=".$id, $post->title);

-				}

-			}

+                        # attachment images

+                        $images = $img->upload_image("images", "", array($this->feed['thumb_img_width'], $this->feed['thumb_img_height']));

+                        if($images) {

+                                foreach($images AS $image) {

+                                        $img->insert_images($image, "feeditemid=".$id, $post->title);

+                                }

+                        }

 

-			# attachment files

-			$files->upload("files", "feeditemid=".$id);

+                        # attachment files

+                        $files->upload("files", "feeditemid=".$id);

 

-			# go

-			go(CP."?act=feeds&part=control&page=".$get->_page);

-		}

+                        # go

+                        go(CP."?act=feeds&part=control&page=".$get->_page);

+                }

 

-		# back

-		goback();

-	}

+                # back

+                goback();

+        }

 

 

-	/**

-	 * Migrate record to another feed

-	 *

-	 * @param int $id - record identificator from feed

-	 */

-	public function migrate_item($id) {

+        /**

+         * Migrate record to another feed

+         *

+         * @param int $id - record identificator from feed

+         */

+        public function migrate_item($id) {

 

-		global $db, $logger, $tpl, $smarty, $post;

+                global $db, $logger, $tpl, $smarty, $post;

 

-		# Migrate

-		if(isset($post->from) && isset($post->to) && $db->check_id($post->from, STRUCTURE_TABLE, "id", "page_type='feed'") && $db->check_id($post->to, STRUCTURE_TABLE, "id", "page_type='feed'")) {

+                # Migrate

+                if(isset($post->from) && isset($post->to) && $db->check_id($post->from, STRUCTURE_TABLE, "id", "page_type='feed'") && $db->check_id($post->to, STRUCTURE_TABLE, "id", "page_type='feed'")) {

 

-			$db->query("UPDATE ".PAGES_FEED_TABLE."

+                        $db->query("UPDATE ".PAGES_FEED_TABLE."

 		        		SET	sid = '".$post->to."',

 						date_update = '".time()."'

 					WHERE	id = '".$id."'");

 

-			# recount items

-			$this->count_items($post->from);

-			$this->count_items($post->to);

+                        # recount items

+                        $this->count_items($post->from);

+                        $this->count_items($post->to);

 

 

-			# notice

-			$logger->info("Элемент #".$id." успешно перемещен.");

+                        # notice

+                        $logger->info("Элемент #".$id." успешно перемещен.");

 

-			#go

-			go(CP."?act=feeds&part=control&page=".$post->to);

-		}

+                        #go

+                        go(CP."?act=feeds&part=control&page=".$post->to);

+                }

 

 

-		# get data item from db

-		$q = $db->query("SELECT id, sid, title FROM ".PAGES_FEED_TABLE." WHERE id='".$id."'");

-		$data = $db->fetch_assoc($q);

+                # get data item from db

+                $q = $db->query("SELECT id, sid, title FROM ".PAGES_FEED_TABLE." WHERE id='".$id."'");

+                $data = $db->fetch_assoc($q);

 

-		# smarty vars

-		$smarty->assign("item", $data);

+                # smarty vars

+                $smarty->assign("item", $data);

 

 

-		# get data feeds from db

-		$feeds = [];

-		$q = $db->query("SELECT id, title, alias FROM ".STRUCTURE_TABLE." WHERE page_type='feed' ORDER BY id ASC");

-		while($row = $db->fetch_assoc($q)) {

-			$feeds[$row['id']] = $row;

-		}

+                # get data feeds from db

+                $feeds = [];

+                $q = $db->query("SELECT id, title, alias FROM ".STRUCTURE_TABLE." WHERE page_type='feed' ORDER BY id ASC");

+                while($row = $db->fetch_assoc($q)) {

+                        $feeds[$row['id']] = $row;

+                }

 

-		# smarty vars

-		$smarty->assign("feeds", $feeds);

+                # smarty vars

+                $smarty->assign("feeds", $feeds);

 

-		# tpl

-		$content = $tpl->load_template("feeds_migrate_item_feed", true);

-		$smarty->assign("content", $content);

-	}

+                # tpl

+                $content = $tpl->load_template("feeds_migrate_item_feed", true);

+                $smarty->assign("content", $content);

+        }

 

 

-	/**

-	 * Change status to record feed

-	 *

-	 * @param int $id - record id

-	 * @param int $status - 1=show , 0=hide

-	 */

-	public function change_item_status($id, $status = 1) {

+        /**

+         * Change status to record feed

+         *

+         * @param int $id - record id

+         * @param int $status - 1=show , 0=hide

+         */

+        public function change_item_status($id, $status = 1) {

 

-		global $db, $logger;

+                global $db, $logger;

 

-		$status = (int) filter_var($status, FILTER_VALIDATE_BOOLEAN);

+                $status = (int) filter_var($status, FILTER_VALIDATE_BOOLEAN);

 

-		# update data in db

-		$db->query("UPDATE ".PAGES_FEED_TABLE." SET status='".$status."' WHERE id='".$id."'");

+                # update data in db

+                $db->query("UPDATE ".PAGES_FEED_TABLE." SET status='".$status."' WHERE id='".$id."'");

 

-		# notice

-		$mstatus = ($status) ? "Видимый" : "Скрытый" ;

-		$logger->info("Запись #".$id." успешно изменила свой статус на <".$mstatus.">.");

+                # notice

+                $mstatus = ($status) ? "Видимый" : "Скрытый" ;

+                $logger->info("Запись #".$id." успешно изменила свой статус на <".$mstatus.">.");

 

-		# go

-		goback();

-	}

+                # go

+                goback();

+        }

 

 

-	/**

-	 * Remove record from feed

-	 *

-	 * @param int $id - record id

-	 */

-	public function delete_item($id) {

+        /**

+         * Remove record from feed

+         *

+         * @param int $id - record id

+         */

+        public function delete_item($id) {

 

-		global $db, $logger, $img, $files, $tags;

+                global $db, $logger, $img, $files, $tags;

 

-		# get sid

-		$q = $db->query("SELECT sid FROM ".PAGES_FEED_TABLE." WHERE id='".$id."'");

-		$row = $db->fetch_assoc($q);

+                # get sid

+                $q = $db->query("SELECT sid FROM ".PAGES_FEED_TABLE." WHERE id='".$id."'");

+                $row = $db->fetch_assoc($q);

 

-		# del attached images

-		$img->remove_images("feeditemid=".$id);

+                # del attached images

+                $img->remove_images("feeditemid=".$id);

 

-		# del attached files

-		$files->remove_files("feeditemid=".$id);

+                # del attached files

+                $files->remove_files("feeditemid=".$id);

 

-		# del tags

-		$tags->save_tags("", "feeditemid=".$id);

+                # del tags

+                $tags->save_tags("", "feeditemid=".$id);

 

-		# delete item

-		$db->query("DELETE FROM ".PAGES_FEED_TABLE." WHERE id='".$id."'");

+                # delete item

+                $db->query("DELETE FROM ".PAGES_FEED_TABLE." WHERE id='".$id."'");

 

-		# recount items

-		$this->count_items($row['sid']);

+                # recount items

+                $this->count_items($row['sid']);

 

-		# notice

-		$logger->info("Элемент #".$id." успешно удален.");

+                # notice

+                $logger->info("Элемент #".$id." успешно удален.");

 

-		# go

-		goback();

-	}

+                # go

+                goback();

+        }

 

 

-	/**

-	 * Remove feed

-	 *

-	 * @param int $sid - structure element id

-	 */

-	public function delete_feed($sid) {

+        /**

+         * Remove feed

+         *

+         * @param int $sid - structure element id

+         */

+        public function delete_feed($sid) {

 

-		global $db, $img, $files, $tags;

+                global $db, $img, $files, $tags;

 

-		$cond = "";

-		$f = $db->query("SELECT id FROM ".PAGES_FEED_TABLE." WHERE sid='".$sid."'");

-		while($fid = $db->fetch_assoc($f)) {

-			# del tags

-			$tags->save_tags("", "feeditemid=".$fid['id']);

-			# cond

-			$cond = $db->qcond_or($cond);

-			$cond .= " attachedto='feeditemid=".$fid['id']."' " ;

-		}

+                $cond = "";

+                $f = $db->query("SELECT id FROM ".PAGES_FEED_TABLE." WHERE sid='".$sid."'");

+                while($fid = $db->fetch_assoc($f)) {

+                        # del tags

+                        $tags->save_tags("", "feeditemid=".$fid['id']);

+                        # cond

+                        $cond = $db->qcond_or($cond);

+                        $cond .= " attachedto='feeditemid=".$fid['id']."' " ;

+                }

 

-		# del attached images

-		if(trim($cond) != "") {

-                	$img->remove_images($cond, true);

-                	$files->remove_files($cond, true);

-		}

-

-		$db->query("DELETE FROM ".PAGES_FEED_TABLE." WHERE sid='".$sid."'");

-	}

+                # del attached images

+                if(trim($cond) != "") {

+                        $img->remove_images($cond, true);

+                        $files->remove_files($cond, true);

+                }

+

+                $db->query("DELETE FROM ".PAGES_FEED_TABLE." WHERE sid='".$sid."'");

+        }

 

 

-	/**

-	 * Settings feed

-	 */

-	public function settings() {

+        /**

+         * Settings feed

+         */

+        public function settings() {

 

-		global $config, $tpl, $smarty;

+                global $config, $tpl, $smarty;

 

-		# Уведомление о глобальном отключении RSS лент

-		$this->feed['rss_warn'] = (!$config->rss_power) ? true : false ;

+                # Уведомление о глобальном отключении RSS лент

+                $this->feed['rss_warn'] = (!$config->rss_power) ? true : false ;

 

-		# глобальное значение количества элементов на страницу

-		$this->feed['global_items_per_page'] =& $config->feed_items_per_page;

+                # глобальное значение количества элементов на страницу

+                $this->feed['global_items_per_page'] =& $config->feed_items_per_page;

 

-		# default thumb size

-		$default_thumb_size = array('width'	=> $config->gd_thumb_image_width,

-					    'height'	=> $config->gd_thumb_image_height);

+                # default thumb size

+                $default_thumb_size = array('width'	=> $config->gd_thumb_image_width,

+                                                'height'	=> $config->gd_thumb_image_height);

 

-		# smarty vars

-		$smarty->assign("feed",$this->feed);

-		$smarty->assign("default_thumb_size", $default_thumb_size);

+                # smarty vars

+                $smarty->assign("feed",$this->feed);

+                $smarty->assign("default_thumb_size", $default_thumb_size);

 

-		# tpl

-		$content = $tpl->load_template("feeds_settings_feed", true);

-		$smarty->assign("content", $content);

-	}

+                # tpl

+                $content = $tpl->load_template("feeds_settings_feed", true);

+                $smarty->assign("content", $content);

+        }

 

 

-	/**

-	 * Settings update to feed

-	 */

-	public function update_settings() {

-

-		global $db, $img, $post, $logger;

-

-		if(isset($post->update_settings)) {

-			# update buffer

-			$update = "";

-

-			# RSS flag

-			$rss = 0;

-			if($post->rss == "1") {

-				$rss = 1;

-			}

-			$update .= " rss='".$rss."', ";

-

-			# items per page

-			$items_per_page = 0;

-			if(round($post->items_per_page) >= 0) {

-				$items_per_page = round($post->items_per_page);

-			}

-			$update .= " items_per_page='".$items_per_page."', " ;

-

-			# thumbnail check

-			$img->check_post_thumb_parametrs();

-

-			# items sorting in feed

-			$items_sorting = "datepublication";

-			if(isset($post->items_sorting)) {

-				switch($post->items_sorting) {

-					case 'title_asc':

-						$items_sorting = "title_asc";

-						break;

-

-					case 'title_desc':

-						$items_sorting = "title_desc";

-						break;

-

-					case 'manual_sorting':

-						$items_sorting = "manual_sorting";

-						break;

-				}

-			}

-			$update .= " items_sorting = '".$items_sorting."', ";

-

-			# show_child_feeds

-			$show_child_feeds = "none";

-			if(isset($post->show_child_feeds)) {

-				switch($post->show_child_feeds) {

-					case 'default':

-						$show_child_feeds = "default";

-						break;

-

-					case 'forced':

-						$show_child_feeds = "forced";

-						break;

-				}

-			}

-

-

-			# up data to db

-			$db->query("UPDATE ".STRUCTURE_TABLE."

+        /**

+         * Settings update to feed

+         */

+        public function update_settings() {

+

+                global $db, $img, $post, $logger;

+

+                if(isset($post->update_settings)) {

+                        # update buffer

+                        $update = "";

+

+                        # RSS flag

+                        $rss = 0;

+                        if($post->rss == "1") {

+                                $rss = 1;

+                        }

+                        $update .= " rss='".$rss."', ";

+

+                        # items per page

+                        $items_per_page = 0;

+                        if(round($post->items_per_page) >= 0) {

+                                $items_per_page = round($post->items_per_page);

+                        }

+                        $update .= " items_per_page='".$items_per_page."', " ;

+

+                        # thumbnail check

+                        $img->check_post_thumb_parametrs();

+

+                        # items sorting in feed

+                        $items_sorting = "datepublication";

+                        if(isset($post->items_sorting)) {

+                                switch($post->items_sorting) {

+                                        case 'title_asc':

+                                                $items_sorting = "title_asc";

+                                                break;

+

+                                        case 'title_desc':

+                                                $items_sorting = "title_desc";

+                                                break;

+

+                                        case 'manual_sorting':

+                                                $items_sorting = "manual_sorting";

+                                                break;

+                                }

+                        }

+                        $update .= " items_sorting = '".$items_sorting."', ";

+

+                        # show_child_feeds

+                        $show_child_feeds = "none";

+                        if(isset($post->show_child_feeds)) {

+                                switch($post->show_child_feeds) {

+                                        case 'default':

+                                                $show_child_feeds = "default";

+                                                break;

+

+                                        case 'forced':

+                                                $show_child_feeds = "forced";

+                                                break;

+                                }

+                        }

+

+

+                        # up data to db

+                        $db->query("UPDATE ".STRUCTURE_TABLE."

 					SET

 						".$update."

 						show_child_feeds='".$show_child_feeds."',

@@ -572,148 +572,148 @@ 
 					WHERE

 						id='".$this->feed['id']."'");

 

-			$logger->info("Настройки ленты #".$this->feed['id']." успешно обновлены.");

-		}

+                        $logger->info("Настройки ленты #".$this->feed['id']." успешно обновлены.");

+                }

 

-		# go

-		goback();

-	}

+                # go

+                goback();

+        }

 

 

-	/**

-	 * Recount records in feed

-	 *

-	 * @param int $sid - feed id

-	 */

-	public function count_items($sid) {

+        /**

+         * Recount records in feed

+         *

+         * @param int $sid - feed id

+         */

+        public function count_items($sid) {

 

-		global $db;

+                global $db;

 

-		# count

-		$items = $db->count(PAGES_FEED_TABLE, "sid='".$sid."'");

+                # count

+                $items = $db->count(PAGES_FEED_TABLE, "sid='".$sid."'");

 

-		# save

-		$db->query("UPDATE ".STRUCTURE_TABLE." SET items='".$items."' WHERE id='".$sid."'");

-	}

+                # save

+                $db->query("UPDATE ".STRUCTURE_TABLE." SET items='".$items."' WHERE id='".$sid."'");

+        }

 

 

-	/**

-	 * Check data post

-	 */

-	private function check_post_data_fields() {

+        /**

+         * Check data post

+         */

+        private function check_post_data_fields() {

 

-		global $post, $logger;

+                global $post, $logger;

 

-		# title

-		if(!isset($post->title)) {

-			$logger->error("Не заполнен заголовок элемента", false);

-		}

+                # title

+                if(!isset($post->title)) {

+                        $logger->error("Не заполнен заголовок элемента", false);

+                }

 

-		# full desc item

-		if(!isset($post->full_item)) {

-			$logger->error("Не заполнен подробный текст элемента", false);

-		}

+                # full desc item

+                if(!isset($post->full_item)) {

+                        $logger->error("Не заполнен подробный текст элемента", false);

+                }

 

-		# status

-		$post->status = (int) filter_var($post->status, FILTER_VALIDATE_BOOLEAN);

-	}

+                # status

+                $post->status = (int) filter_var($post->status, FILTER_VALIDATE_BOOLEAN);

+        }

 

 

-	/**

-	 *  Check dates from data post

-	 */

-	private function control_post_data_date() {

+        /**

+         *  Check dates from data post

+         */

+        private function control_post_data_date() {

 

-		global $post, $parse;

+                global $post, $parse;

 

-		# check isset date publication

-		if(!isset($post->date_publications)) {

-			$post->date_publications = date("d.m.Y",time());

-		}

+                # check isset date publication

+                if(!isset($post->date_publications)) {

+                        $post->date_publications = date("d.m.Y",time());

+                }

 

-		# check isset date end publication

-		if(!isset($post->date_end_publications)) {

-			$post->date_end_publications = 0;

-		}

+                # check isset date end publication

+                if(!isset($post->date_end_publications)) {

+                        $post->date_end_publications = 0;

+                }

 

-		# date publications

-		$post->date_publications = $parse->date->rusint_to_unix($post->date_publications);

+                # date publications

+                $post->date_publications = $parse->date->rusint_to_unix($post->date_publications);

 

-		# date end publications

-		if($post->date_end_publications != 0) {

-			$post->date_end_publications = $parse->date->rusint_to_unix($post->date_end_publications);

-		}

+                # date end publications

+                if($post->date_end_publications != 0) {

+                        $post->date_end_publications = $parse->date->rusint_to_unix($post->date_end_publications);

+                }

 

-		if($post->date_end_publications <= $post->date_publications) {

-			$post->date_end_publications = 0;

-		}

-	}

+                if($post->date_end_publications <= $post->date_publications) {

+                        $post->date_end_publications = 0;

+                }

+        }

 

 

-	/**

-	 * Check and correct secondary fields

-	 */

-	private function correct_post_fields() {

+        /**

+         * Check and correct secondary fields

+         */

+        private function correct_post_fields() {

 

-		global $users, $post;

+                global $users, $post;

 

-		# tags

-		if(!isset($post->tags)) {

-			$post->tags = NULL;

-		}

+                # tags

+                if(!isset($post->tags)) {

+                        $post->tags = NULL;

+                }

 

-		# sort

-		if(!isset($post->itemsort) || round($post->itemsort) < 0) {

-			$post->itemsort = 0;

-		}

-		else {

-			$post->itemsort = round($post->itemsort);

-		}

+                # sort

+                if(!isset($post->itemsort) || round($post->itemsort) < 0) {

+                        $post->itemsort = 0;

+                }

+                else {

+                        $post->itemsort = round($post->itemsort);

+                }

 

-		# group ids with access

-		if(isset($post->gids) && is_array($post->gids)) {

-			$post->gids = implode(",", $post->gids);

-		}

-		else {

-			$post->gids = 0;

-		}

+                # group ids with access

+                if(isset($post->gids) && is_array($post->gids)) {

+                        $post->gids = implode(",", $post->gids);

+                }

+                else {

+                        $post->gids = 0;

+                }

 

-		# userlist

-		$this->userlist = $users->get_userlist();

-

-		# author

-		if(!isset($post->author_id) || !array_key_exists($post->author_id, $this->userlist)) {

-			$post->author_id = 0;

-		}

-	}

+                # userlist

+                $this->userlist = $users->get_userlist();

+

+                # author

+                if(!isset($post->author_id) || !array_key_exists($post->author_id, $this->userlist)) {

+                        $post->author_id = 0;

+                }

+        }

 

 

-	/**

-	 * Это временная функция

-	 *

-	 * @param int    $id

-	 * @param string $title

-	 * @param string $subject

-	 */

-	private function mailing($id, $title, $subject) {

-

-		global $parse, $mailer, $logger, $users, $mailer, $site;

-

-		# get userlist

-		$userlist = $users->get_userlist(1, 0, 1);

-

-		# html

-		$subject = $parse->text->html($subject);

-		$subject = "<h1>".$title."</h1>

+        /**

+         * Это временная функция

+         *

+         * @param int    $id

+         * @param string $title

+         * @param string $subject

+         */

+        private function mailing($id, $title, $subject) {

+

+                global $parse, $mailer, $logger, $users, $mailer, $site;

+

+                # get userlist

+                $userlist = $users->get_userlist(1, 0, 1);

+

+                # html

+                $subject = $parse->text->html($subject);

+                $subject = "<h1>".$title."</h1>

 				".$subject."

 				<br /><br /><a href=\"http://".$site['domain']."/index.php?page=".$this->feed['alias']."&id=".$id."\">Читать полностью</a>";

 

-		# send to email

-		if(count($userlist) != 0) {

-			$mailer->spread($userlist, $title, $subject);

-		}

-		else {

-			$logger->error("Сообщение не отправлено! Не обнаружены подписчики подходящие под заданные критерии.", false);

-		}

-	}

+                # send to email

+                if(count($userlist) != 0) {

+                        $mailer->spread($userlist, $title, $subject);

+                }

+                else {

+                        $logger->error("Сообщение не отправлено! Не обнаружены подписчики подходящие под заданные критерии.", false);

+                }

+        }

 }

Upper-Lower-Casing +19 added lines, -19 removed lines

@@ -60,7 +60,7 @@ 
 		while($row = $db->fetch_assoc($q)) {

 

 			# flag future publications

-			$row['publication_future'] = ($row['date_publications'] > time()) ? true : false ;

+			$row['publication_future'] = ($row['date_publications'] > time()) ? TRUE : FALSE ;

 

 			# flag show/hide

 			$row['publication_status'] = "show";

@@ -78,7 +78,7 @@ 
 

 			# formated date

 			$row['date_publications'] = $parse->date->unix_to_rus($row['date_publications']);

-			$row['date_update'] = $parse->date->unix_to_rus($row['date_update'], false, true, true);

+			$row['date_update'] = $parse->date->unix_to_rus($row['date_update'], FALSE, TRUE, TRUE);

 

 			$taglinks[$row['id']] = "feeditemid=".$row['id'];

 			$feedlist[$row['id']] = $row;

@@ -92,7 +92,7 @@ 
 		$smarty->assign("subfeeds", $this->feed['subfeeds']);

 		$smarty->assign("feedlist", $feedlist);

 

-		$content = $tpl->load_template("feeds_control_feed", true);

+		$content = $tpl->load_template("feeds_control_feed", TRUE);

 		$smarty->assign("content",  $content);

 	}

 

@@ -138,7 +138,7 @@ 
 				# attachment images

 				$images = $img->upload_image("images", "", array($this->feed['thumb_img_width'], $this->feed['thumb_img_height']));

 				if($images) {

-					foreach($images AS $image) {

+					foreach($images as $image) {

 						$img->insert_images($image, "feeditemid=".$fiid, $post->title);

 					}

 				}

@@ -170,7 +170,7 @@ 
 		$groups = $users->get_usergroups();

 

 		# popular tags

-		$poptags = $tags->list_tags(true);

+		$poptags = $tags->list_tags(TRUE);

 

 		# show upload files & images form

 		$tpl->load_image_upload_tpl("imagesupload");

@@ -183,7 +183,7 @@ 
 		$smarty->assign("groups",   $groups);          # groups

 

 		# tpl

-		$content = $tpl->load_template("feeds_create_item_feed", true);

+		$content = $tpl->load_template("feeds_create_item_feed", TRUE);

 		$smarty->assign("content",  $content);

 	}

 

@@ -220,7 +220,7 @@ 
 		$item['tags'] = implode(", ", array_map(array("Tags", "get_tag_title"), $tags->read_tags("feeditemid=".$id)));

 

 		# popular tags

-		$poptags = $tags->list_tags(true);

+		$poptags = $tags->list_tags(TRUE);

 

 

 		# download attached images

@@ -228,7 +228,7 @@ 
 		$smarty->assign("attachimg", $attachimg);

 

 		# show attached images

-		$attachedimages = $tpl->load_template("attached_images", true);

+		$attachedimages = $tpl->load_template("attached_images", TRUE);

 		$smarty->assign("attachedimages", $attachedimages);

 

 

@@ -237,7 +237,7 @@ 
 		$smarty->assign("attachfile", $attachfile);

 

 		# show attached files

-		$attachedfiles = $tpl->load_template("attached_files", true);

+		$attachedfiles = $tpl->load_template("attached_files", TRUE);

 		$smarty->assign("attachedfiles", $attachedfiles);

 

 

@@ -255,7 +255,7 @@ 
 		$smarty->assign("groups",   $groups);          # group list

 

 		# tpl

-		$content = $tpl->load_template("feeds_edit_item_feed", true);

+		$content = $tpl->load_template("feeds_edit_item_feed", TRUE);

 		$smarty->assign("content", $content);

 	}

 

@@ -310,7 +310,7 @@ 
 			# attachment images

 			$images = $img->upload_image("images", "", array($this->feed['thumb_img_width'], $this->feed['thumb_img_height']));

 			if($images) {

-				foreach($images AS $image) {

+				foreach($images as $image) {

 					$img->insert_images($image, "feeditemid=".$id, $post->title);

 				}

 			}

@@ -376,7 +376,7 @@ 
 		$smarty->assign("feeds", $feeds);

 

 		# tpl

-		$content = $tpl->load_template("feeds_migrate_item_feed", true);

+		$content = $tpl->load_template("feeds_migrate_item_feed", TRUE);

 		$smarty->assign("content", $content);

 	}

 

@@ -462,8 +462,8 @@ 
 

 		# del attached images

 		if(trim($cond) != "") {

-                	$img->remove_images($cond, true);

-                	$files->remove_files($cond, true);

+                	$img->remove_images($cond, TRUE);

+                	$files->remove_files($cond, TRUE);

 		}

 

 		$db->query("DELETE FROM ".PAGES_FEED_TABLE." WHERE sid='".$sid."'");

@@ -478,7 +478,7 @@ 
 		global $config, $tpl, $smarty;

 

 		# Уведомление о глобальном отключении RSS лент

-		$this->feed['rss_warn'] = (!$config->rss_power) ? true : false ;

+		$this->feed['rss_warn'] = (!$config->rss_power) ? TRUE : FALSE ;

 

 		# глобальное значение количества элементов на страницу

 		$this->feed['global_items_per_page'] =& $config->feed_items_per_page;

@@ -492,7 +492,7 @@ 
 		$smarty->assign("default_thumb_size", $default_thumb_size);

 

 		# tpl

-		$content = $tpl->load_template("feeds_settings_feed", true);

+		$content = $tpl->load_template("feeds_settings_feed", TRUE);

 		$smarty->assign("content", $content);

 	}

 

@@ -606,12 +606,12 @@ 
 

 		# title

 		if(!isset($post->title)) {

-			$logger->error("Не заполнен заголовок элемента", false);

+			$logger->error("Не заполнен заголовок элемента", FALSE);

 		}

 

 		# full desc item

 		if(!isset($post->full_item)) {

-			$logger->error("Не заполнен подробный текст элемента", false);

+			$logger->error("Не заполнен подробный текст элемента", FALSE);

 		}

 

 		# status

@@ -713,7 +713,7 @@ 
 			$mailer->spread($userlist, $title, $subject);

 		}

 		else {

-			$logger->error("Сообщение не отправлено! Не обнаружены подписчики подходящие под заданные критерии.", false);

+			$logger->error("Сообщение не отправлено! Не обнаружены подписчики подходящие под заданные критерии.", FALSE);

 		}

 	}

 }