Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

bug fix in plugin installation

Browse source 
--HG--
branch : Gsoc14-ryzomAppImprovements
This commit is contained in:
shubham_meena 2014-08-15 00:13:00 +05:30
parent 750ded21bd
commit a01e331639
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/ryzom/tools/server/ryzom_ams/www/html/func/install_plugin.php
View file

@ -220,7 +220,7 @@ function checkForUpdate( $fileName, $findPath, $tempFile, $tempPath )
// check for the version for the plugin // check for the version for the plugin
$db = new DBLayer( "lib" ); $db = new DBLayer( "lib" );
$sth = $db -> select( "plugins", array( ':name' => $result['PluginName'] ), "Name = :name" ); $sth = $db -> select( "plugins", array( 'Name' => $result['PluginName'] ), "Name = :Name" );
$info = $sth -> fetch(); $info = $sth -> fetch();
$info['Info'] = json_decode( $info['Info'] ); $info['Info'] = json_decode( $info['Info'] );
@ -237,11 +237,11 @@ function checkForUpdate( $fileName, $findPath, $tempFile, $tempPath )
// then there MUST be an increment in the Y value. // then there MUST be an increment in the Y value.
// When there is increment in the X value , Y and Z MUST be 0. // When there is increment in the X value , Y and Z MUST be 0.
// comparing if there is some change // comparing if there is some change
if ( !array_intersect( $new_version , $pre_version ) ) if ( !array_diff( $new_version , $pre_version ) )
{ {
// removing the uploaded file // removing the uploaded file
Plugincache :: rrmdir( $tempPath . "/test/" . $fileName ); Plugincache :: rrmdir( $tempPath . "/test/" . $fileName );
return '2'; return '2'; //plugin already exists
} }
else else
{ {

2
code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php
View file

@ -186,7 +186,7 @@
CREATE TABLE IF NOT EXISTS `" . $cfg['db']['lib']['name'] ."`.`plugins` ( CREATE TABLE IF NOT EXISTS `" . $cfg['db']['lib']['name'] ."`.`plugins` (
`Id` INT(10) NOT NULL AUTO_INCREMENT, `Id` INT(10) NOT NULL AUTO_INCREMENT,
`FileName` VARCHAR(255) NOT NULL, `FileName` VARCHAR(255) NOT NULL,
`Name` VARCHAR(11) NOT NULL, `Name` VARCHAR(56) NOT NULL,
`Type` VARCHAR(12) NOT NULL, `Type` VARCHAR(12) NOT NULL,
`Owner` VARCHAR(25) NOT NULL, `Owner` VARCHAR(25) NOT NULL,
`Permission` VARCHAR(5) NOT NULL, `Permission` VARCHAR(5) NOT NULL,