Index: trunk/admin/install.php =================================================================== diff -u -r2604 -r2618 --- trunk/admin/install.php (.../install.php) (revision 2604) +++ trunk/admin/install.php (.../install.php) (revision 2618) @@ -1106,17 +1106,15 @@ while ($file = $dir->read()) { if ($file != "." && $file != ".." && !is_dir($dir_name.$file)) { - - if (strstr($file, 'inportal_upgrade_v')) { - $file = str_replace("inportal_upgrade_v", "", $file); - $file = str_replace(".sql", "", $file); - if ($p == '') { - $p = 'in-portal'; - } + if( preg_match('/inportal_upgrade_v(.*).(php|sql)$/', $file, $rets) ) + { + if($p == '') $p = 'in-portal'; + $sql = "SELECT Version FROM ".$g_TablePrefix."Modules WHERE Name = '".$p."'"; $rs = $ado->Execute($sql); - if (ConvertVersion($rs->fields['Version']) < ConvertVersion($file)) { + if( ConvertVersion($rs->fields['Version']) < ConvertVersion( $rets[1] ) ) + { $show_upgrade = true; } } Index: trunk/admin/install/inportal_remove.sql =================================================================== diff -u -r1566 -r2618 --- trunk/admin/install/inportal_remove.sql (.../inportal_remove.sql) (revision 1566) +++ trunk/admin/install/inportal_remove.sql (.../inportal_remove.sql) (revision 2618) @@ -1,11 +1,97 @@ -DROP TABLE BanRules +DROP TABLE Addresses # -------------------------------------------------------- -DROP TABLE Category +DROP TABLE AffiliatePayments # -------------------------------------------------------- -DROP TABLE CategoryItems +DROP TABLE AffiliatePlans # -------------------------------------------------------- +DROP TABLE AffiliatePlansBrackets +# -------------------------------------------------------- +DROP TABLE AffiliatePlansItems +# -------------------------------------------------------- +DROP TABLE Affiliates +# -------------------------------------------------------- +DROP TABLE Currencies +# -------------------------------------------------------- +DROP TABLE GatewayConfigFields +# -------------------------------------------------------- +DROP TABLE GatewayConfigValues +# -------------------------------------------------------- +DROP TABLE Gateways +# -------------------------------------------------------- +DROP TABLE Manufacturers +# -------------------------------------------------------- +DROP TABLE OrderItems +# -------------------------------------------------------- +DROP TABLE Orders +# -------------------------------------------------------- +DROP TABLE PaymentTypeCurrencies +# -------------------------------------------------------- +DROP TABLE PaymentTypes +# -------------------------------------------------------- +DROP TABLE ProductFiles +# -------------------------------------------------------- +DROP TABLE Products +# -------------------------------------------------------- +DROP TABLE ProductsCouponItems +# -------------------------------------------------------- +DROP TABLE ProductsCoupons +# -------------------------------------------------------- +DROP TABLE ProductsDiscountItems +# -------------------------------------------------------- +DROP TABLE ProductsDiscounts +# -------------------------------------------------------- +DROP TABLE ProductsPricing +# -------------------------------------------------------- +DROP TABLE ShippingBrackets +# -------------------------------------------------------- +DROP TABLE ShippingCosts +# -------------------------------------------------------- +DROP TABLE ShippingQuoteEngines +# -------------------------------------------------------- +DROP TABLE ShippingType +# -------------------------------------------------------- +DROP TABLE ShippingZones +# -------------------------------------------------------- +DROP TABLE ShippingZonesDestinations +# -------------------------------------------------------- +DROP TABLE TaxZones +# -------------------------------------------------------- +DROP TABLE TaxZonesDestinations +# -------------------------------------------------------- +DROP TABLE UserDownloads +# -------------------------------------------------------- +DROP TABLE UserFileAccess +# -------------------------------------------------------- DROP TABLE Censorship # -------------------------------------------------------- +DROP TABLE Emoticon +# -------------------------------------------------------- +DROP TABLE Topic +# -------------------------------------------------------- +DROP TABLE Posting +# -------------------------------------------------------- +DROP TABLE PrivateMessageBody +# -------------------------------------------------------- +DROP TABLE PrivateMessages +# -------------------------------------------------------- +DROP TABLE Link +# -------------------------------------------------------- +DROP TABLE LinkValidation +# -------------------------------------------------------- +DROP TABLE ListingTypes +# -------------------------------------------------------- +DROP TABLE Listings +# -------------------------------------------------------- +DROP TABLE News +# -------------------------------------------------------- +DROP TABLE BanRules +# -------------------------------------------------------- +DROP TABLE Cache +# -------------------------------------------------------- +DROP TABLE Category +# -------------------------------------------------------- +DROP TABLE CategoryItems +# -------------------------------------------------------- DROP TABLE ConfigurationAdmin # -------------------------------------------------------- DROP TABLE ConfigurationValues @@ -16,14 +102,14 @@ # -------------------------------------------------------- DROP TABLE CustomMetaData # -------------------------------------------------------- +DROP TABLE EmailLog +# -------------------------------------------------------- DROP TABLE EmailMessage # -------------------------------------------------------- DROP TABLE EmailQueue # -------------------------------------------------------- DROP TABLE EmailSubscribers # -------------------------------------------------------- -DROP TABLE Emoticon -# -------------------------------------------------------- DROP TABLE Events # -------------------------------------------------------- DROP TABLE Favorites @@ -34,6 +120,8 @@ # -------------------------------------------------------- DROP TABLE Images # -------------------------------------------------------- +DROP TABLE ImportScripts +# -------------------------------------------------------- DROP TABLE ItemRating # -------------------------------------------------------- DROP TABLE ItemReview @@ -42,12 +130,8 @@ # -------------------------------------------------------- DROP TABLE Language # -------------------------------------------------------- -DROP TABLE Link -# -------------------------------------------------------- DROP TABLE Modules # -------------------------------------------------------- -DROP TABLE News -# -------------------------------------------------------- DROP TABLE PermCache # -------------------------------------------------------- DROP TABLE PermissionConfig @@ -64,11 +148,9 @@ # -------------------------------------------------------- DROP TABLE PortalUser # -------------------------------------------------------- -DROP TABLE Posting -# -------------------------------------------------------- DROP TABLE Relationship # -------------------------------------------------------- -DROP TABLE SearchConfig +DROP TABLE SearchConfig # -------------------------------------------------------- DROP TABLE SearchLog # -------------------------------------------------------- @@ -78,73 +160,27 @@ # -------------------------------------------------------- DROP TABLE StatItem # -------------------------------------------------------- -DROP TABLE Theme +DROP TABLE StdDestinations # -------------------------------------------------------- -DROP TABLE ThemeFiles +DROP TABLE StylesheetSelectors # -------------------------------------------------------- -DROP TABLE Topic +DROP TABLE Stylesheets # -------------------------------------------------------- -DROP TABLE UserGroup -# -------------------------------------------------------- -DROP TABLE UserSession -# -------------------------------------------------------- DROP TABLE SuggestMail -# -------------------------------------------------------- +# -------------------------------------------------------- DROP TABLE SysCache # -------------------------------------------------------- -DROP TABLE TagLibrary -# -------------------------------------------------------- DROP TABLE TagAttributes # -------------------------------------------------------- -DROP TABLE LinkValidation +DROP TABLE TagLibrary # -------------------------------------------------------- -DROP TABLE ImportScripts +DROP TABLE Theme # -------------------------------------------------------- -DROP TABLE ImportPhrases +DROP TABLE ThemeFiles # -------------------------------------------------------- -DROP TABLE ImportEvents +DROP TABLE UserGroup # -------------------------------------------------------- -DROP TABLE EmailLog +DROP TABLE UserSession # -------------------------------------------------------- -DROP TABLE PrivateMessageBody -# -------------------------------------------------------- -DROP TABLE PrivateMessages -# -------------------------------------------------------- -DROP TABLE Cache -# -------------------------------------------------------- -DROP TABLE GatewayConfigFields -# -------------------------------------------------------- -DROP TABLE GatewayConfigValues -# -------------------------------------------------------- -DROP TABLE Gateways -# -------------------------------------------------------- -DROP TABLE OrderItems -# -------------------------------------------------------- -DROP TABLE Orders -# -------------------------------------------------------- -DROP TABLE PaymentTypes -# -------------------------------------------------------- -DROP TABLE Products -# -------------------------------------------------------- -DROP TABLE ProductsDiscountItems -# -------------------------------------------------------- -DROP TABLE ProductsDiscounts -# -------------------------------------------------------- -DROP TABLE ProductsPricing -# -------------------------------------------------------- -DROP TABLE ShippingBrackets -# -------------------------------------------------------- -DROP TABLE ShippingCosts -# -------------------------------------------------------- -DROP TABLE ShippingType -# -------------------------------------------------------- -DROP TABLE ShippingZones -# -------------------------------------------------------- -DROP TABLE ShippingZonesDestinations -# -------------------------------------------------------- -DROP TABLE StdDestinations -# -------------------------------------------------------- -DROP TABLE TaxZones -# -------------------------------------------------------- -DROP TABLE TaxZonesDestinations +DROP TABLE Visits # \ No newline at end of file