|
From: FlorinCB <ory...@us...> - 2009-07-11 01:37:59
|
Update of /cvsroot/mxbb/mx_radiocast/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9688/includes Modified Files: radiocast_add.php radiocast_edit.php Log Message: update Index: radiocast_add.php =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_add.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** radiocast_add.php 22 Jan 2009 08:29:51 -0000 1.2 --- radiocast_add.php 11 Jul 2009 01:37:52 -0000 1.3 *************** *** 244,247 **** --- 244,251 ---- 'L_STATION_TITLE' => $lang['Station_Title'], 'L_STATION_URL' => $lang['Station_url'], + + 'L_STATION_IMGURL' => $lang['Station_imgurl'], + 'L_STATION_IMGURL_DESC' => $lang['Station_imgurl_desc'], + 'STATION_IMGURL' => $thissong['station_imgurl'], 'L_STATION_DESC' => $lang['Station_Desc'], Index: radiocast_edit.php =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_edit.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** radiocast_edit.php 22 Jan 2009 08:29:51 -0000 1.2 --- radiocast_edit.php 11 Jul 2009 01:37:52 -0000 1.3 *************** *** 175,181 **** 'L_STATION_TITLE' => $lang['Station_Title'], - 'STATION_TITLE' => $thissong['station_title'], 'L_STATION_URL' => $lang['Station_url'], ! 'STATION_URL' => $thissong['station_url'], 'STATION_SINGER' => $thissong['station_singer'], 'STATION_DESC' => $thissong['station_desc'], --- 175,186 ---- 'L_STATION_TITLE' => $lang['Station_Title'], 'L_STATION_URL' => $lang['Station_url'], ! ! 'L_STATION_IMGURL' => $lang['Station_imgurl'], ! 'L_STATION_IMGURL_DESC' => $lang['Station_imgurl_desc'], ! 'STATION_IMGURL' => $thissong['station_imgurl'], ! ! 'STATION_TITLE' => $thissong['station_title'], ! 'STATION_URL' => $thissong['station_url'], 'STATION_SINGER' => $thissong['station_singer'], 'STATION_DESC' => $thissong['station_desc'], *************** *** 205,209 **** //Image Edit Added by OryNider 'L_STATION_IMAGE' => $lang['Station_image'], ! 'L_STATION_IMAGE_DESC' => $lang['Station_image_desc'], 'L_NO_IMAGE' => $no_image, 'L_UPLOAD_IMAGE' => $lang['Upload_image'], --- 210,215 ---- //Image Edit Added by OryNider 'L_STATION_IMAGE' => $lang['Station_image'], ! 'L_STATION_IMGURL' => $lang['Station_imgurl'], ! 'L_STATION_IMAGE_DESC' => $lang['Station_image_desc'], 'L_NO_IMAGE' => $no_image, 'L_UPLOAD_IMAGE' => $lang['Upload_image'], *************** *** 236,239 **** --- 242,249 ---- //Image Edit Added by OryNider $image_system = str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['image_system']))); + + $station_imgurl = str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['station_imgurl']))); + + $station_image = str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['station_image']))); $station_singer = str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['station_singer']))); *************** *** 270,284 **** $imagetmp = ( !empty($HTTP_POST_FILES['station_image']['tmp_name']) ) ? $HTTP_POST_FILES['station_image']['tmp_name'] : ''; - - //Image Edit Added by OryNider - // -------------------------------- - // Check image size // -------------------------------- ! ! if( $image_system == '1' ) ! { ! // -------------------------------- ! // Check image type ! // -------------------------------- switch ($imagetype) { --- 280,288 ---- $imagetmp = ( !empty($HTTP_POST_FILES['station_image']['tmp_name']) ) ? $HTTP_POST_FILES['station_image']['tmp_name'] : ''; // -------------------------------- ! // Check image type ! // -------------------------------- ! if($station_image) ! { switch ($imagetype) { *************** *** 287,305 **** case 'image/pjpeg': $station_imagetype = '.jpg'; ! break; case 'image/gif': $station_imagetype = '.gif'; ! break; case 'image/png': case 'image/x-png': $station_imagetype = '.png'; ! break; default: mx_message_die(GENERAL_ERROR, $lang['Not_allowed_image_type'] . ': ' . $imagetype); } ! if( $imagesize > $radiocast_config['max_image_size'] ) { --- 291,309 ---- case 'image/pjpeg': $station_imagetype = '.jpg'; ! break; case 'image/gif': $station_imagetype = '.gif'; ! break; case 'image/png': case 'image/x-png': $station_imagetype = '.png'; ! break; default: mx_message_die(GENERAL_ERROR, $lang['Not_allowed_image_type'] . ': ' . $imagetype); } ! if( $imagesize > $radiocast_config['max_image_size'] ) { *************** *** 307,313 **** } ! // -------------------------------- ! // If exits old image deleate it ! // -------------------------------- if( !empty($old_pic_filename) && file_exists($station_image_path . $old_pic_filename) ) --- 311,317 ---- } ! // -------------------------------- ! // If exits old image deleate it ! // -------------------------------- if( !empty($old_pic_filename) && file_exists($station_image_path . $old_pic_filename) ) *************** *** 316,322 **** } ! // -------------------------------- ! // Generate imagename ! // -------------------------------- do --- 320,326 ---- } ! // -------------------------------- ! // Generate imagename ! // -------------------------------- do *************** *** 327,333 **** ! // -------------------------------- ! // Move song image to directory ! // -------------------------------- if( !empty($HTTP_POST_FILES['station_image']['tmp_name']) ) --- 331,337 ---- ! // -------------------------------- ! // Move song image to directory ! // -------------------------------- if( !empty($HTTP_POST_FILES['station_image']['tmp_name']) ) *************** *** 353,359 **** } ! // -------------------------------- ! // Check its image size ! // -------------------------------- if( !empty($HTTP_POST_FILES['station_image']['size']) ) --- 357,363 ---- } ! // -------------------------------- ! // Check its image size ! // -------------------------------- if( !empty($HTTP_POST_FILES['station_image']['size']) ) *************** *** 372,382 **** } } - else if( !empty($old_pic_filename) ) - { - $station_imagename = $old_pic_filename; - } else { ! $station_imagename = ''; } --- 376,382 ---- } } else { ! $station_imagename = $station_imgurl ? $station_imgurl : ($old_pic_filename ? $old_pic_filename : ''); } |