tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-23 22:05:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

2012-06-21 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* extensions/update_manager/load_updatemanager.php: fixed the lost
	parameter for keygen, the dbtype.
	
	* extensions/update_manager/lib/libupdate_manager_client.php: fixed
	when update enterprise packages maybe sometimes try to update again
	and again and again....like spoon killer.
	
	Merged from 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6667 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-06-21 15:41:09 +00:00
parent 6f73b31102
commit f1c738c49e
3 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/ChangeLog
View File

@ -1,3 +1,14 @@
2012-06-21 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager/load_updatemanager.php: fixed the lost
parameter for keygen, the dbtype.
* extensions/update_manager/lib/libupdate_manager_client.php: fixed
when update enterprise packages maybe sometimes try to update again
and again and again....like spoon killer.
Merged from 4.0.2
2012-06-21 Sancho Lerena <slerena@artica.es> 2012-06-21 Sancho Lerena <slerena@artica.es>
* extensions/update_manager/sql/update_manager.oracle.sql, * extensions/update_manager/sql/update_manager.oracle.sql,

4
pandora_console/extensions/update_manager/lib/libupdate_manager_client.php
View File

@ -641,7 +641,8 @@ function um_client_upgrade_to_latest ($user_key, $force = true) {
do { do {
$package = um_client_get_package ($settings, $user_key); $package = um_client_get_package ($settings, $user_key);
if ($package === false || $package === true) { if ($package === false || $package === true ||
$package === 0 || $package === 1) {
break; break;
} }
@ -651,7 +652,6 @@ function um_client_upgrade_to_latest ($user_key, $force = true) {
break; break;
$settings->current_update = $package->id; $settings->current_update = $package->id;
} }
while (1); while (1);

8
pandora_console/extensions/update_manager/load_updatemanager.php
View File

@ -73,10 +73,14 @@ function get_user_key ($settings) {
' '.$config['dbuser'].' '.$config['dbpass']. ' '.$config['dbuser'].' '.$config['dbpass'].
' '.$config['dbname'], true); */ ' '.$config['dbname'], true); */
$user_key = exec (escapeshellcmd ($settings->keygen_path. $command_line = escapeshellcmd($settings->keygen_path.
' '.$settings->customer_key.' '.$config['dbhost']. ' '.$settings->customer_key.' '.$config['dbhost'].
' '.$config['dbuser'].' '.$config['dbpass']. ' '.$config['dbuser'].' '.$config['dbpass'].
' '.$config['dbname'].' '.$config["dbtype"])); ' '.$config['dbname'].' '.$config['dbtype']);
//html_debug_print($command_line, true);
$user_key = exec ($command_line);
return $user_key; return $user_key;
} }