Menu
▾
▴
[mxbb-commits] mx_smartor/includes album_allpics.php, 1.1, 1.2 album_cat.php, 1.11, 1.12 album_cat_sort.php, 1.9, 1.10 album_memberlist.php, 1.5, 1.6 album_otf.php, 1.1, 1.2 album_otf_thumbnail.php, 1.1, 1.2 album_personal.php, 1.7, 1.8 album_personal_cat_admin.php, 1.7, 1.8 album_personal_random.php, 1.1, 1.2 album_picm.php, 1.6, 1.7 album_rdf.php, 1.1, 1.2 album_rss.php, 1.1, 1.2 album_search.php, 1.8, 1.9 album_showpage.php, 1.11, 1.12 album_thumbnail.php, 1.6, 1.7
Update of /cvsroot/mxbb/mx_smartor/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11014/includes Modified Files: album_allpics.php album_cat.php album_cat_sort.php album_memberlist.php album_otf.php album_otf_thumbnail.php album_personal.php album_personal_cat_admin.php album_personal_random.php album_picm.php album_rdf.php album_rss.php album_search.php album_showpage.php album_thumbnail.php Log Message: This will make use of: $mx_user->extend(MX_LANG_MAIN, MX_IMAGES); and: $mode = $mx_request_vars->request('smartor_mode', MX_TYPE_NO_TAGS, 'album_index'); Index: album_personal.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_personal.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** album_personal.php 7 Jun 2007 20:13:29 -0000 1.7 --- album_personal.php 9 Aug 2007 13:16:57 -0000 1.8 *************** *** 387,391 **** $template->assign_vars(array( 'U_UPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_upload&cat_id=". PERSONAL_GALLERY)), ! 'UPLOAD_PIC_IMG' => $mx_images['upload_pic'], 'L_UPLOAD_PIC' => $lang['Upload_Pic'], --- 387,391 ---- $template->assign_vars(array( 'U_UPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_upload&cat_id=". PERSONAL_GALLERY)), ! 'UPLOAD_PIC_IMG' => $images['upload_pic'], 'L_UPLOAD_PIC' => $lang['Upload_Pic'], Index: album_cat_sort.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_cat_sort.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** album_cat_sort.php 7 Jun 2007 20:13:27 -0000 1.9 --- album_cat_sort.php 9 Aug 2007 13:16:55 -0000 1.10 *************** *** 601,605 **** 'U_UPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_upload&cat_id=$cat_id")), ! 'UPLOAD_PIC_IMG' => $mx_images['upload_pic'], 'L_UPLOAD_PIC' => $lang['Upload_Pic'], --- 601,605 ---- 'U_UPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_upload&cat_id=$cat_id")), ! 'UPLOAD_PIC_IMG' => $images['upload_pic'], 'L_UPLOAD_PIC' => $lang['Upload_Pic'], Index: album_showpage.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_showpage.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** album_showpage.php 11 Jul 2007 20:07:30 -0000 1.11 --- album_showpage.php 9 Aug 2007 13:17:00 -0000 1.12 *************** *** 833,844 **** //users mesangers, website, email ! 'PROFILE_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $phpbb_root_path .$profile_url . '"><img src="' . $mx_images['icon_profile'] . '" alt="' . $lang['Read_profile'] . '" title="' . $lang['Read_profile'] . '" border="0" /></a>' : '', ! 'PM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $phpbb_root_path .$pm_url . '"><img src="' . $mx_images['icon_pm'] . '" alt="' . $lang['Send_private_message'] . '" title="' . $lang['Send_private_message'] . '" border="0" /></a>' : '', ! 'AIM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_aim'] ) ? '<a href="aim:goim?screenname=' . $commentrow[$i]['user_aim'] . '&message=Hello+Are+you+there?"><img src="' . $mx_images['icon_aim'] . '" alt="' . $lang['AIM'] . '" title="' . $lang['AIM'] . '" border="0" /></a>' : '' : '', ! 'YIM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $commentrow[$i]['user_yim'] . '&.src=pg"><img src="' . $mx_images['icon_yim'] . '" alt="' . $lang['YIM'] . '" title="' . $lang['YIM'] . '" border="0" /></a>' : '' : '', ! 'MSNM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_msnm'] ) ? '<a href="' . $temp_url . '"><img src="' . $mx_images['icon_msnm'] . '" alt="' . $lang['MSNM'] . '" title="' . $lang['MSNM'] . '" border="0" /></a>' : '' : '', ! 'ICQ_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_icq'] ) ? '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $commentrow[$i]['user_icq'] . '"><img src="' . $mx_images['icon_icq'] . '" alt="' . $lang['ICQ'] . '" title="' . $lang['ICQ'] . '" border="0" /></a>' : '' : '', ! 'EMAIL_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $email_uri . '"><img src="' . $mx_images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>' : '', ! 'WWW_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_website'] ) ? '<a href="' . $commentrow[$i]['user_website'] . '" target="_userwww"><img src="' . $mx_images['icon_www'] . '" alt="' . $lang['Visit_website'] . '" title="' . $lang['Visit_website'] . '" border="0" /></a>' : '' : '', 'POSTER_AVATAR' => $poster_avatar, --- 833,844 ---- //users mesangers, website, email ! 'PROFILE_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $phpbb_root_path .$profile_url . '"><img src="' . $images['icon_profile'] . '" alt="' . $lang['Read_profile'] . '" title="' . $lang['Read_profile'] . '" border="0" /></a>' : '', ! 'PM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $phpbb_root_path .$pm_url . '"><img src="' . $images['icon_pm'] . '" alt="' . $lang['Send_private_message'] . '" title="' . $lang['Send_private_message'] . '" border="0" /></a>' : '', ! 'AIM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_aim'] ) ? '<a href="aim:goim?screenname=' . $commentrow[$i]['user_aim'] . '&message=Hello+Are+you+there?"><img src="' . $images['icon_aim'] . '" alt="' . $lang['AIM'] . '" title="' . $lang['AIM'] . '" border="0" /></a>' : '' : '', ! 'YIM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $commentrow[$i]['user_yim'] . '&.src=pg"><img src="' . $images['icon_yim'] . '" alt="' . $lang['YIM'] . '" title="' . $lang['YIM'] . '" border="0" /></a>' : '' : '', ! 'MSNM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_msnm'] ) ? '<a href="' . $temp_url . '"><img src="' . $images['icon_msnm'] . '" alt="' . $lang['MSNM'] . '" title="' . $lang['MSNM'] . '" border="0" /></a>' : '' : '', ! 'ICQ_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_icq'] ) ? '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $commentrow[$i]['user_icq'] . '"><img src="' . $images['icon_icq'] . '" alt="' . $lang['ICQ'] . '" title="' . $lang['ICQ'] . '" border="0" /></a>' : '' : '', ! 'EMAIL_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>' : '', ! 'WWW_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_website'] ) ? '<a href="' . $commentrow[$i]['user_website'] . '" target="_userwww"><img src="' . $images['icon_www'] . '" alt="' . $lang['Visit_website'] . '" title="' . $lang['Visit_website'] . '" border="0" /></a>' : '' : '', 'POSTER_AVATAR' => $poster_avatar, Index: album_personal_random.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_personal_random.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** album_personal_random.php 13 Jun 2007 18:46:45 -0000 1.1 --- album_personal_random.php 9 Aug 2007 13:16:58 -0000 1.2 *************** *** 434,438 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; break; --- 434,438 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; break; *************** *** 484,488 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $mx_module_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; break; --- 484,488 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $mx_module_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; break; *************** *** 530,534 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $mx_module_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); break; } --- 530,534 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $mx_module_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); break; } *************** *** 592,596 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; } --- 592,596 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; } Index: album_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_cat.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** album_cat.php 11 Jul 2007 14:25:27 -0000 1.11 --- album_cat.php 9 Aug 2007 13:16:55 -0000 1.12 *************** *** 605,626 **** // END build jumpbox ! global $mx_images; $current_template_images = $module_root_path . "templates/". $theme['template_name'] ."/images"; - if ( file_exists( $mx_images['upload_pic'] ) ) - { - $upload_img = $mx_images['upload_pic']; - } - elseif ( file_exists( PORTAL_URL . $current_template_images . "/" . LANG . "/upload_pic.gif" ) ) - { - $upload_img = PORTAL_URL . $current_template_images . "/" . LANG . "/upload_pic.gif"; - } - else - { - $upload_img = PORTAL_URL . $module_root_path . "templates/subSilver/images" . "/" . LANG . "/upload_pic.gif"; - } ! $jupload_img = $mx_images['jupload_pic']; // $upload_link = append_sid(album_append_uid("album_upload.$phpEx?cat_id=$cat_id")); --- 605,617 ---- // END build jumpbox ! global $images; $current_template_images = $module_root_path . "templates/". $theme['template_name'] ."/images"; ! $upload_img = $images['upload_pic']; ! $jupload_img = $images['jupload_pic']; ! $download_img = $images['download_pic']; ! $download_all_img = $images['download_all_pic']; // $upload_link = append_sid(album_append_uid("album_upload.$phpEx?cat_id=$cat_id")); *************** *** 630,645 **** $jupload_full_link = '<a href="' . $jupload_link . '"><img src="' . $jupload_img .'" alt="' . $lang['JUpload_Pic'] . '" title="' . $lang['JUpload_Pic'] . '" align="middle" border="0" /></a>'; - if ( file_exists( $mx_images['download_pic'] ) ) - { - $download_img = $mx_images['download_pic']; - } - elseif ( file_exists( PORTAL_URL . $current_template_images . "/" . LANG . "/download.gif" ) ) - { - $download_img = PORTAL_URL . $current_template_images . "/" . LANG . "/download.gif"; - } - else - { - $download_img = PORTAL_URL . $module_root_path . "templates/subSilver/images" . "/" . LANG . "/download.gif"; - } // $download_link = append_sid(album_append_uid('album_download.' . $phpEx . '?cat_id=' . $cat_id . ( ($sort_method != '') ? '&sort_method=' . $sort_method : '' ) . ( ($sort_order != '') ? '&sort_order=' . $sort_order : '' ) . ( ($start != '') ? '&start=' . $start : '' ))); // $download_link =append_sid(this_smartor_mxurl("smartor_mode=album_download" . '&cat_id=' . $cat_id . ( ($sort_method != '') ? '&sort_method=' . $sort_method : '' ) . ( ($sort_order != '') ? '&sort_order=' . $sort_order : '' ) . ( ($start != '') ? '&start=' . $start : '' ))); --- 621,624 ---- *************** *** 647,658 **** $download_full_link = '<a href="' . $download_link . '"><img src="' . $download_img . '" alt="' . $lang['Download_page'] . '" title="' . $lang['Download_page'] . '" align="middle" border="0" /></a>'; - if ( file_exists( $mx_images['download_all_pic'] ) ) - { - $download_all_img = $mx_images['download_all_pic']; - } - else - { - $download_all_img = PORTAL_URL . $current_template_images . "/" . LANG . "/download_all.gif"; - } // $download_all_link = append_sid(album_append_uid('album_download.' . $phpEx . '?cat_id=' . $cat_id . ( ($sort_method != '') ? '&sort_method=' . $sort_method : '' ) . ( ($sort_order != '') ? '&sort_order=' . $sort_order : '' ) . '&download_all_pics=true')); $download_all_link =append_sid(this_smartor_mxurl("smartor_mode=album_download" . '&cat_id=' . $cat_id . ( ($sort_method != '') ? '&sort_method=' . $sort_method : '' ) . ( ($sort_order != '') ? '&sort_order=' . $sort_order : '' ) . '&download_all_pics=true')); --- 626,629 ---- *************** *** 799,803 **** 'U_UPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_upload&cat_id=" . $cat_id)), ! 'UPLOAD_PIC_IMG' => $mx_images['upload_pic'], 'L_UPLOAD_PIC' => $lang['Upload_Pic'], 'UPLOAD_FULL_LINK' => $upload_full_link, --- 770,774 ---- 'U_UPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_upload&cat_id=" . $cat_id)), ! 'UPLOAD_PIC_IMG' => $images['upload_pic'], 'L_UPLOAD_PIC' => $lang['Upload_Pic'], 'UPLOAD_FULL_LINK' => $upload_full_link, *************** *** 805,809 **** 'U_JUPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_jupload&cat_id=" . $cat_id)), ! 'JUPLOAD_PIC_IMG' => $mx_images['jupload_pic'], 'L_JUPLOAD_PIC' => $lang['JUpload_Pic'], --- 776,780 ---- 'U_JUPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_jupload&cat_id=" . $cat_id)), ! 'JUPLOAD_PIC_IMG' => $images['jupload_pic'], 'L_JUPLOAD_PIC' => $lang['JUpload_Pic'], *************** *** 823,827 **** 'U_MANAGE_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_personal_cat_admin&cat_id=$cat_id")), ! 'MANAGE_PIC_IMG' => $mx_images['manage_pic'], 'L_MANAGE_PIC' => $lang['manage_Pic'], --- 794,798 ---- 'U_MANAGE_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_personal_cat_admin&cat_id=$cat_id")), ! 'MANAGE_PIC_IMG' => $images['manage_pic'], 'L_MANAGE_PIC' => $lang['manage_Pic'], Index: album_picm.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_picm.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** album_picm.php 7 Jun 2007 20:13:30 -0000 1.6 --- album_picm.php 9 Aug 2007 13:16:59 -0000 1.7 *************** *** 170,174 **** header('Content-type: image/jpeg'); ! readfile($mx_images['no_thumbnail']); exit; } --- 170,174 ---- header('Content-type: image/jpeg'); ! readfile($images['no_thumbnail']); exit; } Index: album_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_search.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** album_search.php 11 Jul 2007 15:35:12 -0000 1.8 --- album_search.php 9 Aug 2007 13:17:00 -0000 1.9 *************** *** 215,219 **** 'L_NRESULTS' => $numres, 'L_TRESULTS' => $total_pics, ! 'IMG_FOLDER' => $mx_images['folder'], 'L_TCATEGORY' => $lang['Pic_Cat'], 'L_TTITLE' => $lang['Pic_Image'], --- 215,219 ---- 'L_NRESULTS' => $numres, 'L_TRESULTS' => $total_pics, ! 'IMG_FOLDER' => $images['folder'], 'L_TCATEGORY' => $lang['Pic_Cat'], 'L_TTITLE' => $lang['Pic_Image'], Index: album_rdf.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_rdf.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** album_rdf.php 7 Jun 2007 20:13:34 -0000 1.1 --- album_rdf.php 9 Aug 2007 13:16:59 -0000 1.2 *************** *** 76,82 **** ! if (!isset($mx_images['logo_url']) || empty($mx_images['logo_url'])) { ! $mx_images['logo_url'] = PORTAL_URL . 'templates/' . $theme['template_name'] . '/' . $logo; } --- 76,82 ---- ! if (!isset($images['logo_url']) || empty($images['logo_url'])) { ! $images['logo_url'] = PORTAL_URL . 'templates/' . $theme['template_name'] . '/' . $logo; } *************** *** 99,103 **** <link>" . $index_site . "</link> <description>" . $board_config['site_desc'] . "</description> ! <url>" . $mx_images['logo_url'] . "</url> </image> </channel> --- 99,103 ---- <link>" . $index_site . "</link> <description>" . $board_config['site_desc'] . "</description> ! <url>" . $images['logo_url'] . "</url> </image> </channel> Index: album_otf_thumbnail.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_otf_thumbnail.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** album_otf_thumbnail.php 7 Jun 2007 20:13:33 -0000 1.1 --- album_otf_thumbnail.php 9 Aug 2007 13:16:57 -0000 1.2 *************** *** 86,90 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_posted_" . $pic_title_reg . $pic_filetype); ! readfile($mx_images['no_thumbnail']); exit; break; --- 86,90 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_posted_" . $pic_title_reg . $pic_filetype); ! readfile($images['no_thumbnail']); exit; break; *************** *** 118,122 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($mx_images['no_thumbnail']); exit; break; --- 118,122 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($images['no_thumbnail']); exit; break; *************** *** 160,164 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($mx_images['no_thumbnail']); exit; break; --- 160,164 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($images['no_thumbnail']); exit; break; *************** *** 194,198 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($mx_images['no_thumbnail']); exit; break; --- 194,198 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($images['no_thumbnail']); exit; break; *************** *** 255,259 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($mx_images['no_thumbnail']); break; } --- 255,259 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($images['no_thumbnail']); break; } *************** *** 314,318 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($mx_images['no_thumbnail']); exit; } --- 314,318 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($images['no_thumbnail']); exit; } Index: album_otf.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_otf.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** album_otf.php 7 Jun 2007 20:13:33 -0000 1.1 --- album_otf.php 9 Aug 2007 13:16:56 -0000 1.2 *************** *** 77,81 **** /* ! global $album_config, $template, $lang, $mx_images, $theme; global $mx_root_path, $phpEx; */ --- 77,81 ---- /* ! global $album_config, $template, $lang, $images, $theme; global $mx_root_path, $phpEx; */ Index: album_personal_cat_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_personal_cat_admin.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** album_personal_cat_admin.php 7 Jun 2007 20:13:30 -0000 1.7 --- album_personal_cat_admin.php 9 Aug 2007 13:16:57 -0000 1.8 *************** *** 46,64 **** // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ); } --- 46,64 ---- // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); } Index: album_rss.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_rss.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** album_rss.php 7 Jun 2007 20:13:34 -0000 1.1 --- album_rss.php 9 Aug 2007 13:16:59 -0000 1.2 *************** *** 86,96 **** ! if (!isset($mx_images['logo_url']) || empty($mx_images['logo_url'])) { ! $mx_images['logo_url'] = PORTAL_URL . 'templates/' . $theme['template_name'] . '/images/' . $logo; } elseif (!isset($theme['template_name']) || empty($theme['template_name'])) { ! $mx_images['logo_url'] = PORTAL_URL . 'templates/subSilver/images/' . $logo; } --- 86,96 ---- ! if (!isset($images['logo_url']) || empty($images['logo_url'])) { ! $images['logo_url'] = PORTAL_URL . 'templates/' . $theme['template_name'] . '/images/' . $logo; } elseif (!isset($theme['template_name']) || empty($theme['template_name'])) { ! $images['logo_url'] = PORTAL_URL . 'templates/subSilver/images/' . $logo; } *************** *** 117,121 **** <link>" . $index_site . "</link> <description>" . $board_config['site_desc'] . "</description> ! <url>" . $mx_images['logo_url'] . "</url> </image> "; --- 117,121 ---- <link>" . $index_site . "</link> <description>" . $board_config['site_desc'] . "</description> ! <url>" . $images['logo_url'] . "</url> </image> "; Index: album_memberlist.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_memberlist.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** album_memberlist.php 7 Jun 2007 20:13:29 -0000 1.5 --- album_memberlist.php 9 Aug 2007 13:16:56 -0000 1.6 *************** *** 368,380 **** 'U_SHOW_ALL_PICS' => append_sid(album_append_uid("album.$phpEx?user_id=$album_user_id$album_view_mode_param&type=pic")), 'L_SHOW_ALL_PICS' => sprintf($lang['Show_All_Pictures_Of_user'], $username), ! 'SHOW_ALL_PICS_IMG' => $mx_images['show_all_pics'], 'U_SHOW_ALL_RATINGS' => append_sid(album_append_uid("album.$phpEx?user_id=$album_user_id$album_view_mode_param&type=rating")), 'L_SHOW_ALL_RATINGS' => sprintf($lang['Show_All_Ratings_Of_user'], $username), ! 'SHOW_ALL_RATINGS_IMG' => $mx_images['show_all_ratings'], 'U_SHOW_ALL_COMMENTS' => append_sid(album_append_uid("album.$phpEx?user_id=$album_user_id$album_view_mode_param&type=comment")), 'L_SHOW_ALL_COMMENTS' => sprintf($lang['Show_All_Comments_Of_user'], $username), ! 'SHOW_ALL_COMMENTS_IMG' => $mx_images['show_all_comments'], 'L_PICTURES_OF_USER' => $list_title, --- 368,380 ---- 'U_SHOW_ALL_PICS' => append_sid(album_append_uid("album.$phpEx?user_id=$album_user_id$album_view_mode_param&type=pic")), 'L_SHOW_ALL_PICS' => sprintf($lang['Show_All_Pictures_Of_user'], $username), ! 'SHOW_ALL_PICS_IMG' => $images['show_all_pics'], 'U_SHOW_ALL_RATINGS' => append_sid(album_append_uid("album.$phpEx?user_id=$album_user_id$album_view_mode_param&type=rating")), 'L_SHOW_ALL_RATINGS' => sprintf($lang['Show_All_Ratings_Of_user'], $username), ! 'SHOW_ALL_RATINGS_IMG' => $images['show_all_ratings'], 'U_SHOW_ALL_COMMENTS' => append_sid(album_append_uid("album.$phpEx?user_id=$album_user_id$album_view_mode_param&type=comment")), 'L_SHOW_ALL_COMMENTS' => sprintf($lang['Show_All_Comments_Of_user'], $username), ! 'SHOW_ALL_COMMENTS_IMG' => $images['show_all_comments'], 'L_PICTURES_OF_USER' => $list_title, Index: album_thumbnail.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_thumbnail.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** album_thumbnail.php 7 Jun 2007 20:13:30 -0000 1.6 --- album_thumbnail.php 9 Aug 2007 13:17:01 -0000 1.7 *************** *** 180,184 **** header('Content-type: image/jpeg'); header('Content-Disposition: filename=' . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; */ --- 180,184 ---- header('Content-type: image/jpeg'); header('Content-Disposition: filename=' . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; */ *************** *** 209,213 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; break; --- 209,213 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; break; *************** *** 259,263 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $mx_module_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; break; --- 259,263 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $mx_module_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; break; *************** *** 320,324 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $mx_module_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); break; } --- 320,324 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $mx_module_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); break; } *************** *** 387,391 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; } --- 387,391 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; } Index: album_allpics.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_allpics.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** album_allpics.php 7 Jun 2007 20:13:31 -0000 1.1 --- album_allpics.php 9 Aug 2007 13:16:55 -0000 1.2 *************** *** 576,588 **** 'U_SHOW_ALL_PICS' => append_sid(this_smartor_mxurl("smartor_mode=album_allpics" . $album_view_mode_param . '&type=pic')), 'L_SHOW_ALL_PICS' => $lang['All_Show_All_Pictures_Of_user'], ! 'SHOW_ALL_PICS_IMG' => $mx_images['show_all_pics'], 'U_SHOW_ALL_RATINGS' => append_sid(this_smartor_mxurl("smartor_mode=album_allpics" . $album_view_mode_param . '&type=rating')), 'L_SHOW_ALL_RATINGS' => $lang['All_Show_All_Ratings_Of_user'], ! 'SHOW_ALL_RATINGS_IMG' => $mx_images['show_all_ratings'], 'U_SHOW_ALL_COMMENTS' => append_sid(this_smartor_mxurl("smartor_mode=album_allpics" . $album_view_mode_param . '&type=comment')), 'L_SHOW_ALL_COMMENTS' => $lang['All_Show_All_Comments_Of_user'], ! 'SHOW_ALL_COMMENTS_IMG' => $mx_images['show_all_comments'], 'L_PICTURES_OF_USER' => $list_title, --- 576,588 ---- 'U_SHOW_ALL_PICS' => append_sid(this_smartor_mxurl("smartor_mode=album_allpics" . $album_view_mode_param . '&type=pic')), 'L_SHOW_ALL_PICS' => $lang['All_Show_All_Pictures_Of_user'], ! 'SHOW_ALL_PICS_IMG' => $images['show_all_pics'], 'U_SHOW_ALL_RATINGS' => append_sid(this_smartor_mxurl("smartor_mode=album_allpics" . $album_view_mode_param . '&type=rating')), 'L_SHOW_ALL_RATINGS' => $lang['All_Show_All_Ratings_Of_user'], ! 'SHOW_ALL_RATINGS_IMG' => $images['show_all_ratings'], 'U_SHOW_ALL_COMMENTS' => append_sid(this_smartor_mxurl("smartor_mode=album_allpics" . $album_view_mode_param . '&type=comment')), 'L_SHOW_ALL_COMMENTS' => $lang['All_Show_All_Comments_Of_user'], ! 'SHOW_ALL_COMMENTS_IMG' => $images['show_all_comments'], 'L_PICTURES_OF_USER' => $list_title, |
