[fusionregistry-commitlog] SF.net SVN: fusionregistry: [23] trunk
Brought to you by:
copland007
From: SVN c. <fus...@li...> - 2007-06-20 03:30:39
|
Revision: 23 http://fusionregistry.svn.sourceforge.net/fusionregistry/?rev=23&view=rev Author: copland007 Date: 2007-06-19 20:30:39 -0700 (Tue, 19 Jun 2007) Log Message: ----------- Merged stable_3_0_x changes r6:22 into the trunk. Modified Paths: -------------- trunk/INSTALL.txt trunk/README.txt trunk/UPGRADE.txt trunk/fusionregistry_component.xml trunk/ipb_skin-fusionregistry.xml.gz trunk/upload/cache/lang_cache/en/lang_registry.php trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_categories.php trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_config.php trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_custom_fields.php trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_makes_models.php trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_permissions.php trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_rating_fields.php trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_registry_loader.php trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_tools.php trunk/upload/sources/components_acp/registry.php trunk/upload/sources/components_public/fusion_config.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/attach.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/guestbook.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/install/index.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/install/sql/inserts.sql.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/install/template.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/item.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/content.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/core.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/custom_fields.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/functions.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/ratings.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/session.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/upload.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/main.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/modification.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/index.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/instagrade/instagrade.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/instagrade/template.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_20007/version_upgrade.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30000/version_upgrade.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30001/version_upgrade.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30002/version_upgrade.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30003/version_upgrade.php trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/version_history.php trunk/upload/sources/components_public/registry.php trunk/upload/sources/portal_plugins/registry-cfg.php trunk/upload/sources/portal_plugins/registry.php trunk/upload/sources/tasks/registrysessions.php Added Paths: ----------- trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30004/ trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30004/version_upgrade.php Removed Paths: ------------- trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30004/version_upgrade.php Modified: trunk/INSTALL.txt =================================================================== --- trunk/INSTALL.txt 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/INSTALL.txt 2007-06-20 03:30:39 UTC (rev 23) @@ -1,7 +1,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -28,8 +28,7 @@ ============================================================================ -These instructions are for a new fresh install. -Fusion Registry v3.0.3 only works with IPB v2.2.x! +Installing Fusion Registry ============================================================================ Upgrading and Installing note: As with any change to files on your server Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/README.txt 2007-06-20 03:30:39 UTC (rev 23) @@ -1,7 +1,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Modified: trunk/UPGRADE.txt =================================================================== --- trunk/UPGRADE.txt 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/UPGRADE.txt 2007-06-20 03:30:39 UTC (rev 23) @@ -1,7 +1,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -28,7 +28,7 @@ ============================================================================ -Upgrading to Fusion Registry v3.0.3 +Upgrading Fusion Registry ============================================================================ Upgrading and Installing note: As with any change to files on your server @@ -46,9 +46,9 @@ 2. Head into your ACP -> ADMIN -> Manage Components. Delete the old Fusion Registry component, then use the 'Import XML Component File' to import - the component xml file 'fusionregistry_component.xml' from v3.0.3. + the new component xml file 'fusionregistry_component.xml'. -3. Import the new v3.0.3 skin and remove (or hide) any previous Fusion +3. Import the new skin and remove (or hide) any previous Fusion Registry/Garage Module skin set. Update any custom skin sets to use the newly imported skin as the new parent. See the installation instructions for more details on this process if needed. Modified: trunk/fusionregistry_component.xml =================================================================== --- trunk/fusionregistry_component.xml 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/fusionregistry_component.xml 2007-06-20 03:30:39 UTC (rev 23) @@ -6,7 +6,7 @@ <com_title>Fusion Registry</com_title> <com_author>Fusion Scripts</com_author> <com_url>http://www.fusionscripts.com</com_url> - <com_version>3.0.3</com_version> + <com_version>3.0.4</com_version> <com_date_added>1181093473</com_date_added> <com_menu_data><![CDATA[a:7:{i:1;a:5:{s:9:"menu_text";s:13:"Configuration";s:8:"menu_url";s:11:"menu=config";s:13:"menu_redirect";i:0;s:12:"menu_permbit";s:6:"config";s:13:"menu_permlang";s:29:"Allow ACCESS to configuration";}i:11;a:5:{s:9:"menu_text";s:13:"Custom Fields";s:8:"menu_url";s:18:"menu=custom_fields";s:13:"menu_redirect";i:0;s:12:"menu_permbit";s:13:"custom_fields";s:13:"menu_permlang";s:29:"Allow ACCESS to custom fields";}i:111;a:5:{s:9:"menu_text";s:13:"Rating Fields";s:8:"menu_url";s:18:"menu=rating_fields";s:13:"menu_redirect";i:0;s:12:"menu_permbit";s:13:"rating_fields";s:13:"menu_permlang";s:29:"Allow ACCESS to rating fields";}i:1111;a:5:{s:9:"menu_text";s:18:"Makes & Models";s:8:"menu_url";s:17:"menu=makes_models";s:13:"menu_redirect";i:0;s:12:"menu_permbit";s:12:"makes_models";s:13:"menu_permlang";s:34:"Allow ACCESS to makes & models";}i:11111;a:5:{s:9:"menu_text";s:23:"Modification Categories";s:8:"menu_url";s:15:"menu=categories";s:13:"menu_redirect";i:0;s:12:"menu_permbit";s:10:"categories";s:13:"menu_permlang";s:39:"Allow ACCESS to modification categories";}i:111111;a:5:{s:9:"menu_text";s:11:"Permissions";s:8:"menu_url";s:16:"menu=permissions";s:13:"menu_redirect";i:0;s:12:"menu_permbit";s:11:"permissions";s:13:"menu_permlang";s:27:"Allow ACCESS to permissions";}i:1111111;a:5:{s:9:"menu_text";s:5:"Tools";s:8:"menu_url";s:10:"menu=tools";s:13:"menu_redirect";i:0;s:12:"menu_permbit";s:5:"tools";s:13:"menu_permlang";s:21:"Allow ACCESS to tools";}}]]></com_menu_data> <com_enabled>1</com_enabled> Modified: trunk/ipb_skin-fusionregistry.xml.gz =================================================================== (Binary files differ) Modified: trunk/upload/cache/lang_cache/en/lang_registry.php =================================================================== --- trunk/upload/cache/lang_cache/en/lang_registry.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/cache/lang_cache/en/lang_registry.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Modified: trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_categories.php =================================================================== --- trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_categories.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_categories.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -185,11 +185,8 @@ $cat_array[] = array( $registry_cat['id'], $registry_cat['title']); } - $this->ipsclass->admin->page_detail = "Before we remove this Fusion Registry category, we need to determine what to do with any modifications that may be left in this category."; + $this->ipsclass->html .= $this->ipsclass->skin_acp_global->information_box( "Removing Fusion Registry category '$name'", "Before we remove this Fusion Registry category, we need to determine what to do with any modifications that may be left in this category.".'<br /> ' ) . "<br >"; - $this->ipsclass->admin->page_title = "Removing Fusion Registry category '$name'"; - - // Build the HTML $this->ipsclass->html .= $this->ipsclass->adskin->start_form( array( 1 => array( 'code', 'delete_cat' ), 2 => array( 'act' , REGISTRY_URL ), @@ -225,8 +222,7 @@ */ function main_menu() { - $this->ipsclass->admin->page_detail = "You may add/modify/delete Fusion Registry Modification Categories below."; - $this->ipsclass->admin->page_title = "Fusion Registry Category Management"; + $this->ipsclass->html .= $this->ipsclass->skin_acp_global->information_box( "Fusion Registry Category Management", "You may add/modify/delete Fusion Registry Modification Categories below.".'<br /> ' ) . "<br >"; //---------------------------------------- // Current Categories Modify/Delete Form @@ -339,8 +335,7 @@ 5 => array( 'section', 'components' ), ) ); - $this->ipsclass->admin->page_detail = "You may modify the title for the Fusion Registry category below."; - $this->ipsclass->admin->page_title = "Modifying Fusion Registry Category '{$registry_cat['title']}'"; + $this->ipsclass->html .= $this->ipsclass->skin_acp_global->information_box( "Modifying Fusion Registry Category '{$registry_cat['title']}'", "You may modify the title for the Fusion Registry category below.".'<br /> ' ) . "<br >"; $this->ipsclass->adskin->td_header[] = array( " " , "20%" ); $this->ipsclass->adskin->td_header[] = array( " " , "80%" ); Modified: trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_config.php =================================================================== --- trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_config.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_config.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -181,8 +181,7 @@ */ function main_menu() { - $this->ipsclass->admin->page_detail = "You may update your Fusion Registry Configuration below."; - $this->ipsclass->admin->page_title = "Fusion Registry Configuration"; + $this->ipsclass->html .= $this->ipsclass->skin_acp_global->information_box( "Fusion Registry Configuration", "You may update your Fusion Registry Configuration below.".'<br /> ' ) . "<br >"; //------------------------------ // Fusion Registry Configuration form @@ -418,9 +417,8 @@ $this->ipsclass->html .= $this->ipsclass->adskin->end_table(); - // That's all folk! $this->ipsclass->admin->output(); } } -?> +?> \ No newline at end of file Modified: trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_custom_fields.php =================================================================== --- trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_custom_fields.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_custom_fields.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -216,24 +216,24 @@ */ function do_form($type='edit') { - $this->ipsclass->admin->page_detail = "This section will allow you to add or edit an existing custom field.<br /><br />"; + $cf_help = "This section will allow you to add or edit an existing custom field.<br /><br />"; // Add key to help people out - $this->ipsclass->admin->page_detail .= '<b>Quick Options Help - </b><br /><br />'. - 'For Radio Buttons, Select Lists and Check Boxes enter options like this:<br />'. - 'value1|Display1<br />'. - 'value2|Display2<br />'. - 'Where <i>value</i> is what is stored in the database, and <i>Display</i> '. - 'is what is shown to end users. You can change the <i>Display</i> value at any time and not '. - 'affect existing entries in the database. Enter one <i>value|Display</i> option per line.<br /><br >'. + $cf_help .= '<b>Quick Options Help - </b><br /><br />'. + 'For Radio Buttons, Select Lists and Check Boxes enter options like this:<br />'. + 'value1|Display1<br />'. + 'value2|Display2<br />'. + 'Where <i>value</i> is what is stored in the database, and <i>Display</i> '. + 'is what is shown to end users. You can change the <i>Display</i> value at any time and not '. + 'affect existing entries in the database. Enter one <i>value|Display</i> option per line.<br /><br >'. - 'For special built-in fields you have the following choices available (these are for supporting legacy '. - 'fields for automotive related sites):<br />'. - '<i>year</i> - This will create a populated select list<br />'. - '<i>make</i> - This will create the automotive Make field controlled via javascript<br />'. - '<i>model</i> - This will create the automative Model field controlled via javascript<br /><br />'. + 'For special built-in fields you have the following choices available (these are for supporting legacy '. + 'fields for automotive related sites):<br />'. + '<i>year</i> - This will create a populated select list<br />'. + '<i>make</i> - This will create the automotive Make field controlled via javascript<br />'. + '<i>model</i> - This will create the automative Model field controlled via javascript<br /><br />'. - '<b>NOTE: For the make/model special fields to work you MUST create both of them!</b>'; + '<b>NOTE: For the make/model special fields to work you MUST create both of them!</b>'; if ( $type == 'edit' ) { @@ -265,7 +265,7 @@ $field_types = $this->field_types_list(); - $this->ipsclass->admin->page_title = $title; + $this->ipsclass->html .= $this->ipsclass->skin_acp_global->information_box( $title, $cf_help.'<br /> ' ) . "<br >"; $this->ipsclass->html .= $this->ipsclass->adskin->start_form( array( 1 => array( 'code', $code ), 2 => array( 'act' , REGISTRY_URL ), @@ -453,8 +453,6 @@ */ function do_group_form($type='edit') { - $this->ipsclass->admin->page_detail = "This section will allow you to add or edit an existing custom field group. Custom fields can only be in one custom field group at a time, so the available fields to add to the group below will exclude any already present in other groups."; - if ( $type == 'edit' ) { if ($this->ipsclass->input['g'] == "") @@ -481,7 +479,7 @@ $code = "group_donew"; } - $this->ipsclass->admin->page_title = $title; + $this->ipsclass->html .= $this->ipsclass->skin_acp_global->information_box( $title, "This section will allow you to add or edit an existing custom field group. Custom fields can only be in one custom field group at a time, so the available fields to add to the group below will exclude any already present in other groups.".'<br /> ' ) . "<br >"; // Now let's plop in the dynamic query for either the new/edit group form $rs = $this->ipsclass->DB->query($query); @@ -626,8 +624,7 @@ $cf_defs = $this->lib['custom_fields']->get_cf_defs( array( 'ORDER BY' => 'field_order ASC, field_name ASC' ) ); $cf_groups = $this->lib['custom_fields']->get_cf_groups(); - $this->ipsclass->admin->page_title = "Fusion Registry Custom Fields Overview"; - $this->ipsclass->admin->page_detail = "You can manage your garage custom fields from here.<br /><br /><span style='color:red'><b>PLEASE NOTE:</b> You must not configure the same order number for more than 1 custom field. Doing so will result in some of your custom fields from not showing up!</span>"; + $this->ipsclass->html .= $this->ipsclass->skin_acp_global->information_box( "Fusion Registry Custom Fields Overview", "You can manage your garage custom fields from here.<br /><br /><span style='color:red'><b>PLEASE NOTE:</b> You must not configure the same order number for more than 1 custom field. Doing so will result in some of your custom fields from not showing up!</span>".'<br /> ' ) . "<br >"; // Get the processed list of all custom fields and groups $cf_processed = $this->lib['custom_fields']->process_cf_defs( array( 'cf_defs' => $cf_defs, 'cf_groups' => $cf_groups, 'type' => 'acp_highlight' ) ); Modified: trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_makes_models.php =================================================================== --- trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_makes_models.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_makes_models.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -252,9 +252,7 @@ */ function make_menu() { - // Page stuff - $this->ipsclass->admin->page_detail = "You may add/rename/delete Fusion Registry Vehicle Makes below.<br /><br /><b>NOTE:</b> This section of the ACP is targeted towards vehicle based registries.<br />If you do not run a vehicle based registry you can ignore this section of the ACP entirely."; - $this->ipsclass->admin->page_title = "Fusion Registry Vehicle Makes"; + $this->ipsclass->html .= $this->ipsclass->skin_acp_global->information_box( "Fusion Registry Vehicle Makes", "You may add/rename/delete Fusion Registry Vehicle Makes below.<br /><br /><b>NOTE:</b> This section of the ACP is targeted towards vehicle based registries.<br />If you do not run a vehicle based registry you can ignore this section of the ACP entirely.".'<br /> ' ) . "<br >"; //------------------------------ // Add new Make Form @@ -388,9 +386,7 @@ $this->ipsclass->DB->query("SELECT make FROM ibf_registry_makes WHERE id='".$this->ipsclass->input['make_id']."'"); $make = $this->ipsclass->DB->fetch_row(); - // Page stuff - $this->ipsclass->admin->page_detail = "You may add/rename/delete Fusion Registry Vehicle Models below."; - $this->ipsclass->admin->page_title = "Fusion Registry `". $make['make'] ."` Models"; + $this->ipsclass->html .= $this->ipsclass->skin_acp_global->information_box( "Fusion Registry `". $make['make'] ."` Models", "You may add/rename/delete Fusion Registry Vehicle Models below.".'<br /> ' ) . "<br >"; //------------------------------ // Add new Model Form @@ -637,11 +633,8 @@ $this->ipsclass->input['make_id'] = implode(',', $this->ipsclass->input['make_id']); } - $this->ipsclass->admin->page_detail = $this->ad_registry_loader->imgs['warning'] ." Before we delete the Fusion Registry Vehicle Make(s), we need to determine what to do with any vehicles that may be associated to the Make(s). Please note that during this process all models belonging to the make(s) will also be deleted. Any vehicles that are associated to those models will have their Models un-associated and will need to be updated."; + $this->ipsclass->html .= $this->ipsclass->skin_acp_global->information_box( "Removing Fusion Registry Make(s)", $this->ad_registry_loader->imgs['warning'] ." Before we delete the Fusion Registry Vehicle Make(s), we need to determine what to do with any vehicles that may be associated to the Make(s). Please note that during this process all models belonging to the make(s) will also be deleted. Any vehicles that are associated to those models will have their Models un-associated and will need to be updated.".'<br /> ' ) . "<br >"; - $this->ipsclass->admin->page_title = "Removing Fusion Registry Make(s)"; - - // Build the HTML $this->ipsclass->html .= $this->ipsclass->adskin->start_form( array( 1 => array( 'code' , 'delete_make' ), 2 => array( 'act' , REGISTRY_URL ), @@ -807,11 +800,8 @@ $this->ipsclass->input['model_id'] = implode(',', $this->ipsclass->input['model_id']); } - $this->ipsclass->admin->page_detail = $this->ad_registry_loader->imgs['warning'] ." Before we delete this Fusion Registry Vehicle Model, we need to determine what to do with any vehicles that may be associated to this Model."; + $this->ipsclass->html .= $this->ipsclass->skin_acp_global->information_box( "Removing Fusion Registry Vehicle Model(s)", $this->ad_registry_loader->imgs['warning'] ." Before we delete this Fusion Registry Vehicle Model, we need to determine what to do with any vehicles that may be associated to this Model.".'<br /> ' ) . "<br >"; - $this->ipsclass->admin->page_title = "Removing Fusion Registry Vehicle Model(s)"; - - // Build the HTML $this->ipsclass->html .= $this->ipsclass->adskin->start_form( array( 1 => array( 'code' , 'delete_model' ), 2 => array( 'act' , REGISTRY_URL ), Modified: trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_permissions.php =================================================================== --- trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_permissions.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_permissions.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -510,10 +510,8 @@ */ function main_menu() { - $this->ipsclass->admin->page_title = "Edit permissions for Fusion Registry"; + $this->ipsclass->html .= $this->ipsclass->skin_acp_global->information_box( "Edit permissions for Fusion Registry", "<b>Fusion Registry access permissions</b><br />(Check box for access, uncheck to not allow access). 'Interact' dictates whether the mask will be able to vote, search, and leave comments in the Registry. 'Add' dictates whether the mask will be able to add new items and modifications to the Fusion Registry. 'Upload' dictates whether the mask will be able to upload images in the Fusion Registry.<p /><b>NOTE:</b> Regardless of permission settings for Guests below they will not be allowed to add a new item to the Fusion Registry.".'<br /> ' ) . "<br >"; - $this->ipsclass->admin->page_detail = "<b>Fusion Registry access permissions</b><br />(Check box for access, uncheck to not allow access). 'Interact' dictates whether the mask will be able to vote, search, and leave comments in the Registry. 'Add' dictates whether the mask will be able to add new items and modifications to the Fusion Registry. 'Upload' dictates whether the mask will be able to upload images in the Fusion Registry.<p /><b>NOTE:</b> Regardless of permission settings for Guests below they will not be allowed to add a new item to the Fusion Registry."; - $code = "config"; $this->ipsclass->html .= $this->ipsclass->adskin->start_form( array( 1 => array( 'code', $code ), @@ -542,4 +540,4 @@ $this->ipsclass->admin->output(); } } -?> +?> \ No newline at end of file Modified: trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_rating_fields.php =================================================================== --- trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_rating_fields.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_rating_fields.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -192,8 +192,6 @@ */ function do_form($type='edit') { - $this->ipsclass->admin->page_detail = "This section will allow you to add or edit an existing rating field."; - if ( $type == 'edit' ) { if ($this->ipsclass->input['r'] == "") @@ -222,7 +220,7 @@ $code = "donew"; } - $this->ipsclass->admin->page_title = $title; + $this->ipsclass->html .= $this->ipsclass->skin_acp_global->information_box( $title, "This section will allow you to add or edit an existing rating field.".'<br /> ' ) . "<br >"; $this->ipsclass->html .= $this->ipsclass->adskin->start_form( array( 1 => array( 'code', $code ), 2 => array( 'act' , REGISTRY_URL ), @@ -293,8 +291,7 @@ */ function main_menu() { - $this->ipsclass->admin->page_detail = "You may update your Fusion Registry Rating Configuration below."; - $this->ipsclass->admin->page_title = "Fusion Registry Rating Configuration"; + $this->ipsclass->html .= $this->ipsclass->skin_acp_global->information_box( "Fusion Registry Rating Configuration", "You may update your Fusion Registry Rating Configuration below.".'<br /> ' ) . "<br >"; //------------------------------ // Fusion Registry Configuration form Modified: trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_registry_loader.php =================================================================== --- trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_registry_loader.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_registry_loader.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -53,8 +53,8 @@ /**#@+ @var string */ var $base_url; - var $r_version_short = 'v3.0.3'; - var $r_version_long = '30003'; + var $r_version_short = 'v3.0.4'; + var $r_version_long = '30004'; /**#@-*/ /** @var object */ Modified: trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_tools.php =================================================================== --- trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_tools.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_acp/fusionscripts/fusionregistry/ad_tools.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -164,8 +164,7 @@ // Construct menu HTML //------------------------------- - $this->ipsclass->admin->page_detail = "Below are all the orphaned files that were found. An orphaned file is defined as a file that exists on your local drive that is no longer present in the database.<br />Please check all the applicable orphans you wish to delete.<br /><br />". $this->ad_registry_loader->imgs['warning'] ." <b>This operation is not undo-able! Once you choose to remove an orphan it is gone for good.</b>"; - $this->ipsclass->admin->page_title = "Fusion Registry Orphan Locator"; + $this->ipsclass->html .= $this->ipsclass->skin_acp_global->information_box( "Fusion Registry Orphan Locator", "Below are all the orphaned files that were found. An orphaned file is defined as a file that exists on your local drive that is no longer present in the database.<br />Please check all the applicable orphans you wish to delete.<br /><br />". $this->ad_registry_loader->imgs['warning'] ." <b>This operation is not undo-able! Once you choose to remove an orphan it is gone for good.</b>".'<br /> ' ) . "<br >"; // Inject our javascript toggle $this->ipsclass->html .= <<<EOF @@ -713,8 +712,7 @@ */ function main_menu() { - $this->ipsclass->admin->page_detail = "Below are tools that can help you keep your Fusion Registry running smooth."; - $this->ipsclass->admin->page_title = "Fusion Registry Tools"; + $this->ipsclass->html .= $this->ipsclass->skin_acp_global->information_box( "Fusion Registry Tools", "Below are tools that can help you keep your Fusion Registry running smooth.".'<br /> ' ) . "<br >"; //------------------------------- // Rebuild Thumbs Modified: trunk/upload/sources/components_acp/registry.php =================================================================== --- trunk/upload/sources/components_acp/registry.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_acp/registry.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Modified: trunk/upload/sources/components_public/fusion_config.php =================================================================== --- trunk/upload/sources/components_public/fusion_config.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusion_config.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/attach.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/attach.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/attach.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/guestbook.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/guestbook.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/guestbook.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/install/index.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/install/index.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/install/index.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -42,8 +42,8 @@ define( 'INS_ROOT_PATH', '../../../../../' ); define( 'INS_KERNEL_PATH', INS_ROOT_PATH.'ips_kernel/' ); -define( 'FR_VERSION_SHORT', 'v3.0.3' ); -define( 'FR_VERSION_LONG', '30003' ); +define( 'FR_VERSION_SHORT', 'v3.0.4' ); +define( 'FR_VERSION_LONG', '30004' ); require './template.php'; Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/install/sql/inserts.sql.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/install/sql/inserts.sql.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/install/sql/inserts.sql.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,5 +2,5 @@ INSERT INTO `ibf_registry_config` VALUES ('convert_path', '/usr/bin/convert'); INSERT INTO `ibf_registry_config` VALUES ('convert_options', '-antialias +profile "*"'); INSERT INTO `ibf_registry_config` VALUES ('date_format', 'm-j-y H:i'); -INSERT INTO `ibf_registry_config` VALUES ('version_long', '30003'); -INSERT INTO `ibf_registry_config` VALUES ('version_short', 'v3.0.3'); \ No newline at end of file +INSERT INTO `ibf_registry_config` VALUES ('version_long', '30004'); +INSERT INTO `ibf_registry_config` VALUES ('version_short', 'v3.0.4'); \ No newline at end of file Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/install/template.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/install/template.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/install/template.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/item.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/item.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/item.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/content.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/content.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/content.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -713,4 +713,4 @@ } } -?> +?> \ No newline at end of file Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/core.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/core.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/core.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -59,8 +59,8 @@ var $class = ""; /** @var string */ - var $r_version_short = 'v3.0.3'; - var $r_version_long = '30003'; + var $r_version_short = 'v3.0.4'; + var $r_version_long = '30004'; var $r_session = ""; /**#@-*/ Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/custom_fields.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/custom_fields.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/custom_fields.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -1084,4 +1084,4 @@ } } -?> +?> \ No newline at end of file Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/functions.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/functions.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/functions.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -377,4 +377,4 @@ } -?> +?> \ No newline at end of file Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/ratings.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/ratings.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/ratings.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -379,4 +379,4 @@ } } -?> +?> \ No newline at end of file Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/session.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/session.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/session.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -562,4 +562,4 @@ } -?> +?> \ No newline at end of file Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/upload.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/upload.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/lib/upload.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -604,4 +604,4 @@ } -?> +?> \ No newline at end of file Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/main.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/main.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/main.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/modification.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/modification.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/modification.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/index.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/index.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/index.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/instagrade/instagrade.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/instagrade/instagrade.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/instagrade/instagrade.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/instagrade/template.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/instagrade/template.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/instagrade/template.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_20007/version_upgrade.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_20007/version_upgrade.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_20007/version_upgrade.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30000/version_upgrade.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30000/version_upgrade.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30000/version_upgrade.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or @@ -191,6 +191,7 @@ // These are straight "INSERT ... SELECT ... FROM ..." statements. // Images + $this->ipsclass->DB->allow_sub_select = 1; $this->ipsclass->DB->query( "INSERT INTO ".$this->ipsclass->vars['sql_tbl_prefix']."registry_images ". "( attach_id, attach_location, attach_hits, attach_ext, attach_file, ". "attach_thumb_location, attach_thumb_width, attach_thumb_height, ". @@ -203,6 +204,7 @@ $executed++; // Gallery + $this->ipsclass->DB->allow_sub_select = 1; $this->ipsclass->DB->query( "INSERT INTO ".$this->ipsclass->vars['sql_tbl_prefix']."registry_gallery ". "( id, item_id, image_id ) ". "SELECT g.id, g.garage_id, g.image_id ". @@ -211,6 +213,7 @@ $executed++; // Guestbooks + $this->ipsclass->DB->allow_sub_select = 1; $this->ipsclass->DB->query( "INSERT INTO ".$this->ipsclass->vars['sql_tbl_prefix']."registry_guestbooks ". "( id, item_id, author_id, post_date, ip_address, post ) ". "SELECT gb.id, gb.garage_id, gb.author_id, gb.post_date, gb.ip_address, gb.post ". @@ -219,6 +222,7 @@ $executed++; // Categories + $this->ipsclass->DB->allow_sub_select = 1; $this->ipsclass->DB->query( "INSERT INTO ".$this->ipsclass->vars['sql_tbl_prefix']."registry_categories ". "( id, title, image_id ) ". "SELECT c.id, c.title, c.image_id ". @@ -227,6 +231,7 @@ $executed++; // Makes + $this->ipsclass->DB->allow_sub_select = 1; $this->ipsclass->DB->query( "INSERT INTO ".$this->ipsclass->vars['sql_tbl_prefix']."registry_makes ". "( id, make ) ". "SELECT m.id, m.make ". @@ -235,6 +240,7 @@ $executed++; // Models + $this->ipsclass->DB->allow_sub_select = 1; $this->ipsclass->DB->query( "INSERT INTO ".$this->ipsclass->vars['sql_tbl_prefix']."registry_models ". "( id, make_id, model ) ". "SELECT m.id, m.make_id, m.model ". @@ -243,6 +249,7 @@ $executed++; // Modifications + $this->ipsclass->DB->allow_sub_select = 1; $this->ipsclass->DB->query( "INSERT INTO ".$this->ipsclass->vars['sql_tbl_prefix']."registry_mods ". "( id, item_id, member_id, category_id, title, price, install_price, ". "rating, comments, image_id, date_created, date_updated ) ". Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30001/version_upgrade.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30001/version_upgrade.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30001/version_upgrade.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30002/version_upgrade.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30002/version_upgrade.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30002/version_upgrade.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Modified: trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30003/version_upgrade.php =================================================================== --- trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30003/version_upgrade.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30003/version_upgrade.php 2007-06-20 03:30:39 UTC (rev 23) @@ -2,7 +2,7 @@ /*-------------------------------------------------------------------------\ | | ======================================================== -| Fusion Registry GPL v3.0.3 +| Fusion Registry GPL | Copyright (C) 2007 Fusion Scripts | | This program is free software; you can redistribute it and/or Copied: trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30004 (from rev 22, branches/stable_3_0_x/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30004) Deleted: trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30004/version_upgrade.php =================================================================== --- branches/stable_3_0_x/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30004/version_upgrade.php 2007-06-19 17:55:50 UTC (rev 22) +++ trunk/upload/sources/components_public/fusionscripts/fusionregistry/upgrade/upgrade_30004/version_upgrade.php 2007-06-20 03:30:39 UTC (rev 23) @@ -1,144 +0,0 @@ -<?php -/*-------------------------------------------------------------------------\ -| -| ======================================================== -| Fusion Registry GPL -| Copyright (C) 2007 Fusion Scripts -| -| This program is free software; you can redistribute it and/or -| modify it under the terms of the GNU General Public License -| as published by the Free Software Foundation; either version 2 -| of the License, or (at your option) any later version. -| -| This program is distributed in the hope that it will be useful, -| but WITHOUT ANY WARRANTY; without even the implied warranty of -| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -| GNU General Public License for more details. -| -| You should have received a copy of the GNU General Public License -| along with this program; if not, write to the Free Software -| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -| ======================================================== -| -| Email: in...@fu... -| Web-Site: http://www.fusionscripts.com/ -| -| $Id$ -| -\-------------------------------------------------------------------------*/ - -/** - * Installation template class - * - * @package Fusion Registry - * @subpackage installer - * @version $Id$ - */ -if ( ! defined( 'IN_IPB' ) ) -{ - print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files."; - exit(); -} - -class version_upgrade -{ - var $ipsclass; - var $instagrade; - var $this_version = '30004'; - var $upgrade_from = '30003'; - var $base_url = ''; - var $mod_to_run = ''; - - - /** - * Generate the upgrades to happen string - */ - function version_process() - { - $this->base_url = "index.php?act=kit"; - - if ( is_array( $this->instagrade->modules_to_run ) and count( $this->instagrade->modules_to_run ) ) - { - $tmp = array_shift( $this->instagrade->modules_to_run ); - - $this->mod_to_run = implode( ', ', $this->instagrade->modules_to_run ); - } - - if ( ! $this->mod_to_run ) - { - $this->mod_to_run = 'None'; - } - } - - - /** - * Oh how we love to upgrade! - */ - function auto_run() - { - switch( $this->ipsclass->input['kitact'] ) - { - case 'cleanup': - $this->do_cleanup(); - break; - - default: - $this->upgrade_kit_intro(); - break; - } - } - - - - /** - * Only thing we need to do is update the DB version - */ - function do_cleanup() - { - $executed = 0; - - // Update the database version strings - $vers = array( 'version_long' => $this->this_version, - 'version_short' => 'v3.0.4' ); - - foreach ( $vers ... [truncated message content] |