Index: trunk/admin/install.php =================================================================== diff -u -r689 -r744 --- trunk/admin/install.php (.../install.php) (revision 689) +++ trunk/admin/install.php (.../install.php) (revision 744) @@ -470,23 +470,26 @@ $p = ''; } - $dir_name = $pathtoroot.$p."/admin/install/upgrades/"; + $dir_name = $pathtoroot.$p."/admin";///install/upgrades/"; - $dir = @dir($dir_name); + $Modules[] = $rs->fields['Name']; + $Texts[] = $rs->fields['Name']." (".$rs->fields['Version']." ".prompt_language("la_to")." ".GetMaxPortalVersion($dir_name).")"; + /*$dir = @dir($dir_name); + 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); - $sql = "SELECT count(*) AS count FROM ".$g_TablePrefix."Modules WHERE Name = '".$rs->fields['Name']."' AND Version = '$file'"; - $rs1 = $ado->Execute($sql); + //$sql = "SELECT count(*) AS count FROM ".$g_TablePrefix."Modules WHERE Name = '".$rs->fields['Name']."' AND Version = '$file'"; + //$rs1 = $ado->Execute($sql); if ($rs1->fields['count'] == 0 && ConvertVersion($file) > ConvertVersion($rs->fields['Version'])) { if ($Modules[$i-1] == $rs->fields['Name']) { - $Texts[$i-1] = $rs->fields['Name']." (".$rs->fields['Version']." ".prompt_language("la_to")." ".$file.")"; + $Texts[$i-1] = $rs->fields['Name']." (".$rs->fields['Version']." ".prompt_language("la_to")." ".$file.")"; $i--; } else { @@ -498,7 +501,7 @@ } } } - } + }*/ $rs->MoveNext(); } @@ -508,7 +511,7 @@ } if ($state == "upgrade_process") { - $ado =& inst_GetADODBConnection(); + $ado =& inst_GetADODBConnection(); $mod_arr = $_POST['modules']; $mod_str = ''; @@ -529,12 +532,12 @@ foreach($mod_arr as $p) { - $mod_name = strtolower($p); + $mod_name = strtolower($p); - $sql = "SELECT Version FROM ".$g_TablePrefix."Modules WHERE Name = '$p'"; - $rs = $ado->Execute($sql); - - $current_version = $rs->fields['Version']; + $sql = "SELECT Version FROM ".$g_TablePrefix."Modules WHERE Name = '$p'"; + $rs = $ado->Execute($sql); + + $current_version = $rs->fields['Version']; if ($mod_name == 'in-portal') { $mod_name = ''; @@ -547,26 +550,26 @@ $new_version = ''; while ($file = $dir->read()) { - if ($file != "." && $file != ".." && !is_dir($dir_name.$file)) { - if (strstr($file, 'inportal_upgrade_v')) { - $upgrades_arr[] = $file; - } - } + if ($file != "." && $file != ".." && !is_dir($dir_name.$file)) { + if (strstr($file, 'inportal_upgrade_v')) { + $upgrades_arr[] = $file; + } + } } usort($upgrades_arr, "VersionSort"); foreach($upgrades_arr as $file) { - $file_tmp = str_replace("inportal_upgrade_v", "", $file); - $file_tmp = str_replace(".sql", "", $file_tmp); + $file_tmp = str_replace("inportal_upgrade_v", "", $file); + $file_tmp = str_replace(".sql", "", $file_tmp); if (ConvertVersion($file_tmp) > ConvertVersion($current_version)) { $filename = $pathtoroot.$mod_name."/admin/install/upgrades/$file"; //echo "Running: $filename
"; if(file_exists($filename)) - { - RunSQLFile($ado, $filename); - } + { + RunSQLFile($ado, $filename); + } } }