Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: Florin C B. <ory...@us...> - 2013-03-19 02:01:52
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/modules In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31576/modules Modified Files: album_pic.php album_picm.php album_upload.php Log Message: Album Image Class Update to partialy support the other type of images Index: album_pic.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_pic.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** album_pic.php 18 Mar 2013 20:58:58 -0000 1.10 --- album_pic.php 19 Mar 2013 02:01:49 -0000 1.11 *************** *** 343,347 **** case '.xbm': $file_header = 'Content-type: image/xbm'; ! $read_function = 'imagecreatefromwxbm'; $send_function = 'SendToBrowser'; break; --- 343,347 ---- case '.xbm': $file_header = 'Content-type: image/xbm'; ! $read_function = 'imagecreatefromxbm'; $send_function = 'SendToBrowser'; break; Index: album_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_upload.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** album_upload.php 23 Dec 2008 06:59:33 -0000 1.7 --- album_upload.php 19 Mar 2013 02:01:49 -0000 1.8 *************** *** 21,27 **** } - - - if ($album_config['switch_nuffload'] == 1) { --- 21,24 ---- *************** *** 751,755 **** // Get File Upload Info // -------------------------------- - $filetype = $upload_files['type'][$index]; $filesize = $upload_files['size'][$index]; --- 748,751 ---- *************** *** 800,804 **** // Check file size // -------------------------------- - $recompress = 0; if ( ($album_config['dynamic_pic_resampling'] == 1) && (intval($album_config['max_file_size_resampling']) > intval($album_config['max_file_size'])) && ($album_config['switch_nuffload'] == 0) ) --- 796,799 ---- *************** *** 833,837 **** // Check file type // -------------------------------- - switch ($filetype) { --- 828,831 ---- *************** *** 844,849 **** } $pic_filetype = '.jpg'; ! break; ! case 'image/png': case 'image/x-png': --- 838,842 ---- } $pic_filetype = '.jpg'; ! break; case 'image/png': case 'image/x-png': *************** *** 853,858 **** } $pic_filetype = '.png'; ! break; ! case 'image/gif': if ($album_config['gif_allowed'] == 0) --- 846,850 ---- } $pic_filetype = '.png'; ! break; case 'image/gif': if ($album_config['gif_allowed'] == 0) *************** *** 861,865 **** } $pic_filetype = '.gif'; ! break; default: mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); --- 853,879 ---- } $pic_filetype = '.gif'; ! break; ! case 'image/xbm': ! if ($album_config['gif_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $pic_filetype = '.xbm'; ! break; ! case 'image/wbmp': ! case 'image/vnd.wap.wbmp': ! if ($album_config['gif_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $pic_filetype = '.wbmp'; ! break; ! case 'image/bmp': ! if ($album_config['gif_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $pic_filetype = '.bmp'; ! break; default: mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); *************** *** 886,896 **** // Generate filename // -------------------------------- - srand((double)microtime()*1000000); // for older than version 4.2.0 of PHP - do { $pic_filename = md5(uniqid(rand())) . $pic_filetype; } while( file_exists(ALBUM_UPLOAD_PATH . $pic_filename) ); --- 900,909 ---- // Generate filename // -------------------------------- srand((double)microtime()*1000000); // for older than version 4.2.0 of PHP do { $pic_filename = md5(uniqid(rand())) . $pic_filetype; } + while( file_exists(ALBUM_UPLOAD_PATH . $pic_filename) ); *************** *** 904,908 **** // Move this file to upload directory // -------------------------------- - $ini_val = ( @phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var'; --- 917,920 ---- *************** *** 933,939 **** @unlink($filetmp); } - @chmod(ALBUM_UPLOAD_PATH . $pic_filename, 0777); - if ($album_config['gd_version'] == 0) { --- 945,949 ---- *************** *** 943,953 **** } - // -------------------------------- // Well, it's an image. Check its image size // -------------------------------- - $pic_size = getimagesize(ALBUM_UPLOAD_PATH . $pic_filename); - $pic_width = $pic_size[0]; $pic_height = $pic_size[1]; --- 953,960 ---- *************** *** 968,972 **** // Resize on upload ! if ( ((($pic_width > $album_config['max_width']) || ($pic_height > $album_config['max_height'])) || ($recompress == 1)) && ($pic_filetype != '.gif')) { if ($album_config['gd_version'] == 0) --- 975,979 ---- // Resize on upload ! if ( ((($pic_width > $album_config['max_width']) || ($pic_height > $album_config['max_height'])) || ($recompress == 1)) && ($pic_filetype != '.xbmp')) { if ($album_config['gd_version'] == 0) *************** *** 980,991 **** switch ($pic_filetype) { ! case '.jpg': ! $read_function = 'imagecreatefromjpeg'; ! break; case '.png': ! $read_function = 'imagecreatefrompng'; ! break; } - $src = @$read_function(ALBUM_UPLOAD_PATH . $pic_filename); --- 987,1009 ---- switch ($pic_filetype) { ! case '.gif': ! $read_function = 'imageCreateFromGIF'; ! break; ! case '.jpeg': ! $read_function = 'imageCreateFromJPEG'; ! break; case '.png': ! $read_function = 'imageCreateFromPNG'; ! break; ! case '.wbmp': ! $read_function = 'imageCreateFromWBMP'; ! break; ! case '.bmp': ! $read_function = 'ImageCreateFromBMP'; ! break; ! default: ! $ermsg = $pic_filetype .' images are not supported<br />'; ! break; } $src = @$read_function(ALBUM_UPLOAD_PATH . $pic_filename); *************** *** 1199,1203 **** { $pic_thumbnail = $pic_filename; - // Write to disk switch ($pic_filetype) --- 1217,1220 ---- *************** *** 1210,1214 **** break; } - @chmod(ALBUM_CACHE_PATH . $pic_thumbnail, 0777); --- 1227,1230 ---- Index: album_picm.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_picm.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** album_picm.php 18 Mar 2013 21:38:44 -0000 1.11 --- album_picm.php 19 Mar 2013 02:01:49 -0000 1.12 *************** *** 306,310 **** break; case '.wbmp': ! $file_header = 'Content-type: image/wbmp'; $read_function = 'ReadSourceFile'; $send_function = 'SendToBrowser'; --- 306,310 ---- break; case '.wbmp': ! $file_header = 'Content-Type: image/vnd.wap.wbmp'; $read_function = 'ReadSourceFile'; $send_function = 'SendToBrowser'; |
|
From: Florin C B. <ory...@us...> - 2013-03-19 02:01:51
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31576/includes Modified Files: album_image_class.php Log Message: Album Image Class Update to partialy support the other type of images Index: album_image_class.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_image_class.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** album_image_class.php 18 Mar 2013 21:38:44 -0000 1.7 --- album_image_class.php 19 Mar 2013 02:01:49 -0000 1.8 *************** *** 67,71 **** case IMG_PNG: $read_function = 'imagecreatefrompng'; ! break; default: return false; --- 67,80 ---- case IMG_PNG: $read_function = 'imagecreatefrompng'; ! break; ! case IMG_XBM: [...1028 lines suppressed...] ! $b = ord($str[1]); ! $c = ord($str[2]); ! return $c*256*256 + $b*256 + $a; ! } ! function byte3($n) ! { ! return chr($n & 255) . chr(($n >> 8) & 255) . chr(($n >> 16) & 255); ! } ! function dword($n) ! { ! return pack("V", $n); } + function word($n) + { + return pack("v", $n); + } + ?> \ No newline at end of file |
|
From: Florin C B. <ory...@us...> - 2013-03-18 21:47:17
|
Update of /cvsroot/mxbb/mx_smartor/templates/_core/images In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19753 Removed Files: Thumbs.db Log Message: database schema upgrade for mx_smartor 3.0 and FAP 1.5.0 plus some files --- Thumbs.db DELETED --- |
|
From: Florin C B. <ory...@us...> - 2013-03-18 21:47:09
|
Update of /cvsroot/mxbb/mx_smartor/upload/users In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19728 Added Files: index.html Log Message: database schema upgrade for mx_smartor 3.0 and FAP 1.5.0 plus some files --- NEW FILE: index.html --- <html> <head> <title>Photo Album Addon by Smartor</title> </head> <body> <br /><br /><br /><br /><br /><br /><br /> <center><h1><a href="http://smartor.is-root.com">http://smartor.is-root.com</a></h1></center> </body> |
|
From: Florin C B. <ory...@us...> - 2013-03-18 21:47:01
|
Update of /cvsroot/mxbb/mx_smartor/album_mod In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19686 Added Files: nopicture.gif nothumbnail.gif Log Message: database schema upgrade for mx_smartor 3.0 and FAP 1.5.0 plus some files --- NEW FILE: nothumbnail.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nopicture.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Florin C B. <ory...@us...> - 2013-03-18 21:42:02
|
Update of /cvsroot/mxbb/mx_smartor/upload/users In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19081/users Log Message: Directory /cvsroot/mxbb/mx_smartor/upload/users added to the repository |
|
From: Florin C B. <ory...@us...> - 2013-03-18 21:38:47
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/modules In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18812/modules Modified Files: album_pic_nuffed.php album_picm.php Log Message: database schema upgrade for mx_smartor 3.0 and FAP 1.5.0 plus some files Index: album_pic_nuffed.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_pic_nuffed.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** album_pic_nuffed.php 23 Jul 2010 11:15:17 -0000 1.4 --- album_pic_nuffed.php 18 Mar 2013 21:38:44 -0000 1.5 *************** *** 1,22 **** <?php ! /*************************************************************************** ! * album_pic_nuffed.php ! * ------------------- ! * begin : 2005/11/10 ! * copyright : Mighty Gorgon ! * email : mig...@mi... ! * ! * $Id: album_pic_nuffed.php, v 1.0.0 2005/11/10 ! * ! ***************************************************************************/ ! ! /*************************************************************************** * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! ***************************************************************************/ // MX --- 1,11 ---- <?php ! /** * ! * @package Mx-Publisher Module - mx_smartor ! * @version $Id$ ! * @copyright (c) 2003 [sma...@ho..., Smartor] Mx-Publisher Development Team ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * ! */ // MX *************** *** 47,50 **** --- 36,47 ---- mx_message_die(GENERAL_MESSAGE, 'No pics specified'); } + //$pic_id = phpBB3::request_var('pic_id', 0); + if ($pic_id <= 0) + { + image_no_thumbnail('no_thumb.jpg'); + exit; + //die($lang['NO_PICS_SPECIFIED']); + //message_die(GENERAL_MESSAGE, $lang['NO_PICS_SPECIFIED']); + } // ------------------------------------ *************** *** 54,61 **** { $sql = "SELECT p.*, c.* ! FROM ". ALBUM_TABLE ." AS p, ". ALBUM_CAT_TABLE ." AS c ! WHERE p.pic_id = '$pic_id' ! AND c.cat_id = p.pic_cat_id"; ! if( !($result = $db->sql_query($sql)) ) { --- 51,58 ---- { $sql = "SELECT p.*, c.* ! FROM " . ALBUM_TABLE . " AS p, " . ALBUM_CAT_TABLE . " AS c ! WHERE pic_id = '" . $pic_id . "' ! AND c.cat_id = p.pic_cat_id ! LIMIT 1"; if( !($result = $db->sql_query($sql)) ) { *************** *** 68,72 **** $sql = "SELECT * FROM ". ALBUM_TABLE ." ! WHERE pic_id = '$pic_id'"; if( !($result = $db->sql_query($sql)) ) { --- 65,69 ---- $sql = "SELECT * FROM ". ALBUM_TABLE ." ! WHERE pic_id = '$pic_id'"; if( !($result = $db->sql_query($sql)) ) { *************** *** 75,79 **** $thispic = $db->sql_fetchrow($result); } - $db->sql_freeresult($result); --- 72,75 ---- *************** *** 81,106 **** $album_user_id = $thispic['cat_user_id']; ! $pic_filename = $thispic['pic_filename']; ! $file_part = explode('.', strtolower($pic_filename)); ! $pic_filetype = $file_part[sizeof($file_part) - 1]; ! $pic_title = substr($pic_filename, 0, strlen($pic_filename) - strlen($pic_filetype) - 1); ! $pic_title = $thispic['pic_title']; ! $pic_thumbnail = $thispic['pic_thumbnail']; ! if( empty($thispic) || !file_exists(ALBUM_UPLOAD_PATH . $pic_filename) ) { - if(empty($images['no_picure']) || file_exists($module_root_path. 'album_mod/nopicture.jpg')) - { - header('Content-type: image/jpeg'); - header('Content-Disposition: filename=\'PHPBB_URL. $module_root_path. \'album_mod/nopicture.jpg'); - readfile($module_root_path. 'album_mod/nopicture.jpg'); - } - else - { - header('Content-type: image/jpeg'); - header('Content-Disposition: filename=' . $images['no_picure']); - readfile($images['no_picure']); - } - exit; mx_message_die(GENERAL_MESSAGE, $lang['Pic_not_exist']); } --- 77,85 ---- $album_user_id = $thispic['cat_user_id']; ! $pic_info = array(); ! $pic_info = pic_info($thispic['pic_filename'], $thispic['pic_thumbnail'], $thispic['pic_title']); ! if(empty($thispic) || ($pic_info['exists'] == false) || !file_exists($pic_info['fullpath'])) { mx_message_die(GENERAL_MESSAGE, $lang['Pic_not_exist']); } *************** *** 110,116 **** // ------------------------------------ $album_user_access = album_permissions($album_user_id, $cat_id, ALBUM_AUTH_VIEW, $thispic); ! if( $album_user_access['view'] == false ) { ! mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); } --- 89,95 ---- // ------------------------------------ $album_user_access = album_permissions($album_user_id, $cat_id, ALBUM_AUTH_VIEW, $thispic); ! if($album_user_access['view'] == false) { ! mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorized']); } *************** *** 118,129 **** // Check Pic Approval // ------------------------------------ ! ! if( $userdata['user_level'] != ADMIN ) { ! if( ($thispic['cat_approval'] == ADMIN) || (($thispic['cat_approval'] == MOD) && !$album_user_access['moderator']) ) { ! if( $thispic['pic_approval'] != 1 ) { ! mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); } } --- 97,107 ---- // Check Pic Approval // ------------------------------------ ! if($user->data['user_level'] != ADMIN) { ! if(($thispic['cat_approval'] == ADMIN) || (($thispic['cat_approval'] == MOD) && !$album_user_access['moderator'])) { ! if($thispic['pic_approval'] != 1) { ! mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorized']); } } *************** *** 133,139 **** // Check hotlink // ------------------------------------ ! if( ($album_config['hotlink_prevent'] == true) && (isset($HTTP_SERVER_VARS['HTTP_REFERER'])) ) { ! $check_referer = explode('?', $HTTP_SERVER_VARS['HTTP_REFERER']); $check_referer = trim($check_referer[0]); --- 111,117 ---- // Check hotlink // ------------------------------------ ! if(($album_config['hotlink_prevent'] == true) && (isset($_SERVER['HTTP_REFERER']))) { ! $check_referer = explode('?', $_SERVER['HTTP_REFERER']); $check_referer = trim($check_referer[0]); *************** *** 145,157 **** } ! $good_referers[] = $board_config['server_name'] . $board_config['script_path']; $errored = true; ! for ($i = 0; $i < count($good_referers); $i++) { $good_referers[$i] = trim($good_referers[$i]); ! if( (strstr($check_referer, $good_referers[$i])) && ($good_referers[$i] != '') ) { $errored = false; --- 123,135 ---- } ! $good_referers[] = $config['server_name'] . $config['script_path']; $errored = true; ! for ($i = 0; $i < sizeof($good_referers); $i++) { $good_referers[$i] = trim($good_referers[$i]); ! if((strstr($check_referer, $good_referers[$i])) && ($good_referers[$i] != '')) { $errored = false; *************** *** 159,169 **** } ! if( $errored ) { ! mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); /* ! header('Content-type: image/jpeg'); ! header('Content-Disposition: filename=' . $pic_title_reg . '.' . $pic_filetype); ! readfile($images['no_thumbnail']); exit; */ --- 137,145 ---- } ! if($errored) { ! mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorized']); /* ! image_no_thumbnail($pic_info['title_reg'] . '.' . $pic_info['filetype']); exit; */ *************** *** 174,184 **** $Image = new ImgObj(); ! $Image->ReadSourceFile(ALBUM_UPLOAD_PATH . $pic_filename); ! //include(ALBUM_UPLOAD_PATH . $pic_filename); ! if( (($nuff_http['nuff_sepia'] == true) || ($nuff_http['nuff_bw'] == true) || ($nuff_http['nuff_blur'] == true) || ($nuff_http['nuff_scatter'] == true)) && ($album_config['enable_sepia_bw'] == true) ) { ! ( ($nuff_http['nuff_resize_w'] == 0) || ($nuff_http['nuff_resize_w'] > 200) ) ? ($nuff_http['nuff_resize_w'] = 200) : false; ! ( ($nuff_http['nuff_resize_h'] == 0) || ($nuff_http['nuff_resize_h'] > 150) ) ? ($nuff_http['nuff_resize_h'] = 150) : false; $Image->Resize($nuff_http['nuff_resize_w'], $nuff_http['nuff_resize_h']); --- 150,160 ---- $Image = new ImgObj(); ! $Image->ReadSourceFile($pic_info['fullpath']); ! ! if((($nuff_http['nuff_sepia'] == true) || ($nuff_http['nuff_bw'] == true) || ($nuff_http['nuff_blur'] == true) || ($nuff_http['nuff_scatter'] == true)) && ($album_config['enable_sepia_bw'] == true)) { ! (($nuff_http['nuff_resize_w'] == 0) || ($nuff_http['nuff_resize_w'] > 200)) ? ($nuff_http['nuff_resize_w'] = 200) : false; ! (($nuff_http['nuff_resize_h'] == 0) || ($nuff_http['nuff_resize_h'] > 150)) ? ($nuff_http['nuff_resize_h'] = 150) : false; $Image->Resize($nuff_http['nuff_resize_w'], $nuff_http['nuff_resize_h']); *************** *** 230,234 **** //Rotate anti-clockwise degrees (transparency lost) ! if( $nuff_http['nuff_rotation_d'] > 0 ) { ($nuff_http['nuff_rotation'] == true) ? $Image->Rotate($nuff_http['nuff_rotation_d']) : false; --- 206,210 ---- //Rotate anti-clockwise degrees (transparency lost) ! if($nuff_http['nuff_rotation_d'] > 0) { ($nuff_http['nuff_rotation'] == true) ? $Image->Rotate($nuff_http['nuff_rotation_d']) : false; *************** *** 236,245 **** //WatermarkPos(File, Pos, Size, Transition) ! if( ($pic_filetype != 'gif') && ($album_config['use_watermark'] == true) && ($userdata['user_level'] != ADMIN) && ! ( (!$userdata['session_logged_in']) || ($album_config['wut_users'] == 1)) ) { //$wm_file = ALBUM_WM_FILE; $wm_file = (file_exists($thispic['cat_wm']) ? $thispic['cat_wm'] : ALBUM_WM_FILE); ! $wm_position = ( ($album_config['disp_watermark_at'] > 0) && ($album_config['disp_watermark_at'] < 10) ) ? $album_config['disp_watermark_at'] : 5; $wm_maxsize = 50; $wm_transition = 100; --- 212,221 ---- //WatermarkPos(File, Pos, Size, Transition) ! if(($pic_info['filetype'] != 'gif') && ($album_config['use_watermark'] == true) && ($user->data['user_level'] != ADMIN) && ! ((!$user->data['session_logged_in']) || ($album_config['wut_users'] == 1))) { //$wm_file = ALBUM_WM_FILE; $wm_file = (file_exists($thispic['cat_wm']) ? $thispic['cat_wm'] : ALBUM_WM_FILE); ! $wm_position = (($album_config['disp_watermark_at'] > 0) && ($album_config['disp_watermark_at'] < 10)) ? $album_config['disp_watermark_at'] : 5; $wm_maxsize = 50; $wm_transition = 100; *************** *** 247,256 **** } ! $Image->SendToFile(ALBUM_UPLOAD_PATH . "cache/" . $pic_filename); //Write image to file //JPG Compression ! $nuff_http['nuff_recompress_r'] = (($nuff_http['nuff_recompress'] == false) || ($nuff_http['nuff_recompress_r'] == 0)) ? 75 : false; ! $Image->SendToBrowser($pic_title, $pic_filetype, '', '_nuffed', $nuff_http['nuff_recompress_r']); $Image->Destroy(); //Destroy whole class including GD image in memory. --- 223,232 ---- } ! //$Image->SendToFile("cache/test2"); //Write image to file //JPG Compression ! (($nuff_http['nuff_recompress'] == false) || ($nuff_http['nuff_recompress_r'] == 0)) ? ($nuff_http['nuff_recompress_r'] = 75) : false; ! $Image->SendToBrowser($pic_info['title_reg'], $pic_info['filetype'], '', '_nuffed', $nuff_http['nuff_recompress_r']); $Image->Destroy(); //Destroy whole class including GD image in memory. Index: album_picm.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_picm.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** album_picm.php 18 Mar 2013 20:58:58 -0000 1.10 --- album_picm.php 18 Mar 2013 21:38:44 -0000 1.11 *************** *** 54,62 **** { //$sql = "SELECT * FROM " . ALBUM_TABLE . " WHERE pic_id = '$pic_id'"; ! $sql = "SELECT p.*, c.* ! FROM " . ALBUM_TABLE . " AS p, " . ALBUM_CAT_TABLE . " AS c ! WHERE p.pic_id = '" . $pic_id . "' ! AND c.cat_id = p.pic_cat_id ! LIMIT 1"; if (!($result = $db->sql_query($sql))) { --- 54,71 ---- { //$sql = "SELECT * FROM " . ALBUM_TABLE . " WHERE pic_id = '$pic_id'"; ! if ($cat_id != PERSONAL_GALLERY) ! { ! $sql = "SELECT p.*, c.* ! FROM ". ALBUM_TABLE ." AS p, ". ALBUM_CAT_TABLE ." AS c ! WHERE p.pic_id = '$pic_id' ! AND c.cat_id = p.pic_cat_id"; ! } ! else ! { ! $sql = "SELECT * ! FROM ". ALBUM_TABLE ." ! WHERE pic_id = '$pic_id'"; ! ! } if (!($result = $db->sql_query($sql))) { *************** *** 70,74 **** } } - $thispic = $db->sql_fetchrow($result); $db->sql_freeresult($result); --- 79,82 ---- |
|
From: Florin C B. <ory...@us...> - 2013-03-18 21:38:46
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18812/includes Modified Files: album_image_class.php Log Message: database schema upgrade for mx_smartor 3.0 and FAP 1.5.0 plus some files Index: album_image_class.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_image_class.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** album_image_class.php 18 Mar 2013 20:58:58 -0000 1.6 --- album_image_class.php 18 Mar 2013 21:38:44 -0000 1.7 *************** *** 2139,2179 **** /* Resize */ ! $nuff_http['nuff_resize'] = request_var('nuff_resize', 0); /* Resize Width */ ! $nuff_http['nuff_resize_w'] = request_var('nuff_resize_w', 0); /* Resize Height*/ ! $nuff_http['nuff_resize_h'] = request_var('nuff_resize_h', 0); /* Recompression */ ! $nuff_http['nuff_recompress'] = request_var('nuff_recompress', 0); /* Recompression Ratio */ ! $nuff_http['nuff_recompress_r'] = request_var('nuff_recompress_r', 0); /* Rotation */ ! $nuff_http['nuff_rotation'] = request_var('nuff_rotation', 0); /* Rotation Degree */ ! $nuff_http['nuff_rotation_d'] = request_var('nuff_rotation_d', 0); /* Sepia */ ! $nuff_http['nuff_sepia'] = request_var('nuff_sepia', 0); /* Black And White */ ! $nuff_http['nuff_bw'] = request_var('nuff_bw', 0); /* Mirror */ ! $nuff_http['nuff_mirror'] = request_var('nuff_mirror', 0); /* Flip */ ! $nuff_http['nuff_flip'] = request_var('nuff_flip', 0); /* Blur */ ! $nuff_http['nuff_blur'] = request_var('nuff_blur', 0); /* Pixelate */ ! $nuff_http['nuff_pixelate'] = request_var('nuff_pixelate', 0); /* Scatter */ ! $nuff_http['nuff_scatter'] = request_var('nuff_scatter', 0); /* Infrared */ ! $nuff_http['nuff_infrared'] = request_var('nuff_infrared', 0); /* Tint */ ! $nuff_http['nuff_tint'] = request_var('nuff_tint', 0); /* Interlace */ ! $nuff_http['nuff_interlace'] = request_var('nuff_interlace', 0); /* Screen */ ! $nuff_http['nuff_screen'] = request_var('nuff_screen', 0); /* Stereogram */ ! $nuff_http['nuff_stereogram'] = request_var('nuff_stereogram', 0); $nuff_http_full_string = ''; --- 2139,2179 ---- /* Resize */ ! $nuff_http['nuff_resize'] = phpBB3::request_var('nuff_resize', 0); /* Resize Width */ ! $nuff_http['nuff_resize_w'] = phpBB3::request_var('nuff_resize_w', 0); /* Resize Height*/ ! $nuff_http['nuff_resize_h'] = phpBB3::request_var('nuff_resize_h', 0); /* Recompression */ ! $nuff_http['nuff_recompress'] = phpBB3::request_var('nuff_recompress', 0); /* Recompression Ratio */ ! $nuff_http['nuff_recompress_r'] = phpBB3::request_var('nuff_recompress_r', 0); /* Rotation */ ! $nuff_http['nuff_rotation'] = phpBB3::request_var('nuff_rotation', 0); /* Rotation Degree */ ! $nuff_http['nuff_rotation_d'] = phpBB3::request_var('nuff_rotation_d', 0); /* Sepia */ ! $nuff_http['nuff_sepia'] = phpBB3::request_var('nuff_sepia', 0); /* Black And White */ ! $nuff_http['nuff_bw'] = phpBB3::request_var('nuff_bw', 0); /* Mirror */ ! $nuff_http['nuff_mirror'] = phpBB3::request_var('nuff_mirror', 0); /* Flip */ ! $nuff_http['nuff_flip'] = phpBB3::request_var('nuff_flip', 0); /* Blur */ ! $nuff_http['nuff_blur'] = phpBB3::request_var('nuff_blur', 0); /* Pixelate */ ! $nuff_http['nuff_pixelate'] = phpBB3::request_var('nuff_pixelate', 0); /* Scatter */ ! $nuff_http['nuff_scatter'] = phpBB3::request_var('nuff_scatter', 0); /* Infrared */ ! $nuff_http['nuff_infrared'] = phpBB3::request_var('nuff_infrared', 0); /* Tint */ ! $nuff_http['nuff_tint'] = phpBB3::request_var('nuff_tint', 0); /* Interlace */ ! $nuff_http['nuff_interlace'] = phpBB3::request_var('nuff_interlace', 0); /* Screen */ ! $nuff_http['nuff_screen'] = phpBB3::request_var('nuff_screen', 0); /* Stereogram */ ! $nuff_http['nuff_stereogram'] = phpBB3::request_var('nuff_stereogram', 0); $nuff_http_full_string = ''; |
|
From: Florin C B. <ory...@us...> - 2013-03-18 20:59:00
|
Update of /cvsroot/mxbb/mx_smartor In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16285 Modified Files: album.php Log Message: database schema upgrade for mx_smartor 3.0 and FAP 1.5.0 plus some files Index: album.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** album.php 18 Mar 2013 05:51:46 -0000 1.29 --- album.php 18 Mar 2013 20:58:57 -0000 1.30 *************** *** 321,325 **** else if ( $mode == 'album_picm' ) { ! error_reporting(E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables include($album_root_path. 'modules/album_picm.'.$phpEx); } --- 321,326 ---- else if ( $mode == 'album_picm' ) { ! error_reporting(E_ALL & ~E_NOTICE); //Default error reporting in PHP 5.2+ ! //error_reporting(E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables include($album_root_path. 'modules/album_picm.'.$phpEx); } *************** *** 637,641 **** +----------------------- */ - $page_title = $lang['Album']; --- 638,641 ---- |
|
From: Florin C B. <ory...@us...> - 2013-03-18 05:51:49
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/modules In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4712/album_mod/modules Modified Files: album_picm.php Log Message: database schema upgrade for mx_smartor 3.0 and FAP 1.5.0 plus some files Index: album_picm.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_picm.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** album_picm.php 8 Nov 2011 07:17:16 -0000 1.8 --- album_picm.php 18 Mar 2013 05:51:46 -0000 1.9 *************** *** 56,60 **** { //$sql = "SELECT * FROM " . ALBUM_TABLE . " WHERE pic_id = '$pic_id'"; - // ------------------------------------ // Get this pic info and current Category Info --- 56,59 ---- *************** *** 65,69 **** AND c.cat_id = p.pic_cat_id LIMIT 1"; - if (!($result = $db->sql_query($sql))) { --- 64,67 ---- *************** *** 105,109 **** $pic_info = array(); ! $pic_info = (@function_exists('mx_message_die')) ? @pic_info($thispic['pic_filename'], $thispic['pic_thumbnail'], $thispic['pic_title']) : false; $apply_wm = false; --- 103,107 ---- $pic_info = array(); ! $pic_info = pic_info($thispic['pic_filename'], $thispic['pic_thumbnail'], $thispic['pic_title']); $apply_wm = false; *************** *** 118,124 **** } ! if( empty($thispic) or !file_exists(ALBUM_UPLOAD_PATH . $pic_filename) ) { ! die($lang['Pic_not_exist']); } --- 116,122 ---- } ! if(empty($thispic) or !file_exists($pic_info['fullpath'])) { ! mx_message_die(GENERAL_MESSAGE, $lang['Pic_not_exist'] . ': ' . $pic_info['fullpath']); } *************** *** 140,144 **** if(empty($thispic) || ($pic_info['exists'] == false) || !file_exists($pic_info['fullpath'])) { ! mx_message_die(GENERAL_MESSAGE, $lang['Pic_not_exist']); } --- 138,142 ---- if(empty($thispic) || ($pic_info['exists'] == false) || !file_exists($pic_info['fullpath'])) { ! mx_message_die(GENERAL_MESSAGE, $lang['Pic_not_exist'] . ': ' . $pic_fullpath); } |
|
From: Florin C B. <ory...@us...> - 2013-03-18 05:51:48
|
Update of /cvsroot/mxbb/mx_smartor In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4712 Modified Files: album.php Log Message: database schema upgrade for mx_smartor 3.0 and FAP 1.5.0 plus some files Index: album.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** album.php 3 Mar 2011 14:28:40 -0000 1.28 --- album.php 18 Mar 2013 05:51:46 -0000 1.29 *************** *** 321,325 **** else if ( $mode == 'album_picm' ) { ! error_reporting(E_ALL); //Errors will coupt thumbnalis include($album_root_path. 'modules/album_picm.'.$phpEx); } --- 321,325 ---- else if ( $mode == 'album_picm' ) { ! error_reporting(E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables include($album_root_path. 'modules/album_picm.'.$phpEx); } |
Update of /cvsroot/mxbb/mx_smartor/album_mod/modules In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30185/album_mod/modules Modified Files: album_cat_sort.php album_comment.php album_memberlist.php album_personal.php album_personal_random.php album_thumbnail.php Log Message: database schema upgrade for mx_smartor 3.0 and FAP 1.5.0 plus some files Index: album_personal.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_personal.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** album_personal.php 23 Dec 2008 06:59:33 -0000 1.5 --- album_personal.php 18 Mar 2013 03:41:25 -0000 1.6 *************** *** 28,31 **** --- 28,39 ---- } + // ------------------------------------------------------------------------ + // This file is only included in the album.php and album_cat.php, it should be stored in the album_mod folder + // ------------------------------------------------------------------------ + + // ------------------------------------------------------------------------ + // $album_user_id, $cat_id and $moderators_list are as default set in album.php and in album_cat.php files in the main folder. + // ------------------------------------------------------------------------ + // ------------------------------------ // Check the request *************** *** 228,232 **** // Count Pics // ------------------------------------ - $sql = "SELECT COUNT(pic_id) AS count FROM ". ALBUM_TABLE ." --- 236,239 ---- *************** *** 246,250 **** // Build up // ------------------------------------ - if ($total_pics > 0) { --- 253,256 ---- *************** *** 276,280 **** // Thumbnails table // -------------------------------- - for ($i = 0; $i < count($picrow); $i += $album_config['cols_per_page']) { --- 282,285 ---- *************** *** 287,291 **** break; } - $template->assign_block_vars('picrow.piccol', array( 'U_PIC' => ($album_config['fullpic_popup']) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=". $picrow[$j]['pic_id'])) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=". $picrow[$j]['pic_id'])), --- 292,295 ---- *************** *** 295,302 **** ); $image_rating = ImageRating($picrow[$j]['rating']); $template->assign_block_vars('picrow.pic_detail', array( ! 'TITLE' => $picrow[$j]['pic_title'],album_create_date 'TIME' => album_create_date($board_config['default_dateformat'], $picrow[$j]['pic_time'], $board_config['board_timezone']), --- 299,326 ---- ); + // -------------------------------- + // Prepare variables + // -------------------------------- + $pic_user_id = $userdata['user_id']; + $pic_user_ip = $userdata['session_ip']; + + switch (PORTAL_BACKEND) + { + case 'internal': + case 'phpbb2': + $pic_user_id = $userdata['user_id']; + $pic_user_ip = $userdata['session_ip']; + break; + case 'phpbb3': + $pic_user_id = $mx_user->data['user_id']; + $pic_user_ip = album_encode_ip($mx_user->data['session_ip']); + break; + } + $image_rating = ImageRating($picrow[$j]['rating']); $template->assign_block_vars('picrow.pic_detail', array( ! 'TITLE' => $picrow[$j]['pic_title'], ! 'TIME' => album_create_date($board_config['default_dateformat'], $picrow[$j]['pic_time'], $board_config['board_timezone']), *************** *** 313,317 **** 'LOCK' => ($userdata['user_level'] == ADMIN) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&mode=". (($picrow[$j]['pic_lock'] == 0) ? 'lock' : 'unlock') ."&pic_id=". $picrow[$j]['pic_id'])) .'">'. (($picrow[$j]['pic_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.domaintools.com/' . decode_ip2($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($picrow[$j]['pic_user_ip']) .'</a><br />' : '' ) ); --- 337,341 ---- 'LOCK' => ($userdata['user_level'] == ADMIN) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&mode=". (($picrow[$j]['pic_lock'] == 0) ? 'lock' : 'unlock') ."&pic_id=". $picrow[$j]['pic_id'])) .'">'. (($picrow[$j]['pic_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.domaintools.com/' . album_decode_ip($picrow[$j]['pic_user_ip']) . '" target="_blank">' . album_decode_ip($picrow[$j]['pic_user_ip']) .'</a><br />' : '' ) ); Index: album_personal_random.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_personal_random.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** album_personal_random.php 3 Mar 2011 14:28:40 -0000 1.4 --- album_personal_random.php 18 Mar 2013 03:41:25 -0000 1.5 *************** *** 190,194 **** // Count Pics // ------------------------------------ - $sql = "SELECT COUNT(pic_id) AS count FROM ". ALBUM_TABLE ." --- 190,193 ---- *************** *** 208,212 **** // Build up // ------------------------------------ - if ($total_pics > 0) { --- 207,210 ---- *************** *** 238,242 **** // Thumbnails table // -------------------------------- - for ($i = 0; $i < count($picrow); $i += $album_config['cols_per_page']) { --- 236,239 ---- *************** *** 249,258 **** break; } ! $avatar_number = rand(1,$j); ! $upic = ($album_config['fullpic_popup']) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=". $picrow[$avatar_number]['pic_id'])) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=". $picrow[$j]['pic_id'])); ! $thumnail = mx_append_sid('album.' . $phpEx . "?smartor_mode=album_thumbnail&pic_id=". $picrow[$avatar_number]['pic_id'], TRUE); ! $pic_id = $picrow[$avatar_number]['pic_id']; ! ! } } --- 246,254 ---- break; } ! $avatar_number = rand(0, $j); ! $upic = ($album_config['fullpic_popup']) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=". $picrow[$avatar_number]['pic_id'])) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=". $picrow[$j]['pic_id'])); ! $thumnail = mx_append_sid('album.' . $phpEx . "?smartor_mode=album_thumbnail&pic_id=". $picrow[$avatar_number]['pic_id'], TRUE); ! $pic_id = $picrow[$avatar_number]['pic_id']; ! } } *************** *** 280,284 **** $thispic = '0'; } ! elseif ($cat_id != PERSONAL_GALLERY) { $sql = "SELECT p.*, c.* --- 276,281 ---- $thispic = '0'; } ! ! if ($cat_id != PERSONAL_GALLERY) { $sql = "SELECT p.*, c.* Index: album_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_comment.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** album_comment.php 23 Dec 2008 06:59:33 -0000 1.7 --- album_comment.php 18 Mar 2013 03:41:25 -0000 1.8 *************** *** 308,312 **** 'POSTER' => $poster, 'TIME' => album_create_date($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']), ! 'IP' => ($userdata['user_level'] == ADMIN) ? '-----------------------------------<br />' . $lang['IP_Address'] . ': <a href="http://whois.domaintools.com/' . decode_ip2($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . decode_ip2($commentrow[$i]['comment_user_ip']) .'</a><br />' : '', 'TEXT' => nl2br($commentrow[$i]['comment_text']), --- 308,312 ---- 'POSTER' => $poster, 'TIME' => album_create_date($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']), ! 'IP' => ($userdata['user_level'] == ADMIN) ? '-----------------------------------<br />' . $lang['IP_Address'] . ': <a href="http://whois.domaintools.com/' . album_decode_ip($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . album_decode_ip($commentrow[$i]['comment_user_ip']) .'</a><br />' : '', 'TEXT' => nl2br($commentrow[$i]['comment_text']), Index: album_cat_sort.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_cat_sort.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** album_cat_sort.php 9 Aug 2011 04:32:19 -0000 1.7 --- album_cat_sort.php 18 Mar 2013 03:41:25 -0000 1.8 *************** *** 483,487 **** 'LOCK' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid("album_modcp.$phpEx?mode=". (($picrow[$j]['pic_lock'] == 0) ? 'lock' : 'unlock') ."&pic_id=". $picrow[$j]['pic_id']) .'">'. (($picrow[$j]['pic_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.domaintools.com/' . decode_ip2($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($picrow[$j]['pic_user_ip']) .'</a><br />' : '' ) ); --- 483,487 ---- 'LOCK' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid("album_modcp.$phpEx?mode=". (($picrow[$j]['pic_lock'] == 0) ? 'lock' : 'unlock') ."&pic_id=". $picrow[$j]['pic_id']) .'">'. (($picrow[$j]['pic_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.domaintools.com/' . album_decode_ip($picrow[$j]['pic_user_ip']) . '" target="_blank">' . album_decode_ip($picrow[$j]['pic_user_ip']) .'</a><br />' : '' ) ); Index: album_memberlist.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_memberlist.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** album_memberlist.php 23 Dec 2008 06:59:33 -0000 1.5 --- album_memberlist.php 18 Mar 2013 03:41:25 -0000 1.6 *************** *** 271,275 **** 'MOVE' => ($userdata['user_level'] == ADMIN) ? '<a href="'. mx_append_sid(album_append_uid("album_modcp.$phpEx?mode=move&pic_id=". $picrow[$j]['pic_id'])) . '">' . $lang['Move'] . '</a>' : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip2($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($picrow[$j]['pic_user_ip']) .'</a><br />' : '' ) ); --- 271,275 ---- 'MOVE' => ($userdata['user_level'] == ADMIN) ? '<a href="'. mx_append_sid(album_append_uid("album_modcp.$phpEx?mode=move&pic_id=". $picrow[$j]['pic_id'])) . '">' . $lang['Move'] . '</a>' : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . album_decode_ip($picrow[$j]['pic_user_ip']) . '" target="_blank">' . album_decode_ip($picrow[$j]['pic_user_ip']) .'</a><br />' : '' ) ); Index: album_thumbnail.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_thumbnail.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** album_thumbnail.php 8 Nov 2011 07:17:16 -0000 1.10 --- album_thumbnail.php 18 Mar 2013 03:41:25 -0000 1.11 *************** *** 50,54 **** // ------------------------------------ // Get this pic info and current category info ! // ------------------------------------ $sql = "SELECT p.*, c.* FROM " . ALBUM_TABLE . " AS p, " . ALBUM_CAT_TABLE . " AS c --- 50,54 ---- // ------------------------------------ // Get this pic info and current category info ! // ------------------------------------ $sql = "SELECT p.*, c.* FROM " . ALBUM_TABLE . " AS p, " . ALBUM_CAT_TABLE . " AS c *************** *** 76,80 **** } } ! @define('ALBUM_NOPIC_PATH', $module_root_path . 'album_mod/'); // Mighty Gorgon: this code is reserved for generating extra thumbnail size on the fly... --- 76,80 ---- } } ! //@define('ALBUM_NOPIC_PATH', $module_root_path . 'album_mod/'); // Mighty Gorgon: this code is reserved for generating extra thumbnail size on the fly... *************** *** 107,115 **** $pic_size = @getimagesize($pic_fullpath); //$pic_size = get_full_image_info($pic_fullpath); if($pic_size == false) { $pic_fullpath = $pic_nopic_fullpath; ! $pic_size = @getimagesize($pic_fullpath); } /* --- 107,116 ---- $pic_size = @getimagesize($pic_fullpath); //$pic_size = get_full_image_info($pic_fullpath); + //mx_message_die(GENERAL_MESSAGE, $lang['Pic_not_exist'] . ': ' . $pic_fullpath); if($pic_size == false) { $pic_fullpath = $pic_nopic_fullpath; ! $pic_size = getimagesize($pic_fullpath); } /* *************** *** 126,130 **** $pic_thumbnail_fullpath = ALBUM_CACHE_PATH . $pic_thumbnail; ! if( empty($thispic) || !file_exists($pic_fullpath) ) { mx_message_die(GENERAL_MESSAGE, $lang['Pic_not_exist'] . ': ' . $pic_fullpath); --- 127,131 ---- $pic_thumbnail_fullpath = ALBUM_CACHE_PATH . $pic_thumbnail; ! if( empty($thispic) || !@file_exists($pic_fullpath) ) { mx_message_die(GENERAL_MESSAGE, $lang['Pic_not_exist'] . ': ' . $pic_fullpath); |
|
From: Florin C B. <ory...@us...> - 2013-03-18 03:41:27
|
Update of /cvsroot/mxbb/mx_smartor In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30185 Modified Files: db_install.php db_uninstall.php db_upgrade.php Log Message: database schema upgrade for mx_smartor 3.0 and FAP 1.5.0 plus some files Index: db_uninstall.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/db_uninstall.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** db_uninstall.php 3 Mar 2011 14:28:40 -0000 1.13 --- db_uninstall.php 18 Mar 2013 03:41:25 -0000 1.14 *************** *** 39,45 **** "DROP TABLE ".$mx_table_prefix."smartor_album_rate ", "DROP TABLE ".$mx_table_prefix."smartor_album_comment ", "DROP TABLE ".$mx_table_prefix."smartor_album_cat ", "DROP TABLE ".$mx_table_prefix."smartor_album_config ", ! "DROP TABLE ".$mx_table_prefix."smartor_album_sp_config " ); --- 39,46 ---- "DROP TABLE ".$mx_table_prefix."smartor_album_rate ", "DROP TABLE ".$mx_table_prefix."smartor_album_comment ", + "DROP TABLE ".$mx_table_prefix."smartor_album_comment_watch ", "DROP TABLE ".$mx_table_prefix."smartor_album_cat ", "DROP TABLE ".$mx_table_prefix."smartor_album_config ", ! "DROP TABLE ".$mx_table_prefix."smartor_album_sp_config " ); Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/db_install.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** db_install.php 9 Aug 2011 04:32:19 -0000 1.35 --- db_install.php 18 Mar 2013 03:41:25 -0000 1.36 *************** *** 37,42 **** switch (PORTAL_BACKEND) { ! case 'internal': ! case 'phpbb2': --- 37,41 ---- switch (PORTAL_BACKEND) { ! case 'internal': case 'phpbb2': *************** *** 52,56 **** } ! $mx_module_version = '2.9.9'; $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by <a href="" target="_blank">Jon Ohlsson</a> & <a href="http://mxpcms.sourceforge.net/" target="_blank">Florin C. Bodin</a> & <a href="http://www.icyphoenix.com/" target="_blank">Mighty Gorgon</a> & <a href="http://smartor.is-root.com/" target="_blank">Smartor</a>'; --- 51,55 ---- } ! $mx_module_version = '3.0.0-RC'; $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by <a href="" target="_blank">Jon Ohlsson</a> & <a href="http://mxpcms.sourceforge.net/" target="_blank">Florin C. Bodin</a> & <a href="http://www.icyphoenix.com/" target="_blank">Mighty Gorgon</a> & <a href="http://smartor.is-root.com/" target="_blank">Smartor</a>'; *************** *** 93,97 **** $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_sp_config VALUES ('midthumb_cache', '1')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_sp_config VALUES ('jaime_lettering', '0')"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('fap_version', '1.4.1')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_index_thumb', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_index_total_pics', '1')"; --- 92,96 ---- $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_sp_config VALUES ('midthumb_cache', '1')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_sp_config VALUES ('jaime_lettering', '0')"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('fap_version', '1.5.0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_index_thumb', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_index_total_pics', '1')"; *************** *** 161,165 **** $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_last_comments', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('enable_mooshow', '0')"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('enable_fullurl', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('enable_integration', '1')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('override_default_pages', '0')"; --- 160,164 ---- $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_last_comments', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('enable_mooshow', '0')"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('enable_fullurl', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('enable_integration', '1')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('override_default_pages', '0')"; *************** *** 169,178 **** $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_all_pics_link', '1')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_personal_galleries_link', '1')"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('fullurl', '".PORTAL_URL."')"; ! $sql[] = "ALTER TABLE ".$mx_table_prefix."smartor_album_rate ADD rate_hon_point TINYINT(3) DEFAULT '0' NOT NULL"; ! $sql[] = "ALTER TABLE ".$mx_table_prefix."smartor_album_cat ADD cat_wm TEXT AFTER cat_desc"; ! $sql[] = "ALTER TABLE ".$mx_table_prefix."smartor_album_cat ADD cat_parent MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER cat_approval"; ! $sql[] = "ALTER TABLE ".$mx_table_prefix."smartor_album_cat ADD cat_user_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER cat_parent"; ! $sql[] = "ALTER TABLE ".$mx_table_prefix."smartor_album_comment ADD comment_cat_id int(11) NOT NULL default '0' AFTER comment_pic_id"; $n = 0; --- 168,172 ---- $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_all_pics_link', '1')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_personal_galleries_link', '1')"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('fullurl', '".PORTAL_URL."')"; $n = 0; *************** *** 206,209 **** --- 200,204 ---- pic_id int(11) UNSIGNED NOT NULL auto_increment, pic_filename varchar(255) NOT NULL, + pic_size INT(15) unsigned NOT NULL DEFAULT '0', pic_thumbnail varchar(255), pic_title mediumtext, *************** *** 253,256 **** --- 248,260 ---- ) TYPE=MyISAM"; + $sql[] = "CREATE TABLE ".$mx_table_prefix."smartor_album_comment_watch ( + pic_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', + user_id MEDIUMINT(8) NOT NULL DEFAULT '0', + notify_status TINYINT(1) NOT NULL DEFAULT '0', + KEY pic_id (pic_id), + KEY user_id (user_id), + KEY notify_status (notify_status) + ) TYPE=MyISAM"; + $sql[] = "CREATE TABLE ".$mx_table_prefix."smartor_album_cat ( cat_id mediumint(8) UNSIGNED NOT NULL auto_increment, *************** *** 258,261 **** --- 262,266 ---- cat_desc text, cat_wm text, + cat_pics MEDIUMINT(8) unsigned NOT NULL DEFAULT '0', cat_order mediumint(8) NOT NULL, cat_view_level tinyint(3) NOT NULL DEFAULT '-1', Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/db_upgrade.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** db_upgrade.php 9 Aug 2011 04:32:19 -0000 1.32 --- db_upgrade.php 18 Mar 2013 03:41:25 -0000 1.33 *************** *** 47,55 **** $upgrade_2142 = 0; $upgrade_2990 = 0; // // validate before 2.00 // ! $result = $db->sql_query( "SELECT cat_user_id from " . $mx_table_prefix . "smartor_album_cat" ); if (@$db->sql_numrows($result) == 0) { --- 47,56 ---- $upgrade_2142 = 0; $upgrade_2990 = 0; + $upgrade_3000 = 0; // // validate before 2.00 // ! $result = $db->sql_query( "SELECT cat_wm from " . $mx_table_prefix . "smartor_album_cat" ); if (@$db->sql_numrows($result) == 0) { *************** *** 67,85 **** { $upgrade_2990 = 1; ! } $message = "<b>Upgrading!</b><br/><br/>"; if ($upgrade_2000 = 1) { ! $message .= "<b>Upgrading to v. 2.00...</b><br/><br/>"; $sql[] = "UPDATE ". $mx_table_prefix ."smartor_album_config ! SET config_value = '0.54' WHERE config_name = 'album_version'"; $sql[] = "ALTER TABLE ".$mx_table_prefix."smartor_album_cat ADD cat_wm TEXT AFTER cat_desc"; $sql[] = "ALTER TABLE ".$mx_table_prefix."smartor_album_cat ADD cat_parent MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER cat_approval"; $sql[] = "ALTER TABLE ".$mx_table_prefix."smartor_album_cat ADD cat_user_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER cat_parent"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('fap_version', '1.4.0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_index_thumb', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_index_total_pics', '1')"; --- 68,91 ---- { $upgrade_2990 = 1; ! } + $result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "smartor_album_comment_watch WHERE config_name = 'pic_id'" ); + if (@$db->sql_numrows($result) == 0) + { + $upgrade_3000 = 1; + } $message = "<b>Upgrading!</b><br/><br/>"; if ($upgrade_2000 = 1) { ! $message .= "<b>Upgrading to v. 2.0000...</b><br/><br/>"; $sql[] = "UPDATE ". $mx_table_prefix ."smartor_album_config ! SET config_value = '.0.54' WHERE config_name = 'album_version'"; $sql[] = "ALTER TABLE ".$mx_table_prefix."smartor_album_cat ADD cat_wm TEXT AFTER cat_desc"; $sql[] = "ALTER TABLE ".$mx_table_prefix."smartor_album_cat ADD cat_parent MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER cat_approval"; $sql[] = "ALTER TABLE ".$mx_table_prefix."smartor_album_cat ADD cat_user_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER cat_parent"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('fap_version', '1.2.0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_index_thumb', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_index_total_pics', '1')"; *************** *** 163,168 **** $message .= "<b>Upgrading to v. 2.100...</b><br/><br/>"; $sql[] = "UPDATE ". $mx_table_prefix ."smartor_album_config ! SET config_value = '1.4.2' WHERE config_name = 'fap_version'"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('invert_nav_arrows', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_otf_link', '1')"; --- 169,180 ---- $message .= "<b>Upgrading to v. 2.100...</b><br/><br/>"; $sql[] = "UPDATE ". $mx_table_prefix ."smartor_album_config ! SET config_value = '1.3.0' WHERE config_name = 'fap_version'"; + $sql[] = "UPDATE ". $mx_table_prefix ."smartor_album_config + SET config_value = '.0.54' + WHERE config_name = 'album_version'"; + ######################################## + ## BUILD 055 ## + ######################################## $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('invert_nav_arrows', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_otf_link', '1')"; *************** *** 178,184 **** if ($upgrade_2990 = 1) { ! $message .= "<b>Upgrading to v. 2.990...</b><br/><br/>"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('enable_fullurl', '0')"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('fullurl', '".PORTAL_URL."')"; } else --- 190,232 ---- if ($upgrade_2990 = 1) { ! $message .= "<b>Upgrading to v. 3.000-RC</b><br/><br/>"; ! $sql[] = "UPDATE ". $mx_table_prefix ."smartor_album_config ! SET config_value = '1.4.0' ! WHERE config_name = 'fap_version'"; ! $sql[] = "UPDATE ". $mx_table_prefix ."smartor_album_config ! SET config_value = '.0.55' ! WHERE config_name = 'album_version'"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('enable_fullurl', '0')"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('fullurl', '".PORTAL_URL."')"; ! } ! ! if ($upgrade_3000 = 1) ! { ! $message .= "<b>Upgrading to v. 3.000-RC</b><br/><br/>"; ! $sql[] = "UPDATE ". $mx_table_prefix ."smartor_album_config ! SET config_value = '1.5.0' ! WHERE config_name = 'fap_version'"; ! $sql[] = "UPDATE ". $mx_table_prefix ."smartor_album_config ! SET config_value = '.0.56' ! WHERE config_name = 'album_version'"; ! $sql[] = "CREATE TABLE ".$mx_table_prefix."smartor_album_comment_watch ( ! pic_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', ! user_id MEDIUMINT(8) NOT NULL DEFAULT '0', ! notify_status TINYINT(1) NOT NULL DEFAULT '0', ! KEY pic_id (pic_id), ! KEY user_id (user_id), ! KEY notify_status (notify_status) ! ) TYPE=MyISAM"; ! ######################################## ! ## BUILD 056 ## ! ######################################## ! $sql[] = "ALTER TABLE ".$mx_table_prefix."smartor_album_cat ADD cat_pics MEDIUMINT(8) unsigned NOT NULL DEFAULT '0' AFTER cat_wm"; ! $sql[] = "ALTER TABLE ".$mx_table_prefix."smartor_album ADD COLUMN pic_size int(15) unsigned default '0' NOT NULL AFTER pic_filename"; ! ! $sql[] = "ALTER TABLE ".$mx_table_prefix."smartor_album_comment CHANGE comment_user_ip comment_user_ip varchar(40) NOT NULL DEFAULT ''"; ! $sql[] = "ALTER TABLE ".$mx_table_prefix."smartor_album_rate CHANGE rate_user_ip rate_user_ip varchar(40) NOT NULL DEFAULT ''"; ! ! $sql[] = "UPDATE ". $mx_table_prefix ."smartor_album_comment ip SET ip.comment_user_ip = INET_NTOA(CONV(ip.comment_user_ip, 16, 10))"; ! $sql[] = "UPDATE ". $mx_table_prefix ."smartor_album_rate ip SET ip.rate_user_ip = INET_NTOA(CONV(ip.rate_user_ip, 16, 10))"; } else *************** *** 186,195 **** $message .= "<b>Nothing to upgrade...</b><br/><br/>"; } ! $sql[] = "UPDATE " . $mx_table_prefix . "module" . " SET module_version = '" . $mx_module_version . "', module_copy = '" . $mx_module_copy . "' WHERE module_id = '" . $mx_module_id . "'"; - $message .= mx_do_install_upgrade($sql); } --- 234,242 ---- $message .= "<b>Nothing to upgrade...</b><br/><br/>"; } ! $sql[] = "UPDATE " . $mx_table_prefix . "module" . " SET module_version = '" . $mx_module_version . "', module_copy = '" . $mx_module_copy . "' WHERE module_id = '" . $mx_module_id . "'"; $message .= mx_do_install_upgrade($sql); } |
|
From: Florin C B. <ory...@us...> - 2013-03-17 02:20:39
|
Update of /cvsroot/mxbb/mx_music/templates/_core In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21002 Modified Files: music_cat_xs.tpl music_page_body.tpl music_pic_cat_body.tpl Log Message: update for vimeo and youtube Index: music_pic_cat_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/_core/music_pic_cat_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_pic_cat_body.tpl 29 Jan 2008 07:51:30 -0000 1.1 --- music_pic_cat_body.tpl 17 Mar 2013 02:20:37 -0000 1.2 *************** *** 117,134 **** if ( WMP7 ) { ! ! document.write (' <object id="MediaPlayer" width={WIDTH} height={HEIGHT} classid="CLSID:6BF52A52-394A-11D3-B153-00C04F79FAA6"'); ! document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"'); ! document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">'); ! document.write ('<PARAM NAME="url" VALUE="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="FileName" value="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="AutoStart" VALUE="false">'); ! document.write ('<PARAM NAME="ShowControls" VALUE="1">'); ! document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); ! document.write ('<PARAM NAME="AutoSize" VALUE="0">'); ! document.write ('<PARAM NAME="uiMode" VALUE="mini">'); ! document.write ('<PARAM NAME="width" VALUE="{song_detail.WIDTH}">'); ! document.write ('<PARAM NAME="height" VALUE="{song_detail.WIDTH}">'); ! document.write (' <Embed type="application/x-mplayer2"'); document.write (' pluginspage="http://www.microsoft.com/isapi/redir.dll?prd=windows&sbp=mediaplayer&ar=Media&sba=Plugin&"'); --- 117,133 ---- if ( WMP7 ) { ! document.write (' <object id="MediaPlayer" width={WIDTH} height={HEIGHT} classid="CLSID:6BF52A52-394A-11D3-B153-00C04F79FAA6"'); ! document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"'); ! document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">'); ! document.write ('<PARAM NAME="url" VALUE="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="FileName" value="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="AutoStart" VALUE="false">'); ! document.write ('<PARAM NAME="ShowControls" VALUE="1">'); ! document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); ! document.write ('<PARAM NAME="AutoSize" VALUE="0">'); ! document.write ('<PARAM NAME="uiMode" VALUE="mini">'); ! document.write ('<PARAM NAME="width" VALUE="{song_detail.WIDTH}">'); ! document.write ('<PARAM NAME="height" VALUE="{song_detail.WIDTH}">'); ! document.write (' <Embed type="application/x-mplayer2"'); document.write (' pluginspage="http://www.microsoft.com/isapi/redir.dll?prd=windows&sbp=mediaplayer&ar=Media&sba=Plugin&"'); *************** *** 140,150 **** document.write (' ShowStatusBar="1"'); document.write (' AUTOSTART="false"'); ! document.write (' AutoSize="0"'); document.write (' width="{song_detail.WIDTH}"'); document.write (' height="{song_detail.HEIGHT}">'); document.write (' </embed>'); - document.write ('</OBJECT>'); - } --- 139,147 ---- document.write (' ShowStatusBar="1"'); document.write (' AUTOSTART="false"'); ! document.write (' AutoSize="0"'); document.write (' width="{song_detail.WIDTH}"'); document.write (' height="{song_detail.HEIGHT}">'); document.write (' </embed>'); document.write ('</OBJECT>'); } *************** *** 152,169 **** else { - //IE Code ! document.write (' <object id="wmp" width={WIDTH} height={HEIGHT} classid="CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95"'); ! document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"'); ! document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">'); ! document.write ('<PARAM NAME="url" VALUE="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="FileName" value="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="AutoStart" VALUE="false">'); ! document.write ('<PARAM NAME="ShowControls" VALUE="1">'); ! document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); ! document.write ('<PARAM NAME="AutoSize" VALUE="0">'); ! document.write ('<PARAM NAME="width" VALUE="{song_detail.WIDTH}">'); ! document.write ('<PARAM NAME="height" VALUE="{song_detail.WIDTH}">'); ! //Firefox code document.write (' <Embed type="application/x-mplayer2"'); --- 149,164 ---- else { //IE Code ! document.write (' <object id="wmp" width={WIDTH} height={HEIGHT} classid="CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95"'); ! document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"'); ! document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">'); ! document.write ('<PARAM NAME="url" VALUE="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="FileName" value="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="AutoStart" VALUE="false">'); ! document.write ('<PARAM NAME="ShowControls" VALUE="1">'); ! document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); ! document.write ('<PARAM NAME="AutoSize" VALUE="0">'); ! document.write ('<PARAM NAME="width" VALUE="{song_detail.WIDTH}">'); ! document.write ('<PARAM NAME="height" VALUE="{song_detail.WIDTH}">'); //Firefox code document.write (' <Embed type="application/x-mplayer2"'); *************** *** 180,186 **** document.write (' height="{song_detail.HEIGHT}">'); document.write (' </embed>'); - document.write ('</OBJECT>'); - } } --- 175,179 ---- *************** *** 211,215 **** </object> <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq FLV --> <div id="flvplayer"> --- 204,219 ---- </object> <!-- ENDIF --> ! ! <!-- IF song_detail.S_ROW_TYPE eq VIMEO --> ! <object type="application/x-shockwave-flash" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" data="{song_detail.VIDEO_URL}"> ! <param name="quality" value="best" /> ! <param name="allowfullscreen" value="true" /> ! <param name="scale" value="showAll" /> ! <param name="movie" value="{song_detail.VIDEO_URL}" /> ! <param name="flashvars" value="&rs=1&sn=1&iurl={song_detail.U_IMG}" /> ! <embed src="{song_detail.VIDEO_URL}" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" allowfullscreen="true" flashvars="&rs=1&sn=1&iurl={song_detail.U_IMG}" /> ! </object> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq FLV --> <div id="flvplayer"> Index: music_page_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/_core/music_page_body.tpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** music_page_body.tpl 23 Dec 2012 14:52:43 -0000 1.9 --- music_page_body.tpl 17 Mar 2013 02:20:37 -0000 1.10 *************** *** 27,31 **** <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> ! <th height="25" colspan="2" class="thTop">{SONG_TITLE}</th> </tr> <tr> --- 27,31 ---- <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> ! <th height="25" colspan="2" class="thTop">{VIDEO_TITLE}</th> </tr> <tr> *************** *** 166,170 **** <!-- BEGIN youtube --> ! <object width="425" height="350"> <param name="movie" value="{VIDEO_URL}" /> <param name="wmode" value="transparent" /> --- 166,170 ---- <!-- BEGIN youtube --> ! <object width="{WIDTH}" height="{HEIGHT}"> <param name="movie" value="{VIDEO_URL}" /> <param name="wmode" value="transparent" /> *************** *** 174,181 **** </object> <!-- END youtube --> ! <!-- BEGIN flv --> <div id="flvplayer"> ! <object width="425" height="350" id="flvplayer" align="center"> <param name="allowScriptAccess" value="always" /> <param name="type" value="application/x-shockwave-flash" /> --- 174,199 ---- </object> <!-- END youtube --> ! <!-- BEGIN vimeobbcode --> ! <object type="application/x-shockwave-flash" width="{WIDTH}" height="{HEIGHT}" data="http://www.vimeo.com/moogaloop.swf?clip_id={IDENTIFIER}"> ! <param name="quality" value="best" /> ! <param name="allowfullscreen" value="true" /> ! <param name="scale" value="showAll" /> ! <param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id={IDENTIFIER}" /> ! </object> ! <!-- ex: http://player.vimeo.com/video/42690142 --> ! <!-- END vimeobbcode --> ! <!-- BEGIN vimeo --> ! <object type="application/x-shockwave-flash" width="{WIDTH}" height="{HEIGHT}" data="{VIDEO_URL}"> ! <param name="quality" value="best" /> ! <param name="allowfullscreen" value="true" /> ! <param name="scale" value="showAll" /> ! <param name="movie" value="{VIDEO_URL}" /> ! <param name="flashvars" value="&rs=1&sn=1&iurl={U_IMG}" /> ! <embed src="{VIDEO_URL}" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" allowfullscreen="true" flashvars="&rs=1&sn=1&iurl={U_IMG}" /> ! </object> ! <!-- END vimeo --> <!-- BEGIN flv --> <div id="flvplayer"> ! <object width="{WIDTH}" height="{HEIGHT}" id="flvplayer" align="center"> <param name="allowScriptAccess" value="always" /> <param name="type" value="application/x-shockwave-flash" /> Index: music_cat_xs.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/_core/music_cat_xs.tpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** music_cat_xs.tpl 23 Dec 2012 14:52:43 -0000 1.8 --- music_cat_xs.tpl 17 Mar 2013 02:20:37 -0000 1.9 *************** *** 301,311 **** <param name="scale" value="noscale" /> <param name="salign" value="lt" /> ! <embed src="{song_detail.VIDEO_URL}" type="application/x-shockwave-flash" wmode="transparent" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" allowfullscreen="true"> ! </embed> ! </object> ! <!-- ENDIF --> ! ! <!-- IF song_detail.S_ROW_TYPE eq YOUTUBE --> ! <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" id="VideoPlayback" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}"> <param name="movie" value="{song_detail.VIDEO_URL}" /> <param name="wmode" value="transparent" /> --- 301,310 ---- <param name="scale" value="noscale" /> <param name="salign" value="lt" /> ! <embed src="{song_detail.VIDEO_URL}" type="application/x-shockwave-flash" wmode="transparent" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" allowfullscreen="true"> ! </embed> ! </object> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq YOUTUBE --> ! <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" id="VideoPlayback" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}"> <param name="movie" value="{song_detail.VIDEO_URL}" /> <param name="wmode" value="transparent" /> *************** *** 313,320 **** <param name="flashvars" value="&rs=1&sn=1&iurl={song_detail.U_IMG}" /> <embed src="{song_detail.VIDEO_URL}" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" allowfullscreen="true" flashvars="&rs=1&sn=1&iurl={song_detail.U_IMG}" /> ! </object> ! <!-- ENDIF --> ! ! <!-- IF song_detail.S_ROW_TYPE eq FLV --> <div id="flvplayer"> <object width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" id="flvplayer" align="center"> --- 312,328 ---- <param name="flashvars" value="&rs=1&sn=1&iurl={song_detail.U_IMG}" /> <embed src="{song_detail.VIDEO_URL}" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" allowfullscreen="true" flashvars="&rs=1&sn=1&iurl={song_detail.U_IMG}" /> ! </object> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq VIMEO --> ! <object type="application/x-shockwave-flash" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" data="{song_detail.VIDEO_URL}"> ! <param name="quality" value="best" /> ! <param name="allowfullscreen" value="true" /> ! <param name="scale" value="showAll" /> ! <param name="movie" value="{song_detail.VIDEO_URL}" /> ! <param name="flashvars" value="&rs=1&sn=1&iurl={song_detail.U_IMG}" /> ! <embed src="{song_detail.VIDEO_URL}" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" allowfullscreen="true" flashvars="&rs=1&sn=1&iurl={song_detail.U_IMG}" /> ! </object> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq FLV --> <div id="flvplayer"> <object width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" id="flvplayer" align="center"> |
|
From: Florin C B. <ory...@us...> - 2013-03-17 02:20:25
|
Update of /cvsroot/mxbb/mx_music/music_box/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20982/includes Modified Files: music_functions.php Log Message: update for vimeo and youtube Index: music_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/includes/music_functions.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** music_functions.php 26 Sep 2008 12:29:04 -0000 1.9 --- music_functions.php 17 Mar 2013 02:20:23 -0000 1.10 *************** *** 793,798 **** // END function music_user_access() // ---------------------------------------------------------------------------- - - function mx_music_sitename($domain) { --- 793,796 ---- *************** *** 807,811 **** return $r; } - function mx_music_sitesufix($domain) { --- 805,808 ---- *************** *** 816,820 **** return $r; } ! // ---------------------------------------------------------------------------- // You must retain the full copyright notice below including the link to my site. --- 813,959 ---- return $r; } ! function mx_video_image($url) ! { ! $image_url = parse_url($url); ! if($image_url['host'] == 'www.youtube.com' || $image_url['host'] == 'youtube.com') ! { ! $array = explode("&", $image_url['query']); ! return "http://img.youtube.com/vi/".substr($array[0], 2)."/0.jpg"; ! } ! else if($image_url['host'] == 'www.vimeo.com' || $image_url['host'] == 'vimeo.com') ! { ! $hash = unserialize(file_get_contents("http://vimeo.com/api/v2/video/".substr($image_url['path'], 1).".php")); ! return $hash[0]["thumbnail_small"]; ! } ! } ! function mx_video_get_title($url) ! { ! $image_url = parse_url($url); ! if($image_url['host'] == 'www.youtube.com' || $image_url['host'] == 'youtube.com') ! { ! $array = explode("&", $image_url['query']); ! // This is the youtube video code ! $code = substr($array[0], 2); ! // Get video feed info (xml) from youtube, but only the title | http://php.net/manual/en/function.file-get-contents.php ! $video_feed = file_get_contents("http://gdata.youtube.com/feeds/api/videos?v=2&q=".$code."&max-results=1&fields=entry(title)&prettyprint=true"); ! // xml to object | http://php.net/manual/en/function.simplexml-load-string.php ! $video_obj = simplexml_load_string($video_feed); ! // Get the title string to a variable ! $video_str = $video_obj->entry->title; ! // Change the type to string ! $title = (string) $video_str; ! // Output ! return $title; ! } ! } ! function mx_video_get_content($url, $mode = 'description') ! { ! $desc_url = parse_url($url); ! if($desc_url['host'] == 'www.youtube.com' || $desc_url['host'] == 'youtube.com') ! { ! $array = explode("&", $desc_url['query']); ! // This is the youtube video code ! $id = substr($array[0], 2); ! // create an array to return ! $videoDetails = array(); ! // get the xml data from youtube ! $url = "http://gdata.youtube.com/feeds/api/videos/".$id; ! $xml = simplexml_load_file($url); ! // load up the array ! $videoDetails['title'] = $xml->title[0]; ! $videoDetails['description'] = $xml->content[0]; ! $videoDetails['thumbnail'] = "http://i.ytimg.com/vi/".$id."/2.jpg"; ! // Output ! switch($mode) ! { ! case 'title': ! return $videoDetails['title']; ! break; ! case 'description': ! return $videoDetails['description']; ! break; ! case 'desc': ! return substr($videoDetails['desc'], 0, 120).'...'; ! break; ! case 'thumbnail': ! case 'thumburl': ! return thumbnail; ! break; ! default: ! return $videoDetails; ! } ! } ! elseif($desc_url['host'] == 'www.vimeo.com' || $desc_url['host'] == 'vimeo.com') ! { ! $video_id = explode('vimeo.com/', $url); ! $video_id = $video_id[1]; ! // create an array to return ! $data['video_type'] = 'vimeo'; ! $data['video_id'] = $video_id; ! // get the xml data from youtube ! $url = "http://vimeo.com/api/v2/video/$video_id.xml"; ! $xml = simplexml_load_file($url); ! // load up foreach ! foreach ($xml->video as $video) { ! $data['id']=$video->id; ! $data['title']=$video->title; ! $data['info']=$video->description; ! $data['url']=$video->url; ! $data['upload_date']=$video->upload_date; ! $data['mobile_url']=$video->mobile_url; ! $data['thumb_small']=$video->thumbnail_small; ! $data['thumb_medium']=$video->thumbnail_medium; ! $data['thumb_large']=$video->thumbnail_large; ! $data['user_name']=$video->user_name; ! $data['urer_url']=$video->urer_url; ! $data['user_thumb_small']=$video->user_portrait_small; ! $data['user_thumb_medium']=$video->user_portrait_medium; ! $data['user_thumb_large']=$video->user_portrait_large; ! $data['user_thumb_huge']=$video->user_portrait_huge; ! $data['likes']=$video->stats_number_of_likes; ! $data['views']=$video->stats_number_of_plays; ! $data['comments']=$video->stats_number_of_comments; ! $data['duration']=$video->duration; ! $data['width']=$video->width; ! $data['height']=$video->height; ! $data['tags']=$video->tags; ! } // End foreach ! // Change the type to string ! $desc = substr($data['info'], 0, 120).'...'; ! // Output ! switch($mode) ! { ! case 'title': ! return $data['title']; ! break; ! case 'description': ! return $data['info']; ! break; ! case 'desc': ! return $desc; ! break; ! case 'thumbnail': ! case 'thumburl': ! return $data['thumbnail_small']; ! break; ! case 'views': ! return $data['stats_number_of_plays']; ! break; ! case 'upload_date': ! return $data['upload_date']; ! break; ! case 'user_name': ! return $data['user_name']; ! break; ! case 'views': ! return $data['views']; ! case 'duration': ! return $data['duration']; ! break; ! default: ! return $data; ! } ! } // End Vimeo ! } // ---------------------------------------------------------------------------- // You must retain the full copyright notice below including the link to my site. |
|
From: Florin C B. <ory...@us...> - 2013-03-06 18:39:56
|
Update of /cvsroot/mxbb/mx_who_am_i/includes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16062 Modified Files: mx_common.php Log Message: fixes phpbb_root_path as global in common function Index: mx_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_who_am_i/includes/mx_common.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mx_common.php 16 Dec 2011 01:35:07 -0000 1.11 --- mx_common.php 6 Mar 2013 18:39:54 -0000 1.12 *************** *** 156,160 **** function _html_output() { ! global $phpEx; global $mx_user; global $board_config; --- 156,160 ---- function _html_output() { ! global $phpEx, $phpbb_root_path, $mx_root_path; global $mx_user; global $board_config; |
|
From: Florin C B. <ory...@us...> - 2012-11-25 04:23:00
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes
In directory vz-cvs-4.sog:/tmp/cvs-serv9572
Modified Files:
functions.php
Log Message:
Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** functions.php 8 Jul 2009 15:29:05 -0000 1.25
--- functions.php 25 Nov 2012 04:22:57 -0000 1.26
***************
*** 649,655 ****
* @param int $minimum_time The minimum acceptable age for a submitted form in seconds
*/
! public static function check_form_key( $form_name, $timespan = false, $return_page = '', $trigger = false, $minimum_time = false )
{
! global $board_config, $user;
if ( $timespan === false )
{
--- 649,655 ----
* @param int $minimum_time The minimum acceptable age for a submitted form in seconds
*/
! public static function check_form_key($form_name, $timespan = false, $return_page = '', $trigger = false, $minimum_time = false)
{
! global $board_config, $mx_user;
if ( $timespan === false )
{
***************
*** 671,677 ****
if ( ( $diff >= $minimum_time ) && ( ( $diff <= $timespan ) || $timespan == -1 ) )
{
! $token_sid = ( $user->data['user_id'] == ANONYMOUS && !empty( $board_config['form_token_sid_guests'] ) ) ? $user->session_id : '';
! $key = sha1( $creation_time . $user->data['user_form_salt'] . $form_name . $token_sid );
if ( $key === $token )
{
--- 671,677 ----
if ( ( $diff >= $minimum_time ) && ( ( $diff <= $timespan ) || $timespan == -1 ) )
{
! $token_sid = ( $mx_user->data['user_id'] == ANONYMOUS && !empty( $board_config['form_token_sid_guests'] ) ) ? $mx_user->session_id : '';
! $key = sha1( $creation_time . $mx_user->data['user_form_salt'] . $form_name . $token_sid );
if ( $key === $token )
{
***************
*** 682,686 ****
if ( $trigger )
{
! trigger_error( $user->lang['FORM_INVALID'] . $return_page );
}
print '<pre>';
--- 682,686 ----
if ( $trigger )
{
! trigger_error( $mx_user->lang['FORM_INVALID'] . $return_page );
}
print '<pre>';
***************
*** 696,700 ****
public static function group_create( &$group_id, $type, $name, $desc, $group_attributes, $allow_desc_bbcode = false, $allow_desc_urls = false, $allow_desc_smilies = false )
{
! global $phpbb_root_path, $board_config, $db, $user, $file_upload;
$error = array();
--- 696,700 ----
public static function group_create( &$group_id, $type, $name, $desc, $group_attributes, $allow_desc_bbcode = false, $allow_desc_urls = false, $allow_desc_smilies = false )
{
! global $phpbb_root_path, $board_config, $db, $mx_user, $file_upload;
$error = array();
***************
*** 717,721 ****
if ( !utf8_strlen( $name ) || utf8_strlen( $name ) > 60 )
{
! $error[] = ( !utf8_strlen( $name ) ) ? $user->lang['GROUP_ERR_USERNAME'] : $user->lang['GROUP_ERR_USER_LONG'];
}
--- 717,721 ----
if ( !utf8_strlen( $name ) || utf8_strlen( $name ) > 60 )
{
! $error[] = ( !utf8_strlen( $name ) ) ? $mx_user->lang['GROUP_ERR_USERNAME'] : $mx_user->lang['GROUP_ERR_USER_LONG'];
}
***************
*** 723,732 ****
if ( !empty( $err ) )
{
! $error[] = $user->lang[$err];
}
if ( !in_array( $type, array( GROUP_OPEN, GROUP_CLOSED, GROUP_HIDDEN, GROUP_SPECIAL, GROUP_FREE ) ) )
{
! $error[] = $user->lang['GROUP_ERR_TYPE'];
}
--- 723,732 ----
if ( !empty( $err ) )
{
! $error[] = $mx_user->lang[$err];
}
if ( !in_array( $type, array( GROUP_OPEN, GROUP_CLOSED, GROUP_HIDDEN, GROUP_SPECIAL, GROUP_FREE ) ) )
{
! $error[] = $mx_user->lang['GROUP_ERR_TYPE'];
}
***************
*** 832,836 ****
}
! $name = ( $type == GROUP_SPECIAL ) ? $user->lang['G_' . $name] : $name;
//add_log( 'admin', $log, $name );
--- 832,836 ----
}
! $name = ( $type == GROUP_SPECIAL ) ? $mx_user->lang['G_' . $name] : $name;
//add_log( 'admin', $log, $name );
***************
*** 2471,2482 ****
* @param bool $trigger If true, the function will triger an error when encountering an invalid form
*/
! public static function check_form_key($form_name, $timespan = false, $return_page = '', $trigger = false)
{
! global $config, $user;
if ($timespan === false)
{
// we enforce a minimum value of half a minute here.
! $timespan = ($config['form_token_lifetime'] == -1) ? -1 : max(30, $config['form_token_lifetime']);
}
--- 2471,2482 ----
* @param bool $trigger If true, the function will triger an error when encountering an invalid form
*/
! public static function check_form_key($form_name, $timespan = false, $return_page = '', $trigger = false, $minimum_time = false)
{
! global $board_config, $mx_user, $_POST;
if ($timespan === false)
{
// we enforce a minimum value of half a minute here.
! $timespan = ($board_config['form_token_lifetime'] == -1) ? -1 : max(30, $board_config['form_token_lifetime']);
}
***************
*** 2491,2496 ****
if ($diff && ($diff <= $timespan || $timespan === -1))
{
! $token_sid = ($user->data['user_id'] == ANONYMOUS && !empty($config['form_token_sid_guests'])) ? $user->session_id : '';
! $key = sha1($creation_time . $user->data['user_form_salt'] . $form_name . $token_sid);
if ($key === $token)
--- 2491,2496 ----
if ($diff && ($diff <= $timespan || $timespan === -1))
{
! $token_sid = ($mx_user->data['user_id'] == ANONYMOUS && !empty($board_config['form_token_sid_guests'])) ? $mx_user->session_id : '';
! $key = sha1($creation_time . $mx_user->data['user_form_salt'] . $form_name . $token_sid);
if ($key === $token)
***************
*** 2503,2507 ****
if ($trigger)
{
! trigger_error($user->lang['FORM_INVALID'] . $return_page);
}
--- 2503,2507 ----
if ($trigger)
{
! trigger_error($mx_user->lang['FORM_INVALID'] . $return_page);
}
|
|
From: Florin C B. <ory...@us...> - 2012-10-25 13:08:33
|
Update of /cvsroot/mxbb/mx_pjirc/templates/prosilver
In directory vz-cvs-4.sog:/tmp/cvs-serv7267
Modified Files:
pjirc_chat.html
Log Message:
constants
Index: pjirc_chat.html
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/templates/prosilver/pjirc_chat.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pjirc_chat.html 9 Apr 2011 16:30:58 -0000 1.1
--- pjirc_chat.html 25 Oct 2012 13:08:31 -0000 1.2
***************
*** 18,27 ****
}
.tdblock {
! font-family: Verdana, Arial, Helvetica, sans-serif;
! font-size: 10px;
font-weight: bold;
border: 0;
margin: 2px;
}
-->
</style>
--- 18,37 ----
}
.tdblock {
! font-family: Fixedsys, Verdana, Arial, Helvetica, sans-serif;
! font-size: 12px;
font-weight: bold;
border: 0;
margin: 2px;
}
+ body {
+ /* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */
+ font-family: Fixedsys, Verdana, Helvetica, Arial, sans-serif;
+ color: #828282;
+ background-color: #FFFFFF;
+ /*font-size: 62.5%; This sets the default font size to be equivalent to 10px */
+ font-size: 12px;
+ margin: 0;
+ padding: 12px 0;
+ }
-->
</style>
|
|
From: Florin C B. <ory...@us...> - 2012-10-25 13:08:06
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/includes
In directory vz-cvs-4.sog:/tmp/cvs-serv7246
Modified Files:
album_constants.php
Log Message:
constants
Index: album_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_constants.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** album_constants.php 7 Jan 2011 17:14:06 -0000 1.14
--- album_constants.php 25 Oct 2012 13:08:01 -0000 1.15
***************
*** 94,101 ****
!defined('ALBUM_SP_CONFIG_TABLE') ? define('ALBUM_SP_CONFIG_TABLE', $mx_table_prefix.'smartor_album_sp_config') : false;
! @define('PAGE_ALBUM', -50); // for Session Handling
! @define('PAGE_ALBUM_PERSONAL', -51);
! @define('PAGE_ALBUM_PICTURE', -52);
! @define('PAGE_ALBUM_SEARCH', -53);
define('PERSONAL_GALLERY', 0); // pic_cat_id <- do NOT change this value
--- 94,106 ----
!defined('ALBUM_SP_CONFIG_TABLE') ? define('ALBUM_SP_CONFIG_TABLE', $mx_table_prefix.'smartor_album_sp_config') : false;
! define('PAGE_ALBUM_DEFAULT', -50);
! define('PAGE_ALBUM', -50); // for Session Handling
! define('PAGE_ALBUM_PERSONAL', -51);
! define('PAGE_IMAGES', -52);
! define('PAGE_ALBUM_PICTURE', -52);
! define('PAGE_IMAGE_THUMBNAIL', -52);
! define('PAGE_IMAGE_THUMBNAIL_S', -52);
! define('PAGE_ALBUM_SEARCH', -53);
! define('PAGE_ALBUM_RSS', -54);
define('PERSONAL_GALLERY', 0); // pic_cat_id <- do NOT change this value
|
|
From: Florin C B. <ory...@us...> - 2012-10-25 13:07:52
|
Update of /cvsroot/mxbb/mx_simpledoc/simpledoc In directory vz-cvs-4.sog:/tmp/cvs-serv7226 Modified Files: simpledoc_common.php Log Message: constants Index: simpledoc_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_simpledoc/simpledoc/simpledoc_common.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** simpledoc_common.php 3 Jun 2008 20:14:14 -0000 1.10 --- simpledoc_common.php 25 Oct 2012 13:07:50 -0000 1.11 *************** *** 27,31 **** // Load a wrapper for common phpBB2 functions (compatibility with core 2.8.x) // ! include_once( $mx_root_path . 'includes/shared/phpbb2/includes/functions.' . $phpEx ); $mx_simpledoc = new mx_simpledoc_public(); --- 27,31 ---- // Load a wrapper for common phpBB2 functions (compatibility with core 2.8.x) // ! include_once($mx_root_path . 'includes/shared/phpbb2/includes/functions.' . $phpEx); $mx_simpledoc = new mx_simpledoc_public(); |
|
From: Florin C B. <ory...@us...> - 2012-10-25 13:02:37
|
Update of /cvsroot/mxbb/mx_pafiledb/templates/_core
In directory vz-cvs-4.sog:/tmp/cvs-serv5982
Modified Files:
mx_pafiledb.cfg
Log Message:
constants
Index: mx_pafiledb.cfg
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/templates/_core/mx_pafiledb.cfg,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mx_pafiledb.cfg 29 Dec 2011 05:51:52 -0000 1.6
--- mx_pafiledb.cfg 25 Oct 2012 13:02:35 -0000 1.7
***************
*** 45,50 ****
// -------------------------------------------------------------------------
! // Define buttons
! // -------------------------------------------------------------------------
$mx_images['pa_search'] = "$current_template_images/{LANG}/icon_pa_search.gif";
$mx_images['buttontype']['pa_search'] = MX_BUTTON_IMAGE;
--- 45,50 ----
// -------------------------------------------------------------------------
! // (Re)Define images
! //-------------------------------------------------------------------------
$mx_images['pa_search'] = "$current_template_images/{LANG}/icon_pa_search.gif";
$mx_images['buttontype']['pa_search'] = MX_BUTTON_IMAGE;
***************
*** 110,113 ****
--- 110,114 ----
$mx_images['icon_minipost_new'] = "$current_module_images/icon_minipost_new.gif";
*/
+
//
// Last Message and Anouncement block compatibility
|
|
From: Florin C B. <ory...@us...> - 2012-10-25 13:02:05
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/includes
In directory vz-cvs-4.sog:/tmp/cvs-serv5951
Modified Files:
functions_pafiledb.php pafiledb_constants.php
Log Message:
constants
Index: pafiledb_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/pafiledb_constants.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** pafiledb_constants.php 6 Jan 2010 20:27:15 -0000 1.29
--- pafiledb_constants.php 25 Oct 2012 13:02:03 -0000 1.30
***************
*** 32,37 ****
//die("$module_root_path");
! define( 'PAGE_DOWNLOAD', -501 ); // If this id generates a conflict with other mods, change it ;)
! define( 'ICONS_DIR', 'pafiledb/images/icons/' );
//
--- 32,40 ----
//die("$module_root_path");
! define('PAGE_DLOAD', -501);
! define('PAGE_DOWNLOAD', -501); // If this id generates a conflict with other mods, change it ;);
! define('PAGE_DL_DEFAULT', -501);
! //define('PAGE_DL_DEFAULT', PAGE_DOWNLOADS);
! define('ICONS_DIR', 'pafiledb/images/icons/');
//
Index: functions_pafiledb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_pafiledb.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** functions_pafiledb.php 6 Jan 2010 20:27:15 -0000 1.65
--- functions_pafiledb.php 25 Oct 2012 13:02:02 -0000 1.66
***************
*** 190,194 ****
* @param unknown_type $init
*/
! function sync( $cat_id, $init = true )
{
global $db;
--- 190,194 ----
* @param unknown_type $init
*/
! function sync($cat_id, $init = true)
{
global $db;
***************
*** 244,248 ****
* @param unknown_type $cat_nav
*/
! function category_nav( $parent_id, $cat_nav )
{
if ( !empty( $this->cat_rowset[$parent_id] ) )
--- 244,248 ----
* @param unknown_type $cat_nav
*/
! function category_nav($parent_id, $cat_nav)
{
if ( !empty( $this->cat_rowset[$parent_id] ) )
***************
*** 462,466 ****
* @param unknown_type $cat_id
*/
! function generate_navigation( $cat_id )
{
global $template, $db;
--- 462,466 ----
* @param unknown_type $cat_id
*/
! function generate_navigation($cat_id)
{
global $template, $db;
***************
*** 2404,2408 ****
* @return unknown
*/
! function main( $module_id = false )
{
return false;
--- 2404,2408 ----
* @return unknown
*/
! function main($module_id = false)
{
return false;
|
|
From: Florin C B. <ory...@us...> - 2012-10-25 13:01:05
|
Update of /cvsroot/mxbb/mx_newssuite/includes
In directory vz-cvs-4.sog:/tmp/cvs-serv5886
Modified Files:
newssuite_constants.php
Log Message:
constants
Index: newssuite_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_newssuite/includes/newssuite_constants.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** newssuite_constants.php 23 Jul 2007 21:42:40 -0000 1.21
--- newssuite_constants.php 25 Oct 2012 13:01:03 -0000 1.22
***************
*** 17,21 ****
// This file defines specific constants for the module
// -------------------------------------------------------------------------
! define( 'PAGE_NEWSSUITE', -501 );
$newssuite_module_version = "News Suite v. 2.71 :: MX-Portal Module 2004";
--- 17,21 ----
// This file defines specific constants for the module
// -------------------------------------------------------------------------
! define('PAGE_NEWSSUITE', -77);
$newssuite_module_version = "News Suite v. 2.71 :: MX-Portal Module 2004";
|
|
From: Florin C B. <ory...@us...> - 2012-10-25 13:00:23
|
Update of /cvsroot/mxbb/mx_news/mx_news/includes In directory vz-cvs-4.sog:/tmp/cvs-serv5830 Modified Files: mx_news_constants.php Log Message: constants Index: mx_news_constants.php =================================================================== RCS file: /cvsroot/mxbb/mx_news/mx_news/includes/mx_news_constants.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_news_constants.php 3 Jun 2008 20:12:40 -0000 1.6 --- mx_news_constants.php 25 Oct 2012 13:00:20 -0000 1.7 *************** *** 28,32 **** $is_block = false; } ! define( 'MX_NEWS_ROOT_CAT', 0 ); --- 28,32 ---- $is_block = false; } ! define( 'PAGE_NEWS', -77 ); define( 'MX_NEWS_ROOT_CAT', 0 ); |
|
From: Florin C B. <ory...@us...> - 2012-10-25 12:59:33
|
Update of /cvsroot/mxbb/mx_music/music_box/includes
In directory vz-cvs-4.sog:/tmp/cvs-serv5795
Modified Files:
music_constants.php
Log Message:
constants
Index: music_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/includes/music_constants.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** music_constants.php 18 Sep 2008 07:24:45 -0000 1.10
--- music_constants.php 25 Oct 2012 12:59:31 -0000 1.11
***************
*** 25,29 ****
--- 25,34 ----
}
+
+ define('PAGE_MUSIC_DEFAULT', -19);
define('PAGE_MUSIC', -19); // for Session Handling
+ define('PAGE_MUSIC_PERSONAL', -20);
+ define('PAGE_MUSIC_PICTURE', -21);
+ define('PAGE_MUSIC_SEARCH', -22);
|
2 messages has been excluded from this view by a project administrator.
