mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] mx_smartor/album_mod/includes album_constants.php, 1.3, 1.4

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/album_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32439

Modified Files:
	album_constants.php 
Log Message:
upgrade version to 2.0.2 for core29x branch

Index: album_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_constants.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_constants.php	13 Mar 2008 08:35:54 -0000	1.3
--- album_constants.php	13 Mar 2008 08:47:23 -0000	1.4
***************
*** 32,42 ****
  }
  
! // -------------------------------------------------------------------------
! // Extend User Style with module lang and images
! // Usage:  $mx_user->extend(LANG, IMAGES)
! // Switches:
! // - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE
! // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
! // -------------------------------------------------------------------------
  if (!MXBB_MODULE)
  {
--- 32,37 ----
  }
  
! $mx_user->set_module_lang_path($module_root_path . 'album_mod/');
! 
  if (!MXBB_MODULE)
  {
***************
*** 44,48 ****
  	{
  		$mx_user->set_module_cfg_name('mx_smartor');
- 		$mx_user->set_module_lang_path($module_root_path . 'album_mod/');
  		$mx_user->extend(MX_LANG_ALL, MX_IMAGES);
  	}
--- 39,42 ----
***************
*** 54,71 ****
  		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
  	}
- 
- 	if (is_object($mx_page))
- 	{
- 		// -------------------------------------------------------------------------
- 		// Extend User Style with module lang and images
- 		// Usage:  $mx_user->extend(LANG, IMAGES)
- 		// Switches:
- 		// - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE
- 		// - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
- 		// -------------------------------------------------------------------------
- 		$mx_user->extend(MX_LANG_ALL, MX_IMAGES);
- 	}
  }
  
  // Album Tables
  !defined('ALBUM_TABLE') ? define('ALBUM_TABLE', $mx_table_prefix.'smartor_album') : false;
--- 48,62 ----
  		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
  	}
  }
  
+ // -------------------------------------------------------------------------
+ // Extend User Style with module lang and images
+ // Usage:  $mx_user->extend(LANG, IMAGES)
+ // Switches:
+ // - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE
+ // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
+ // -------------------------------------------------------------------------
+ $mx_user->extend(MX_LANG_ALL, MX_IMAGES);
+ 
  // Album Tables
  !defined('ALBUM_TABLE') ? define('ALBUM_TABLE', $mx_table_prefix.'smartor_album') : false;

[mxbb-commits] mx_smartor/language/lang_english index.htm, 1.1.2.1, 1.1.2.2 lang_admin.php, 1.7.2.8, 1.7.2.9 lang_main.php, 1.7.2.1, 1.7.2.2

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/language/lang_english
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30112/lang_english

Added Files:
      Tag: core28x
	index.htm lang_admin.php lang_main.php 
Log Message:
downgrade version to 2.0.1 for core28x branch

--- NEW FILE: lang_main.php ---
<?php
/**
*
* @package mxBB Portal Module - mx_smartor
* @version $Id: lang_main.php,v 1.7.2.2 2008/03/13 08:42:32 orynider Exp $
* @copyright (c) 2003 [sma...@ho..., Smartor] mxBB Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

// 
// The format of this file is: 
// 
// ---> $lang["message"] = "text"; 
// 
// Specify your language character encoding... [optional]
// 
// setlocale(LC_ALL, "en");

//
// Album Index
//
$lang['Photo_Album'] = 'Photo Album';
$lang['Pics'] = 'Pics';
$lang['Last_Pic'] = 'Last Pic';
$lang['Public_Categories'] = 'Public Categories';
$lang['No_Pics'] = 'No Pics';
$lang['Users_Personal_Galleries'] = 'Users Personal Galleries';
$lang['Your_Personal_Gallery'] = 'Your Personal Gallery';
$lang['Recent_Public_Pics'] = 'Recent Public Pics';
$lang['Toprated_Public_Pics'] = 'Highest Rated Pictures'; 
$lang['Random_Public_Pics'] = 'Random Pictures';
$lang['Most_Public_Pics'] = 'Most Viewed Pictures';

$lang['View'] = 'View';

// Category View
$lang['Category_not_exist'] = 'This category does not exist';
$lang['Upload_Pic'] = 'Upload Pic';
$lang['JUpload_Pic'] = 'Upload Multiple Pictures with Jupload';
$lang['Upload_Pics'] = 'Upload Pics';
$lang['Pic_Title'] = 'Pic Title';
$lang['View'] = 'View';
$lang['Pic_Poster'] = 'Poster';
$lang['Pic_Image'] = 'Image';

$lang['Album_upload_can'] = 'You <b>can</b> upload new pics in this category';
$lang['Album_upload_cannot'] = 'You <b>cannot</b> upload new pics in this category';
$lang['Album_rate_can'] = 'You <b>can</b> rate pics in this category';
$lang['Album_rate_cannot'] = 'You <b>cannot</b> rate pics in this category';
$lang['Album_comment_can'] = 'You <b>can</b> post comments to pics in this category';
$lang['Album_comment_cannot'] = 'You <b>cannot</b> post comments to pics in this category';
$lang['Album_edit_can'] = 'You <b>can</b> edit your pics and comments in this category';
$lang['Album_edit_cannot'] = 'You <b>cannot</b> edit your pics and comments in this category';
$lang['Album_delete_can'] = 'You <b>can</b> delete your pics and comments in this category';
$lang['Album_delete_cannot'] = 'You <b>cannot</b> delete your pics and comments in this category';
$lang['Album_moderate_can'] = 'You <b>can</b> %smoderate%s this category';

$lang['Edit_pic'] = 'Edit';
$lang['Delete_pic'] = 'Delete';
$lang['Rating'] = 'Rating';
$lang['Comments'] = 'Comments';
$lang['New_Comment'] = 'New Comment';

$lang['Not_rated'] = '<i>not rated</i>';
$lang['Select_initial'] = 'Select:';
//
// Upload
//
$lang['Pic_Desc'] = 'Pic Description';
$lang['Plain_text_only'] = 'Plain text only';
$lang['Max_length'] = 'Max length (bytes)';
$lang['Upload_pic_from_machine'] = 'Upload a pic from your machine';
$lang['Upload_to_Category'] = 'Upload to Category';
$lang['Upload_thumbnail_from_machine'] = 'Upload its thumbnail from your machine (must be the same type with your pic)';
$lang['Upload_thumbnail'] = 'Upload a thumbnail image';
$lang['Upload_thumbnail_explain'] = 'It must be of the same file type as your picture';
$lang['Thumbnail_size'] = 'Thumbnail size (pixel)';
$lang['Filetype_and_thumbtype_do_not_match'] = 'Your pic and your thumbnail must be the same type';

$lang['Add_File'] = 'Add File';

$lang['Upload_no_title'] = 'You must enter a title for your pic';
$lang['Upload_no_file'] = 'You must enter your path and your filename';
$lang['Desc_too_long'] = 'Your description is too long';


$lang['Rotation'] = 'Rotate (Anti-Clockwise) - Degrees';

$lang['Max_file_size'] = 'Maximum file size (bytes)';
$lang['Max_width'] = 'Maximum image width before recompression (pixel)';
$lang['Max_height'] = 'Maximum image height before recompression (pixel)';


$lang['JPG_allowed'] = 'Allowed to upload JPG files';
$lang['PNG_allowed'] = 'Allowed to upload PNG files';
$lang['GIF_allowed'] = 'Allowed to upload GIF files';

$lang['Album_reached_quota'] = 'This category has reached the quota of pics. Now you cannot upload any more. Please contact the administrators for more information';
$lang['User_reached_pics_quota'] = 'You have reached your quota of pics. Now you cannot upload any more. Please contact the administrators for more information';

$lang['Bad_upload_file_size'] = 'Your uploaded file is too large or corrupted';
$lang['Not_allowed_file_type'] = 'Your file type is not allowed';
$lang['Upload_image_size_too_big'] = 'Your image dimension size is too large';
$lang['Upload_thumbnail_size_too_big'] = 'Your thumbnail dimension size is too large';

$lang['Missed_pic_title'] = 'You must enter your pic title';

$lang['Album_upload_successful'] = 'Your pic has been uploaded successfully';
$lang['Album_upload_need_approval'] = 'Your pic has been uploaded successfully.<br /><br />But the feature Pic Approval has been enabled so your pic must be approved by a administrator or a moderator before posting';
$lang['Click_return_category'] = 'Click %shere%s to return to the category';
$lang['Click_return_album_index'] = 'Click %shere%s to return to the Album Index';

// View Pic
$lang['Pic_ID'] = 'ID';
$lang['Pic_Details'] = 'Image Details';
$lang['Pic_Size'] = 'Size';
$lang['Pic_Type'] = 'Image Type';
$lang['Pic_BBCode'] = 'BBCode';
$lang['Pic_not_exist'] = 'This pic does not exist';
$lang['Click_enlarge'] = 'Click on image to view larger image';
$lang['Prev_Pic'] = 'View Previous Picture';
$lang['Next_Pic'] = 'View Next Picture';
$lang['Slideshow'] = 'Slide Show';
$lang['Slideshow_Delay'] = 'Slide Show Delay';
$lang['Slideshow_On'] = 'Slide Show';
$lang['Slideshow_Off'] = 'Stop Slide Show';
$lang['Pics_Nav'] = 'Pictures Navigation';
$lang['Pics_Nav_Next'] = 'Next Pictures';
$lang['Pics_Nav_Prev'] = 'Previous Pictures';

// Edit Pic
$lang['Edit_Pic_Info'] = 'Edit Pic Information';
$lang['Pics_updated_successfully'] = 'Your pic information has been updated successfully';

// Delete Pic
$lang['Album_delete_confirm'] = 'Are you sure to delete these pic(s)?';
$lang['Pics_deleted_successfully'] = 'These pic(s) have been deleted successfully';

//
// ModCP
//
$lang['Approval'] = 'Approval';
$lang['Approve'] = 'Approve';
$lang['Unapprove'] = 'Unapprove';
$lang['Status'] = 'Status';
$lang['Locked'] = 'Locked';
$lang['Not_approved'] = 'Not approved';
$lang['Approved'] = 'Approved';
$lang['Move_to_Category'] = 'Move to Category';
$lang['Pics_moved_successfully'] = 'Your pic(s) have been moved successfully';
$lang['Pics_locked_successfully'] = 'Your pic(s) have been locked successfully';
$lang['Pics_unlocked_successfully'] = 'Your pic(s) have been unlocked successfully';
$lang['Pics_approved_successfully'] = 'Your pic(s) have been approved successfully';
$lang['Pics_unapproved_successfully'] = 'Your pic(s) have been unapproved successfully';

//
// Rate
//
$lang['Current_Rating'] = 'Current Rating';
$lang['Please_Rate_It'] = 'Please Rate It';
$lang['Already_rated'] = 'You have already rated this pic';
$lang['Album_rate_successfully'] = 'Your pic has been rated successfully';

//
// Comment
//
$lang['Comment_no_text'] = 'Please enter your comment';
$lang['Comment_too_long'] = 'Your comment is too long';
$lang['Comment_delete_confirm'] = 'Are you sure to delete this comment?';
$lang['Pic_Locked'] = 'Sorry, this pic was locked. So you cannot post comment for this pic anymore';

//
// Personal Gallery
//
$lang['Personal_Gallery_Explain'] = 'You can view the personal galleries of other members by clicking on the link in their profiles';
$lang['Personal_gallery_not_created'] = 'The personal gallery of %s is empty or has not been created';
$lang['Not_allowed_to_create_personal_gallery'] = 'Sorry, the administrators of this board donot allowed you to create your personal gallery';
$lang['Click_return_personal_gallery'] = 'Click %shere%s to return to the personal gallery';

// added
$lang['Album'] = 'Album Index';
$lang['Personal_Gallery_Of_User'] = 'Personal Gallery of %s';
$lang['Post_your_comment'] = 'Post your comment';
$lang['Not_Authorised'] = 'You are not authorized for this page, or you are not logged in as required.';
$lang['Nav_Separator'] = '&nbsp;&raquo;&nbsp;';
$lang['Rss_Feed'] = 'RSS Feed';

$lang['Album_Search'] = 'Searching the Album';
$lang['Pic_Name'] = 'Picture Name';
$lang['Description'] = 'Description';
$lang['Search_Contents'] = ' that contains: ';
$lang['Search_Found'] = 'Search found ';
$lang['Search_Matches'] = 'Matches:';

// The picture list of a member (album_memberlist.php)
$lang['Pic_Cat'] = 'Category';
$lang['Picture_List_Of_User'] = 'All Pictures by %s';
$lang['Member_Picture_List_Explain'] = 'You can view the complete list of picture contributed by other members by clicking on the link in their profiles';
$lang['Comment_List_Of_User'] = 'All Comments by %s';
$lang['Rating_List_Of_User'] = 'All Ratings by %s';
$lang['Show_All_Pictures_Of_user'] = 'Show All Pictures by %s';
$lang['Show_All_Comments_Of_user'] = 'Show All Comments by %s';
$lang['Show_All_Ratings_Of_user'] = 'Show All Ratings by %s';

// Album Nuffload
$lang['time_elapsed'] = 'Time Elapsed';
$lang['time_remaining'] = 'Time Remaining';
$lang['upload_in_progress'] = 'Upload In Progress';
$lang['please_wait'] = 'Please Wait...';
$lang['uploaded'] = 'Uploaded %multi_id% of %multi_max% images.';
$lang['no_file_received'] = 'No image file received';
$lang['no_thumbnail_file_received'] = 'No thumbnail file received';
$lang['file_too_big'] = 'Image file size too big';
$lang['thumbnail_too_big'] = 'Thumbnail file size too big';
$lang['image_res_too_high'] = 'Image resolution too high';
$lang['add_field'] = 'Add file upload field';
$lang['remove_field'] = 'Remove file upload field';
$lang['ZIP_allowed'] = 'Allowed to upload ZIP files';

// Album Hierarchy Index Table
$lang['Last_Comment'] = 'Last Comment';
$lang['Last_Comments'] = 'Last Comments';
$lang['No_Comment_Info'] = 'No Comments';
$lang['No_Pictures_In_Cat']= 'No Pictures In Category';
$lang['Total_Pics'] = 'Total Pics';
$lang['Total_Comments'] = 'Total Comments';
$lang['Last_Index_Thumbnail'] = 'Last Pic';
$lang['One_Sub_Total_Pics'] = '%d Pic';
$lang['Multiple_Sub_Total_Pics'] = '%d Pics';
$lang['Album_sub_categories'] = 'Sub Categories';
$lang['No_Public_Galleries'] = 'No Public Galleries';
$lang['One_new_picture'] = '%d new picture';
$lang['Multiple_new_pictures'] = '%d new pictures';

// The pictures list
$lang['All_Picture_List_Of_User'] = 'All Pictures';
$lang['All_Comment_List_Of_User'] = 'All Comments';
$lang['All_Rating_List_Of_User'] = 'All Ratings';
$lang['All_Show_All_Pictures_Of_user'] = 'Show All Pictures';
$lang['All_Show_All_Comments_Of_user'] = 'Show All Comments';
$lang['All_Show_All_Ratings_Of_user'] = 'Show All Ratings';

$lang['Not_commented'] = '<i>Not Commented</i>';

// Nuff's Stuff
$lang['Nuff_Click'] = 'Click here to apply Special Effects';
$lang['Nuff_UnClick'] = 'Click here for normal visualization';
$lang['Nuff_Title'] = 'Special Effects';
$lang['Nuff_Explain'] ='Using this page you can apply multiple effects to the pictures.<br />Remember that this is a <i><b>very heavy operation on server CPU load</b></i>, so please do not abuse it. Some effects will automatically resize the output image so to not charge too much server CPU.';
$lang['Nuff_Normal'] = 'Normal Image';
$lang['Nuff_Normal_Explain'] = 'No effects applied';
$lang['Nuff_BW'] = 'Black & White';
$lang['Nuff_BW_Explain'] = 'This effect will transform the image into Black and White';
$lang['Nuff_Sepia'] = 'Sepia Tone';
$lang['Nuff_Sepia_Explain'] = 'This effect will apply sepia toning to the picture';
$lang['Nuff_Flip'] = 'Flip';
$lang['Nuff_Flip_Explain'] = 'Using this function you can flip the image';
$lang['Nuff_Mirror'] = 'Mirror';
$lang['Nuff_Mirror_Explain'] = 'Using this function you can mirror the image';
$lang['Nuff_Flip_H'] = 'Horizontal';
$lang['Nuff_Flip_V'] = 'Vertical';
$lang['Nuff_Rotate'] = 'Picture Rotation (Anti Clockwise)';
$lang['Nuff_Rotate_Explain'] = 'Rotates the images anti clockwise';
$lang['Nuff_Resize'] = 'Resize';
$lang['Nuff_Resize_Explain'] = 'This function is for image resizing';
$lang['Nuff_Resize_W'] = 'Width';
$lang['Nuff_Resize_H'] = 'Height';
$lang['Nuff_Resize_No_Resize'] = 'No Resize';
$lang['Nuff_Watermark'] = 'Watermark';
$lang['Nuff_Watermark_Explain'] = 'Apply a watermark to the image';
$lang['Nuff_Recompress'] = 'Recompress';
$lang['Nuff_Recompress_Explain'] = 'This function can recompress the image';
$lang['Nuff_Alpha'] = 'Alpha';
$lang['Nuff_Alpha_Explain'] = 'This effect will overlay an alpha channel to the image';
$lang['Nuff_Blur'] = 'Blur';
$lang['Nuff_Blur_Explain'] = 'This effect will apply a blur filter to the image';
$lang['Nuff_Pixelate'] = 'Pixelate';
$lang['Nuff_Pixelate_Explain'] = 'This effect will apply a pixelate filter to the image';
$lang['Nuff_Scatter'] = 'Scatter';
$lang['Nuff_Scatter_Explain'] = 'This effect will apply a scatter filter to the image';
$lang['Nuff_Infrared'] = 'Infrared';
$lang['Nuff_Infrared_Explain'] = 'This effect will apply an infrared filter to the image';
$lang['Nuff_Tint'] = 'Tint';
$lang['Nuff_Tint_Explain'] = 'This effect will apply a red tint to the image';
$lang['Nuff_Interlace'] = 'Interlace (Horizontal Lines)';
$lang['Nuff_Interlace_Explain'] = 'This effect will overlay an interlace channel to the image';
$lang['Nuff_Screen'] = 'Screen (Hor Ver Lines)';
$lang['Nuff_Screen_Explain'] = 'This effect will overlay a screen channel to the image';
$lang['Nuff_Stereogram'] = 'Stereogram';
$lang['Nuff_Stereogram_Explain'] = 'This effect will convert the image to a stereogram (BW 16 bit required)';

$lang['Pic_Gallery'] = 'OTF Gallery';
$lang['Album_otf'] = 'OTF Gallery';
$lang['Select_Pic'] = 'Select Pic';
$lang['Select_Category'] = 'Select Category';

// Personal Album Hierarchy Index Table
$lang['Personal_Categories'] = 'Personal Gallery';
$lang['Create_Personal_Categories'] = 'Create Personal Gallery';
$lang['Personal_Cat_Admin'] = 'Personal Gallery Category Admin';
$lang['Recent_Personal_Pics'] = 'Recent Pictures From the Personal Gallery of %s';

// Access language strings
$lang['Album_Can_Manage_Categories'] = 'You <b>can</b> %smanage%s the categories in the gallery';
$lang['No_Personal_Category_admin'] = 'You are not allowed to manage your personal gallery categories';


//
// Welcome
//
$lang['Welcome'] = "Welcome";
$lang['Welcome_User'] = "Welcome, %s !";
$lang['Search_at'] = "Search at";
$lang['Advanced_search'] = "Advanced Search";
$lang['Search_unread'] = "View unread posts";
$lang['Search_self_topics'] = "Topics you've started";
$lang['Search_self_posts'] = "View all your posts";
$lang['Posts_since_last_visit'] = "Posts since last visit";
$lang['View_latest'] = "View latest";
$lang['Total_Personal_Pics'] = "You have <b>%d</b> personal pictures.";

//
// That's all Folks!
// -------------------------------------------------
?>
--- NEW FILE: lang_admin.php ---
<?php
/**
*
* @package mxBB Portal Module - mx_smartor
* @version $Id: lang_admin.php,v 1.7.2.9 2008/03/13 08:42:30 orynider Exp $
* @copyright (c) 2003 [sma...@ho..., Smartor] mxBB Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

// 
// The format of this file is: 
// 
// ---> $lang["message"] = "text"; 
// 
// Specify your language character encoding... [optional]
// 
// setlocale(LC_ALL, "en");

//
// Configuration
//
$lang['Album_config'] = 'Album Configuration';
$lang['Album_config_explain'] = 'You can change the general settings of your Photo Album here';
$lang['Album_config_updated'] = 'Album Configuration has been updated successfully';
$lang['Click_return_album_config'] = 'Click %sHere%s to return to the Album Configuration';
$lang['Max_pics'] = 'Maximum pics for each Category (-1 = unlimited)';
$lang['User_pics_limit'] = 'Pics limit per category for each user (-1 = unlimited)';
$lang['Moderator_pics_limit'] = 'Pics limit per category for each moderator (-1 = unlimited)';
$lang['Pics_Approval'] = 'Pics Approval';
$lang['Rows_per_page'] = 'Number of rows on thumbnail page (in categories)';
$lang['Cols_per_page'] = 'Number of columns on thumbnail page (in categories)';
$lang['Thumbnail_quality'] = 'Thumbnail quality (1-100)';
$lang['Thumbnail_cache'] = 'Thumbnail cache';
$lang['Manual_thumbnail'] = 'Manual thumbnail';
$lang['GD_version'] = 'Optimize for the version of GD';
$lang['Pic_Desc_Max_Length'] = 'Pic Description/Comment Max Length (bytes)';
$lang['Hotlink_prevent'] = 'Hotlink Prevention';
$lang['Hotlink_allowed'] = 'Allowed domains for hotlink (separated by a comma)';
$lang['Personal_gallery'] = 'Allowed to create personal gallery for users';
$lang['Personal_gallery_limit'] = 'Pics limit for each personal gallery (-1 = unlimited)';
$lang['Personal_gallery_view'] = 'Who can view personal galleries';
$lang['Rate_system'] = 'Enable rate system';
$lang['Rate_Scale'] =' Rating Scale';
$lang['Comment_system'] = 'Enable comment system';
$lang['Thumbnail_Settings'] = 'Thumbnail Settings';
$lang['Extra_Settings'] = 'Extra Settings';
$lang['Default_Sort_Method'] = 'Default Sort Method';
$lang['Default_Sort_Order'] = 'Default Sort Order';
$lang['Fullpic_Popup'] = 'View full pic as a popup';
$lang['Show_Download'] = 'Show DOWNLOAD button (which enables the downloading of pictures in ZIP format) only to those who have UPLOAD permissions in the Album (if you choose ALWAYS the button will be always available even if the users has no UPLOAD permissions)';
$lang['Show_Slideshow'] = 'Enable Slideshow feature';
$lang['Show_Slideshow_Script'] = 'Enable transition effects for Slideshow';
$lang['Show_Pic_Size'] = 'Show the pic size on thumbnail';
$lang['Show_IMG_No_GD'] = 'Show GIF thumbnails without using GD libraries (full images are loaded and then just shown resized).';
$lang['Show_GIF_MidThumb'] = 'Show full GIF images if Mid Thumb is enabled.';
$lang['Show_Pics_Nav'] = 'Show Picture Navigation Box in Show Page';
$lang['Invert_Nav_Arrows'] = 'Invert the Arrows link in Showpage (right arrow = more recent)';
$lang['Show_Inline_Copyright'] = 'Show Copyrights Info on a single line';
$lang['Enable_Nuffimage'] = 'Enable Pictures Special Effects page based on Nuffmon Images Class';
$lang['Enable_Sepia_BW'] = 'Enable Sepia and B&W in Special Effects page (disable this function if you want no to load server\'s CPU)';
$lang['Show_EXIF_Info'] = 'Show picture EXIF informations';
$lang['Enable_BBCode'] = 'Enable BBCode';
$lang['Set_Memory'] = 'Set a memory limit via PHP (MB)';
$lang['Set_Memory_Explain'] = 'This feature may be used to increase memory limit in PHP (this setting must be allowed by your hosting): you can try to increase memory when your images are not loaded correctly. To avoid higher memory limits the max value is forced to be 16MB.';
$lang['LB_Preview'] = 'Enable LightBox Preview';
$lang['LB_Preview_Explain'] = 'This feature will show a LightBox with picture preview when moving the mouse over a thumbnail.';
$lang['Album_config_notice'] = 'If you change the current Photo Album settings and then select another tab, you will be prompted to save your changes.<br />The system will <b>not save</b> the changes for you automatically.';
$lang['Save_sucessfully_confimation'] = '%s was saved successfully';
$lang['Show_Recent_In_Subcats'] = 'Show recent pictures in sub categories';
$lang['Show_Recent_Instead_of_NoPics'] = 'Show recent pictures instead of no picture message';
$lang['Show_Last_Comments'] = 'Display last comments block on album index and categories';
$lang['Album_Index_Settings'] = 'Album Index';
$lang['Show_Index_Subcats'] = 'Show sub categories in index table';
$lang['Show_Index_Thumb'] = 'Show category thumbnails in index table';
$lang['Show_Index_Pics'] = 'Show the number of pictures in current category in index table';
$lang['Show_Index_Comments'] = 'Show the number of comments in current category in index table';
$lang['Show_Index_Total_Pics'] = 'Show the number of total pictures for current categories and all it\'s sub categories in index table';
$lang['Show_Index_Total_Comments'] = 'Show the number of total comments for current categories and all it\'s sub categories in index table';
$lang['Show_Index_Last_Comment'] = 'Show last comments for current categories and all it\'s sub categories in index table';
$lang['Show_Index_Last_Pic'] = 'Show last picture info for current categories and all it\'s sub categories in index table';
$lang['Line_Break_Subcats'] = 'Show each sub cat on a new line';
$lang['Show_Personal_Gallery_Link'] = 'Show Personal Gallery and Users Personal Gallery link in Sub Categories';
$lang['Album_Personal_Auth_Explain'] = 'Here you can choose which usergroup(s) can be the moderators for <b>all</b> personal album categories or just has the private access to them';
$lang['Album_debug_mode'] = 'Enable the hierarchy debug mode.<br /><span class="gensmall">This will generate a lot of extra output on the page and also some header warnings, which are all ok.<br />This option should <b>only</b> be used when having problems.</span>';
$lang['New_Pic_Check_Interval'] = 'The time to use to see if a picture is new or not.<br /><span class="gensmall"><b>Format</b> : &lt;number&gt;&lt;type&gt; Where type is either h, d, w or m (hour, day, week or month)<br /> e.g. 12H = 12 hours and 12D = 12 days and 12W = 12 weeks and 12M = 12 months<br />If no type is specified the system will use <b>days</b></span>';
$lang['New_Pic_Check_Interval_Desc'] = '<span class="gensmall">H = HOURS, D = DAYS, W = WEEKS, M = MONTHS</span>';
$lang['New_Pic_Check_Interval_LV'] = 'Enabling this option the new pics counter is based on users last visit time.';
$lang['Enable_Show_All_Pics'] = 'Enable toggling of personal gallery view mode (all pictures or only selected category).<br /> When set to <b>no</b>, only selected category is shown.';
$lang['Enable_Index_Supercells'] = 'Enable super cells in the index table. <br /><span class="gensmall">This will enable the mouseover effects on the columns, also knows as the supercell effect.</span>';
$lang['Show_OTF_Link'] = 'Show "Album OTF" link on Album Index';
$lang['Show_AllPics_Link'] = 'Show "All Pics" link on Album Index';
$lang['Show_PG_Link'] = 'Show "Personal Galleries" link on Album Index';


// Personal Gallery Page
$lang['Personal_Galleries'] = 'Personal Galleries';
$lang['Album_personal_gallery_title'] = 'Personal Gallery';
$lang['Album_personal_gallery_explain'] = 'On this page, you can choose which usergroups have right to create and view personal galleries. These settings only affect when you set "PRIVATE" for "Allowed to create personal gallery for users" or "Who can view personal galleries" in Album Configuration screen';
$lang['Album_personal_successfully'] = 'The setting has been updated successfully';
$lang['Click_return_album_personal'] = 'Click %sHere%s to return to the Personal Gallery Settings';
$lang['Allow_Album_Avatars'] = 'Allow users to use own posted images in Album as Avatar';


// Personal Gallery FAP
$lang['Album_Personal_Settings'] = 'Personal Galleries';
$lang['Album_Personal_Settings_Explain'] = 'You can change the settings of your Personal Galleries here';
$lang['Show_Personal_Sub_Cats'] = 'Show personal sub categories in index table';
$lang['Personal_Gallery_Approval'] = 'Personal gallery pics approval';
$lang['Personal_Gallery_MOD'] = 'Personal gallery can be moderated by owner';
$lang['Personal_Sub_Cat_Limit'] = 'Maximum number of sub categories (-1 = unlimited)';
$lang['User_Can_Create_Personal_SubCats'] = 'Users can create sub categories in own personal gallery';
$lang['Click_return_personal_gallery_index'] = 'Click %shere%s to return to the personal gallery index';
$lang['Show_Recent_In_Personal_Subcats'] = 'Show recent pictures in personal sub categories';
$lang['Show_Recent_Instead_of_Personal_NoPics'] = 'Show recent pictures instead of no picture message in personal gallery';

//
// Categories
//
$lang['Album_Categories_Title'] = 'Album Categories Control';
$lang['Album_Categories_Explain'] = 'On this screen you can manage your categories: create, alter, delete, sort, etc.';
$lang['Category_Permissions'] = 'Category Permissions';
$lang['Category_Title'] = 'Category Title';
$lang['Category_Desc'] = 'Category Description';
$lang['View_level'] = 'View Level';
$lang['Upload_level'] = 'Upload Level';
$lang['Rate_level'] = 'Rate Level';
$lang['Comment_level'] = 'Comment Level';
$lang['Edit_level'] = ' Edit Level';
$lang['Delete_level'] = 'Delete Level';
$lang['New_category_created'] = 'New category has been created successfully';
$lang['Click_return_album_category'] = 'Click %sHere%s to return to the Album Categories Manager';
$lang['Category_updated'] = 'This category has been updated successfully';
$lang['Delete_Category'] = 'Delete Category';
$lang['Delete_Category_Explain'] = 'The form below will allow you to delete a category and decide where you want to put pics it contained';
$lang['Delete_all_pics'] = 'Delete all pics';
$lang['Category_deleted'] = 'This category has been deleted successfully';
$lang['Category_changed_order'] = 'This category has been changed order successfully';
$lang['Watermark'] = 'WaterMark';
$lang['Watermark_explain'] = 'You can specify the watermark file to be used in this category. Insert the watermark file path respect to your phpBB root (i.e.: <b>modules/mx_smartor/album_mod/mark_fap.png</b>). The watermark will be applied only if Watermark feature is on.';
$lang['Personal_Root_Gallery'] = 'Personal Gallery Root Category';
$lang['Parent_Category'] = 'Parent Category (for this category)';
$lang['Child_Category_Moved'] = 'Selected category had child categories. The child categories got moved to the <B>%s</B> category.';
$lang['No_Self_Refering_Cat'] = 'You cannot set a category\'s parent to itself';
$lang['Can_Not_Change_Main_Parent'] = 'You cannot change to parent of the main category of your personal gallery';

//
// Permissions
//
$lang['Album_Auth_Title'] = 'Album Permissions';
$lang['Album_Auth_Explain'] = 'Here you can choose which usergroup(s) can be the moderators for each album category or just has the private access';
$lang['Select_a_Category'] = 'Select a Category';
$lang['Look_up_Category'] = 'Look up Category';
$lang['Album_Auth_successfully'] = 'Auth has been updated successfully';
$lang['Click_return_album_auth'] = 'Click %sHere%s to return to the Album Permissions';

$lang['Upload'] = 'Upload';
$lang['Rate'] = 'Rate';
$lang['Comment'] = 'Comment';

//
// Clear Cache
//
$lang['Clear_Cache'] = 'Clear Cache';
$lang['Album_clear_cache_confirm'] = 'If you use the Thumbnail Cache feature you must clear your thumbnail cache after changing your thumbnail settings in Album Configuration to make them re-generated.<br /><br /> Do you want to clear them now?';
$lang['Thumbnail_cache_cleared_successfully'] = '<br />Your thumbnail cache has been cleared successfully<br />&nbsp;';

// CLowN
$lang['SP_Album_config'] = 'ADV CLowN SP Configuration';
$lang['SP_Album_config_explain'] = 'Here you can configure some options for the Album Service Pack';
$lang['SP_Album_sp_general'] = 'General Config';
$lang['SP_Album_sp_watermark'] = 'WaterMark Config';
$lang['SP_Album_sp_hotornot'] = 'Hot or Not Config';
$lang['SP_Rate_type'] = 'Select how do you want picture rating to be displayed';
$lang['SP_Rate_type_0'] = 'Images only';
$lang['SP_Rate_type_1'] = 'Numbers only';
$lang['SP_Rate_type_2'] = 'Numbers and Images';
$lang['SP_Display_latest'] = 'Display latest submited pictures block';
$lang['SP_Display_highest'] = 'Display highest rated pictures block';
$lang['SP_Display_most_viewed'] = 'Display most viewed pictures block';
$lang['SP_Display_random'] = 'Display random pictures block';
$lang['SP_Pic_row'] = 'Number of rows on thumbnail page (in index)';
$lang['SP_Pic_col'] = 'Number of columns on thumbnail page (in index)';
$lang['SP_Midthumb_use'] = 'Use mid-thumbnail';
$lang['SP_Midthumb_cache'] = 'Enable caching of mid-thumbnail';
$lang['SP_Midthumb_high'] = 'Height of mid-thumbnail (pixel)';
$lang['SP_Midthumb_width'] = 'Width of mid-thumbnail (pixel)';
$lang['SP_Watermark'] = 'Use WaterMark';
$lang['SP_Watermark_users'] = 'Show WaterMark for all users, if \'No\' only display to unregistered users';
$lang['SP_Watermark_placent'] = 'WaterMark position on the picture';
$lang['SP_Hon_already_rated'] = 'Unlimited rating on Hot or Not page';
$lang['SP_Hon_sep_rating'] = 'Store Hot or Not rating in a separate table';
$lang['SP_Hon_where'] = 'Display pictures on hot or not from what categories? (leave blank to use pictures from all of the categories, if more then one category, separate by commas)';
$lang['SP_Hon_users'] = 'Can unregistered users rate';
$lang['SP_jaime_lettering'] = 'Show alphabetic navigation index within a category (Jaime Lettering)'; 
$lang['SP_Always'] = 'Always';

// Multiple Uploads Admin configuration
$lang['Upload_Settings'] = 'Upload';
$lang['Max_Files_To_Upload'] = 'Maximum number of files user can upload at a time';
$lang['Album_upload_settings'] = 'Album Upload Settings';
$lang['Max_pregenerated_fields'] = 'Maximum number of fields to pre-generate';
$lang['Dynamic_field_generation'] = 'Enable dynamic adding of upload fields';
$lang['Pre_generate_fields'] = 'Pre generate the upload fields';
$lang['Propercase_pic_title'] = 'Propercase picture title e.g. <i>\'This Is A Picture Title\'</i><br />Setting it to \'NO\' will result in this <i>\'This is a picture title\'</i>';
$lang['Pic_Resampling'] = 'Enabling this option, each image will be resized on the fly if needed (to keep image properties respecting the album settings in ACP).';
$lang['Max_file_size_resampling'] = 'Maximum file size before resampling (bytes)';

$lang['display_most_posts']            		= "Display most posts";
$lang['display_random_posts']     		= "Display random posts";
$lang['display_top_ranked']     		= "Display top ranked";
$lang['display_latest_posts']     		= "Display latest posts";
$lang['num_of_cols']     			= "Num of cols";
$lang['num_of_rows']     			= "Num of rows";

$lang['album_config_updated'] = 'Mx Smartor Configuration Updated Successfully.';
$lang['Click_return_album_config'] = 'Click %sHere%s to return to mx_smartor Configuration';

$lang['index']		= 'Mx Smartor Album Index';

$lang['mx_album_admin'] = 'mxBB Smartor Integration';
$lang['mx_album_admin_explain'] = 'Here, you can do album index and mxBB page mappings.';

$lang['default_pages_title'] = 'mxBB and Smartor integration'; 
$lang['default_pages_title_explain'] = '';

$lang['default_pages_more_title'] = 'More mappings...'; 
$lang['default_pages_more_title_explain'] = '';

$lang['integration_enabled'] = 'Activate the Integration?';
$lang['integration_enabled_explain'] = 'When the Smartor module integration is activated, all mx_smartor URLs will be directed to mxBB pages. If deactivated, album.php will operate "as usual"';

$lang['integration_enabled_yes'] = 'Activate';
$lang['integration_enabled_no'] = 'Do not integrate album.php';

$lang['override'] = 'Associate album.php and mxBB pages';
$lang['override_explain'] = 'All mx_smartor urls are redirected to mxBB pages following these settings.';

$lang['override_yes'] = 'Use Block Settings';
$lang['override_no'] = 'Use fixed mappings (see below)';

// Welcome block
$lang['Welcome_Msg'] = "<b>Welcome Message:</b>";
$lang['Welcome_Msginfo'] = "This message will be visible for all users.";
$lang['Register_Msg'] = "<b>Register Message:</b>";
$lang['Register_Msginfo'] = "This message will only be visible for anonymous users to encourage them to register.<br />Tip: Use <b>%s</b> twice to enclose the string you want as a link to register.";
$lang['Vertical_Layout'] = "<b>Vertical Layout:</b>";
$lang['Vertical_Layoutinfo'] = "Select if you wish to display this block with a <b>Vertical</b> or <b>Horizontal</b> layout.";
$lang['View_JumpTo'] = "<b>View JumpTo:</b>";
$lang['View_JumpToinfo'] = "Select if you wish to display a <b>JumpToForum</b> box.<br /><u>Note:</u> Disable this feature if you use <b>Vertical layout</b>. Probably, it will make your block wider than the page column where you place this block. But, it could be useful, if you select <b>Horizontal layout</b>.";
$lang['Default_Avatar'] = "<b>Default Avatar:</b>";
$lang['Default_Avatarinfo'] = "Image to be used as default welcome avatar. Will be shown when logged in user has no avatar.<br /><u>Note:</u> Relative path for this image is \"modules/mx_tinies/avatars\".";
$lang['View_PostCount'] = "<b>View Post Count:</b>";
$lang['View_PostCountinfo'] = "Specify if you wish to display the post count next to <u>View posts since last visit</u> and <u>View unread posts</u> links, shown when a user is logged in.";

//
// That's all Folks!
// -------------------------------------------------
?>
--- NEW FILE: index.htm ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>

<body bgcolor="#FFFFFF" text="#000000">

</body>
</html>

[mxbb-commits] mx_smartor/language index.htm,1.1.2.1,1.1.2.2

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/language
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30112

Added Files:
      Tag: core28x
	index.htm 
Log Message:
downgrade version to 2.0.1 for core28x branch

--- NEW FILE: index.htm ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>

<body bgcolor="#FFFFFF" text="#000000">

</body>
</html>

[mxbb-commits] mx_smartor/album_mod/modules album_cat.php, 1.2, 1.3 album_cat_sort.php, 1.2, 1.3 album_comment.php, 1.2, 1.3 album_comment_delete.php, 1.2, 1.3 album_comment_edit.php, 1.2, 1.3 album_delete.php, 1.2, 1.3 album_download.php, 1.2, 1.3 album_edit.php, 1.2, 1.3 album_hotornot.php, 1.2, 1.3 album_jupload.php, 1.2, 1.3 album_memberlist.php, 1.2, 1.3 album_modcp.php, 1.2, 1.3 album_otf.php, 1.2, 1.3 album_otf_thumbnail.php, 1.2, 1.3 album_page.php, 1.2, 1.3 album_pclzip_lib.php, 1.2, 1.3 album_personal.php, 1.2, 1.3 album_personal_cat_admin.php, 1.2, 1.3 album_personal_index.php, 1.2, 1.3 album_personal_old.php, 1.2, 1.3 album_personal_random.php, 1.2, 1.3 album_pic.php, 1.2, 1.3 album_picm.php, 1.2, 1.3 album_rate.php, 1.2, 1.3 album_rdf.php, 1.2, 1.3 album_rss.php, 1.2, 1.3 album_search.php, 1.2, 1.3 album_showpage.php, 1.2, 1.3 album_thumbnail.php, 1.2, 1.3 album_upload.php, 1.2, 1.3

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/album_mod/modules
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26794/album_mod/modules

Modified Files:
	album_cat.php album_cat_sort.php album_comment.php 
	album_comment_delete.php album_comment_edit.php 
	album_delete.php album_download.php album_edit.php 
	album_hotornot.php album_jupload.php album_memberlist.php 
	album_modcp.php album_otf.php album_otf_thumbnail.php 
	album_page.php album_pclzip_lib.php album_personal.php 
	album_personal_cat_admin.php album_personal_index.php 
	album_personal_old.php album_personal_random.php album_pic.php 
	album_picm.php album_rate.php album_rdf.php album_rss.php 
	album_search.php album_showpage.php album_thumbnail.php 
	album_upload.php 
Log Message:
upgrade version to 2.0.2 for core29x branch

[mxbb-commits] mx_smartor/album_mod/includes album_bbcode.php, 1.2, 1.3 album_constants.php, 1.2, 1.3 album_functions.php, 1.2, 1.3 album_hierarchy_functions.php, 1.2, 1.3 album_hierarchy_sql.php, 1.2, 1.3 album_integration.php, 1.2, 1.3 album_nuffimage_box.php, 1.2, 1.3 clown_album_functions.php, 1.2, 1.3

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/album_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26794/album_mod/includes

Modified Files:
	album_bbcode.php album_constants.php album_functions.php 
	album_hierarchy_functions.php album_hierarchy_sql.php 
	album_integration.php album_nuffimage_box.php 
	clown_album_functions.php 
Log Message:
upgrade version to 2.0.2 for core29x branch

Index: album_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_constants.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** album_constants.php	13 Mar 2008 03:43:55 -0000	1.2
--- album_constants.php	13 Mar 2008 08:35:54 -0000	1.3
***************
*** 23,26 ****
--- 23,35 ----
  }
  
+ if ( !MXBB_MODULE )
+ {
+ 	define('PORTAL_URL', $portal_config['portal_url']);
+ 	define('PHPBB_URL', PORTAL_URL);
+ 
+ 	$mx_table_prefix = $table_prefix;
+ 	$is_block = false; // This also makes the script work for phpBB ;)
+ }
+ 
  // -------------------------------------------------------------------------
  // Extend User Style with module lang and images
***************
*** 30,35 ****
  // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
  // -------------------------------------------------------------------------
! $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
! $mx_user->extend(MX_LANG_MAIN, MX_IMAGES);
  
  // Album Tables
--- 39,70 ----
  // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
  // -------------------------------------------------------------------------
! if (!MXBB_MODULE)
! {
! 	if (!defined( 'IN_ADMIN' ))
! 	{
! 		$mx_user->set_module_cfg_name('mx_smartor');
! 		$mx_user->set_module_lang_path($module_root_path . 'album_mod/');
! 		$mx_user->extend(MX_LANG_ALL, MX_IMAGES);
! 	}
! }
! else
! {
! 	if (!$_GET['print']) // Do not "fix" with reuest wrapper!!
! 	{
! 		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
! 	}
! 
! 	if (is_object($mx_page))
! 	{
! 		// -------------------------------------------------------------------------
! 		// Extend User Style with module lang and images
! 		// Usage:  $mx_user->extend(LANG, IMAGES)
! 		// Switches:
! 		// - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE
! 		// - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
! 		// -------------------------------------------------------------------------
! 		$mx_user->extend(MX_LANG_ALL, MX_IMAGES);
! 	}
! }
  
  // Album Tables
***************
*** 114,125 ****
  !defined('IMG_GIF') ? define('IMG_GIF', IMAGETYPE_GIF) : false;
  
! // Path (trailing slash required)
! define('ALBUM_UPLOAD_PATH', $module_root_path . 'upload/');
! define('ALBUM_OTF_PATH', $module_root_path . 'upload/otf/');
! define('ALBUM_JUPLOAD_PATH', $module_root_path . 'upload/jupload/');
! define('ALBUM_CACHE_PATH', $module_root_path . 'upload/cache/');
! define('ALBUM_MED_CACHE_PATH', $module_root_path . 'upload/med_cache/');
! define('ALBUM_WM_CACHE_PATH', $module_root_path . 'upload/wm_cache/');
! define('ALBUM_WM_FILE', $module_root_path . 'album_mod/mark_fap.png');
  
  ?>
\ No newline at end of file
--- 149,174 ----
  !defined('IMG_GIF') ? define('IMG_GIF', IMAGETYPE_GIF) : false;
  
! if ( !MXBB_MODULE )
! {
! 	// Path (trailing slash required)
! 	define('ALBUM_UPLOAD_PATH', $module_root_path . 'album_mod/upload/');
! 	define('ALBUM_OTF_PATH', $module_root_path . 'album_mod/upload/otf/');
! 	define('ALBUM_JUPLOAD_PATH', $module_root_path . 'album_mod/upload/jupload/');
! 	define('ALBUM_CACHE_PATH', $module_root_path . 'album_mod/upload/cache/');
! 	define('ALBUM_MED_CACHE_PATH', $module_root_path . 'album_mod/upload/med_cache/');
! 	define('ALBUM_WM_CACHE_PATH', $module_root_path . 'album_mod/upload/wm_cache/');
! 	define('ALBUM_WM_FILE', $module_root_path . 'album_mod/mark_fap.png');
  
+ }
+ else
+ {
+ 	// Path (trailing slash required)
+ 	define('ALBUM_UPLOAD_PATH', $module_root_path . 'upload/');
+ 	define('ALBUM_OTF_PATH', $module_root_path . 'upload/otf/');
+ 	define('ALBUM_JUPLOAD_PATH', $module_root_path . 'upload/jupload/');
+ 	define('ALBUM_CACHE_PATH', $module_root_path . 'upload/cache/');
+ 	define('ALBUM_MED_CACHE_PATH', $module_root_path . 'upload/med_cache/');
+ 	define('ALBUM_WM_CACHE_PATH', $module_root_path . 'upload/wm_cache/');
+ 	define('ALBUM_WM_FILE', $module_root_path . 'album_mod/mark_fap.png');
+ }
  ?>
\ No newline at end of file

Index: album_hierarchy_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_hierarchy_functions.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** album_hierarchy_functions.php	13 Mar 2008 03:43:57 -0000	1.2
--- album_hierarchy_functions.php	13 Mar 2008 08:35:54 -0000	1.3
***************
*** 138,146 ****
  			'INC_SPAN' => $max_level - $level +1 , // + $column_offset,
  
! 			'U_CAT_EDIT' => mx_append_sid(album_append_uid("$admin_url?action=edit&cat_id=$cat_id")),
! 			'U_CAT_DELETE' => ($is_root && $userdata['user_level'] != ADMIN) ? '' : mx_append_sid(album_append_uid("$admin_url?action=delete&cat_id=$cat_id")),
! 			'U_CAT_MOVE_UP' => ($is_root) ? '' : mx_append_sid(album_append_uid("$admin_url?action=move&move=-15&cat_id=$cat_id")),
! 			'U_CAT_MOVE_DOWN' => ($is_root) ? '' : mx_append_sid(album_append_uid("$admin_url?action=move&move=15&cat_id=$cat_id")),
! 			'U_VIEWCAT' => mx_append_sid(album_append_uid("$admin_url?action=edit&cat_id=$cat_id")),
  
  			'L_MOVE_UP' => ($is_root) ? '' : $lang['Move_up'],
--- 138,146 ----
  			'INC_SPAN' => $max_level - $level +1 , // + $column_offset,
  
! 			'U_CAT_EDIT' => mx_append_sid(album_append_uid("$admin_url?action=edit&cat_id=$cat_id"), true),
! 			'U_CAT_DELETE' => ($is_root && $userdata['user_level'] != ADMIN) ? '' : mx_append_sid(album_append_uid("$admin_url?action=delete&cat_id=$cat_id"), true),
! 			'U_CAT_MOVE_UP' => ($is_root) ? '' : mx_append_sid(album_append_uid("$admin_url?action=move&move=-15&cat_id=$cat_id"), true),
! 			'U_CAT_MOVE_DOWN' => ($is_root) ? '' : mx_append_sid(album_append_uid("$admin_url?action=move&move=15&cat_id=$cat_id"), true),
! 			'U_VIEWCAT' => mx_append_sid(album_append_uid("$admin_url?action=edit&cat_id=$cat_id"), true),
  
  			'L_MOVE_UP' => ($is_root) ? '' : $lang['Move_up'],


Index: album_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_functions.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** album_functions.php	13 Mar 2008 03:43:56 -0000	1.2
--- album_functions.php	13 Mar 2008 08:35:54 -0000	1.3
***************
*** 25,28 ****
--- 25,29 ----
  		return phpBB2::create_date($format, $gmepoch, $tz);
  	}
+ }
  
  if(!function_exists(create_date2))

Index: album_integration.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_integration.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** album_integration.php	13 Mar 2008 03:43:58 -0000	1.2
--- album_integration.php	13 Mar 2008 08:35:54 -0000	1.3
***************
*** 49,57 ****
  	function this_smartor_mxurl($args = '', $force_standalone_mode = false)
  	{
! 		global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  		if( $force_standalone_mode || !$is_block )
  		{
! 			$mxurl = $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  		}
  		else
--- 49,57 ----
  	function this_smartor_mxurl($args = '', $force_standalone_mode = false)
  	{
! 		global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  		if( $force_standalone_mode || !$is_block )
  		{
! 			$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  		}
  		else
***************
*** 72,78 ****
  function this_fap_addonurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
! 	$mxurl = $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  
  	return $mxurl;
--- 72,78 ----
  function this_fap_addonurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
! 	$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  
  	return $mxurl;
***************
*** 81,89 ****
  function this_fap_portalurl($args = '')
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  	if( $integration_enabled != "1" )
  	{
! 		$mxurl = $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
--- 81,89 ----
  function this_fap_portalurl($args = '')
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  	if( $integration_enabled != "1" )
  	{
! 		$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
***************
*** 104,112 ****
  function this_fap_toplisturl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled;
  
  	if( $force_standalone_mode )
  	{
! 		$mxurl = $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
--- 104,112 ----
  function this_fap_toplisturl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled;
  
  	if( $force_standalone_mode )
  	{
! 		$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
***************
*** 118,122 ****
  function this_fap_loginurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  
--- 118,122 ----
  function this_fap_loginurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  
***************
*** 134,142 ****
  function this_fap_rssurl($args = '')
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  	if( $integration_enabled != "1" )
  	{
! 		$mxurl = 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
--- 134,142 ----
  function this_fap_rssurl($args = '')
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  	if( $integration_enabled != "1" )
  	{
! 		$mxurl = ( !MXBB_MODULE ) ? 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
***************
*** 154,158 ****
  	if( $force_standalone_mode || !$is_block )
  	{
! 		$mxurl = 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
--- 154,158 ----
  	if( $force_standalone_mode || !$is_block )
  	{
! 		$mxurl = ( !MXBB_MODULE ) ? 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else

[mxbb-commits] mx_smartor/admin admin_album_auth.php, 1.15, 1.16 admin_album_cat.php, 1.13, 1.14 admin_album_cfg.php, 1.8, 1.9 admin_album_clearcache.php, 1.13, 1.14 admin_album_clown_SP.php, 1.17, 1.18 admin_album_config_personal.php, 1.4, 1.5 admin_album_ext.php, 1.3, 1.4 admin_album_otf.php, 1.2, 1.3 admin_album_personal.php, 1.13, 1.14

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26794/admin

Modified Files:
	admin_album_auth.php admin_album_cat.php admin_album_cfg.php 
	admin_album_clearcache.php admin_album_clown_SP.php 
	admin_album_config_personal.php admin_album_ext.php 
	admin_album_otf.php admin_album_personal.php 
Log Message:
upgrade version to 2.0.2 for core29x branch

Index: admin_album_config_personal.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_config_personal.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** admin_album_config_personal.php	8 Feb 2008 10:47:59 -0000	1.4
--- admin_album_config_personal.php	13 Mar 2008 08:35:53 -0000	1.5
***************
*** 9,18 ****
  */
  
! define('IN_PORTAL', 1);
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Album_Personal_Settings'] = "modules/mx_smartor/admin/" .$filename;
  	return;
  }
--- 9,105 ----
  */
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! 
! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
! {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './../';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	require_once($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	@define('IN_PORTAL', true);
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './../';
! 
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	
! 	require_once($mx_mod_path . "includes/functions_core.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;)
! 
! 	//
! 	// Instatiate the mx_cache class
! 	//
! 	$mx_cache = new mx_cache();
! 	
! 	//
! 	// instatiate the mx_request_vars class
! 	//
! 	$mx_request_vars = new mx_request_vars();
! 	
! 
! 	//
! 	// instatiate the mx_user class
! 	//
! 	//$mx_user = new mx_user();
! 
! 	//
! 	// Left Pane Paths
! 	//
! 	$setmodules_admin_path = '';
! 	$setmodules_module_path = "./../";
! 	
! 	if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 	}
! 	else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 	}
! }
! else
! {
! 	define( 'IN_PORTAL', 1 );
! 	define( 'MXBB_MODULE', true );
! 
! 	//
! 	// Main paths
! 	//
! 	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_smartor/';
! 
! 	$setmodules_admin_path = 'modules/mx_smartor/admin/';
! 
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
! 
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! }
! 
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Album_Personal_Settings'] = $setmodules_admin_path . $filename;
  	return;
  }
***************
*** 21,63 ****
  // Let's set the root dir for phpBB
  //
! $module_root_path = '../';
! $mx_root_path = '../../../';
! $phpEx = substr(strrchr(__FILE__, '.'), 1); 
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
  
! define('ALBUM_MOD_PATH', 'album_mod/');
! 
! // Get general album information
! if (!isset($album_root_path) || empty($album_root_path))
  {
! 	$album_root_path = $module_root_path . ALBUM_MOD_PATH . '';
! }
  
! if (!isset($acp_prefix) || empty($acp_prefix))
! {
! 	$acp_prefix = 'admin/';
  }
  
! include_once($album_root_path . 'album_common.'.$phpEx);
! // require($module_root_path . 'album_mod/album_constants.'.$phpEx);
  
  // **********************************************************************
  // 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 );
  }
  
--- 108,140 ----
  // Let's set the root dir for phpBB
  //
! $album_root_path = $module_root_path . 'album_mod/';
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
  
! if ( !MXBB_MODULE )
  {
! 	require_once($mx_mod_path . "includes/functions_styles.$phpEx");
  
! 	$mx_user = new mx_user();	// instatiate the mx_user class
! 	
! 	//
! 	// Define basic constants
! 	//
! 	$mx_user->page_id = 1;
! 	$mx_user->user_ip = $user_ip;
! 	$mx_user->_init_userprefs();
  }
  
! require($module_root_path . 'album_mod/includes/album_constants.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
! else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  }
  
***************
*** 101,105 ****
  
  $template->set_filenames(array(
! 	"body" => $acp_prefix . 'album_config_personal_body.tpl')
  );
  
--- 178,182 ----
  
  $template->set_filenames(array(
! 	"body" => 'admin/album_config_personal_body.tpl')
  );
  

Index: admin_album_cfg.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_cfg.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin_album_cfg.php	13 Mar 2008 03:43:40 -0000	1.8
--- admin_album_cfg.php	13 Mar 2008 08:35:53 -0000	1.9
***************
*** 9,18 ****
  */
  
! define('IN_PORTAL', 1);
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Configuration std'] = "modules/mx_smartor/admin/" .$filename;
  	return;
  }
--- 9,105 ----
  */
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! 
! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
! {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './../';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	require_once($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	@define('IN_PORTAL', true);
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './../';
! 
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	
! 	require_once($mx_mod_path . "includes/functions_core.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;)
! 
! 	//
! 	// Instatiate the mx_cache class
! 	//
! 	$mx_cache = new mx_cache();
! 	
! 	//
! 	// instatiate the mx_request_vars class
! 	//
! 	$mx_request_vars = new mx_request_vars();
! 	
! 
! 	//
! 	// instatiate the mx_user class
! 	//
! 	//$mx_user = new mx_user();
! 
! 	//
! 	// Left Pane Paths
! 	//
! 	$setmodules_admin_path = '';
! 	$setmodules_module_path = "./../";
! 	
! 	if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 	}
! 	else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 	}
! }
! else
! {
! 	define( 'IN_PORTAL', 1 );
! 	define( 'MXBB_MODULE', true );
! 
! 	//
! 	// Main paths
! 	//
! 	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_smartor/';
! 
! 	$setmodules_admin_path = 'modules/mx_smartor/admin/';
! 
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
! 
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! }
! 
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Configuration std'] = $setmodules_admin_path . $filename;
  	return;
  }
***************
*** 21,48 ****
  // Let's set the root dir for phpBB
  //
! $module_root_path = '../';
! $mx_root_path = '../../../';
! $phpEx = substr(strrchr(__FILE__, '.'), 1); 
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
! require($module_root_path . 'album_mod/album_constants.'.$phpEx);
  
  // **********************************************************************
  // 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 );
  }
  
--- 108,149 ----
  // Let's set the root dir for phpBB
  //
! $album_root_path = $module_root_path . 'album_mod/';
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
! 
! if ( !MXBB_MODULE )
! {
! 	require_once($mx_mod_path . "includes/functions_styles.$phpEx");
! 
! 	$mx_user = new mx_user();	// instatiate the mx_user class
! 	
! 	//
! 	// Define basic constants
! 	//
! 	$mx_user->page_id = 1;
! 	$mx_user->user_ip = $user_ip;
! 	$mx_user->_init_userprefs();
! }
! 
! require($module_root_path . 'album_mod/includes/album_constants.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
! else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  }
! 
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_main.$phpEx");
  }
! else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx");
  }
  

Index: admin_album_auth.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_auth.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** admin_album_auth.php	8 Feb 2008 10:47:59 -0000	1.15
--- admin_album_auth.php	13 Mar 2008 08:35:53 -0000	1.16
***************
*** 11,41 ****
  /* Powered by Photo Album v2.x.x (c) 2002-2003 Smartor */
  
! define( 'IN_PORTAL', 1 );
  
! if ( !empty( $setmodules ) )
  {
! 	$filename = basename( __FILE__ );
! 	$module['Smartor_Album']['Permissions'] = "modules/mx_smartor/admin/" . $filename;
  	return;
  }
  
  // Let's set the root dir for phpBB
  
! $module_root_path = './../';
! $mx_root_path = './../../../';
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! require( $mx_root_path . 'admin/pagestart.' . $phpEx );
! include_once( $module_root_path . 'album_mod/album_common.' . $phpEx );
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
  {
! 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
  }
  else
  {
! 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  }
  
--- 11,142 ----
  /* Powered by Photo Album v2.x.x (c) 2002-2003 Smartor */
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
  
! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
  {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './../';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	require_once($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	@define('IN_PORTAL', true);
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './../';
! 
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	
! 	require_once($mx_mod_path . "includes/functions_core.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;)
! 
! 	//
! 	// Instatiate the mx_cache class
! 	//
! 	$mx_cache = new mx_cache();
! 	
! 	//
! 	// instatiate the mx_request_vars class
! 	//
! 	$mx_request_vars = new mx_request_vars();
! 	
! 
! 	//
! 	// instatiate the mx_user class
! 	//
! 	//$mx_user = new mx_user();
! 
! 	//
! 	// Left Pane Paths
! 	//
! 	$setmodules_admin_path = '';
! 	$setmodules_module_path = "./../";
! 	
! 	if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 	}
! 	else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 	}
! }
! else
! {
! 	define( 'IN_PORTAL', 1 );
! 	define( 'MXBB_MODULE', true );
! 
! 	//
! 	// Main paths
! 	//
! 	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_smartor/';
! 
! 	$setmodules_admin_path = 'modules/mx_smartor/admin/';
! 
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
! 
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! }
! 
! 
! if( !empty($setmodules) )
! {
! 	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Permissions'] = $setmodules_admin_path . $filename;
  	return;
  }
  
+ //
  // Let's set the root dir for phpBB
+ //
+ $album_root_path = $module_root_path . 'album_mod/';
+ require($mx_root_path . 'admin/pagestart.' . $phpEx);
  
! if ( !MXBB_MODULE )
! {
! 	require_once($mx_mod_path . "includes/functions_styles.$phpEx");
! 
! 	$mx_user = new mx_user();	// instatiate the mx_user class
! 	
! 	//
! 	// Define basic constants
! 	//
! 	$mx_user->page_id = 1;
! 	$mx_user->user_ip = $user_ip;
! 	$mx_user->_init_userprefs();
! }
! 
! require($module_root_path . 'album_mod/album_common.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
  else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  }
  

Index: admin_album_clearcache.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_clearcache.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** admin_album_clearcache.php	8 Feb 2008 10:47:59 -0000	1.13
--- admin_album_clearcache.php	13 Mar 2008 08:35:53 -0000	1.14
***************
*** 9,18 ****
  */
  
! define( 'IN_PORTAL', 1 );
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Clear_Cache'] = "modules/mx_smartor/admin/" .$filename;
  	return;
  }
--- 9,105 ----
  */
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! 
! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
! {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './../';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	require_once($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	@define('IN_PORTAL', true);
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './../';
! 
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	
! 	require_once($mx_mod_path . "includes/functions_core.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;)
! 
! 	//
! 	// Instatiate the mx_cache class
! 	//
! 	$mx_cache = new mx_cache();
! 	
! 	//
! 	// instatiate the mx_request_vars class
! 	//
! 	$mx_request_vars = new mx_request_vars();
! 	
! 
! 	//
! 	// instatiate the mx_user class
! 	//
! 	//$mx_user = new mx_user();
! 
! 	//
! 	// Left Pane Paths
! 	//
! 	$setmodules_admin_path = '';
! 	$setmodules_module_path = "./../";
! 	
! 	if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 	}
! 	else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 	}
! }
! else
! {
! 	define( 'IN_PORTAL', 1 );
! 	define( 'MXBB_MODULE', true );
! 
! 	//
! 	// Main paths
! 	//
! 	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_smartor/';
! 
! 	$setmodules_admin_path = 'modules/mx_smartor/admin/';
! 
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
! 
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! }
! 
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Clear_Cache'] = $setmodules_admin_path . $filename;
  	return;
  }
***************
*** 21,40 ****
  // Let's set the root dir for phpBB
  //
! $module_root_path = '../';
! $mx_root_path = '../../../';
! $phpEx = substr(strrchr(__FILE__, '.'), 1); 
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
! require($module_root_path . 'album_mod/album_constants.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
  {
! 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
  }
  else
  {
! 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  }
  
--- 108,140 ----
  // Let's set the root dir for phpBB
  //
! $album_root_path = $module_root_path . 'album_mod/';
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
! 
! if ( !MXBB_MODULE )
! {
! 	require_once($mx_mod_path . "includes/functions_styles.$phpEx");
! 
! 	$mx_user = new mx_user();	// instatiate the mx_user class
! 	
! 	//
! 	// Define basic constants
! 	//
! 	$mx_user->page_id = 1;
! 	$mx_user->user_ip = $user_ip;
! 	$mx_user->_init_userprefs();
! }
! 
! require($module_root_path . 'album_mod/includes/album_constants.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
  else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  }
  

Index: admin_album_ext.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_ext.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** admin_album_ext.php	8 Feb 2008 10:47:59 -0000	1.3
--- admin_album_ext.php	13 Mar 2008 08:35:53 -0000	1.4
***************
*** 18,49 ****
  }
  
! $mx_root_path = './../../../';
! $module_root_path = "./../";
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! require( $mx_root_path . '/admin/pagestart.' . $phpEx );
! 
! include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx );
! 
! define('ALBUM_MOD_PATH', 'album_mod/');
! 
! // Get general album information
! if (!isset($album_root_path) || empty($album_root_path))
! {
! 	$album_root_path = $module_root_path . ALBUM_MOD_PATH . '';
! }
  
- include_once($album_root_path . 'album_common.'.$phpEx);
- // include_once( $module_root_path . 'album_mod/album_constants.'.$phpEx );
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
  {
! 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
  }
  else
  {
! 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  }
  
--- 18,40 ----
  }
  
! // Let's set the root dir for phpBB
! $module_root_path = '../';
! $mx_root_path = '../../../';
! $album_root_path = $module_root_path . 'album_mod/';
! $phpEx = substr(strrchr(__FILE__, '.'), 1); 
! require($mx_root_path . 'admin/pagestart.' . $phpEx);
! require($module_root_path . 'album_mod/includes/album_constants.'.$phpEx);
  
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
  else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  }
  

Index: admin_album_cat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_cat.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** admin_album_cat.php	8 Feb 2008 10:47:59 -0000	1.13
--- admin_album_cat.php	13 Mar 2008 08:35:53 -0000	1.14
***************
*** 20,29 ****
   ***************************************************************************/
  
! define('IN_PORTAL', 1);
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Categories'] = "modules/mx_smartor/admin/" .$filename;
  	return;
  }
--- 20,116 ----
   ***************************************************************************/
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! 
! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
! {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './../';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	require_once($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	@define('IN_PORTAL', true);
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './../';
! 
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	
! 	require_once($mx_mod_path . "includes/functions_core.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;)
! 
! 	//
! 	// Instatiate the mx_cache class
! 	//
! 	$mx_cache = new mx_cache();
! 	
! 	//
! 	// instatiate the mx_request_vars class
! 	//
! 	$mx_request_vars = new mx_request_vars();
! 	
! 
! 	//
! 	// instatiate the mx_user class
! 	//
! 	//$mx_user = new mx_user();
! 
! 	//
! 	// Left Pane Paths
! 	//
! 	$setmodules_admin_path = '';
! 	$setmodules_module_path = "./../";
! 	
! 	if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 	}
! 	else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 	}
! }
! else
! {
! 	define( 'IN_PORTAL', 1 );
! 	define( 'MXBB_MODULE', true );
! 
! 	//
! 	// Main paths
! 	//
! 	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_smartor/';
! 
! 	$setmodules_admin_path = 'modules/mx_smartor/admin/';
! 
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
! 
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! }
! 
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Categories'] = $setmodules_admin_path . $filename;
  	return;
  }
***************
*** 32,77 ****
  // Let's set the root dir for phpBB
  //
! $module_root_path = '../';
! $mx_root_path = '../../../';
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! require( $mx_root_path . '/admin/pagestart.' . $phpEx );
! 
! include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx );
! 
! define('ALBUM_MOD_PATH', 'album_mod/');
  
! // Get general album information
! if (!isset($album_root_path) || empty($album_root_path))
  {
! 	$album_root_path = $module_root_path . ALBUM_MOD_PATH . '';
! }
  
! if (!isset($acp_prefix) || empty($acp_prefix))
! {
! 	$acp_prefix = 'admin/';
  }
  
! 
! include_once($album_root_path . 'album_common.'.$phpEx);
! 
  
  // **********************************************************************
  // 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 );
  }
  
--- 119,160 ----
  // Let's set the root dir for phpBB
  //
! $album_root_path = $module_root_path . 'album_mod/';
! require($mx_root_path . 'admin/pagestart.' . $phpEx);
  
! if ( !MXBB_MODULE )
  {
! 	require_once($mx_mod_path . "includes/functions_styles.$phpEx");
  
! 	$mx_user = new mx_user();	// instatiate the mx_user class
! 	
! 	//
! 	// Define basic constants
! 	//
! 	$mx_user->page_id = 1;
! 	$mx_user->user_ip = $user_ip;
! 	$mx_user->_init_userprefs();
  }
  
! require($module_root_path . 'album_mod/album_common.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
! else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  }
! 
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_main.$phpEx");
  }
! else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx");
  }
  
***************
*** 82,93 ****
  	global $lang, $album_user_id, $phpEx;
  
! 	$message = $in_message . "<br /><br />" . sprintf($lang['Click_return_album_category'], "<a href=\"" . mx_append_sid("admin_album_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);
  }
  
! if( !isset($_POST['mode']) )
  {
! 	if( !isset($_GET['action']) )
  	{
  		album_read_tree();
--- 165,176 ----
  	global $lang, $album_user_id, $phpEx;
  
! 	$message = $in_message . "<br /><br />" . sprintf($lang['Click_return_album_category'], "<a href=\"" . mx_append_sid("admin_album_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("../admin/index.$phpEx?pane=right") . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);
  }
  
! if( !isset($HTTP_POST_VARS['mode']) )
  {
! 	if( !isset($HTTP_GET_VARS['action']) )
  	{
  		album_read_tree();
***************
*** 98,102 ****
  		then go back to this template file $acp_prefix . 'album_cat_body.tpl'.
  		*/
! 		$template->set_filenames(array('body' => $acp_prefix . 'album_cat_body.tpl'));
  
  		$template->assign_vars(array(
--- 181,185 ----
  		then go back to this template file $acp_prefix . 'album_cat_body.tpl'.
  		*/
! 		$template->set_filenames(array('body' => 'admin/album_cat_body.tpl'));
  
  		$template->assign_vars(array(
***************
*** 127,133 ****
  	else
  	{
! 		if( $_GET['action'] == 'edit' )
  		{
! 			$cat_id = intval($_GET['cat_id']);
  
  			$sql = "SELECT cat.*, cat2.cat_title AS cat_parent_title, cat2.cat_id AS cat_parent_id
--- 210,216 ----
  	else
  	{
! 		if( $HTTP_GET_VARS['action'] == 'edit' )
  		{
! 			$cat_id = intval($HTTP_GET_VARS['cat_id']);
  
  			$sql = "SELECT cat.*, cat2.cat_title AS cat_parent_title, cat2.cat_id AS cat_parent_id
***************
*** 148,152 ****
  			$s_album_cat_list = album_get_tree_option($catrow['cat_parent_id'], ALBUM_AUTH_VIEW, ALBUM_SELECTBOX_INCLUDE_ALL | ALBUM_SELECTBOX_INCLUDE_ROOT);
  
! 			$template->set_filenames(array('body' => $acp_prefix . 'album_cat_new_body.tpl'));
  
  			$template->assign_block_vars('acp', array(
--- 231,235 ----
  			$s_album_cat_list = album_get_tree_option($catrow['cat_parent_id'], ALBUM_AUTH_VIEW, ALBUM_SELECTBOX_INCLUDE_ALL | ALBUM_SELECTBOX_INCLUDE_ROOT);
  
! 			$template->set_filenames(array('body' => 'admin/album_cat_new_body.tpl'));
  
  			$template->assign_block_vars('acp', array(
***************
*** 236,242 ****
  			include($mx_root_path . 'admin/page_footer_admin.'.$phpEx);
  		}
! 		elseif( $_GET['action'] == 'delete' )
  		{
! 			$cat_id = intval($_GET['cat_id']);
  
  			$sql = "SELECT cat_id, cat_title, cat_order
--- 319,325 ----
  			include($mx_root_path . 'admin/page_footer_admin.'.$phpEx);
  		}
! 		elseif( $HTTP_GET_VARS['action'] == 'delete' )
  		{
! 			$cat_id = intval($HTTP_GET_VARS['cat_id']);
  
  			$sql = "SELECT cat_id, cat_title, cat_order
***************
*** 271,275 ****
  			$select_to .= '</select>';
  
! 			$template->set_filenames(array('body' => $acp_prefix . 'album_cat_delete_body.tpl'));
  
  			$template->assign_vars(array(
--- 354,358 ----
  			$select_to .= '</select>';
  
! 			$template->set_filenames(array('body' => 'admin/album_cat_delete_body.tpl'));
  
  			$template->assign_vars(array(
***************
*** 289,296 ****
  			include($mx_root_path . 'admin/page_footer_admin.'.$phpEx);
  		}
! 		elseif( $_GET['action'] == 'move' )
  		{
! 			$cat_id = intval($_GET['cat_id']);
! 			$move = intval($_GET['move']);
  
  			album_move_tree($cat_id, $move);
--- 372,379 ----
  			include($mx_root_path . 'admin/page_footer_admin.'.$phpEx);
  		}
! 		elseif( $HTTP_GET_VARS['action'] == 'move' )
  		{
! 			$cat_id = intval($HTTP_GET_VARS['cat_id']);
! 			$move = intval($HTTP_GET_VARS['move']);
  
  			album_move_tree($cat_id, $move);
***************
*** 303,322 ****
  else
  {
! 	if( $_POST['mode'] == 'new' )
  	{
! 		if ( is_array($_POST['addcategory']))
  		{
! 			list($cat_id) = each($_POST['addcategory']);
! 			$cat_title = stripslashes($_POST['name'][$cat_id]);
  			$cat_parent = $cat_id;
  			$cat_id = -1;
  		}
  
! 		if( !isset($_POST['cat_title']) )
  		{
  			album_read_tree();
  			$s_album_cat_list = album_get_tree_option($cat_parent, ALBUM_AUTH_VIEW, ALBUM_SELECTBOX_INCLUDE_ALL);
  
! 			$template->set_filenames(array('body' => $acp_prefix . 'album_cat_new_body.tpl'));
  
  			$template->assign_vars(array(
--- 386,405 ----
  else
  {
! 	if( $HTTP_POST_VARS['mode'] == 'new' )
  	{
! 		if ( is_array($HTTP_POST_VARS['addcategory']))
  		{
! 			list($cat_id) = each($HTTP_POST_VARS['addcategory']);
! 			$cat_title = stripslashes($HTTP_POST_VARS['name'][$cat_id]);
  			$cat_parent = $cat_id;
  			$cat_id = -1;
  		}
  
! 		if( !isset($HTTP_POST_VARS['cat_title']) )
  		{
  			album_read_tree();
  			$s_album_cat_list = album_get_tree_option($cat_parent, ALBUM_AUTH_VIEW, ALBUM_SELECTBOX_INCLUDE_ALL);
  
! 			$template->set_filenames(array('body' => 'admin/album_cat_new_body.tpl'));
  
  			$template->assign_vars(array(
***************
*** 376,396 ****
  			if( !get_magic_quotes_gpc() )
  			{
! 				$cat_title = addslashes(htmlspecialchars(trim($_POST['cat_title'])));
! 				$cat_desc = addslashes(trim($_POST['cat_desc']));
  			}
  			else
  			{
! 				$cat_title = htmlspecialchars(trim($_POST['cat_title']));
! 				$cat_desc = trim($_POST['cat_desc']);
  			}
! 			$cat_wm = trim($_POST['cat_wm']);
! 			$view_level = intval($_POST['cat_view_level']);
! 			$upload_level = intval($_POST['cat_upload_level']);
! 			$rate_level = intval($_POST['cat_rate_level']);
! 			$comment_level = intval($_POST['cat_comment_level']);
! 			$edit_level = intval($_POST['cat_edit_level']);
! 			$delete_level = intval($_POST['cat_delete_level']);
! 			$cat_approval = intval($_POST['cat_approval']);
! 			$cat_parent = ($_POST['cat_parent_id'] == ALBUM_ROOT_CATEGORY) ? 0 : intval($_POST['cat_parent_id']);
  			$cat_parent = ($cat_parent < 0) ? 0 : $cat_parent;
  
--- 459,479 ----
  			if( !get_magic_quotes_gpc() )
  			{
! 				$cat_title = addslashes(htmlspecialchars(trim($HTTP_POST_VARS['cat_title'])));
! 				$cat_desc = addslashes(trim($HTTP_POST_VARS['cat_desc']));
  			}
  			else
  			{
! 				$cat_title = htmlspecialchars(trim($HTTP_POST_VARS['cat_title']));
! 				$cat_desc = trim($HTTP_POST_VARS['cat_desc']);
  			}
! 			$cat_wm = trim($HTTP_POST_VARS['cat_wm']);
! 			$view_level = intval($HTTP_POST_VARS['cat_view_level']);
! 			$upload_level = intval($HTTP_POST_VARS['cat_upload_level']);
! 			$rate_level = intval($HTTP_POST_VARS['cat_rate_level']);
! 			$comment_level = intval($HTTP_POST_VARS['cat_comment_level']);
! 			$edit_level = intval($HTTP_POST_VARS['cat_edit_level']);
! 			$delete_level = intval($HTTP_POST_VARS['cat_delete_level']);
! 			$cat_approval = intval($HTTP_POST_VARS['cat_approval']);
! 			$cat_parent = ($HTTP_POST_VARS['cat_parent_id'] == ALBUM_ROOT_CATEGORY) ? 0 : intval($HTTP_POST_VARS['cat_parent_id']);
  			$cat_parent = ($cat_parent < 0) ? 0 : $cat_parent;
  
***************
*** 420,446 ****
  		}
  	}
! 	elseif( $_POST['mode'] == 'edit' )
  	{
  		// Get posting variables
! 		$cat_id = intval($_GET['cat_id']);
  		if( !get_magic_quotes_gpc() )
  		{
! 			$cat_title = addslashes(htmlspecialchars(trim($_POST['cat_title'])));
! 			$cat_desc = addslashes(trim($_POST['cat_desc']));
  		}
  		else
  		{
! 			$cat_title = htmlspecialchars(trim($_POST['cat_title']));
! 			$cat_desc = trim($_POST['cat_desc']);
  		}
! 		$cat_wm = trim($_POST['cat_wm']);
! 		$view_level = intval($_POST['cat_view_level']);
! 		$upload_level = intval($_POST['cat_upload_level']);
! 		$rate_level = intval($_POST['cat_rate_level']);
! 		$comment_level = intval($_POST['cat_comment_level']);
! 		$edit_level = intval($_POST['cat_edit_level']);
! 		$delete_level = intval($_POST['cat_delete_level']);
! 		$cat_approval = intval($_POST['cat_approval']);
! 		$cat_parent = ($_POST['cat_parent_id'] == ALBUM_ROOT_CATEGORY) ? 0 : intval($_POST['cat_parent_id']);
  		$cat_parent = ($cat_parent < 0) ? 0 : $cat_parent;
  		
--- 503,529 ----
  		}
  	}
! 	elseif( $HTTP_POST_VARS['mode'] == 'edit' )
  	{
  		// Get posting variables
! 		$cat_id = intval($HTTP_GET_VARS['cat_id']);
  		if( !get_magic_quotes_gpc() )
  		{
! 			$cat_title = addslashes(htmlspecialchars(trim($HTTP_POST_VARS['cat_title'])));
! 			$cat_desc = addslashes(trim($HTTP_POST_VARS['cat_desc']));
  		}
  		else
  		{
! 			$cat_title = htmlspecialchars(trim($HTTP_POST_VARS['cat_title']));
! 			$cat_desc = trim($HTTP_POST_VARS['cat_desc']);
  		}
! 		$cat_wm = trim($HTTP_POST_VARS['cat_wm']);
! 		$view_level = intval($HTTP_POST_VARS['cat_view_level']);
! 		$upload_level = intval($HTTP_POST_VARS['cat_upload_level']);
! 		$rate_level = intval($HTTP_POST_VARS['cat_rate_level']);
! 		$comment_level = intval($HTTP_POST_VARS['cat_comment_level']);
! 		$edit_level = intval($HTTP_POST_VARS['cat_edit_level']);
! 		$delete_level = intval($HTTP_POST_VARS['cat_delete_level']);
! 		$cat_approval = intval($HTTP_POST_VARS['cat_approval']);
! 		$cat_parent = ($HTTP_POST_VARS['cat_parent_id'] == ALBUM_ROOT_CATEGORY) ? 0 : intval($HTTP_POST_VARS['cat_parent_id']);
  		$cat_parent = ($cat_parent < 0) ? 0 : $cat_parent;
  		
***************
*** 468,472 ****
  		showResultMessage($lang['Category_updated']);
  	}
! 	elseif( $_POST['mode'] == 'delete' )
  	{
  		$parent_cat_deleted = false;
--- 551,555 ----
  		showResultMessage($lang['Category_updated']);
  	}
! 	elseif( $HTTP_POST_VARS['mode'] == 'delete' )
  	{
  		$parent_cat_deleted = false;
***************
*** 474,479 ****
  		$parent_cat_title = "";
  
! 		$cat_id = intval($_GET['cat_id']);
! 		$target = intval($_POST['target']);
  
  		if( $target == ALBUM_JUMPBOX_DELETE ) // Delete All
--- 557,562 ----
  		$parent_cat_title = "";
  
! 		$cat_id = intval($HTTP_GET_VARS['cat_id']);
! 		$target = intval($HTTP_POST_VARS['target']);
  
  		if( $target == ALBUM_JUMPBOX_DELETE ) // Delete All

Index: admin_album_otf.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_otf.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** admin_album_otf.php	5 Feb 2008 03:51:29 -0000	1.2
--- admin_album_otf.php	13 Mar 2008 08:35:53 -0000	1.3
***************
*** 20,62 ****
   ***************************************************************************/
  
! define( 'IN_PORTAL', 1 );
  
! if ( !empty( $setmodules ) )
  {
! 	$file = basename( __FILE__ );
! 	$module['Smartor_Album']['Configuration otf'] = 'modules/mx_smartor/admin/' . $file;
! 	return;
  }
  
! $mx_root_path = './../../../';
! $module_root_path = "./../";
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! require( $mx_root_path . '/admin/pagestart.' . $phpEx );
  
  
! // Start session management
! $mx_user->init($user_ip, PAGE_INDEX);
! // End session management
  
! define('ALBUM_MOD_PATH', 'album_mod/');
  
! // Get general album information
! if (!isset($album_root_path) || empty($album_root_path))
  {
! 	$album_root_path = $module_root_path . ALBUM_MOD_PATH . '';
  }
  
! include_once($album_root_path . 'album_common.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
  {
! 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
  }
  else
  {
! 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  }
  
--- 20,160 ----
   ***************************************************************************/
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
  
! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
  {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './../';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	require_once($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	@define('IN_PORTAL', true);
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './../';
! 
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	
! 	require_once($mx_mod_path . "includes/functions_core.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;)
! 
! 	//
! 	// Instatiate the mx_cache class
! 	//
! 	$mx_cache = new mx_cache();
! 	
! 	//
! 	// instatiate the mx_request_vars class
! 	//
! 	$mx_request_vars = new mx_request_vars();
! 	
! 
! 	//
! 	// instatiate the mx_user class
! 	//
! 	//$mx_user = new mx_user();
! 
! 	//
! 	// Left Pane Paths
! 	//
! 	$setmodules_admin_path = '';
! 	$setmodules_module_path = "./../";
! 	
! 	if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 	}
! 	else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 	}
  }
+ else
+ {
+ 	define( 'IN_PORTAL', 1 );
+ 	define( 'MXBB_MODULE', true );
  
! 	//
! 	// Main paths
! 	//
! 	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_smartor/';
  
+ 	$setmodules_admin_path = 'modules/mx_smartor/admin/';
  
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
  
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! }
  
! 
! if( !empty($setmodules) )
  {
! 	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Configuration otf'] = $setmodules_admin_path . $filename;
! 	return;
  }
  
! //
! // Let's set the root dir for phpBB
! //
! $album_root_path = $module_root_path . 'album_mod/';
! require($mx_root_path . 'admin/pagestart.' . $phpEx);
! 
! if ( !MXBB_MODULE )
! {
! 	require_once($mx_mod_path . "includes/functions_styles.$phpEx");
! 
! 	$mx_user = new mx_user();	// instatiate the mx_user class
! 	
! 	//
! 	// Define basic constants
! 	//
! 	$mx_user->page_id = 1;
! 	$mx_user->user_ip = $user_ip;
! 	$mx_user->_init_userprefs();
! }
! 
! require($module_root_path . 'album_mod/album_common.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
  else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
! }
! 
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx"))
! {
! 	include($album_root_path . "language/lang_english/lang_main.$phpEx");
! }
! else
! {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx");
  }
  
***************
*** 288,292 ****
  		*/
  
! 		$pic_img_thumb = mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&amp;pic_id=' . $pic_file_names[$pic_cat][$i][$j]));
  
  		if ( ($upload_pics == true) && ($cat_to_upload > 0) )
--- 386,390 ----
  		*/
  
! 		$pic_img_thumb = mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&amp;pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&amp;pic_id=' . $pic_file_names[$pic_cat][$i][$j]));
  
  		if ( ($upload_pics == true) && ($cat_to_upload > 0) )

Index: admin_album_personal.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_personal.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** admin_album_personal.php	8 Feb 2008 10:47:59 -0000	1.13
--- admin_album_personal.php	13 Mar 2008 08:35:53 -0000	1.14
***************
*** 9,18 ****
  */
  
! define('IN_PORTAL', 1);
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Personal_Galleries'] = "modules/mx_smartor/admin/" .$filename;
  	return;
  }
--- 9,105 ----
  */
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! 
! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
! {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './../';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	require_once($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	@define('IN_PORTAL', true);
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './../';
! 
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	
! 	require_once($mx_mod_path . "includes/functions_core.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;)
! 
! 	//
! 	// Instatiate the mx_cache class
! 	//
! 	$mx_cache = new mx_cache();
! 	
! 	//
! 	// instatiate the mx_request_vars class
! 	//
! 	$mx_request_vars = new mx_request_vars();
! 	
! 
! 	//
! 	// instatiate the mx_user class
! 	//
! 	//$mx_user = new mx_user();
! 
! 	//
! 	// Left Pane Paths
! 	//
! 	$setmodules_admin_path = '';
! 	$setmodules_module_path = "./../";
! 	
! 	if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 	}
! 	else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 	}
! }
! else
! {
! 	define( 'IN_PORTAL', 1 );
! 	define( 'MXBB_MODULE', true );
! 
! 	//
! 	// Main paths
! 	//
! 	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_smartor/';
! 
! 	$setmodules_admin_path = 'modules/mx_smartor/admin/';
! 
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
! 
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! }
! 
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Personal_Galleries'] = $setmodules_admin_path . $filename;
  	return;
  }
***************
*** 21,67 ****
  // Let's set the root dir for phpBB
  //
! $module_root_path = '../';
! $mx_root_path = '../../../';
! $phpEx = substr(strrchr(__FILE__, '.'), 1); 
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
  
! define('ALBUM_MOD_PATH', 'album_mod/');
! 
! // Get general album information
! if (!isset($album_root_path) || empty($album_root_path))
  {
! 	$album_root_path = $module_root_path . ALBUM_MOD_PATH . '';
! }
  
! if (!isset($acp_prefix) || empty($acp_prefix))
! {
! 	$acp_prefix = 'admin/';
  }
  
! include_once($album_root_path . 'album_common.'.$phpEx);
! // require($module_root_path . 'album_mod/album_constants.'.$phpEx);
  
  // **********************************************************************
  // 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 );
  }
  else
  {
! 	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 );
  }
  
--- 108,149 ----
  // Let's set the root dir for phpBB
  //
! $album_root_path = $module_root_path . 'album_mod/';
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
  
! if ( !MXBB_MODULE )
  {
! 	require_once($mx_mod_path . "includes/functions_styles.$phpEx");
  
! 	$mx_user = new mx_user();	// instatiate the mx_user class
! 	
! 	//
! 	// Define basic constants
! 	//
! 	$mx_user->page_id = 1;
! 	$mx_user->user_ip = $user_ip;
! 	$mx_user->_init_userprefs();
  }
  
! require($module_root_path . 'album_mod/album_common.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
  else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  }
! 
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_main.$phpEx");
  }
! else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx");
  }
  

Index: admin_album_clown_SP.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_clown_SP.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** admin_album_clown_SP.php	13 Mar 2008 03:43:40 -0000	1.17
--- admin_album_clown_SP.php	13 Mar 2008 08:35:53 -0000	1.18
***************
*** 9,18 ****
  */
  
! define('IN_PORTAL', 1);
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Configuration adv'] = "modules/mx_smartor/admin/" .$filename;
  	return;
  }
--- 9,105 ----
  */
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! 
! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
! {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './../';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	require_once($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	@define('IN_PORTAL', true);
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './../';
! 
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	
! 	require_once($mx_mod_path . "includes/functions_core.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;)
! 
! 	//
! 	// Instatiate the mx_cache class
! 	//
! 	$mx_cache = new mx_cache();
! 	
! 	//
! 	// instatiate the mx_request_vars class
! 	//
! 	$mx_request_vars = new mx_request_vars();
! 	
! 
! 	//
! 	// instatiate the mx_user class
! 	//
! 	//$mx_user = new mx_user();
! 
! 	//
! 	// Left Pane Paths
! 	//
! 	$setmodules_admin_path = '';
! 	$setmodules_module_path = "./../";
! 	
! 	if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 	}
! 	else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 	}
! }
! else
! {
! 	define( 'IN_PORTAL', 1 );
! 	define( 'MXBB_MODULE', true );
! 
! 	//
! 	// Main paths
! 	//
! 	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_smartor/';
! 
! 	$setmodules_admin_path = 'modules/mx_smartor/admin/';
! 
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
! 
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! }
! 
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Configuration adv'] = $setmodules_admin_path . $filename;
  	return;
  }
***************
*** 21,48 ****
  // Let's set the root dir for phpBB
  //
! $module_root_path = '../';
! $mx_root_path = '../../../';
! $phpEx = substr(strrchr(__FILE__, '.'), 1); 
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
! require($module_root_path . 'album_mod/album_constants.'.$phpEx);
  
  // **********************************************************************
  // 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 );
  }
  
--- 108,140 ----
  // Let's set the root dir for phpBB
  //
! $album_root_path = $module_root_path . 'album_mod/';
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
! 
! if ( !MXBB_MODULE )
! {
! 	require_once($mx_mod_path . "includes/functions_styles.$phpEx");
! 
! 	$mx_user = new mx_user();	// instatiate the mx_user class
! 	
! 	//
! 	// Define basic constants
! 	//
! 	$mx_user->page_id = 1;
! 	$mx_user->user_ip = $user_ip;
! 	$mx_user->_init_userprefs();
! }
! 
! require($module_root_path . 'album_mod/includes/album_constants.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
! else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  }
  

[mxbb-commits] mx_smartor album.php, 1.23, 1.24 db_install.php, 1.21, 1.22 db_upgrade.php, 1.21, 1.22

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26794

Modified Files:
	album.php db_install.php db_upgrade.php 
Log Message:
upgrade version to 2.0.2 for core29x branch

Index: album.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** album.php	13 Mar 2008 03:43:41 -0000	1.23
--- album.php	13 Mar 2008 08:35:53 -0000	1.24
***************
*** 36,40 ****
  $phpEx = substr(strrchr(__FILE__, '.'), 1);
  
! if ( !defined('PORTAL_BACKEND') && @file_exists( './viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
  {
  	define('MXBB_MODULE', false);
--- 36,40 ----
  $phpEx = substr(strrchr(__FILE__, '.'), 1);
  
! if (@file_exists( './viewtopic.' . $phpEx )) // -------------------------------------------- phpBB MOD MODE
  {
  	define('MXBB_MODULE', false);
***************
*** 362,366 ****
  	include($album_root_path. 'modules/album_personal_random.'.$phpEx);
  }
! else if( !is_object($mx_block))
  {
  	die("Hacking attempt");
--- 362,366 ----
  	include($album_root_path. 'modules/album_personal_random.'.$phpEx);
  }
! else if(!is_object($mx_block) && MXBB_MODULE)
  {
  	die("Hacking attempt");

[mxbb-commits] mx_smartor/album_mod album_bbconstants.php, 1.9, 1.10 album_common.php, 1.24, 1.25

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/album_mod
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26794/album_mod

Modified Files:
	album_bbconstants.php album_common.php 
Log Message:
upgrade version to 2.0.2 for core29x branch

[mxbb-commits] mx_smartor/language/lang_english index.htm, 1.1, NONE lang_admin.php, 1.10, NONE lang_main.php, 1.7, NONE

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/language/lang_english
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26794/language/lang_english

Removed Files:
	index.htm lang_admin.php lang_main.php 
Log Message:
upgrade version to 2.0.2 for core29x branch

--- lang_main.php DELETED ---

--- lang_admin.php DELETED ---

--- index.htm DELETED ---

[mxbb-commits] mx_smartor/language index.htm,1.1,NONE

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/language
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26794/language

Removed Files:
	index.htm 
Log Message:
upgrade version to 2.0.2 for core29x branch

--- index.htm DELETED ---

[mxbb-commits] mx_smartor db_install.php, 1.15.2.7, 1.15.2.8 db_upgrade.php, 1.15.2.7, 1.15.2.8

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25894

Modified Files:
      Tag: core28x
	db_install.php db_upgrade.php 
Log Message:
downgrade version to 2.0.1 for core28x branch

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/db_install.php,v
retrieving revision 1.15.2.7
retrieving revision 1.15.2.8
diff -C2 -d -r1.15.2.7 -r1.15.2.8
*** db_install.php	13 Mar 2008 08:27:26 -0000	1.15.2.7
--- db_install.php	13 Mar 2008 08:33:12 -0000	1.15.2.8
***************
*** 32,36 ****
  }
  
! $mx_module_version = '2.0.2';
  $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>';
  
--- 32,36 ----
  }
  
! $mx_module_version = '2.0.1';
  $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>';
  

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/db_upgrade.php,v
retrieving revision 1.15.2.7
retrieving revision 1.15.2.8
diff -C2 -d -r1.15.2.7 -r1.15.2.8
*** db_upgrade.php	13 Mar 2008 08:27:26 -0000	1.15.2.7
--- db_upgrade.php	13 Mar 2008 08:33:12 -0000	1.15.2.8
***************
*** 30,34 ****
  }
  
! $mx_module_version = '2.0.2';
  $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>';
  
--- 30,34 ----
  }
  
! $mx_module_version = '2.0.1';
  $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>';
  

[mxbb-commits] mx_smartor/album_mod/includes album_constants.php, 1.1.2.4, 1.1.2.5

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/album_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25894/album_mod/includes

Modified Files:
      Tag: core28x
	album_constants.php 
Log Message:
downgrade version to 2.0.1 for core28x branch

Index: album_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_constants.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** album_constants.php	13 Mar 2008 08:27:28 -0000	1.1.2.4
--- album_constants.php	13 Mar 2008 08:33:12 -0000	1.1.2.5
***************
*** 52,56 ****
  	if (!$_GET['print']) // Do not "fix" with reuest wrapper!!
  	{
! 		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
  	}
  
--- 52,56 ----
  	if (!$_GET['print']) // Do not "fix" with reuest wrapper!!
  	{
! 		//$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x (uncomment this in next version)
  	}
  

[mxbb-commits] mx_smartor/album_mod/includes album_bbcode.php, 1.1.2.2, 1.1.2.3 album_constants.php, 1.1.2.3, 1.1.2.4 album_functions.php, 1.1.2.2, 1.1.2.3 album_hierarchy_functions.php, 1.1.2.2, 1.1.2.3 album_hierarchy_sql.php, 1.1.2.2, 1.1.2.3 album_integration.php, 1.1.2.2, 1.1.2.3 album_nuffimage_box.php, 1.1.2.2, 1.1.2.3 clown_album_functions.php, 1.1.2.2, 1.1.2.3

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/album_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22730/album_mod/includes

Modified Files:
      Tag: core28x
	album_bbcode.php album_constants.php album_functions.php 
	album_hierarchy_functions.php album_hierarchy_sql.php 
	album_integration.php album_nuffimage_box.php 
	clown_album_functions.php 
Log Message:
update for new mx_mod 2.8.2

Index: album_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_constants.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** album_constants.php	13 Mar 2008 03:29:49 -0000	1.1.2.3
--- album_constants.php	13 Mar 2008 08:27:28 -0000	1.1.2.4
***************
*** 23,26 ****
--- 23,35 ----
  }
  
+ if ( !MXBB_MODULE )
+ {
+ 	define('PORTAL_URL', $portal_config['portal_url']);
+ 	define('PHPBB_URL', PORTAL_URL);
+ 
+ 	$mx_table_prefix = $table_prefix;
+ 	$is_block = false; // This also makes the script work for phpBB ;)
+ }
+ 
  // -------------------------------------------------------------------------
  // Extend User Style with module lang and images
***************
*** 30,35 ****
  // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
  // -------------------------------------------------------------------------
! //$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
! $mx_user->extend(MX_LANG_MAIN, MX_IMAGES);
  
  // Album Tables
--- 39,70 ----
  // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
  // -------------------------------------------------------------------------
! if (!MXBB_MODULE)
! {
! 	if (!defined( 'IN_ADMIN' ))
! 	{
! 		$mx_user->set_module_cfg_name('mx_smartor');
! 		$mx_user->set_module_lang_path($module_root_path . 'album_mod/');
! 		$mx_user->extend(MX_LANG_ALL, MX_IMAGES);
! 	}
! }
! else
! {
! 	if (!$_GET['print']) // Do not "fix" with reuest wrapper!!
! 	{
! 		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
! 	}
! 
! 	if (is_object($mx_page))
! 	{
! 		// -------------------------------------------------------------------------
! 		// Extend User Style with module lang and images
! 		// Usage:  $mx_user->extend(LANG, IMAGES)
! 		// Switches:
! 		// - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE
! 		// - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
! 		// -------------------------------------------------------------------------
! 		$mx_user->extend(MX_LANG_ALL, MX_IMAGES);
! 	}
! }
  
  // Album Tables
***************
*** 114,125 ****
  !defined('IMG_GIF') ? define('IMG_GIF', IMAGETYPE_GIF) : false;
  
! // Path (trailing slash required)
! define('ALBUM_UPLOAD_PATH', $module_root_path . 'upload/');
! define('ALBUM_OTF_PATH', $module_root_path . 'upload/otf/');
! define('ALBUM_JUPLOAD_PATH', $module_root_path . 'upload/jupload/');
! define('ALBUM_CACHE_PATH', $module_root_path . 'upload/cache/');
! define('ALBUM_MED_CACHE_PATH', $module_root_path . 'upload/med_cache/');
! define('ALBUM_WM_CACHE_PATH', $module_root_path . 'upload/wm_cache/');
! define('ALBUM_WM_FILE', $module_root_path . 'album_mod/mark_fap.png');
  
  ?>
\ No newline at end of file
--- 149,174 ----
  !defined('IMG_GIF') ? define('IMG_GIF', IMAGETYPE_GIF) : false;
  
! if ( !MXBB_MODULE )
! {
! 	// Path (trailing slash required)
! 	define('ALBUM_UPLOAD_PATH', $module_root_path . 'album_mod/upload/');
! 	define('ALBUM_OTF_PATH', $module_root_path . 'album_mod/upload/otf/');
! 	define('ALBUM_JUPLOAD_PATH', $module_root_path . 'album_mod/upload/jupload/');
! 	define('ALBUM_CACHE_PATH', $module_root_path . 'album_mod/upload/cache/');
! 	define('ALBUM_MED_CACHE_PATH', $module_root_path . 'album_mod/upload/med_cache/');
! 	define('ALBUM_WM_CACHE_PATH', $module_root_path . 'album_mod/upload/wm_cache/');
! 	define('ALBUM_WM_FILE', $module_root_path . 'album_mod/mark_fap.png');
  
+ }
+ else
+ {
+ 	// Path (trailing slash required)
+ 	define('ALBUM_UPLOAD_PATH', $module_root_path . 'upload/');
+ 	define('ALBUM_OTF_PATH', $module_root_path . 'upload/otf/');
+ 	define('ALBUM_JUPLOAD_PATH', $module_root_path . 'upload/jupload/');
+ 	define('ALBUM_CACHE_PATH', $module_root_path . 'upload/cache/');
+ 	define('ALBUM_MED_CACHE_PATH', $module_root_path . 'upload/med_cache/');
+ 	define('ALBUM_WM_CACHE_PATH', $module_root_path . 'upload/wm_cache/');
+ 	define('ALBUM_WM_FILE', $module_root_path . 'album_mod/mark_fap.png');
+ }
  ?>
\ No newline at end of file

Index: album_hierarchy_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_hierarchy_functions.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** album_hierarchy_functions.php	13 Mar 2008 03:26:38 -0000	1.1.2.2
--- album_hierarchy_functions.php	13 Mar 2008 08:27:28 -0000	1.1.2.3
***************
*** 138,146 ****
  			'INC_SPAN' => $max_level - $level +1 , // + $column_offset,
  
! 			'U_CAT_EDIT' => mx_append_sid(album_append_uid("$admin_url?action=edit&cat_id=$cat_id")),
! 			'U_CAT_DELETE' => ($is_root && $userdata['user_level'] != ADMIN) ? '' : mx_append_sid(album_append_uid("$admin_url?action=delete&cat_id=$cat_id")),
! 			'U_CAT_MOVE_UP' => ($is_root) ? '' : mx_append_sid(album_append_uid("$admin_url?action=move&move=-15&cat_id=$cat_id")),
! 			'U_CAT_MOVE_DOWN' => ($is_root) ? '' : mx_append_sid(album_append_uid("$admin_url?action=move&move=15&cat_id=$cat_id")),
! 			'U_VIEWCAT' => mx_append_sid(album_append_uid("$admin_url?action=edit&cat_id=$cat_id")),
  
  			'L_MOVE_UP' => ($is_root) ? '' : $lang['Move_up'],
--- 138,146 ----
  			'INC_SPAN' => $max_level - $level +1 , // + $column_offset,
  
! 			'U_CAT_EDIT' => mx_append_sid(album_append_uid("$admin_url?action=edit&cat_id=$cat_id"), true),
! 			'U_CAT_DELETE' => ($is_root && $userdata['user_level'] != ADMIN) ? '' : mx_append_sid(album_append_uid("$admin_url?action=delete&cat_id=$cat_id"), true),
! 			'U_CAT_MOVE_UP' => ($is_root) ? '' : mx_append_sid(album_append_uid("$admin_url?action=move&move=-15&cat_id=$cat_id"), true),
! 			'U_CAT_MOVE_DOWN' => ($is_root) ? '' : mx_append_sid(album_append_uid("$admin_url?action=move&move=15&cat_id=$cat_id"), true),
! 			'U_VIEWCAT' => mx_append_sid(album_append_uid("$admin_url?action=edit&cat_id=$cat_id"), true),
  
  			'L_MOVE_UP' => ($is_root) ? '' : $lang['Move_up'],


Index: album_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_functions.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** album_functions.php	13 Mar 2008 03:26:37 -0000	1.1.2.2
--- album_functions.php	13 Mar 2008 08:27:28 -0000	1.1.2.3
***************
*** 25,28 ****
--- 25,29 ----
  		return phpBB2::create_date($format, $gmepoch, $tz);
  	}
+ }
  
  if(!function_exists(create_date2))

Index: album_integration.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_integration.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** album_integration.php	13 Mar 2008 03:26:40 -0000	1.1.2.2
--- album_integration.php	13 Mar 2008 08:27:28 -0000	1.1.2.3
***************
*** 49,57 ****
  	function this_smartor_mxurl($args = '', $force_standalone_mode = false)
  	{
! 		global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  		if( $force_standalone_mode || !$is_block )
  		{
! 			$mxurl = $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  		}
  		else
--- 49,57 ----
  	function this_smartor_mxurl($args = '', $force_standalone_mode = false)
  	{
! 		global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  		if( $force_standalone_mode || !$is_block )
  		{
! 			$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  		}
  		else
***************
*** 72,78 ****
  function this_fap_addonurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
! 	$mxurl = $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  
  	return $mxurl;
--- 72,78 ----
  function this_fap_addonurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
! 	$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  
  	return $mxurl;
***************
*** 81,89 ****
  function this_fap_portalurl($args = '')
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  	if( $integration_enabled != "1" )
  	{
! 		$mxurl = $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
--- 81,89 ----
  function this_fap_portalurl($args = '')
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  	if( $integration_enabled != "1" )
  	{
! 		$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
***************
*** 104,112 ****
  function this_fap_toplisturl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled;
  
  	if( $force_standalone_mode )
  	{
! 		$mxurl = $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
--- 104,112 ----
  function this_fap_toplisturl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled;
  
  	if( $force_standalone_mode )
  	{
! 		$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
***************
*** 118,122 ****
  function this_fap_loginurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  
--- 118,122 ----
  function this_fap_loginurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  
***************
*** 134,142 ****
  function this_fap_rssurl($args = '')
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  	if( $integration_enabled != "1" )
  	{
! 		$mxurl = 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
--- 134,142 ----
  function this_fap_rssurl($args = '')
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  	if( $integration_enabled != "1" )
  	{
! 		$mxurl = ( !MXBB_MODULE ) ? 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
***************
*** 154,158 ****
  	if( $force_standalone_mode || !$is_block )
  	{
! 		$mxurl = 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
--- 154,158 ----
  	if( $force_standalone_mode || !$is_block )
  	{
! 		$mxurl = ( !MXBB_MODULE ) ? 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else

[mxbb-commits] mx_smartor/album_mod album_bbconstants.php, 1.1.2.9, 1.1.2.10 album_common.php, 1.19.2.9, 1.19.2.10

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/album_mod
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22730/album_mod

Modified Files:
      Tag: core28x
	album_bbconstants.php album_common.php 
Log Message:
update for new mx_mod 2.8.2

[mxbb-commits] mx_smartor album.php, 1.17.2.9, 1.17.2.10 album_lists.php, 1.21.2.5, 1.21.2.6 db_install.php, 1.15.2.6, 1.15.2.7 db_uninstall.php, 1.10.2.3, 1.10.2.4 db_upgrade.php, 1.15.2.6, 1.15.2.7 hierarchy_db_migrate.php, 1.6.2.3, 1.6.2.4 mx_install_readme.htm, 1.9.2.7, 1.9.2.8 welcome.php, 1.8.2.6, 1.8.2.7

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22730

Modified Files:
      Tag: core28x
	album.php album_lists.php db_install.php db_uninstall.php 
	db_upgrade.php hierarchy_db_migrate.php mx_install_readme.htm 
	welcome.php 
Log Message:
update for new mx_mod 2.8.2

Index: album.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album.php,v
retrieving revision 1.17.2.9
retrieving revision 1.17.2.10
diff -C2 -d -r1.17.2.9 -r1.17.2.10
*** album.php	13 Mar 2008 03:26:14 -0000	1.17.2.9
--- album.php	13 Mar 2008 08:27:26 -0000	1.17.2.10
***************
*** 36,40 ****
  $phpEx = substr(strrchr(__FILE__, '.'), 1);
  
! if ( !defined('PORTAL_BACKEND') && @file_exists( './viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
  {
  	define('MXBB_MODULE', false);
--- 36,40 ----
  $phpEx = substr(strrchr(__FILE__, '.'), 1);
  
! if (@file_exists( './viewtopic.' . $phpEx )) // -------------------------------------------- phpBB MOD MODE
  {
  	define('MXBB_MODULE', false);
***************
*** 362,366 ****
  	include($album_root_path. 'modules/album_personal_random.'.$phpEx);
  }
! else if( !is_object($mx_block))
  {
  	die("Hacking attempt");
--- 362,366 ----
  	include($album_root_path. 'modules/album_personal_random.'.$phpEx);
  }
! else if(!is_object($mx_block) && MXBB_MODULE)
  {
  	die("Hacking attempt");



Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/db_upgrade.php,v
retrieving revision 1.15.2.6
retrieving revision 1.15.2.7
diff -C2 -d -r1.15.2.6 -r1.15.2.7
*** db_upgrade.php	13 Mar 2008 03:26:24 -0000	1.15.2.6
--- db_upgrade.php	13 Mar 2008 08:27:26 -0000	1.15.2.7
***************
*** 30,34 ****
  }
  
! $mx_module_version = '2.0.1';
  $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>';
  
--- 30,34 ----
  }
  
! $mx_module_version = '2.0.2';
  $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>';
  

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/db_install.php,v
retrieving revision 1.15.2.6
retrieving revision 1.15.2.7
diff -C2 -d -r1.15.2.6 -r1.15.2.7
*** db_install.php	13 Mar 2008 03:26:18 -0000	1.15.2.6
--- db_install.php	13 Mar 2008 08:27:26 -0000	1.15.2.7
***************
*** 32,36 ****
  }
  
! $mx_module_version = '2.0.1';
  $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>';
  
--- 32,36 ----
  }
  
! $mx_module_version = '2.0.2';
  $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>';
  

[mxbb-commits] mx_smartor/admin admin_album_auth.php, 1.11.2.6, 1.11.2.7 admin_album_cat.php, 1.11.2.5, 1.11.2.6 admin_album_cfg.php, 1.4.2.5, 1.4.2.6 admin_album_clearcache.php, 1.11.2.5, 1.11.2.6 admin_album_clown_SP.php, 1.13.2.5, 1.13.2.6 admin_album_config_personal.php, 1.2.2.5, 1.2.2.6 admin_album_ext.php, 1.1.2.5, 1.1.2.6 admin_album_otf.php, 1.1.2.1, 1.1.2.2 admin_album_personal.php, 1.11.2.5, 1.11.2.6

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22730/admin

Modified Files:
      Tag: core28x
	admin_album_auth.php admin_album_cat.php admin_album_cfg.php 
	admin_album_clearcache.php admin_album_clown_SP.php 
	admin_album_config_personal.php admin_album_ext.php 
	admin_album_otf.php admin_album_personal.php 
Log Message:
update for new mx_mod 2.8.2

Index: admin_album_config_personal.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_config_personal.php,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -C2 -d -r1.2.2.5 -r1.2.2.6
*** admin_album_config_personal.php	13 Mar 2008 03:26:04 -0000	1.2.2.5
--- admin_album_config_personal.php	13 Mar 2008 08:27:24 -0000	1.2.2.6
***************
*** 9,18 ****
  */
  
! define('IN_PORTAL', 1);
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Album_Personal_Settings'] = "modules/mx_smartor/admin/" .$filename;
  	return;
  }
--- 9,105 ----
  */
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! 
! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
! {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './../';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	require_once($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	@define('IN_PORTAL', true);
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './../';
! 
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	
! 	require_once($mx_mod_path . "includes/functions_core.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;)
! 
! 	//
! 	// Instatiate the mx_cache class
! 	//
! 	$mx_cache = new mx_cache();
! 	
! 	//
! 	// instatiate the mx_request_vars class
! 	//
! 	$mx_request_vars = new mx_request_vars();
! 	
! 
! 	//
! 	// instatiate the mx_user class
! 	//
! 	//$mx_user = new mx_user();
! 
! 	//
! 	// Left Pane Paths
! 	//
! 	$setmodules_admin_path = '';
! 	$setmodules_module_path = "./../";
! 	
! 	if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 	}
! 	else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 	}
! }
! else
! {
! 	define( 'IN_PORTAL', 1 );
! 	define( 'MXBB_MODULE', true );
! 
! 	//
! 	// Main paths
! 	//
! 	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_smartor/';
! 
! 	$setmodules_admin_path = 'modules/mx_smartor/admin/';
! 
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
! 
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! }
! 
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Album_Personal_Settings'] = $setmodules_admin_path . $filename;
  	return;
  }
***************
*** 21,63 ****
  // Let's set the root dir for phpBB
  //
! $module_root_path = '../';
! $mx_root_path = '../../../';
! $phpEx = substr(strrchr(__FILE__, '.'), 1); 
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
  
! define('ALBUM_MOD_PATH', 'album_mod/');
! 
! // Get general album information
! if (!isset($album_root_path) || empty($album_root_path))
  {
! 	$album_root_path = $module_root_path . ALBUM_MOD_PATH . '';
! }
  
! if (!isset($acp_prefix) || empty($acp_prefix))
! {
! 	$acp_prefix = 'admin/';
  }
  
! include_once($album_root_path . 'album_common.'.$phpEx);
! // require($module_root_path . 'album_mod/album_constants.'.$phpEx);
  
  // **********************************************************************
  // 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 );
  }
  
--- 108,140 ----
  // Let's set the root dir for phpBB
  //
! $album_root_path = $module_root_path . 'album_mod/';
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
  
! if ( !MXBB_MODULE )
  {
! 	require_once($mx_mod_path . "includes/functions_styles.$phpEx");
  
! 	$mx_user = new mx_user();	// instatiate the mx_user class
! 	
! 	//
! 	// Define basic constants
! 	//
! 	$mx_user->page_id = 1;
! 	$mx_user->user_ip = $user_ip;
! 	$mx_user->_init_userprefs();
  }
  
! require($module_root_path . 'album_mod/includes/album_constants.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
! else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  }
  
***************
*** 101,105 ****
  
  $template->set_filenames(array(
! 	"body" => $acp_prefix . 'album_config_personal_body.tpl')
  );
  
--- 178,182 ----
  
  $template->set_filenames(array(
! 	"body" => 'admin/album_config_personal_body.tpl')
  );
  

Index: admin_album_cfg.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_cfg.php,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -C2 -d -r1.4.2.5 -r1.4.2.6
*** admin_album_cfg.php	13 Mar 2008 03:25:57 -0000	1.4.2.5
--- admin_album_cfg.php	13 Mar 2008 08:27:23 -0000	1.4.2.6
***************
*** 9,18 ****
  */
  
! define('IN_PORTAL', 1);
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Configuration std'] = "modules/mx_smartor/admin/" .$filename;
  	return;
  }
--- 9,105 ----
  */
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! 
! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
! {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './../';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	require_once($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	@define('IN_PORTAL', true);
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './../';
! 
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	
! 	require_once($mx_mod_path . "includes/functions_core.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;)
! 
! 	//
! 	// Instatiate the mx_cache class
! 	//
! 	$mx_cache = new mx_cache();
! 	
! 	//
! 	// instatiate the mx_request_vars class
! 	//
! 	$mx_request_vars = new mx_request_vars();
! 	
! 
! 	//
! 	// instatiate the mx_user class
! 	//
! 	//$mx_user = new mx_user();
! 
! 	//
! 	// Left Pane Paths
! 	//
! 	$setmodules_admin_path = '';
! 	$setmodules_module_path = "./../";
! 	
! 	if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 	}
! 	else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 	}
! }
! else
! {
! 	define( 'IN_PORTAL', 1 );
! 	define( 'MXBB_MODULE', true );
! 
! 	//
! 	// Main paths
! 	//
! 	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_smartor/';
! 
! 	$setmodules_admin_path = 'modules/mx_smartor/admin/';
! 
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
! 
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! }
! 
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Configuration std'] = $setmodules_admin_path . $filename;
  	return;
  }
***************
*** 21,48 ****
  // Let's set the root dir for phpBB
  //
! $module_root_path = '../';
! $mx_root_path = '../../../';
! $phpEx = substr(strrchr(__FILE__, '.'), 1); 
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
! require($module_root_path . 'album_mod/album_constants.'.$phpEx);
  
  // **********************************************************************
  // 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 );
  }
  
--- 108,149 ----
  // Let's set the root dir for phpBB
  //
! $album_root_path = $module_root_path . 'album_mod/';
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
! 
! if ( !MXBB_MODULE )
! {
! 	require_once($mx_mod_path . "includes/functions_styles.$phpEx");
! 
! 	$mx_user = new mx_user();	// instatiate the mx_user class
! 	
! 	//
! 	// Define basic constants
! 	//
! 	$mx_user->page_id = 1;
! 	$mx_user->user_ip = $user_ip;
! 	$mx_user->_init_userprefs();
! }
! 
! require($module_root_path . 'album_mod/includes/album_constants.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
! else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  }
! 
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_main.$phpEx");
  }
! else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx");
  }
  

Index: admin_album_auth.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_auth.php,v
retrieving revision 1.11.2.6
retrieving revision 1.11.2.7
diff -C2 -d -r1.11.2.6 -r1.11.2.7
*** admin_album_auth.php	13 Mar 2008 03:25:54 -0000	1.11.2.6
--- admin_album_auth.php	13 Mar 2008 08:27:22 -0000	1.11.2.7
***************
*** 11,41 ****
  /* Powered by Photo Album v2.x.x (c) 2002-2003 Smartor */
  
! define( 'IN_PORTAL', 1 );
  
! if ( !empty( $setmodules ) )
  {
! 	$filename = basename( __FILE__ );
! 	$module['Smartor_Album']['Permissions'] = "modules/mx_smartor/admin/" . $filename;
  	return;
  }
  
  // Let's set the root dir for phpBB
  
! $module_root_path = './../';
! $mx_root_path = './../../../';
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! require( $mx_root_path . 'admin/pagestart.' . $phpEx );
! include_once( $module_root_path . 'album_mod/album_common.' . $phpEx );
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
  {
! 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
  }
  else
  {
! 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  }
  
--- 11,142 ----
  /* Powered by Photo Album v2.x.x (c) 2002-2003 Smartor */
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
  
! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
  {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './../';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	require_once($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	@define('IN_PORTAL', true);
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './../';
! 
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	
! 	require_once($mx_mod_path . "includes/functions_core.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;)
! 
! 	//
! 	// Instatiate the mx_cache class
! 	//
! 	$mx_cache = new mx_cache();
! 	
! 	//
! 	// instatiate the mx_request_vars class
! 	//
! 	$mx_request_vars = new mx_request_vars();
! 	
! 
! 	//
! 	// instatiate the mx_user class
! 	//
! 	//$mx_user = new mx_user();
! 
! 	//
! 	// Left Pane Paths
! 	//
! 	$setmodules_admin_path = '';
! 	$setmodules_module_path = "./../";
! 	
! 	if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 	}
! 	else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 	}
! }
! else
! {
! 	define( 'IN_PORTAL', 1 );
! 	define( 'MXBB_MODULE', true );
! 
! 	//
! 	// Main paths
! 	//
! 	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_smartor/';
! 
! 	$setmodules_admin_path = 'modules/mx_smartor/admin/';
! 
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
! 
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! }
! 
! 
! if( !empty($setmodules) )
! {
! 	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Permissions'] = $setmodules_admin_path . $filename;
  	return;
  }
  
+ //
  // Let's set the root dir for phpBB
+ //
+ $album_root_path = $module_root_path . 'album_mod/';
+ require($mx_root_path . 'admin/pagestart.' . $phpEx);
  
! if ( !MXBB_MODULE )
! {
! 	require_once($mx_mod_path . "includes/functions_styles.$phpEx");
! 
! 	$mx_user = new mx_user();	// instatiate the mx_user class
! 	
! 	//
! 	// Define basic constants
! 	//
! 	$mx_user->page_id = 1;
! 	$mx_user->user_ip = $user_ip;
! 	$mx_user->_init_userprefs();
! }
! 
! require($module_root_path . 'album_mod/album_common.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
  else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  }
  

Index: admin_album_clearcache.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_clearcache.php,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -C2 -d -r1.11.2.5 -r1.11.2.6
*** admin_album_clearcache.php	13 Mar 2008 03:25:59 -0000	1.11.2.5
--- admin_album_clearcache.php	13 Mar 2008 08:27:24 -0000	1.11.2.6
***************
*** 9,18 ****
  */
  
! define( 'IN_PORTAL', 1 );
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Clear_Cache'] = "modules/mx_smartor/admin/" .$filename;
  	return;
  }
--- 9,105 ----
  */
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! 
! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
! {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './../';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	require_once($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	@define('IN_PORTAL', true);
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './../';
! 
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	
! 	require_once($mx_mod_path . "includes/functions_core.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;)
! 
! 	//
! 	// Instatiate the mx_cache class
! 	//
! 	$mx_cache = new mx_cache();
! 	
! 	//
! 	// instatiate the mx_request_vars class
! 	//
! 	$mx_request_vars = new mx_request_vars();
! 	
! 
! 	//
! 	// instatiate the mx_user class
! 	//
! 	//$mx_user = new mx_user();
! 
! 	//
! 	// Left Pane Paths
! 	//
! 	$setmodules_admin_path = '';
! 	$setmodules_module_path = "./../";
! 	
! 	if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 	}
! 	else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 	}
! }
! else
! {
! 	define( 'IN_PORTAL', 1 );
! 	define( 'MXBB_MODULE', true );
! 
! 	//
! 	// Main paths
! 	//
! 	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_smartor/';
! 
! 	$setmodules_admin_path = 'modules/mx_smartor/admin/';
! 
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
! 
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! }
! 
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Clear_Cache'] = $setmodules_admin_path . $filename;
  	return;
  }
***************
*** 21,40 ****
  // Let's set the root dir for phpBB
  //
! $module_root_path = '../';
! $mx_root_path = '../../../';
! $phpEx = substr(strrchr(__FILE__, '.'), 1); 
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
! require($module_root_path . 'album_mod/album_constants.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
  {
! 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
  }
  else
  {
! 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  }
  
--- 108,140 ----
  // Let's set the root dir for phpBB
  //
! $album_root_path = $module_root_path . 'album_mod/';
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
! 
! if ( !MXBB_MODULE )
! {
! 	require_once($mx_mod_path . "includes/functions_styles.$phpEx");
! 
! 	$mx_user = new mx_user();	// instatiate the mx_user class
! 	
! 	//
! 	// Define basic constants
! 	//
! 	$mx_user->page_id = 1;
! 	$mx_user->user_ip = $user_ip;
! 	$mx_user->_init_userprefs();
! }
! 
! require($module_root_path . 'album_mod/includes/album_constants.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
  else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  }
  

Index: admin_album_ext.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_ext.php,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** admin_album_ext.php	13 Mar 2008 03:26:09 -0000	1.1.2.5
--- admin_album_ext.php	13 Mar 2008 08:27:24 -0000	1.1.2.6
***************
*** 18,49 ****
  }
  
! $mx_root_path = './../../../';
! $module_root_path = "./../";
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! require( $mx_root_path . '/admin/pagestart.' . $phpEx );
! 
! include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx );
! 
! define('ALBUM_MOD_PATH', 'album_mod/');
! 
! // Get general album information
! if (!isset($album_root_path) || empty($album_root_path))
! {
! 	$album_root_path = $module_root_path . ALBUM_MOD_PATH . '';
! }
  
- include_once($album_root_path . 'album_common.'.$phpEx);
- // include_once( $module_root_path . 'album_mod/album_constants.'.$phpEx );
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
  {
! 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
  }
  else
  {
! 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  }
  
--- 18,40 ----
  }
  
! // Let's set the root dir for phpBB
! $module_root_path = '../';
! $mx_root_path = '../../../';
! $album_root_path = $module_root_path . 'album_mod/';
! $phpEx = substr(strrchr(__FILE__, '.'), 1); 
! require($mx_root_path . 'admin/pagestart.' . $phpEx);
! require($module_root_path . 'album_mod/includes/album_constants.'.$phpEx);
  
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
  else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  }
  

Index: admin_album_cat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_cat.php,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -C2 -d -r1.11.2.5 -r1.11.2.6
*** admin_album_cat.php	13 Mar 2008 03:25:56 -0000	1.11.2.5
--- admin_album_cat.php	13 Mar 2008 08:27:23 -0000	1.11.2.6
***************
*** 20,29 ****
   ***************************************************************************/
  
! define('IN_PORTAL', 1);
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Categories'] = "modules/mx_smartor/admin/" .$filename;
  	return;
  }
--- 20,116 ----
   ***************************************************************************/
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! 
! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
! {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './../';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	require_once($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	@define('IN_PORTAL', true);
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './../';
! 
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	
! 	require_once($mx_mod_path . "includes/functions_core.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;)
! 
! 	//
! 	// Instatiate the mx_cache class
! 	//
! 	$mx_cache = new mx_cache();
! 	
! 	//
! 	// instatiate the mx_request_vars class
! 	//
! 	$mx_request_vars = new mx_request_vars();
! 	
! 
! 	//
! 	// instatiate the mx_user class
! 	//
! 	//$mx_user = new mx_user();
! 
! 	//
! 	// Left Pane Paths
! 	//
! 	$setmodules_admin_path = '';
! 	$setmodules_module_path = "./../";
! 	
! 	if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 	}
! 	else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 	}
! }
! else
! {
! 	define( 'IN_PORTAL', 1 );
! 	define( 'MXBB_MODULE', true );
! 
! 	//
! 	// Main paths
! 	//
! 	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_smartor/';
! 
! 	$setmodules_admin_path = 'modules/mx_smartor/admin/';
! 
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
! 
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! }
! 
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Categories'] = $setmodules_admin_path . $filename;
  	return;
  }
***************
*** 32,77 ****
  // Let's set the root dir for phpBB
  //
! $module_root_path = '../';
! $mx_root_path = '../../../';
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! require( $mx_root_path . '/admin/pagestart.' . $phpEx );
! 
! include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx );
! 
! define('ALBUM_MOD_PATH', 'album_mod/');
  
! // Get general album information
! if (!isset($album_root_path) || empty($album_root_path))
  {
! 	$album_root_path = $module_root_path . ALBUM_MOD_PATH . '';
! }
  
! if (!isset($acp_prefix) || empty($acp_prefix))
! {
! 	$acp_prefix = 'admin/';
  }
  
! 
! include_once($album_root_path . 'album_common.'.$phpEx);
! 
  
  // **********************************************************************
  // 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 );
  }
  
--- 119,160 ----
  // Let's set the root dir for phpBB
  //
! $album_root_path = $module_root_path . 'album_mod/';
! require($mx_root_path . 'admin/pagestart.' . $phpEx);
  
! if ( !MXBB_MODULE )
  {
! 	require_once($mx_mod_path . "includes/functions_styles.$phpEx");
  
! 	$mx_user = new mx_user();	// instatiate the mx_user class
! 	
! 	//
! 	// Define basic constants
! 	//
! 	$mx_user->page_id = 1;
! 	$mx_user->user_ip = $user_ip;
! 	$mx_user->_init_userprefs();
  }
  
! require($module_root_path . 'album_mod/album_common.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
! else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  }
! 
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_main.$phpEx");
  }
! else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx");
  }
  
***************
*** 82,93 ****
  	global $lang, $album_user_id, $phpEx;
  
! 	$message = $in_message . "<br /><br />" . sprintf($lang['Click_return_album_category'], "<a href=\"" . mx_append_sid("admin_album_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);
  }
  
! if( !isset($_POST['mode']) )
  {
! 	if( !isset($_GET['action']) )
  	{
  		album_read_tree();
--- 165,176 ----
  	global $lang, $album_user_id, $phpEx;
  
! 	$message = $in_message . "<br /><br />" . sprintf($lang['Click_return_album_category'], "<a href=\"" . mx_append_sid("admin_album_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("../admin/index.$phpEx?pane=right") . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);
  }
  
! if( !isset($HTTP_POST_VARS['mode']) )
  {
! 	if( !isset($HTTP_GET_VARS['action']) )
  	{
  		album_read_tree();
***************
*** 98,102 ****
  		then go back to this template file $acp_prefix . 'album_cat_body.tpl'.
  		*/
! 		$template->set_filenames(array('body' => $acp_prefix . 'album_cat_body.tpl'));
  
  		$template->assign_vars(array(
--- 181,185 ----
  		then go back to this template file $acp_prefix . 'album_cat_body.tpl'.
  		*/
! 		$template->set_filenames(array('body' => 'admin/album_cat_body.tpl'));
  
  		$template->assign_vars(array(
***************
*** 127,133 ****
  	else
  	{
! 		if( $_GET['action'] == 'edit' )
  		{
! 			$cat_id = intval($_GET['cat_id']);
  
  			$sql = "SELECT cat.*, cat2.cat_title AS cat_parent_title, cat2.cat_id AS cat_parent_id
--- 210,216 ----
  	else
  	{
! 		if( $HTTP_GET_VARS['action'] == 'edit' )
  		{
! 			$cat_id = intval($HTTP_GET_VARS['cat_id']);
  
  			$sql = "SELECT cat.*, cat2.cat_title AS cat_parent_title, cat2.cat_id AS cat_parent_id
***************
*** 148,152 ****
  			$s_album_cat_list = album_get_tree_option($catrow['cat_parent_id'], ALBUM_AUTH_VIEW, ALBUM_SELECTBOX_INCLUDE_ALL | ALBUM_SELECTBOX_INCLUDE_ROOT);
  
! 			$template->set_filenames(array('body' => $acp_prefix . 'album_cat_new_body.tpl'));
  
  			$template->assign_block_vars('acp', array(
--- 231,235 ----
  			$s_album_cat_list = album_get_tree_option($catrow['cat_parent_id'], ALBUM_AUTH_VIEW, ALBUM_SELECTBOX_INCLUDE_ALL | ALBUM_SELECTBOX_INCLUDE_ROOT);
  
! 			$template->set_filenames(array('body' => 'admin/album_cat_new_body.tpl'));
  
  			$template->assign_block_vars('acp', array(
***************
*** 236,242 ****
  			include($mx_root_path . 'admin/page_footer_admin.'.$phpEx);
  		}
! 		elseif( $_GET['action'] == 'delete' )
  		{
! 			$cat_id = intval($_GET['cat_id']);
  
  			$sql = "SELECT cat_id, cat_title, cat_order
--- 319,325 ----
  			include($mx_root_path . 'admin/page_footer_admin.'.$phpEx);
  		}
! 		elseif( $HTTP_GET_VARS['action'] == 'delete' )
  		{
! 			$cat_id = intval($HTTP_GET_VARS['cat_id']);
  
  			$sql = "SELECT cat_id, cat_title, cat_order
***************
*** 271,275 ****
  			$select_to .= '</select>';
  
! 			$template->set_filenames(array('body' => $acp_prefix . 'album_cat_delete_body.tpl'));
  
  			$template->assign_vars(array(
--- 354,358 ----
  			$select_to .= '</select>';
  
! 			$template->set_filenames(array('body' => 'admin/album_cat_delete_body.tpl'));
  
  			$template->assign_vars(array(
***************
*** 289,296 ****
  			include($mx_root_path . 'admin/page_footer_admin.'.$phpEx);
  		}
! 		elseif( $_GET['action'] == 'move' )
  		{
! 			$cat_id = intval($_GET['cat_id']);
! 			$move = intval($_GET['move']);
  
  			album_move_tree($cat_id, $move);
--- 372,379 ----
  			include($mx_root_path . 'admin/page_footer_admin.'.$phpEx);
  		}
! 		elseif( $HTTP_GET_VARS['action'] == 'move' )
  		{
! 			$cat_id = intval($HTTP_GET_VARS['cat_id']);
! 			$move = intval($HTTP_GET_VARS['move']);
  
  			album_move_tree($cat_id, $move);
***************
*** 303,322 ****
  else
  {
! 	if( $_POST['mode'] == 'new' )
  	{
! 		if ( is_array($_POST['addcategory']))
  		{
! 			list($cat_id) = each($_POST['addcategory']);
! 			$cat_title = stripslashes($_POST['name'][$cat_id]);
  			$cat_parent = $cat_id;
  			$cat_id = -1;
  		}
  
! 		if( !isset($_POST['cat_title']) )
  		{
  			album_read_tree();
  			$s_album_cat_list = album_get_tree_option($cat_parent, ALBUM_AUTH_VIEW, ALBUM_SELECTBOX_INCLUDE_ALL);
  
! 			$template->set_filenames(array('body' => $acp_prefix . 'album_cat_new_body.tpl'));
  
  			$template->assign_vars(array(
--- 386,405 ----
  else
  {
! 	if( $HTTP_POST_VARS['mode'] == 'new' )
  	{
! 		if ( is_array($HTTP_POST_VARS['addcategory']))
  		{
! 			list($cat_id) = each($HTTP_POST_VARS['addcategory']);
! 			$cat_title = stripslashes($HTTP_POST_VARS['name'][$cat_id]);
  			$cat_parent = $cat_id;
  			$cat_id = -1;
  		}
  
! 		if( !isset($HTTP_POST_VARS['cat_title']) )
  		{
  			album_read_tree();
  			$s_album_cat_list = album_get_tree_option($cat_parent, ALBUM_AUTH_VIEW, ALBUM_SELECTBOX_INCLUDE_ALL);
  
! 			$template->set_filenames(array('body' => 'admin/album_cat_new_body.tpl'));
  
  			$template->assign_vars(array(
***************
*** 376,396 ****
  			if( !get_magic_quotes_gpc() )
  			{
! 				$cat_title = addslashes(htmlspecialchars(trim($_POST['cat_title'])));
! 				$cat_desc = addslashes(trim($_POST['cat_desc']));
  			}
  			else
  			{
! 				$cat_title = htmlspecialchars(trim($_POST['cat_title']));
! 				$cat_desc = trim($_POST['cat_desc']);
  			}
! 			$cat_wm = trim($_POST['cat_wm']);
! 			$view_level = intval($_POST['cat_view_level']);
! 			$upload_level = intval($_POST['cat_upload_level']);
! 			$rate_level = intval($_POST['cat_rate_level']);
! 			$comment_level = intval($_POST['cat_comment_level']);
! 			$edit_level = intval($_POST['cat_edit_level']);
! 			$delete_level = intval($_POST['cat_delete_level']);
! 			$cat_approval = intval($_POST['cat_approval']);
! 			$cat_parent = ($_POST['cat_parent_id'] == ALBUM_ROOT_CATEGORY) ? 0 : intval($_POST['cat_parent_id']);
  			$cat_parent = ($cat_parent < 0) ? 0 : $cat_parent;
  
--- 459,479 ----
  			if( !get_magic_quotes_gpc() )
  			{
! 				$cat_title = addslashes(htmlspecialchars(trim($HTTP_POST_VARS['cat_title'])));
! 				$cat_desc = addslashes(trim($HTTP_POST_VARS['cat_desc']));
  			}
  			else
  			{
! 				$cat_title = htmlspecialchars(trim($HTTP_POST_VARS['cat_title']));
! 				$cat_desc = trim($HTTP_POST_VARS['cat_desc']);
  			}
! 			$cat_wm = trim($HTTP_POST_VARS['cat_wm']);
! 			$view_level = intval($HTTP_POST_VARS['cat_view_level']);
! 			$upload_level = intval($HTTP_POST_VARS['cat_upload_level']);
! 			$rate_level = intval($HTTP_POST_VARS['cat_rate_level']);
! 			$comment_level = intval($HTTP_POST_VARS['cat_comment_level']);
! 			$edit_level = intval($HTTP_POST_VARS['cat_edit_level']);
! 			$delete_level = intval($HTTP_POST_VARS['cat_delete_level']);
! 			$cat_approval = intval($HTTP_POST_VARS['cat_approval']);
! 			$cat_parent = ($HTTP_POST_VARS['cat_parent_id'] == ALBUM_ROOT_CATEGORY) ? 0 : intval($HTTP_POST_VARS['cat_parent_id']);
  			$cat_parent = ($cat_parent < 0) ? 0 : $cat_parent;
  
***************
*** 420,446 ****
  		}
  	}
! 	elseif( $_POST['mode'] == 'edit' )
  	{
  		// Get posting variables
! 		$cat_id = intval($_GET['cat_id']);
  		if( !get_magic_quotes_gpc() )
  		{
! 			$cat_title = addslashes(htmlspecialchars(trim($_POST['cat_title'])));
! 			$cat_desc = addslashes(trim($_POST['cat_desc']));
  		}
  		else
  		{
! 			$cat_title = htmlspecialchars(trim($_POST['cat_title']));
! 			$cat_desc = trim($_POST['cat_desc']);
  		}
! 		$cat_wm = trim($_POST['cat_wm']);
! 		$view_level = intval($_POST['cat_view_level']);
! 		$upload_level = intval($_POST['cat_upload_level']);
! 		$rate_level = intval($_POST['cat_rate_level']);
! 		$comment_level = intval($_POST['cat_comment_level']);
! 		$edit_level = intval($_POST['cat_edit_level']);
! 		$delete_level = intval($_POST['cat_delete_level']);
! 		$cat_approval = intval($_POST['cat_approval']);
! 		$cat_parent = ($_POST['cat_parent_id'] == ALBUM_ROOT_CATEGORY) ? 0 : intval($_POST['cat_parent_id']);
  		$cat_parent = ($cat_parent < 0) ? 0 : $cat_parent;
  		
--- 503,529 ----
  		}
  	}
! 	elseif( $HTTP_POST_VARS['mode'] == 'edit' )
  	{
  		// Get posting variables
! 		$cat_id = intval($HTTP_GET_VARS['cat_id']);
  		if( !get_magic_quotes_gpc() )
  		{
! 			$cat_title = addslashes(htmlspecialchars(trim($HTTP_POST_VARS['cat_title'])));
! 			$cat_desc = addslashes(trim($HTTP_POST_VARS['cat_desc']));
  		}
  		else
  		{
! 			$cat_title = htmlspecialchars(trim($HTTP_POST_VARS['cat_title']));
! 			$cat_desc = trim($HTTP_POST_VARS['cat_desc']);
  		}
! 		$cat_wm = trim($HTTP_POST_VARS['cat_wm']);
! 		$view_level = intval($HTTP_POST_VARS['cat_view_level']);
! 		$upload_level = intval($HTTP_POST_VARS['cat_upload_level']);
! 		$rate_level = intval($HTTP_POST_VARS['cat_rate_level']);
! 		$comment_level = intval($HTTP_POST_VARS['cat_comment_level']);
! 		$edit_level = intval($HTTP_POST_VARS['cat_edit_level']);
! 		$delete_level = intval($HTTP_POST_VARS['cat_delete_level']);
! 		$cat_approval = intval($HTTP_POST_VARS['cat_approval']);
! 		$cat_parent = ($HTTP_POST_VARS['cat_parent_id'] == ALBUM_ROOT_CATEGORY) ? 0 : intval($HTTP_POST_VARS['cat_parent_id']);
  		$cat_parent = ($cat_parent < 0) ? 0 : $cat_parent;
  		
***************
*** 468,472 ****
  		showResultMessage($lang['Category_updated']);
  	}
! 	elseif( $_POST['mode'] == 'delete' )
  	{
  		$parent_cat_deleted = false;
--- 551,555 ----
  		showResultMessage($lang['Category_updated']);
  	}
! 	elseif( $HTTP_POST_VARS['mode'] == 'delete' )
  	{
  		$parent_cat_deleted = false;
***************
*** 474,479 ****
  		$parent_cat_title = "";
  
! 		$cat_id = intval($_GET['cat_id']);
! 		$target = intval($_POST['target']);
  
  		if( $target == ALBUM_JUMPBOX_DELETE ) // Delete All
--- 557,562 ----
  		$parent_cat_title = "";
  
! 		$cat_id = intval($HTTP_GET_VARS['cat_id']);
! 		$target = intval($HTTP_POST_VARS['target']);
  
  		if( $target == ALBUM_JUMPBOX_DELETE ) // Delete All

Index: admin_album_otf.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_otf.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** admin_album_otf.php	1 Feb 2008 14:12:26 -0000	1.1.2.1
--- admin_album_otf.php	13 Mar 2008 08:27:25 -0000	1.1.2.2
***************
*** 20,62 ****
   ***************************************************************************/
  
! define( 'IN_PORTAL', 1 );
  
! if ( !empty( $setmodules ) )
  {
! 	$file = basename( __FILE__ );
! 	$module['Smartor_Album']['Configuration otf'] = 'modules/mx_smartor/admin/' . $file;
! 	return;
  }
  
! $mx_root_path = './../../../';
! $module_root_path = "./../";
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! require( $mx_root_path . '/admin/pagestart.' . $phpEx );
  
  
! // Start session management
! $mx_user->init($user_ip, PAGE_INDEX);
! // End session management
  
! define('ALBUM_MOD_PATH', 'album_mod/');
  
! // Get general album information
! if (!isset($album_root_path) || empty($album_root_path))
  {
! 	$album_root_path = $module_root_path . ALBUM_MOD_PATH . '';
  }
  
! include_once($album_root_path . 'album_common.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
  {
! 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
  }
  else
  {
! 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  }
  
--- 20,160 ----
   ***************************************************************************/
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
  
! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
  {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './../';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	require_once($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	@define('IN_PORTAL', true);
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './../';
! 
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	
! 	require_once($mx_mod_path . "includes/functions_core.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;)
! 
! 	//
! 	// Instatiate the mx_cache class
! 	//
! 	$mx_cache = new mx_cache();
! 	
! 	//
! 	// instatiate the mx_request_vars class
! 	//
! 	$mx_request_vars = new mx_request_vars();
! 	
! 
! 	//
! 	// instatiate the mx_user class
! 	//
! 	//$mx_user = new mx_user();
! 
! 	//
! 	// Left Pane Paths
! 	//
! 	$setmodules_admin_path = '';
! 	$setmodules_module_path = "./../";
! 	
! 	if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 	}
! 	else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 	}
  }
+ else
+ {
+ 	define( 'IN_PORTAL', 1 );
+ 	define( 'MXBB_MODULE', true );
  
! 	//
! 	// Main paths
! 	//
! 	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_smartor/';
  
+ 	$setmodules_admin_path = 'modules/mx_smartor/admin/';
  
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
  
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! }
  
! 
! if( !empty($setmodules) )
  {
! 	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Configuration otf'] = $setmodules_admin_path . $filename;
! 	return;
  }
  
! //
! // Let's set the root dir for phpBB
! //
! $album_root_path = $module_root_path . 'album_mod/';
! require($mx_root_path . 'admin/pagestart.' . $phpEx);
! 
! if ( !MXBB_MODULE )
! {
! 	require_once($mx_mod_path . "includes/functions_styles.$phpEx");
! 
! 	$mx_user = new mx_user();	// instatiate the mx_user class
! 	
! 	//
! 	// Define basic constants
! 	//
! 	$mx_user->page_id = 1;
! 	$mx_user->user_ip = $user_ip;
! 	$mx_user->_init_userprefs();
! }
! 
! require($module_root_path . 'album_mod/album_common.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
  else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
! }
! 
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx"))
! {
! 	include($album_root_path . "language/lang_english/lang_main.$phpEx");
! }
! else
! {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx");
  }
  
***************
*** 288,292 ****
  		*/
  
! 		$pic_img_thumb = mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&amp;pic_id=' . $pic_file_names[$pic_cat][$i][$j]));
  
  		if ( ($upload_pics == true) && ($cat_to_upload > 0) )
--- 386,390 ----
  		*/
  
! 		$pic_img_thumb = mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&amp;pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&amp;pic_id=' . $pic_file_names[$pic_cat][$i][$j]));
  
  		if ( ($upload_pics == true) && ($cat_to_upload > 0) )

Index: admin_album_personal.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_personal.php,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -C2 -d -r1.11.2.5 -r1.11.2.6
*** admin_album_personal.php	13 Mar 2008 03:26:11 -0000	1.11.2.5
--- admin_album_personal.php	13 Mar 2008 08:27:25 -0000	1.11.2.6
***************
*** 9,18 ****
  */
  
! define('IN_PORTAL', 1);
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Personal_Galleries'] = "modules/mx_smartor/admin/" .$filename;
  	return;
  }
--- 9,105 ----
  */
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! 
! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
! {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './../';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	require_once($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	@define('IN_PORTAL', true);
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './../';
! 
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	
! 	require_once($mx_mod_path . "includes/functions_core.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;)
! 
! 	//
! 	// Instatiate the mx_cache class
! 	//
! 	$mx_cache = new mx_cache();
! 	
! 	//
! 	// instatiate the mx_request_vars class
! 	//
! 	$mx_request_vars = new mx_request_vars();
! 	
! 
! 	//
! 	// instatiate the mx_user class
! 	//
! 	//$mx_user = new mx_user();
! 
! 	//
! 	// Left Pane Paths
! 	//
! 	$setmodules_admin_path = '';
! 	$setmodules_module_path = "./../";
! 	
! 	if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 	}
! 	else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 	}
! }
! else
! {
! 	define( 'IN_PORTAL', 1 );
! 	define( 'MXBB_MODULE', true );
! 
! 	//
! 	// Main paths
! 	//
! 	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_smartor/';
! 
! 	$setmodules_admin_path = 'modules/mx_smartor/admin/';
! 
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
! 
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! }
! 
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Personal_Galleries'] = $setmodules_admin_path . $filename;
  	return;
  }
***************
*** 21,67 ****
  // Let's set the root dir for phpBB
  //
! $module_root_path = '../';
! $mx_root_path = '../../../';
! $phpEx = substr(strrchr(__FILE__, '.'), 1); 
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
  
! define('ALBUM_MOD_PATH', 'album_mod/');
! 
! // Get general album information
! if (!isset($album_root_path) || empty($album_root_path))
  {
! 	$album_root_path = $module_root_path . ALBUM_MOD_PATH . '';
! }
  
! if (!isset($acp_prefix) || empty($acp_prefix))
! {
! 	$acp_prefix = 'admin/';
  }
  
! include_once($album_root_path . 'album_common.'.$phpEx);
! // require($module_root_path . 'album_mod/album_constants.'.$phpEx);
  
  // **********************************************************************
  // 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 );
  }
  else
  {
! 	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 );
  }
  
--- 108,149 ----
  // Let's set the root dir for phpBB
  //
! $album_root_path = $module_root_path . 'album_mod/';
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
  
! if ( !MXBB_MODULE )
  {
! 	require_once($mx_mod_path . "includes/functions_styles.$phpEx");
  
! 	$mx_user = new mx_user();	// instatiate the mx_user class
! 	
! 	//
! 	// Define basic constants
! 	//
! 	$mx_user->page_id = 1;
! 	$mx_user->user_ip = $user_ip;
! 	$mx_user->_init_userprefs();
  }
  
! require($module_root_path . 'album_mod/album_common.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
  else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  }
! 
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_main.$phpEx");
  }
! else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.$phpEx");
  }
  

Index: admin_album_clown_SP.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_clown_SP.php,v
retrieving revision 1.13.2.5
retrieving revision 1.13.2.6
diff -C2 -d -r1.13.2.5 -r1.13.2.6
*** admin_album_clown_SP.php	13 Mar 2008 03:26:00 -0000	1.13.2.5
--- admin_album_clown_SP.php	13 Mar 2008 08:27:24 -0000	1.13.2.6
***************
*** 9,18 ****
  */
  
! define('IN_PORTAL', 1);
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Configuration adv'] = "modules/mx_smartor/admin/" .$filename;
  	return;
  }
--- 9,105 ----
  */
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! 
! if ( @file_exists( './../viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
! {
! 	define('MXBB_MODULE', false);
! 	define('IN_PHPBB', true);
! 	
! 	$phpbb_root_path = $module_root_path = './../';
! 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 	
! 	require_once($mx_mod_path . "includes/functions_required.$phpEx");
! 	
! 	@define('IN_PORTAL', true);
! 	
! 	//Check if forum_hack is installed
! 	if (!isset($mx_root_path))
! 	{
! 		$mx_root_path = './../';
! 
! 		include_once($mx_mod_path . "includes/mx_constants.$phpEx");
! 		include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx");
! 	}
! 	
! 	require_once($mx_mod_path . "includes/functions_core.$phpEx");
! 	
! 	//Check for cash mod
! 	if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
! 	{
! 		define('IN_CASHMOD', true);
! 	}
! 
! 	//@ini_set( 'display_errors', '1' );
! 	error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 	//error_reporting(E_ALL & ~E_NOTICE);
! 
! 	define( 'PAGE_MUSIC', -506 ); // If this id generates a conflict with other mods, change it ;)
! 
! 	//
! 	// Instatiate the mx_cache class
! 	//
! 	$mx_cache = new mx_cache();
! 	
! 	//
! 	// instatiate the mx_request_vars class
! 	//
! 	$mx_request_vars = new mx_request_vars();
! 	
! 
! 	//
! 	// instatiate the mx_user class
! 	//
! 	//$mx_user = new mx_user();
! 
! 	//
! 	// Left Pane Paths
! 	//
! 	$setmodules_admin_path = '';
! 	$setmodules_module_path = "./../";
! 	
! 	if (file_exists($phpbb_root_path."modcp.$phpEx")) // phpBB2
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		$tplEx = 'tpl';
! 	}
! 	else if (@file_exists($phpbb_root_path."mcp.$phpEx")) // phpBB3
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		$tplEx = 'html';
! 	}
! }
! else
! {
! 	define( 'IN_PORTAL', 1 );
! 	define( 'MXBB_MODULE', true );
! 
! 	//
! 	// Main paths
! 	//
! 	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_smartor/';
! 
! 	$setmodules_admin_path = 'modules/mx_smartor/admin/';
! 
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
! 
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! }
! 
  
  if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
! 	$module['Smartor_Album']['Configuration adv'] = $setmodules_admin_path . $filename;
  	return;
  }
***************
*** 21,48 ****
  // Let's set the root dir for phpBB
  //
! $module_root_path = '../';
! $mx_root_path = '../../../';
! $phpEx = substr(strrchr(__FILE__, '.'), 1); 
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
! require($module_root_path . 'album_mod/album_constants.'.$phpEx);
  
  // **********************************************************************
  // 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 );
  }
  
--- 108,140 ----
  // Let's set the root dir for phpBB
  //
! $album_root_path = $module_root_path . 'album_mod/';
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
! 
! if ( !MXBB_MODULE )
! {
! 	require_once($mx_mod_path . "includes/functions_styles.$phpEx");
! 
! 	$mx_user = new mx_user();	// instatiate the mx_user class
! 	
! 	//
! 	// Define basic constants
! 	//
! 	$mx_user->page_id = 1;
! 	$mx_user->user_ip = $user_ip;
! 	$mx_user->_init_userprefs();
! }
! 
! require($module_root_path . 'album_mod/includes/album_constants.'.$phpEx);
  
  // **********************************************************************
  // Read language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"))
  {
! 	include($album_root_path . "language/lang_english/lang_admin.$phpEx");
  }
! else
  {
! 	include($album_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  }
  

[mxbb-commits] mx_smartor/album_mod/modules album_cat.php, 1.1.2.2, 1.1.2.3 album_cat_sort.php, 1.1.2.2, 1.1.2.3 album_comment.php, 1.1.2.2, 1.1.2.3 album_comment_delete.php, 1.1.2.2, 1.1.2.3 album_comment_edit.php, 1.1.2.2, 1.1.2.3 album_delete.php, 1.1.2.2, 1.1.2.3 album_download.php, 1.1.2.2, 1.1.2.3 album_edit.php, 1.1.2.2, 1.1.2.3 album_hotornot.php, 1.1.2.2, 1.1.2.3 album_jupload.php, 1.1.2.2, 1.1.2.3 album_memberlist.php, 1.1.2.2, 1.1.2.3 album_modcp.php, 1.1.2.2, 1.1.2.3 album_otf.php, 1.1.2.2, 1.1.2.3 album_otf_thumbnail.php, 1.1.2.2, 1.1.2.3 album_page.php, 1.1.2.2, 1.1.2.3 album_pclzip_lib.php, 1.1.2.2, 1.1.2.3 album_personal.php, 1.1.2.2, 1.1.2.3 album_personal_cat_admin.php, 1.1.2.2, 1.1.2.3 album_personal_index.php, 1.1.2.2, 1.1.2.3 album_personal_old.php, 1.1.2.2, 1.1.2.3 album_personal_random.php, 1.1.2.2, 1.1.2.3 album_pic.php, 1.1.2.2, 1.1.2.3 album_picm.php, 1.1.2.2, 1.1.2.3 album_rate.php, 1.1.2.2, 1.1.2.3 album_rdf.php, 1.1.2.2, 1.1.2.3 album_rss.php, 1.1.2.2, 1.1.2.3 album_search.php, 1.1.2.2, 1.1.2.3 album_showpage.php, 1.1.2.2, 1.1.2.3 album_thumbnail.php, 1.1.2.2, 1.1.2.3 album_upload.php, 1.1.2.2, 1.1.2.3

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/album_mod/modules
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22730/album_mod/modules

Modified Files:
      Tag: core28x
	album_cat.php album_cat_sort.php album_comment.php 
	album_comment_delete.php album_comment_edit.php 
	album_delete.php album_download.php album_edit.php 
	album_hotornot.php album_jupload.php album_memberlist.php 
	album_modcp.php album_otf.php album_otf_thumbnail.php 
	album_page.php album_pclzip_lib.php album_personal.php 
	album_personal_cat_admin.php album_personal_index.php 
	album_personal_old.php album_personal_random.php album_pic.php 
	album_picm.php album_rate.php album_rdf.php album_rss.php 
	album_search.php album_showpage.php album_thumbnail.php 
	album_upload.php 
Log Message:
update for new mx_mod 2.8.2

[mxbb-commits] mx_smartor/language/lang_english index.htm, 1.1, NONE lang_admin.php, 1.7.2.7, NONE lang_main.php, 1.7, NONE

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/language/lang_english
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22730/language/lang_english

Removed Files:
      Tag: core28x
	index.htm lang_admin.php lang_main.php 
Log Message:
update for new mx_mod 2.8.2

--- lang_main.php DELETED ---

--- lang_admin.php DELETED ---

--- index.htm DELETED ---

[mxbb-commits] mx_smartor/language index.htm,1.1,NONE

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/language
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22730/language

Removed Files:
      Tag: core28x
	index.htm 
Log Message:
update for new mx_mod 2.8.2

--- index.htm DELETED ---

[mxbb-commits] mx_smartor/templates/_core _core.cfg, 1.2.2.3, 1.2.2.4

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/templates/_core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22730/templates/_core

Modified Files:
      Tag: core28x
	_core.cfg 
Log Message:
update for new mx_mod 2.8.2

[mxbb-commits] core/includes mx_functions_phpbb.php,1.55,1.56

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25086

Modified Files:
	mx_functions_phpbb.php 
Log Message:
new typo bug with empty _SID

Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** mx_functions_phpbb.php	9 Mar 2008 23:38:00 -0000	1.55
--- mx_functions_phpbb.php	13 Mar 2008 07:19:59 -0000	1.56
***************
*** 1178,1185 ****
--- 1178,1198 ----
  	}
  
+ 	/*
  	if ( !empty($_SID) && !preg_match('#sid=#', $url) )
  	{
  		$url .= ( ( strpos($url, '?') !== false ) ?  ( ( $non_html_amp ) ? '&' : '&' ) : '?' ) . $SID;
  	}
+ 	*/
+ 
+ 	//Will this make troble if it's correct?	
+ 	if ( !empty($_SID) && !preg_match('#sid=#', $url) )
+ 	{
+ 		$url .= ( ( strpos($url, '?') !== false ) ?  ( ( $non_html_amp ) ? '&' : '&' ) : '?' ) . $_SID;
+ 	}
+ 		
+ 	if ( !empty($SID) && !preg_match('#sid=#', $url) )
+ 	{
+ 		$url .= ( ( strpos($url, '?') !== false ) ?  ( ( $non_html_amp ) ? '&' : '&' ) : '?' ) . $SID;
+ 	}
  
  	return $url;

[mxbb-commits] mx_mod_core/root/mx_mod/includes functions_required.php, 1.1, 1.2

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_mod_core/root/mx_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22937

Modified Files:
	functions_required.php 
Log Message:
new typo bug with empty _SID

Index: functions_required.php
===================================================================
RCS file: /cvsroot/mxbb/mx_mod_core/root/mx_mod/includes/functions_required.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** functions_required.php	10 Mar 2008 06:02:26 -0000	1.1
--- functions_required.php	13 Mar 2008 07:14:28 -0000	1.2
***************
*** 531,534 ****
--- 531,535 ----
  		global $SID, $_SID, $mx_mod_rewrite;
  
+ 		/*
  		// Is mod_rewrite enabled? If so, do some url rewrites...
  		if (is_object($mx_mod_rewrite))
***************
*** 542,548 ****
--- 543,555 ----
  			return $url;
  		}
+ 		*/
  
  		if ( !empty($_SID) && !preg_match('#sid=#', $url) )
  		{
+ 			$url .= ( ( strpos($url, '?') !== false ) ?  ( ( $non_html_amp ) ? '&' : '&' ) : '?' ) . $_SID;
+ 		}
+ 		
+ 		if ( !empty($SID) && !preg_match('#sid=#', $url) )
+ 		{
  			$url .= ( ( strpos($url, '?') !== false ) ?  ( ( $non_html_amp ) ? '&' : '&' ) : '?' ) . $SID;
  		}

[mxbb-commits] mx_music music.php,1.15,1.16

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_music
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15746

Modified Files:
	music.php 
Log Message:
update for new mx_mod 2.8.2

Index: music.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** music.php	8 Mar 2008 20:54:49 -0000	1.15
--- music.php	13 Mar 2008 04:57:57 -0000	1.16
***************
*** 69,73 ****
  	// Get mxBB config settings
  	//
! 	//$portal_config = $mx_cache->obtain_mxbb_config();
  
  	//
--- 69,73 ----
  	// Get mxBB config settings
  	//
! 	$portal_config = $mx_cache->obtain_mxbb_config();
  
  	//

[mxbb-commits] mx_music/templates/_core music_flv_body.tpl, NONE, 1.1

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_music/templates/_core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14052/templates/_core

Added Files:
	music_flv_body.tpl 
Log Message:
update for new mx_mod 2.8.2

--- NEW FILE: music_flv_body.tpl ---
<table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border-top:none;">
  <tr> 
    <th height="25" colspan="2" class="thTop">{SONG_TITLE}</th>
  </tr>
  <tr> 
    <td width="44%" class="row1" align="center">
      <!-- BEGIN media -->
            <SCRIPT LANGUAGE="JavaScript"> 
            var WMP7; 
            var Mac; 
            var Win;
            var Unix;
            var Linux; 

            Win = navigator.userAgent.indexOf("Win") > -1; 
            Mac = navigator.userAgent.indexOf("Mac") > -1;
            Unix = navigator.appVersion.indexOf("X11") > -1;
            Linux = navigator.appVersion.indexOf("Linux") > -1; 
 

            if (Mac)
            {

            if ( navigator.appName == "Netscape" ){ 
                 //Netscape code
                 document.write ('    <Embed id="wmp" name="wmp" type="audio/mpeg"');
                 document.write ('        pluginspage="http://www.microsoft.com/windows/windowsmedia/"');
                 document.write ('        filename="{U_SONG}"');
                 document.write ('        src="{U_SONG}"');
                 document.write ('        Name=MediaPlayer');
                 document.write ('        ShowControls=1');
                 document.write ('        ShowDisplay=1');
                 document.write ('        ShowStatusBar=1');
                 document.write ('        AUTOSTART=1');
                 document.write ('        AutoSize=1');
                 document.write ('        width={WIDTH}');
                 document.write ('        height={HEIGHT}>');
                 document.write ('    </Embed>'); } 

            if ( navigator.appName != "Netscape" ){ 
            document.write(' <embed id="wmp" name="wmp" type="audio/mpeg" width="70" height="300" ShowTracker="0" ShowDisplay="0" ShowGotoBar="0" ShowStatusBar="1" ShowCaptioning="0" AUTOSTART="1" filename="{U_SONG}" src="{U_SONG}" ></embed>'); } 
            }


            if (Win)
            {
            if ( navigator.appName != "Netscape" ){ 
            WMP7 = new ActiveXObject('WMPlayer.OCX'); 
            } 

            // Windows Media Player 7 Code 
            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="{U_SONG}">');
                 document.write ('<PARAM NAME="FileName" value="{U_SONG}">');
                 document.write ('<PARAM NAME="AutoStart" VALUE="true">');
                 document.write ('<PARAM NAME="ShowControls" VALUE="1">');
                 document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); 
                 document.write ('<PARAM NAME="AutoSize" VALUE="1">');
                 document.write ('<PARAM NAME="uiMode" VALUE="mini">'); 

                 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&"');
                 document.write ('        filename="{U_SONG}"');
                 document.write ('        src="{U_SONG}"');
                 document.write ('        Name="MediaPlayer2"');
                 document.write ('        ShowControls="1"');
                 document.write ('        ShowDisplay="1"');
                 document.write ('        ShowStatusBar="1"');
                 document.write ('        AUTOSTART="true"');
                 document.write ('        AutoSize="1"');
                 document.write ('        width="70"');
                 document.write ('        height="300">');
                 document.write ('    </embed>');

                 document.write ('</OBJECT>');


            } 

            // Windows Media Player 6.4 Code 
            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="{U_SONG}">');
            document.write ('<PARAM NAME="FileName" value="{U_SONG}">');
            document.write ('<PARAM NAME="AutoStart" VALUE="true">');
            document.write ('<PARAM NAME="ShowControls" VALUE="1">');
            document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); 
            document.write ('<PARAM NAME="AutoSize" VALUE="1">');  

            //Firefox code
            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&"');
            document.write ('        filename="{U_SONG}"');
            document.write ('        src="{U_SONG}"');
            document.write ('        Name="MediaPlayer"');
            document.write ('        ShowControls="1"');
            document.write ('        ShowDisplay="1"');
            document.write ('        ShowStatusBar="1"');
            document.write ('        AUTOSTART="true"');
            document.write ('        AutoSize="1"');
            document.write ('        width="{WIDTH}"');
            document.write ('        height="{HEIGHT}">');
            document.write ('    </embed>');

            document.write ('</OBJECT>');
 
            }
            } 

            else 
            { 

            document.write(' <embed type="audio/mpeg" height="70" width="300" AUTOSTART="1" filename="{U_SONG}" src="{U_SONG}" ></embed>'); 

            } 

            </SCRIPT>
      <!-- END media -->

      <!-- BEGIN flash --> 
	<EMBED src="{U_SONG}" quality=high scale=noborder wmode=transparent bgcolor=#000000 TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">
	</EMBED>
      <!-- END flash -->

      <!-- BEGIN flashvideo --> 
	<embed src="{SONG_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars="">
	</embed>
      <!-- END flashvideo -->

      <!-- BEGIN youtube -->
	<object width="425" height="350">
		<param name="movie" value="{VIDEO_URL}" />
		<param name="wmode" value="transparent" />
		<param name="allowfullscreen" value="true" />
		<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 youtube -->

      <!-- BEGIN flv -->
	<div id="flvplayer">
		<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0" width="425" height="350" id="flvplayer" align="center">
		<param name="allowScriptAccess" value="always" />
		<param name="movie" value="{VIDEO_URL}" />
		<param name="loop" value="false" />
		<param name="menu" value="false" />
		<param name="quality" value="high" />
		<param name="allowfullscreen" value="true" />
		<param name="scale" value="noscale" />
		<param name="salign" value="lt" />
		<param name="bgcolor" value="000000" />
		<param name="flashvars" value="file={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" />
		<embed src="{VIDEO_URL}" flashvars="file={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" loop="false" allowfullscreen="true" menu="false" quality="high" width="425" height="360" scale="noscale" salign="lt" name="flvplayer" align="center" bgcolor="000000" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
		</object>
	</div>
      <!-- END flv -->

	<!-- BEGIN ram -->
<embed src="{U_SONG}" align="center" 
width="275" height="40" type="audio/x-pn-realaudio-plugin" console="cons" 
controls="ControlPanel" autostart="false"></embed>
	<!-- END ram -->

	<!-- BEGIN qt -->
    	<object id="qt" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab" width="377" height="212">
				<param name="qtsrc" value="{U_SONG}">
				<param name="autoplay" value="true">
				<param name="loop" value="false">
				<param name="controller" value="true">
				<param name="kioskmode" value="true">
				<param name="cache" value="false">
				<embed src="templates/subSilver/images/uneedqt41.jpg" qtsrc="{U_SONG}" width="377" height="212" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/" controller="true" loop="false" autoplay="true" kioskmode="true" cache="false">
				</embed>
		</object>
	<!-- END qt -->

	<!-- BEGIN  img --> 
		<a href="javascript:void(0);" onClick="window.open('{SONG_FULL_URL}','','scrollbars=yes,resizable=no,width=804,height=610')"><img src="{SONG_THUMB_URL}" id="image" type="image" width="425" height="350" border="1"></a>
	<!-- END img -->
</td>
 </td>
  </tr>
</table>

<br clear="all" />

[mxbb-commits] mx_music/templates/subSilver music_flv_body.tpl, NONE, 1.1 mx_music.cfg, NONE, 1.1

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_music/templates/subSilver
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14052/templates/subSilver

Added Files:
	music_flv_body.tpl mx_music.cfg 
Log Message:
update for new mx_mod 2.8.2

--- NEW FILE: mx_music.cfg ---
<?php
/**
*
* @package mxBB Portal Module - mx_music
* @version $Id: mx_music.cfg,v 1.1 2008/03/13 04:53:37 orynider Exp $
* @copyright (c) 2002-2006 mxBB Development Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

//
// **      Configuration file for subSilver template       **
//
// **         copyright (C) 2001 The phpBB Group           **
// **             Created by subBlue design                **
// **                  www.subBlue.com                     **
//
// **    subSilver dev. forum: www.subSky.com/phpBB2/      **
//
// $Id: mx_music.cfg,v 1.1 2008/03/13 04:53:37 orynider Exp $
//
// Please note that to enable support of different languages
// the ". LANG ." place holder is available. This will be replaced
// with xxx where xxx is the users selected language. If
// that language isn't available it will default to english.
// Therefore you MUST ensure you have at least a english
// directory if you choose to localise your template
//

//
// Do not alter this line!
//
@define(MX_TEMPLATE_CONFIG, TRUE);
$mx_template_config = true;

$mx_template_name = 'subSilver';


// -------------------------------------------------------------------------
// Prefix with PORTAL_URL
// -------------------------------------------------------------------------
// $current_template_images = PORTAL_URL . $current_template_path . "/images";


$current_template_images = $module_root_path . "templates/". $mx_template_name ."/images";
$current_template_phpbb_images = PHPBB_URL . "templates/". $mx_template_name ."/images"; // phpBB graphics template


if ( !file_exists( $current_template_images . '/lang_' . $board_config['default_lang'] ) )
{
	$link_language='lang_english';
}	
else
{
	$link_language='lang_' . $board_config['default_lang'];
}
 
define('LANG', $link_language);

// -------------------------------------------------------------------------
// (Re)Define images
// -------------------------------------------------------------------------

// MOM Pics
$mx_images['upload_song'] = "$current_template_images/" . LANG . "/upload_song.gif";
$mx_images['no_image'] = "$current_template_images/no_image.gif";

// Use standard phpBB graphics
//
$mx_images['icon_quote'] = "$current_template_phpbb_images/" . LANG . "/icon_quote.gif";
$mx_images['icon_edit'] = "$current_template_phpbb_images/" . LANG . "/icon_edit.gif";
$mx_images['icon_search'] = "$current_template_phpbb_images/" . LANG . "/icon_search.gif";
$mx_images['icon_profile'] = "$current_template_phpbb_images/" . LANG . "/icon_profile.gif";
$mx_images['icon_pm'] = "$current_template_phpbb_images/" . LANG . "/icon_pm.gif";
$mx_images['icon_email'] = "$current_template_phpbb_images/" . LANG . "/icon_email.gif";
$mx_images['icon_delpost'] = "$current_template_phpbb_images/icon_delete.gif";
$mx_images['icon_ip'] = "$current_template_phpbb_images/" . LANG . "/icon_ip.gif";
$mx_images['icon_www'] = "$current_template_phpbb_images/" . LANG . "/icon_www.gif";
$mx_images['icon_icq'] = "$current_template_phpbb_images/" . LANG . "/icon_icq_add.gif";
$mx_images['icon_aim'] = "$current_template_phpbb_images/" . LANG . "/icon_aim.gif";
$mx_images['icon_yim'] = "$current_template_phpbb_images/" . LANG . "/icon_yim.gif";
$mx_images['icon_msnm'] = "$current_template_phpbb_images/" . LANG . "/icon_msnm.gif";
$mx_images['icon_minipost'] = "$current_template_phpbb_images/icon_minipost.gif";
$mx_images['icon_gotopost'] = "$current_template_phpbb_images/icon_minipost.gif";
$mx_images['icon_minipost_new'] = "$current_template_phpbb_images/icon_minipost_new.gif";
$mx_images['icon_latest_reply'] = "$current_template_phpbb_images/icon_latest_reply.gif";
$mx_images['icon_newest_reply'] = "$current_template_phpbb_images/icon_newest_reply.gif";

$mx_images['forum'] = "$current_template_phpbb_images/folder_big.gif";
$mx_images['forum_new'] = "$current_template_phpbb_images/folder_new_big.gif";
$mx_images['forum_locked'] = "$current_template_phpbb_images/folder_locked_big.gif";
?>
--- NEW FILE: music_flv_body.tpl ---
<table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border-top:none;">
  <tr> 
    <th height="25" colspan="2" class="thTop">{SONG_TITLE}</th>
  </tr>
  <tr> 
    <td width="44%" class="row1" align="center">
      <!-- BEGIN media -->
            <SCRIPT LANGUAGE="JavaScript"> 
            var WMP7; 
            var Mac; 
            var Win;
            var Unix;
            var Linux; 

            Win = navigator.userAgent.indexOf("Win") > -1; 
            Mac = navigator.userAgent.indexOf("Mac") > -1;
            Unix = navigator.appVersion.indexOf("X11") > -1;
            Linux = navigator.appVersion.indexOf("Linux") > -1; 
 

            if (Mac)
            {

            if ( navigator.appName == "Netscape" ){ 
                 //Netscape code
                 document.write ('    <Embed id="wmp" name="wmp" type="audio/mpeg"');
                 document.write ('        pluginspage="http://www.microsoft.com/windows/windowsmedia/"');
                 document.write ('        filename="{U_SONG}"');
                 document.write ('        src="{U_SONG}"');
                 document.write ('        Name=MediaPlayer');
                 document.write ('        ShowControls=1');
                 document.write ('        ShowDisplay=1');
                 document.write ('        ShowStatusBar=1');
                 document.write ('        AUTOSTART=1');
                 document.write ('        AutoSize=1');
                 document.write ('        width={WIDTH}');
                 document.write ('        height={HEIGHT}>');
                 document.write ('    </Embed>'); } 

            if ( navigator.appName != "Netscape" ){ 
            document.write(' <embed id="wmp" name="wmp" type="audio/mpeg" width="70" height="300" ShowTracker="0" ShowDisplay="0" ShowGotoBar="0" ShowStatusBar="1" ShowCaptioning="0" AUTOSTART="1" filename="{U_SONG}" src="{U_SONG}" ></embed>'); } 
            }


            if (Win)
            {
            if ( navigator.appName != "Netscape" ){ 
            WMP7 = new ActiveXObject('WMPlayer.OCX'); 
            } 

            // Windows Media Player 7 Code 
            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="{U_SONG}">');
                 document.write ('<PARAM NAME="FileName" value="{U_SONG}">');
                 document.write ('<PARAM NAME="AutoStart" VALUE="true">');
                 document.write ('<PARAM NAME="ShowControls" VALUE="1">');
                 document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); 
                 document.write ('<PARAM NAME="AutoSize" VALUE="1">');
                 document.write ('<PARAM NAME="uiMode" VALUE="mini">'); 

                 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&"');
                 document.write ('        filename="{U_SONG}"');
                 document.write ('        src="{U_SONG}"');
                 document.write ('        Name="MediaPlayer2"');
                 document.write ('        ShowControls="1"');
                 document.write ('        ShowDisplay="1"');
                 document.write ('        ShowStatusBar="1"');
                 document.write ('        AUTOSTART="true"');
                 document.write ('        AutoSize="1"');
                 document.write ('        width="70"');
                 document.write ('        height="300">');
                 document.write ('    </embed>');

                 document.write ('</OBJECT>');


            } 

            // Windows Media Player 6.4 Code 
            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="{U_SONG}">');
            document.write ('<PARAM NAME="FileName" value="{U_SONG}">');
            document.write ('<PARAM NAME="AutoStart" VALUE="true">');
            document.write ('<PARAM NAME="ShowControls" VALUE="1">');
            document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); 
            document.write ('<PARAM NAME="AutoSize" VALUE="1">');  

            //Firefox code
            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&"');
            document.write ('        filename="{U_SONG}"');
            document.write ('        src="{U_SONG}"');
            document.write ('        Name="MediaPlayer"');
            document.write ('        ShowControls="1"');
            document.write ('        ShowDisplay="1"');
            document.write ('        ShowStatusBar="1"');
            document.write ('        AUTOSTART="true"');
            document.write ('        AutoSize="1"');
            document.write ('        width="{WIDTH}"');
            document.write ('        height="{HEIGHT}">');
            document.write ('    </embed>');

            document.write ('</OBJECT>');
 
            }
            } 

            else 
            { 

            document.write(' <embed type="audio/mpeg" height="70" width="300" AUTOSTART="1" filename="{U_SONG}" src="{U_SONG}" ></embed>'); 

            } 

            </SCRIPT>
      <!-- END media -->

      <!-- BEGIN flash --> 
	<EMBED src="{U_SONG}" quality=high scale=noborder wmode=transparent bgcolor=#000000 TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">
	</EMBED>
      <!-- END flash -->

      <!-- BEGIN flashvideo --> 
	<embed src="{SONG_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars="">
	</embed>
      <!-- END flashvideo -->

      <!-- BEGIN youtube -->
	<object width="425" height="350">
		<param name="movie" value="{VIDEO_URL}" />
		<param name="wmode" value="transparent" />
		<param name="allowfullscreen" value="true" />
		<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 youtube -->

      <!-- BEGIN flv -->
	<div id="flvplayer">
		<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0" width="425" height="350" id="flvplayer" align="center">
		<param name="allowScriptAccess" value="always" />
		<param name="movie" value="{VIDEO_URL}" />
		<param name="loop" value="false" />
		<param name="menu" value="false" />
		<param name="quality" value="high" />
		<param name="allowfullscreen" value="true" />
		<param name="scale" value="noscale" />
		<param name="salign" value="lt" />
		<param name="bgcolor" value="000000" />
		<param name="flashvars" value="file={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" />
		<embed src="{VIDEO_URL}" flashvars="file={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" loop="false" allowfullscreen="true" menu="false" quality="high" width="425" height="360" scale="noscale" salign="lt" name="flvplayer" align="center" bgcolor="000000" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
		</object>
	</div>
      <!-- END flv -->

	<!-- BEGIN ram -->
<embed src="{U_SONG}" align="center" 
width="275" height="40" type="audio/x-pn-realaudio-plugin" console="cons" 
controls="ControlPanel" autostart="false"></embed>
	<!-- END ram -->

	<!-- BEGIN qt -->
    	<object id="qt" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab" width="377" height="212">
				<param name="qtsrc" value="{U_SONG}">
				<param name="autoplay" value="true">
				<param name="loop" value="false">
				<param name="controller" value="true">
				<param name="kioskmode" value="true">
				<param name="cache" value="false">
				<embed src="templates/subSilver/images/uneedqt41.jpg" qtsrc="{U_SONG}" width="377" height="212" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/" controller="true" loop="false" autoplay="true" kioskmode="true" cache="false">
				</embed>
		</object>
	<!-- END qt -->

	<!-- BEGIN  img --> 
		<a href="javascript:void(0);" onClick="window.open('{SONG_FULL_URL}','','scrollbars=yes,resizable=no,width=804,height=610')"><img src="{SONG_THUMB_URL}" id="image" type="image" width="425" height="350" border="1"></a>
	<!-- END img -->
</td>
 </td>
  </tr>
</table>

<br clear="all" />