mambax7 / newbb5

include/functions.language.php

Indentation +16 added lines, -16 removed lines

@@ -15,22 +15,22 @@
 define('NEWBB_FUNCTIONS_LANGUAGE_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_LANGUAGE')) {
-    define('NEWBB_FUNCTIONS_LANGUAGE', 1);
+	define('NEWBB_FUNCTIONS_LANGUAGE', 1);
 
-    /**
-     * @param         $page
-     * @param  string $dirname
-     * @return bool
-     */
-    function newbbLoadLanguage($page, $dirname = 'newbb')
-    {
-        $page = str_replace('..', '', $page);
-        if (!@require_once $GLOBALS['xoops']->path("modules/{$dirname}/{$GLOBALS['xoopsConfig']['language']}/{$language}.php")) {
-            if (!@require_once $GLOBALS['xoops']->path("modules/{$dirname}/language/{$language}.php")) {
-                return false;
-            }
-        }
+	/**
+	 * @param         $page
+	 * @param  string $dirname
+	 * @return bool
+	 */
+	function newbbLoadLanguage($page, $dirname = 'newbb')
+	{
+		$page = str_replace('..', '', $page);
+		if (!@require_once $GLOBALS['xoops']->path("modules/{$dirname}/{$GLOBALS['xoopsConfig']['language']}/{$language}.php")) {
+			if (!@require_once $GLOBALS['xoops']->path("modules/{$dirname}/language/{$language}.php")) {
+				return false;
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 }

include/display.php

Indentation +139 added lines, -139 removed lines

@@ -69,161 +69,161 @@
 // uncomment to show text link instead of images (set to true)
 $displayText[''] = //$displayText['blank'] =
 
-    //$displayText['attachment'] =
-    //$displayText['whosonline'] =
-    //$displayText['statistik'] =
-    //$displayText['lastposticon'] =
-
-    //$displayText['plus'] =
-    //$displayText['minus'] =
-
-    //$displayText['forum'] =
-    //$displayText['forum_new'] =
-
-    //$displayText['topic'] =
-    //$displayText['topic_hot'] =
-    //$displayText['topic_sticky'] =
-    //$displayText['topic_digest'] =
-    //$displayText['topic_locked'] =
-    //$displayText['topic_new'] =
-    //$displayText['topic_hot_new'] =
-    //$displayText['topic_my'] =
-
-    //$displayText['post'] =
-
-    //$displayText['poll'] =
-    //$displayText['rss'] =
-    //$displayText['pdf'] =
-    //$displayText['subforum'] =
-
-    //$displayText['admin_move'] =
-    //$displayText['admin_merge'] =
-    //$displayText['admin_edit'] =
-    //$displayText['admin_delete'] =
-
-    //$displayText['document'] =
-
-    //$displayText['previous'] =
-    //$displayText['next'] =
-    //$displayText['right'] =
-    //$displayText['down'] =
-    //$displayText['up'] =
-    //$displayText['printer'] =
-    //$displayText['new_forum']  =
-
-    //$displayText['facebook'] =
-    //$displayText['twitter'] =
-    //$displayText['linkedin'] =
-    //$displayText['googleplus'] =
-    //$displayText['stumbleupon'] =
-    //$displayText['friendfeed'] =
-    //$displayText['digg'] =
-    //$displayText['reddit'] =
-    //$displayText['delicious'] =
-    //$displayText['technorati'] =
-    //$displayText['wong'] =
-    //$displayText['anonym'] =
-    //$displayText['more'] =
-    //$displayText['less'] =
+	//$displayText['attachment'] =
+	//$displayText['whosonline'] =
+	//$displayText['statistik'] =
+	//$displayText['lastposticon'] =
+
+	//$displayText['plus'] =
+	//$displayText['minus'] =
+
+	//$displayText['forum'] =
+	//$displayText['forum_new'] =
+
+	//$displayText['topic'] =
+	//$displayText['topic_hot'] =
+	//$displayText['topic_sticky'] =
+	//$displayText['topic_digest'] =
+	//$displayText['topic_locked'] =
+	//$displayText['topic_new'] =
+	//$displayText['topic_hot_new'] =
+	//$displayText['topic_my'] =
+
+	//$displayText['post'] =
+
+	//$displayText['poll'] =
+	//$displayText['rss'] =
+	//$displayText['pdf'] =
+	//$displayText['subforum'] =
+
+	//$displayText['admin_move'] =
+	//$displayText['admin_merge'] =
+	//$displayText['admin_edit'] =
+	//$displayText['admin_delete'] =
+
+	//$displayText['document'] =
+
+	//$displayText['previous'] =
+	//$displayText['next'] =
+	//$displayText['right'] =
+	//$displayText['down'] =
+	//$displayText['up'] =
+	//$displayText['printer'] =
+	//$displayText['new_forum']  =
+
+	//$displayText['facebook'] =
+	//$displayText['twitter'] =
+	//$displayText['linkedin'] =
+	//$displayText['googleplus'] =
+	//$displayText['stumbleupon'] =
+	//$displayText['friendfeed'] =
+	//$displayText['digg'] =
+	//$displayText['reddit'] =
+	//$displayText['delicious'] =
+	//$displayText['technorati'] =
+	//$displayText['wong'] =
+	//$displayText['anonym'] =
+	//$displayText['more'] =
+	//$displayText['less'] =
 
 $displayText['p_delete'] = $displayText['p_reply'] = $displayText['p_quote'] = $displayText['p_edit'] = $displayText['p_report'] = $displayText['t_new'] = $displayText['t_poll'] = $displayText['t_qr'] = $displayText['t_qr_expand'] = $displayText['t_reply'] =
 
-    //$displayText['online'] =
-    //$displayText['offline'] =
+	//$displayText['online'] =
+	//$displayText['offline'] =
 
-    //$displayText['new_subforum'] =
+	//$displayText['new_subforum'] =
 
 $displayText['p_bann'] =
 
-    true;
+	true;
 
 for ($i = 1; $i <= 5; ++$i) {
-    //$displayText['rate'.$i] = true;
+	//$displayText['rate'.$i] = true;
 }
 
 // uncomment to show images instead of text links (set to false)
 $displayText[''] = //$displayText['blank'] =
 
-    //$displayText['attachment'] =
-    //$displayText['whosonline'] =
-    //$displayText['statistik'] =
-    //$displayText['lastposticon'] =
-
-    //$displayText['plus'] =
-    //$displayText['minus'] =
-
-    //$displayText['forum'] =
-    //$displayText['forum_new'] =
-
-    //$displayText['topic'] =
-    //$displayText['topic_hot'] =
-    //$displayText['topic_sticky'] =
-    //$displayText['topic_digest'] =
-    //$displayText['topic_locked'] =
-    //$displayText['topic_new'] =
-    //$displayText['topic_hot_new'] =
-    //$displayText['topic_my'] =
-
-    //$displayText['post'] =
-
-    //$displayText['poll'] =
-    //$displayText['rss'] =
-    //$displayText['pdf'] =
-    //$displayText['subforum'] =
-
-    //$displayText['admin_move'] =
-    //$displayText['admin_merge'] =
-    //$displayText['admin_edit'] =
-    //$displayText['admin_delete'] =
-
-    //$displayText['document'] =
-
-    //$displayText['previous'] =
-    //$displayText['next'] =
-    //$displayText['right'] =
-    //$displayText['down'] =
-    //$displayText['up'] =
-    //$displayText['printer'] =
-    //$displayText['new_forum']  =
-
-    //$displayText['facebook'] =
-    //$displayText['twitter'] =
-    //$displayText['linkedin'] =
-    //$displayText['googleplus'] =
-    //$displayText['stumbleupon'] =
-    //$displayText['friendfeed'] =
-    //$displayText['digg'] =
-    //$displayText['reddit'] =
-    //$displayText['delicious'] =
-    //$displayText['technorati'] =
-    //$displayText['wong'] =
-    //$displayText['anonym'] =
-    //$displayText['more'] =
-    //$displayText['less'] =
-
-    //$displayText['p_delete'] =
-    //$displayText['p_reply'] =
-    //$displayText['p_quote'] =
-    //$displayText['p_edit'] =
-    //$displayText['p_report'] =
-
-    //$displayText['t_new'] =
-    //$displayText['t_poll'] =
-    //$displayText['t_qr'] =
-    //$displayText['t_qr_expand'] =
-    //$displayText['t_reply'] =
-
-    //$displayText['online'] =
-    //$displayText['offline'] =
-
-    //$displayText['new_subforum'] =
-
-    //$displayText['p_bann'] =
-
-    false;
+	//$displayText['attachment'] =
+	//$displayText['whosonline'] =
+	//$displayText['statistik'] =
+	//$displayText['lastposticon'] =
+
+	//$displayText['plus'] =
+	//$displayText['minus'] =
+
+	//$displayText['forum'] =
+	//$displayText['forum_new'] =
+
+	//$displayText['topic'] =
+	//$displayText['topic_hot'] =
+	//$displayText['topic_sticky'] =
+	//$displayText['topic_digest'] =
+	//$displayText['topic_locked'] =
+	//$displayText['topic_new'] =
+	//$displayText['topic_hot_new'] =
+	//$displayText['topic_my'] =
+
+	//$displayText['post'] =
+
+	//$displayText['poll'] =
+	//$displayText['rss'] =
+	//$displayText['pdf'] =
+	//$displayText['subforum'] =
+
+	//$displayText['admin_move'] =
+	//$displayText['admin_merge'] =
+	//$displayText['admin_edit'] =
+	//$displayText['admin_delete'] =
+
+	//$displayText['document'] =
+
+	//$displayText['previous'] =
+	//$displayText['next'] =
+	//$displayText['right'] =
+	//$displayText['down'] =
+	//$displayText['up'] =
+	//$displayText['printer'] =
+	//$displayText['new_forum']  =
+
+	//$displayText['facebook'] =
+	//$displayText['twitter'] =
+	//$displayText['linkedin'] =
+	//$displayText['googleplus'] =
+	//$displayText['stumbleupon'] =
+	//$displayText['friendfeed'] =
+	//$displayText['digg'] =
+	//$displayText['reddit'] =
+	//$displayText['delicious'] =
+	//$displayText['technorati'] =
+	//$displayText['wong'] =
+	//$displayText['anonym'] =
+	//$displayText['more'] =
+	//$displayText['less'] =
+
+	//$displayText['p_delete'] =
+	//$displayText['p_reply'] =
+	//$displayText['p_quote'] =
+	//$displayText['p_edit'] =
+	//$displayText['p_report'] =
+
+	//$displayText['t_new'] =
+	//$displayText['t_poll'] =
+	//$displayText['t_qr'] =
+	//$displayText['t_qr_expand'] =
+	//$displayText['t_reply'] =
+
+	//$displayText['online'] =
+	//$displayText['offline'] =
+
+	//$displayText['new_subforum'] =
+
+	//$displayText['p_bann'] =
+
+	false;
 
 for ($i = 1; $i <= 5; ++$i) {
-    //$displayText['rate'.$i] = false;
+	//$displayText['rate'.$i] = false;
 }
 
 return $displayText;

include/functions.image.php

Indentation +188 added lines, -188 removed lines

@@ -30,192 +30,192 @@
 //  ------------------------------------------------------------------------ //
 
 if (!defined('NEWBB_FUNCTIONS_IMAGE')) {
-    define('NEWBB_FUNCTIONS_IMAGE', true);
-
-    /**
-     * @param $source
-     * @return string
-     */
-    function newbbAttachmentImage($source)
-    {
-        $img_path   = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments']);
-        $img_url    = XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'];
-        $thumb_path = $img_path . '/thumbs';
-        $thumb_url  = $img_url . '/thumbs';
-
-        $thumb     = $thumb_path . '/' . $source;
-        $image     = $img_path . '/' . $source;
-        $thumb_url = $thumb_url . '/' . $source;
-        $image_url = $img_url . '/' . $source;
-
-        $imginfo  = @getimagesize($image);
-        $img_info = (count($imginfo) > 0) ? $imginfo[0] . 'X' . $imginfo[1] . ' px' : '';
-
-        if ($GLOBALS['xoopsModuleConfig']['max_image_width'] > 0
-            && $GLOBALS['xoopsModuleConfig']['max_image_height'] > 0) {
-            if ($imginfo[0] > $GLOBALS['xoopsModuleConfig']['max_image_width']
-                || $imginfo[1] > $GLOBALS['xoopsModuleConfig']['max_image_height']) {
-                //if (!file_exists($thumb_path.'/'.$source) && $imginfo[0] > $GLOBALS['xoopsModuleConfig']['max_img_width']) {
-                if (!file_exists($thumb_path . '/' . $source)) {
-                    newbbCreateThumbnail($source, $GLOBALS['xoopsModuleConfig']['max_image_width']);
-                }
-            }
-
-            if ($imginfo[0] > $GLOBALS['xoopsModuleConfig']['max_image_width']
-                || $imginfo[1] > $GLOBALS['xoopsModuleConfig']['max_image_height']) {
-                $pseudo_width  = $GLOBALS['xoopsModuleConfig']['max_image_width'];
-                $pseudo_height = $GLOBALS['xoopsModuleConfig']['max_image_width'] * ($imginfo[1] / $imginfo[0]);
-                $pseudo_size   = "width='" . $pseudo_width . "px' height='" . $pseudo_height . "px'";
-            }
-            // irmtfan to fix Undefined variable: pseudo_height
-            if (!empty($pseudo_height) && $GLOBALS['xoopsModuleConfig']['max_image_height'] > 0
-                && $pseudo_height > $GLOBALS['xoopsModuleConfig']['max_image_height']) {
-                $pseudo_height = $GLOBALS['xoopsModuleConfig']['max_image_height'];
-                $pseudo_width  = $GLOBALS['xoopsModuleConfig']['max_image_height'] * ($imginfo[0] / $imginfo[1]);
-                $pseudo_size   = "width='" . $pseudo_width . "px' height='" . $pseudo_height . "px'";
-            }
-        }
-
-        if (file_exists($thumb)) {
-            $attachmentImage = '<a href="' . $image_url . '" title="' . $source . ' ' . $img_info . '" target="_blank">';
-            // $attachmentImage .= '<img src="' . $thumb_url . '" alt="' . $source . ' ' . $img_info . '" />';
-            $attachmentImage .= '<img src="' . $image_url . '" ' . $pseudo_size . ' alt="' . $source . ' ' . $img_info . '" />';
-            $attachmentImage .= '</a>';
-        } elseif (!empty($pseudo_size)) {
-            $attachmentImage = '<a href="' . $image_url . '" title="' . $source . ' ' . $img_info . '" target="_blank">';
-            $attachmentImage .= '<img src="' . $image_url . '" ' . $pseudo_size . ' alt="' . $source . ' ' . $img_info . '" />';
-            $attachmentImage .= '</a>';
-        } elseif (file_exists($image)) {
-            $attachmentImage = '<img src="' . $image_url . '" alt="' . $source . ' ' . $img_info . '" />';
-        } else {
-            $attachmentImage = '';
-        }
-
-        return $attachmentImage;
-    }
-
-    /**
-     * @param $source
-     * @param $thumb_width
-     * @return bool
-     */
-    function newbbCreateThumbnail($source, $thumb_width)
-    {
-        $cmd        = '';
-        $img_path   = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments']);
-        $thumb_path = $img_path . '/thumbs';
-        $src_file   = $img_path . '/' . $source;
-        $new_file   = $thumb_path . '/' . $source;
-        //$imageLibs = newbb_getImageLibs();
-
-        if (!filesize($src_file) || !is_readable($src_file)) {
-            return false;
-        }
-
-        if (!is_dir($thumb_path) || !is_writable($thumb_path)) {
-            return false;
-        }
-
-        $imginfo = @getimagesize($src_file);
-
-        if (null === $imginfo) {
-            return false;
-        }
-        if ($imginfo[0] < $thumb_width) {
-            return false;
-        }
-
-        $newWidth  = (int)min($imginfo[0], $thumb_width);
-        $newHeight = (int)($imginfo[1] * $newWidth / $imginfo[0]);
-
-        if (1 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
-            if (preg_match("#[A-Z]:|\\\\#Ai", __FILE__)) {
-                $cur_dir     = __DIR__;
-                $src_file_im = '"' . $cur_dir . '\\' . str_replace('/', '\\', $src_file) . '"';
-                $new_file_im = '"' . $cur_dir . '\\' . str_replace('/', '\\', $new_file) . '"';
-            } else {
-                $src_file_im = @escapeshellarg($src_file);
-                $new_file_im = @escapeshellarg($new_file);
-            }
-            $path           = empty($GLOBALS['xoopsModuleConfig']['path_magick']) ? '' : $GLOBALS['xoopsModuleConfig']['path_magick'] . '/';
-            $magick_command = $path . 'convert -quality 85 -antialias -sample ' . $newWidth . 'x' . $newHeight . ' ' . $src_file_im . ' +profile "*" ' . str_replace('\\', '/', $new_file_im) . '';
-
-            @passthru($magick_command);
-            if (file_exists($new_file)) {
-                return true;
-            }
-        }
-
-        if (2 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
-            $path = empty($GLOBALS['xoopsModuleConfig']['path_netpbm']) ? '' : $GLOBALS['xoopsModuleConfig']['path_netpbm'] . '/';
-            if (preg_match("/\.png/", $source)) {
-                $cmd = $path . "pngtopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | " . $path . "pnmtopng > $new_file";
-            } elseif (preg_match("/\.(jpg|jpeg)/", $source)) {
-                $cmd = $path . "jpegtopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | " . $path . "ppmtojpeg -quality=90 > $new_file";
-            } elseif (preg_match("/\.gif/", $source)) {
-                $cmd = $path . "giftopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | ppmquant 256 | " . $path . "ppmtogif > $new_file";
-            }
-
-            @exec($cmd, $output, $retval);
-            if (file_exists($new_file)) {
-                return true;
-            }
-        }
-
-        $type            = $imginfo[2];
-        $supported_types = [];
-
-        if (!extension_loaded('gd')) {
-            return false;
-        }
-        if (function_exists('imagegif')) {
-            $supported_types[] = 1;
-        }
-        if (function_exists('imagejpeg')) {
-            $supported_types[] = 2;
-        }
-        if (function_exists('imagepng')) {
-            $supported_types[] = 3;
-        }
-
-        $imageCreateFunction = function_exists('imagecreatetruecolor') ? 'imagecreatetruecolor' : 'imagecreate';
-
-        if (in_array($type, $supported_types)) {
-            switch ($type) {
-                case 1:
-                    if (!function_exists('imagecreatefromgif')) {
-                        return false;
-                    }
-                    $im     = imagecreatefromgif($src_file);
-                    $new_im = imagecreate($newWidth, $newHeight);
-                    imagecopyresized($new_im, $im, 0, 0, 0, 0, $newWidth, $newHeight, $imginfo[0], $imginfo[1]);
-                    imagegif($new_im, $new_file);
-                    imagedestroy($im);
-                    imagedestroy($new_im);
-                    break;
-                case 2:
-                    $im     = imagecreatefromjpeg($src_file);
-                    $new_im = $imageCreateFunction($newWidth, $newHeight);
-                    imagecopyresized($new_im, $im, 0, 0, 0, 0, $newWidth, $newHeight, $imginfo[0], $imginfo[1]);
-                    imagejpeg($new_im, $new_file, 90);
-                    imagedestroy($im);
-                    imagedestroy($new_im);
-                    break;
-                case 3:
-                    $im     = imagecreatefrompng($src_file);
-                    $new_im = $imageCreateFunction($newWidth, $newHeight);
-                    imagecopyresized($new_im, $im, 0, 0, 0, 0, $newWidth, $newHeight, $imginfo[0], $imginfo[1]);
-                    imagepng($new_im, $new_file);
-                    imagedestroy($im);
-                    imagedestroy($new_im);
-                    break;
-            }
-        }
-
-        if (file_exists($new_file)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
+	define('NEWBB_FUNCTIONS_IMAGE', true);
+
+	/**
+	 * @param $source
+	 * @return string
+	 */
+	function newbbAttachmentImage($source)
+	{
+		$img_path   = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments']);
+		$img_url    = XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'];
+		$thumb_path = $img_path . '/thumbs';
+		$thumb_url  = $img_url . '/thumbs';
+
+		$thumb     = $thumb_path . '/' . $source;
+		$image     = $img_path . '/' . $source;
+		$thumb_url = $thumb_url . '/' . $source;
+		$image_url = $img_url . '/' . $source;
+
+		$imginfo  = @getimagesize($image);
+		$img_info = (count($imginfo) > 0) ? $imginfo[0] . 'X' . $imginfo[1] . ' px' : '';
+
+		if ($GLOBALS['xoopsModuleConfig']['max_image_width'] > 0
+			&& $GLOBALS['xoopsModuleConfig']['max_image_height'] > 0) {
+			if ($imginfo[0] > $GLOBALS['xoopsModuleConfig']['max_image_width']
+				|| $imginfo[1] > $GLOBALS['xoopsModuleConfig']['max_image_height']) {
+				//if (!file_exists($thumb_path.'/'.$source) && $imginfo[0] > $GLOBALS['xoopsModuleConfig']['max_img_width']) {
+				if (!file_exists($thumb_path . '/' . $source)) {
+					newbbCreateThumbnail($source, $GLOBALS['xoopsModuleConfig']['max_image_width']);
+				}
+			}
+
+			if ($imginfo[0] > $GLOBALS['xoopsModuleConfig']['max_image_width']
+				|| $imginfo[1] > $GLOBALS['xoopsModuleConfig']['max_image_height']) {
+				$pseudo_width  = $GLOBALS['xoopsModuleConfig']['max_image_width'];
+				$pseudo_height = $GLOBALS['xoopsModuleConfig']['max_image_width'] * ($imginfo[1] / $imginfo[0]);
+				$pseudo_size   = "width='" . $pseudo_width . "px' height='" . $pseudo_height . "px'";
+			}
+			// irmtfan to fix Undefined variable: pseudo_height
+			if (!empty($pseudo_height) && $GLOBALS['xoopsModuleConfig']['max_image_height'] > 0
+				&& $pseudo_height > $GLOBALS['xoopsModuleConfig']['max_image_height']) {
+				$pseudo_height = $GLOBALS['xoopsModuleConfig']['max_image_height'];
+				$pseudo_width  = $GLOBALS['xoopsModuleConfig']['max_image_height'] * ($imginfo[0] / $imginfo[1]);
+				$pseudo_size   = "width='" . $pseudo_width . "px' height='" . $pseudo_height . "px'";
+			}
+		}
+
+		if (file_exists($thumb)) {
+			$attachmentImage = '<a href="' . $image_url . '" title="' . $source . ' ' . $img_info . '" target="_blank">';
+			// $attachmentImage .= '<img src="' . $thumb_url . '" alt="' . $source . ' ' . $img_info . '" />';
+			$attachmentImage .= '<img src="' . $image_url . '" ' . $pseudo_size . ' alt="' . $source . ' ' . $img_info . '" />';
+			$attachmentImage .= '</a>';
+		} elseif (!empty($pseudo_size)) {
+			$attachmentImage = '<a href="' . $image_url . '" title="' . $source . ' ' . $img_info . '" target="_blank">';
+			$attachmentImage .= '<img src="' . $image_url . '" ' . $pseudo_size . ' alt="' . $source . ' ' . $img_info . '" />';
+			$attachmentImage .= '</a>';
+		} elseif (file_exists($image)) {
+			$attachmentImage = '<img src="' . $image_url . '" alt="' . $source . ' ' . $img_info . '" />';
+		} else {
+			$attachmentImage = '';
+		}
+
+		return $attachmentImage;
+	}
+
+	/**
+	 * @param $source
+	 * @param $thumb_width
+	 * @return bool
+	 */
+	function newbbCreateThumbnail($source, $thumb_width)
+	{
+		$cmd        = '';
+		$img_path   = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments']);
+		$thumb_path = $img_path . '/thumbs';
+		$src_file   = $img_path . '/' . $source;
+		$new_file   = $thumb_path . '/' . $source;
+		//$imageLibs = newbb_getImageLibs();
+
+		if (!filesize($src_file) || !is_readable($src_file)) {
+			return false;
+		}
+
+		if (!is_dir($thumb_path) || !is_writable($thumb_path)) {
+			return false;
+		}
+
+		$imginfo = @getimagesize($src_file);
+
+		if (null === $imginfo) {
+			return false;
+		}
+		if ($imginfo[0] < $thumb_width) {
+			return false;
+		}
+
+		$newWidth  = (int)min($imginfo[0], $thumb_width);
+		$newHeight = (int)($imginfo[1] * $newWidth / $imginfo[0]);
+
+		if (1 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
+			if (preg_match("#[A-Z]:|\\\\#Ai", __FILE__)) {
+				$cur_dir     = __DIR__;
+				$src_file_im = '"' . $cur_dir . '\\' . str_replace('/', '\\', $src_file) . '"';
+				$new_file_im = '"' . $cur_dir . '\\' . str_replace('/', '\\', $new_file) . '"';
+			} else {
+				$src_file_im = @escapeshellarg($src_file);
+				$new_file_im = @escapeshellarg($new_file);
+			}
+			$path           = empty($GLOBALS['xoopsModuleConfig']['path_magick']) ? '' : $GLOBALS['xoopsModuleConfig']['path_magick'] . '/';
+			$magick_command = $path . 'convert -quality 85 -antialias -sample ' . $newWidth . 'x' . $newHeight . ' ' . $src_file_im . ' +profile "*" ' . str_replace('\\', '/', $new_file_im) . '';
+
+			@passthru($magick_command);
+			if (file_exists($new_file)) {
+				return true;
+			}
+		}
+
+		if (2 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
+			$path = empty($GLOBALS['xoopsModuleConfig']['path_netpbm']) ? '' : $GLOBALS['xoopsModuleConfig']['path_netpbm'] . '/';
+			if (preg_match("/\.png/", $source)) {
+				$cmd = $path . "pngtopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | " . $path . "pnmtopng > $new_file";
+			} elseif (preg_match("/\.(jpg|jpeg)/", $source)) {
+				$cmd = $path . "jpegtopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | " . $path . "ppmtojpeg -quality=90 > $new_file";
+			} elseif (preg_match("/\.gif/", $source)) {
+				$cmd = $path . "giftopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | ppmquant 256 | " . $path . "ppmtogif > $new_file";
+			}
+
+			@exec($cmd, $output, $retval);
+			if (file_exists($new_file)) {
+				return true;
+			}
+		}
+
+		$type            = $imginfo[2];
+		$supported_types = [];
+
+		if (!extension_loaded('gd')) {
+			return false;
+		}
+		if (function_exists('imagegif')) {
+			$supported_types[] = 1;
+		}
+		if (function_exists('imagejpeg')) {
+			$supported_types[] = 2;
+		}
+		if (function_exists('imagepng')) {
+			$supported_types[] = 3;
+		}
+
+		$imageCreateFunction = function_exists('imagecreatetruecolor') ? 'imagecreatetruecolor' : 'imagecreate';
+
+		if (in_array($type, $supported_types)) {
+			switch ($type) {
+				case 1:
+					if (!function_exists('imagecreatefromgif')) {
+						return false;
+					}
+					$im     = imagecreatefromgif($src_file);
+					$new_im = imagecreate($newWidth, $newHeight);
+					imagecopyresized($new_im, $im, 0, 0, 0, 0, $newWidth, $newHeight, $imginfo[0], $imginfo[1]);
+					imagegif($new_im, $new_file);
+					imagedestroy($im);
+					imagedestroy($new_im);
+					break;
+				case 2:
+					$im     = imagecreatefromjpeg($src_file);
+					$new_im = $imageCreateFunction($newWidth, $newHeight);
+					imagecopyresized($new_im, $im, 0, 0, 0, 0, $newWidth, $newHeight, $imginfo[0], $imginfo[1]);
+					imagejpeg($new_im, $new_file, 90);
+					imagedestroy($im);
+					imagedestroy($new_im);
+					break;
+				case 3:
+					$im     = imagecreatefrompng($src_file);
+					$new_im = $imageCreateFunction($newWidth, $newHeight);
+					imagecopyresized($new_im, $im, 0, 0, 0, 0, $newWidth, $newHeight, $imginfo[0], $imginfo[1]);
+					imagepng($new_im, $new_file);
+					imagedestroy($im);
+					imagedestroy($new_im);
+					break;
+			}
+		}
+
+		if (file_exists($new_file)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 }

include/images.php

Indentation +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 $forumImage['facebook'] = $forumImage['twitter'] = $forumImage['linkedin'] = $forumImage['googleplus'] = $forumImage['stumbleupon'] = $forumImage['friendfeed'] = $forumImage['digg'] = $forumImage['reddit'] = $forumImage['delicious'] = $forumImage['technorati'] = $forumImage['wong'] = $forumImage['anonym'] = $forumImage['more'] = $forumImage['less'] = 'icon';
 
 for ($i = 1; $i <= 5; ++$i) {
-    $forumImage['rate' . $i] = 'icon';
+	$forumImage['rate' . $i] = 'icon';
 }
 
 $forumImage['p_delete'] = $forumImage['p_reply'] = $forumImage['p_quote'] = $forumImage['p_edit'] = $forumImage['p_report'] =
@@ -61,7 +61,7 @@ 
 
 $forumImage['p_bann'] =
 
-    'language';
+	'language';
 
 /*
 $forumImage[''] = $forumImage['blank'] = $forumImage['icon']."blank";

include/functions.topic.php

Indentation +28 added lines, -28 removed lines

@@ -15,35 +15,35 @@
 define('NEWBB_FUNCTIONS_TOPIC_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_TOPIC')) {
-    define('NEWBB_FUNCTIONS_TOPIC', 1);
+	define('NEWBB_FUNCTIONS_TOPIC', 1);
 
-    /**
-     * Create full title of a topic
-     *
-     * the title is composed of [type_name] if type_id is greater than 0 plus topic Title
-     * @param         $topicTitle
-     * @param  null   $prefixName
-     * @param  null   $prefixColor
-     * @return string
-     */
-    function newbbGetTopicTitle($topicTitle, $prefixName = null, $prefixColor = null)
-    {
-        return getTopicTitle($topicTitle, $prefixName = null, $prefixColor = null);
-    }
+	/**
+	 * Create full title of a topic
+	 *
+	 * the title is composed of [type_name] if type_id is greater than 0 plus topic Title
+	 * @param         $topicTitle
+	 * @param  null   $prefixName
+	 * @param  null   $prefixColor
+	 * @return string
+	 */
+	function newbbGetTopicTitle($topicTitle, $prefixName = null, $prefixColor = null)
+	{
+		return getTopicTitle($topicTitle, $prefixName = null, $prefixColor = null);
+	}
 
-    /**
-     * @param         $topicTitle
-     * @param  null   $prefixName
-     * @param  null   $prefixColor
-     * @return string
-     */
-    function getTopicTitle($topicTitle, $prefixName = null, $prefixColor = null)
-    {
-        if (empty($prefixName)) {
-            return $topicTitle;
-        }
-        $topicPrefix = $prefixColor ? '<em style="font-style: normal; color: ' . $prefixColor . ';">[' . $prefixName . ']</em> ' : '[' . $prefixName . '] ';
+	/**
+	 * @param         $topicTitle
+	 * @param  null   $prefixName
+	 * @param  null   $prefixColor
+	 * @return string
+	 */
+	function getTopicTitle($topicTitle, $prefixName = null, $prefixColor = null)
+	{
+		if (empty($prefixName)) {
+			return $topicTitle;
+		}
+		$topicPrefix = $prefixColor ? '<em style="font-style: normal; color: ' . $prefixColor . ';">[' . $prefixName . ']</em> ' : '[' . $prefixName . '] ';
 
-        return $topicPrefix . $topicTitle;
-    }
+		return $topicPrefix . $topicTitle;
+	}
 }

include/functions.read.php

Indentation +61 added lines, -61 removed lines

@@ -17,75 +17,75 @@
 define('NEWBB_FUNCTIONS_READ_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_READ')) {
-    define('NEWBB_FUNCTIONS_READ', 1);
+	define('NEWBB_FUNCTIONS_READ', 1);
 
-    /**
-     * @param        $type
-     * @param        $item_id
-     * @param        $post_id
-     * @param  null  $uid
-     * @return mixed
-     */
-    function newbbSetRead($type, $item_id, $post_id, $uid = null)
-    {
-        /** @var Newbb\ReadHandler $readHandler */
-        $readHandler = Newbb\Helper::getInstance()->getHandler('Read'.$type);
+	/**
+	 * @param        $type
+	 * @param        $item_id
+	 * @param        $post_id
+	 * @param  null  $uid
+	 * @return mixed
+	 */
+	function newbbSetRead($type, $item_id, $post_id, $uid = null)
+	{
+		/** @var Newbb\ReadHandler $readHandler */
+		$readHandler = Newbb\Helper::getInstance()->getHandler('Read'.$type);
 
-        return $readHandler->setRead($item_id, $post_id, $uid);
-    }
+		return $readHandler->setRead($item_id, $post_id, $uid);
+	}
 
-    /**
-     * @param        $type
-     * @param        $item_id
-     * @param  null  $uid
-     * @return mixed
-     */
-    function newbbGetRead($type, $item_id, $uid = null)
-    {
-        /** @var Newbb\ReadHandler $readHandler */
-        $readHandler = Newbb\Helper::getInstance()->getHandler('Read'.$type);
+	/**
+	 * @param        $type
+	 * @param        $item_id
+	 * @param  null  $uid
+	 * @return mixed
+	 */
+	function newbbGetRead($type, $item_id, $uid = null)
+	{
+		/** @var Newbb\ReadHandler $readHandler */
+		$readHandler = Newbb\Helper::getInstance()->getHandler('Read'.$type);
 
-        return $readHandler->getRead($item_id, $uid);
-    }
+		return $readHandler->getRead($item_id, $uid);
+	}
 
-    /**
-     * @param  int  $status
-     * @param  null $uid
-     * @return mixed
-     */
-    function newbbSetReadForum($status = 0, $uid = null)
-    {
-        /** @var Newbb\ReadForumHandler $readHandler */
-        $readForumHandler = Newbb\Helper::getInstance()->getHandler('Readforum');
+	/**
+	 * @param  int  $status
+	 * @param  null $uid
+	 * @return mixed
+	 */
+	function newbbSetReadForum($status = 0, $uid = null)
+	{
+		/** @var Newbb\ReadForumHandler $readHandler */
+		$readForumHandler = Newbb\Helper::getInstance()->getHandler('Readforum');
 
-        return $readForumHandler->setReadItems($status, $uid);
-    }
+		return $readForumHandler->setReadItems($status, $uid);
+	}
 
-    /**
-     * @param  int  $status
-     * @param  int  $forum_id
-     * @param  null $uid
-     * @return mixed
-     */
-    function newbbSetReadTopic($status = 0, $forum_id = 0, $uid = null)
-    {
-        /** @var Newbb\ReadtopicHandler $readHandler */
-        $readTopicHandler = Newbb\Helper::getInstance()->getHandler('Readtopic');
+	/**
+	 * @param  int  $status
+	 * @param  int  $forum_id
+	 * @param  null $uid
+	 * @return mixed
+	 */
+	function newbbSetReadTopic($status = 0, $forum_id = 0, $uid = null)
+	{
+		/** @var Newbb\ReadtopicHandler $readHandler */
+		$readTopicHandler = Newbb\Helper::getInstance()->getHandler('Readtopic');
 
-        return $readTopicHandler->setReadItems($status, $forum_id, $uid);
-    }
+		return $readTopicHandler->setReadItems($status, $forum_id, $uid);
+	}
 
-    /**
-     * @param        $type
-     * @param        $items
-     * @param  null  $uid
-     * @return mixed
-     */
-    function newbbIsRead($type, &$items, $uid = null)
-    {
-        /** @var Newbb\ReadHandler $readHandler */
-        $readHandler = Newbb\Helper::getInstance()->getHandler('Read'.$type);
+	/**
+	 * @param        $type
+	 * @param        $items
+	 * @param  null  $uid
+	 * @return mixed
+	 */
+	function newbbIsRead($type, &$items, $uid = null)
+	{
+		/** @var Newbb\ReadHandler $readHandler */
+		$readHandler = Newbb\Helper::getInstance()->getHandler('Read'.$type);
 
-        return $readHandler->isReadItems($items, $uid);
-    }
+		return $readHandler->isReadItems($items, $uid);
+	}
 }

include/functions.ini.php

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 if (defined('NEWBB_FUNCTIONS_INI')) {
-    return;
+	return;
 }
 define('NEWBB_FUNCTIONS_INI', 1);
 

include/functions.php

Indentation +7 added lines, -7 removed lines

@@ -15,12 +15,12 @@
 define('NEWBB_FUNCTIONS_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS')) {
-    define('NEWBB_FUNCTIONS', 1);
+	define('NEWBB_FUNCTIONS', 1);
 
-    require_once __DIR__ . '/functions.image.php';
-    require_once __DIR__ . '/functions.user.php';
-    require_once __DIR__ . '/functions.render.php';
-    require_once __DIR__ . '/functions.forum.php';
-    require_once __DIR__ . '/functions.session.php';
-    require_once __DIR__ . '/functions.stats.php';
+	require_once __DIR__ . '/functions.image.php';
+	require_once __DIR__ . '/functions.user.php';
+	require_once __DIR__ . '/functions.render.php';
+	require_once __DIR__ . '/functions.forum.php';
+	require_once __DIR__ . '/functions.session.php';
+	require_once __DIR__ . '/functions.stats.php';
 }

include/functions.stats.php

Indentation +78 added lines, -78 removed lines

@@ -17,97 +17,97 @@
 define('NEWBB_FUNCTIONS_STATS_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_STATS')) {
-    define('NEWBB_FUNCTIONS_STATS', 1);
+	define('NEWBB_FUNCTIONS_STATS', 1);
 
-    /**
-     * @return mixed
-     */
-    function newbbGetStats()
-    {
-        /** @var Newbb\StatsHandler $statsHandler */
-        $statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
-        $stats        = $statsHandler->getStats();
+	/**
+	 * @return mixed
+	 */
+	function newbbGetStats()
+	{
+		/** @var Newbb\StatsHandler $statsHandler */
+		$statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
+		$stats        = $statsHandler->getStats();
 
-        return $stats;
-    }
+		return $stats;
+	}
 
-    /**
-     * @param        $id
-     * @param        $type
-     * @param  int   $increment
-     * @return mixed
-     */
-    function newbbUpdateStats($id, $type, $increment = 1)
-    {
-        /** @var Newbb\StatsHandler $statsHandler */
-        $statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
+	/**
+	 * @param        $id
+	 * @param        $type
+	 * @param  int   $increment
+	 * @return mixed
+	 */
+	function newbbUpdateStats($id, $type, $increment = 1)
+	{
+		/** @var Newbb\StatsHandler $statsHandler */
+		$statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
 
-        return $statsHandler->update($id, $type, $increment);
-    }
+		return $statsHandler->update($id, $type, $increment);
+	}
 
-    /*
+	/*
     * Gets the total number of topics in a form
     */
-    /**
-     * @param  string $forum_id
-     * @return mixed
-     */
-    function getTotalTopics($forum_id = '')
-    {
-        /** @var Newbb\TopicHandler $topicHandler */
-        $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-        $criteria     = new \CriteriaCompo(new \Criteria('approved', 0, '>'));
-        if ($forum_id) {
-            $criteria->add(new \Criteria('forum_id', (int)$forum_id));
-        }
+	/**
+	 * @param  string $forum_id
+	 * @return mixed
+	 */
+	function getTotalTopics($forum_id = '')
+	{
+		/** @var Newbb\TopicHandler $topicHandler */
+		$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+		$criteria     = new \CriteriaCompo(new \Criteria('approved', 0, '>'));
+		if ($forum_id) {
+			$criteria->add(new \Criteria('forum_id', (int)$forum_id));
+		}
 
-        return $topicHandler->getCount($criteria);
-    }
+		return $topicHandler->getCount($criteria);
+	}
 
-    /*
+	/*
     * Returns the total number of posts in the whole system, a forum, or a topic
     * Also can return the number of users on the system.
     */
-    /**
-     * @param  int    $id
-     * @param  string $type
-     * @return mixed
-     */
-    function getTotalPosts($id = 0, $type = 'all')
-    {
-        /** @var Newbb\PostHandler $postHandler */
-        $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
-        $criteria    = new \CriteriaCompo(new \Criteria('approved', 0, '>'));
-        switch ($type) {
-            case 'forum':
-                if ($id > 0) {
-                    $criteria->add(new \Criteria('forum_id', (int)$id));
-                }
-                break;
-            case 'topic':
-                if ($id > 0) {
-                    $criteria->add(new \Criteria('topic_id', (int)$id));
-                }
-                break;
-            case 'all':
-            default:
-                break;
-        }
+	/**
+	 * @param  int    $id
+	 * @param  string $type
+	 * @return mixed
+	 */
+	function getTotalPosts($id = 0, $type = 'all')
+	{
+		/** @var Newbb\PostHandler $postHandler */
+		$postHandler = Newbb\Helper::getInstance()->getHandler('Post');
+		$criteria    = new \CriteriaCompo(new \Criteria('approved', 0, '>'));
+		switch ($type) {
+			case 'forum':
+				if ($id > 0) {
+					$criteria->add(new \Criteria('forum_id', (int)$id));
+				}
+				break;
+			case 'topic':
+				if ($id > 0) {
+					$criteria->add(new \Criteria('topic_id', (int)$id));
+				}
+				break;
+			case 'all':
+			default:
+				break;
+		}
 
-        return $postHandler->getCount($criteria);
-    }
+		return $postHandler->getCount($criteria);
+	}
 
-    /**
-     * @return null
-     */
-    function getTotalViews()
-    {
-        $sql = 'SELECT sum(topic_views) FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' ';
-        if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-            return null;
-        }
-        list($total) = $GLOBALS['xoopsDB']->fetchRow($result);
+	/**
+	 * @return null
+	 */
+	function getTotalViews()
+	{
+		$sql = 'SELECT sum(topic_views) FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' ';
+		if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+			return null;
+		}
+		list($total) = $GLOBALS['xoopsDB']->fetchRow($result);
 
-        return $total;
-    }
+		return $total;
+	}
 }