From 7fe908c50c8dbc5cc05f571dbe11d66141caacd4 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Thu, 14 Nov 2013 09:01:22 -0500 Subject: [PATCH] Cleaning up code to match coding guidelines --- interface/web/admin/software_package_install.php | 78 +++++++++++++++++++------------------- 1 files changed, 39 insertions(+), 39 deletions(-) diff --git a/interface/web/admin/software_package_install.php b/interface/web/admin/software_package_install.php index f838177..6150709 100644 --- a/interface/web/admin/software_package_install.php +++ b/interface/web/admin/software_package_install.php @@ -28,8 +28,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -require_once('../../lib/config.inc.php'); -require_once('../../lib/app.inc.php'); +require_once '../../lib/config.inc.php'; +require_once '../../lib/app.inc.php'; //* Check permissions for module $app->auth->check_module_permissions('admin'); @@ -49,20 +49,20 @@ //* verify the key if($package['package_installable'] == 'key' && $install_key != '') { - + $repo = $app->db->queryOneRecord("SELECT * FROM software_repo WHERE software_repo_id = ".$package['software_repo_id']); - + $client = new SoapClient(null, array('location' => $repo['repo_url'], - 'uri' => $repo['repo_url'])); - + 'uri' => $repo['repo_url'])); + $install_key_verified = $client->check_installable($package_name, $install_key, $repo['repo_username'], $repo['repo_password']); - + if($install_key_verified == false) { //$install_key = ''; $message_err = 'Verification of the key failed.'; } else { // Store the verified key into the database - $app->db->datalogUpdate('software_package', "package_key = '$install_key'", 'package_id',$package['package_id']); + $app->db->datalogUpdate('software_package', "package_key = '$install_key'", 'package_id', $package['package_id']); } } else { $message_ok = 'Please enter the software key for the package.'; @@ -73,64 +73,64 @@ $sql = "SELECT software_update_id, package_name, update_title FROM software_update WHERE type = 'full' AND package_name = '$package_name' ORDER BY v1 DESC, v2 DESC, v3 DESC, v4 DESC LIMIT 0,1"; $tmp = $app->db->queryOneRecord($sql); $software_update_id = $tmp['software_update_id']; - + //* if package requires a DB and there is no data for a db in config, then we create this data now if($package['package_requires_db'] == 'mysql') { $app->uses('ini_parser,getconf'); - + $package_config_array = array(); if(trim($package['package_config']) != '') { $package_config_array = $app->ini_parser->parse_ini_string(stripslashes($package['package_config'])); } - + if(!isset($package_config_array['mysql'])) { - $package_config_array['mysql'] = array( 'database_name' => 'ispapp'.$package['package_id'], - 'database_user' => 'ispapp'.$package['package_id'], - 'database_password' => md5(mt_rand()), - 'database_host' => 'localhost'); + $package_config_array['mysql'] = array( 'database_name' => 'ispapp'.$package['package_id'], + 'database_user' => 'ispapp'.$package['package_id'], + 'database_password' => md5(mt_rand()), + 'database_host' => 'localhost'); $package_config_str = $app->ini_parser->get_ini_string($package_config_array); $package['package_config'] = $package_config_str; - $app->db->datalogUpdate('software_package', "package_config = '".$app->db->quote($package_config_str)."'", 'package_id',$package['package_id']); + $app->db->datalogUpdate('software_package', "package_config = '".$app->db->quote($package_config_str)."'", 'package_id', $package['package_id']); } } - + //* If the packages requires a remote user if($package['package_remote_functions'] != '') { - + if(trim($package['package_config']) != '') { $package_config_array = $app->ini_parser->parse_ini_string(stripslashes($package['package_config'])); } - + if(!isset($package_config_array['remote_api'])) { $remote_user = 'ispapp'.$package['package_id']; $remote_password = md5(mt_rand()); $remote_functions = $app->db->quote($package['package_remote_functions']); - + $package_config_array['remote_api'] = array( - 'remote_hostname' => $_SERVER['HTTP_HOST'], - 'remote_user' => $remote_user, - 'remote_password' => $remote_password - ); + 'remote_hostname' => $_SERVER['HTTP_HOST'], + 'remote_user' => $remote_user, + 'remote_password' => $remote_password + ); $package_config_str = $app->ini_parser->get_ini_string($package_config_array); $package['package_config'] = $package_config_str; $remote_password_md5 = md5($remote_password); - $app->db->datalogUpdate('software_package', "package_config = '".$app->db->quote($package_config_str)."'", 'package_id',$package['package_id']); - + $app->db->datalogUpdate('software_package', "package_config = '".$app->db->quote($package_config_str)."'", 'package_id', $package['package_id']); + $sql = "INSERT INTO `remote_user` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `remote_username`, `remote_password`, `remote_functions`) VALUES (1, 1, 'riud', 'riud', '', '$remote_user', '$remote_password_md5', '$remote_functions');"; - + $app->db->query($sql); - + } - + } - + //* Add the record to start the install process $insert_data = "(package_name, server_id, software_update_id, status) VALUES ('$package_name', '$install_server_id', '$software_update_id','installing')"; $app->db->datalogInsert('software_update_inst', $insert_data, 'software_update_inst_id'); $message_ok = 'Starting package installation '."<a href=\"#\" onclick=\"submitForm('pageForm','admin/software_package_list.php');\">".$app->lng('next')."</a>"; - + } if(count($_POST) > 2 && $install_key == '') { @@ -147,17 +147,17 @@ // Loading the template $app->uses('tpl'); $app->tpl->newTemplate("form.tpl.htm"); -$app->tpl->setInclude('content_tpl','templates/software_package_install.htm'); +$app->tpl->setInclude('content_tpl', 'templates/software_package_install.htm'); -$app->tpl->setVar('message_ok',$message_ok); -$app->tpl->setVar('message_err',$message_err); -$app->tpl->setVar('insert_key',$insert_key); -$app->tpl->setVar('install_key',$install_key); -$app->tpl->setVar('package_name',$package_name); -$app->tpl->setVar('server_id',$install_server_id); +$app->tpl->setVar('message_ok', $message_ok); +$app->tpl->setVar('message_err', $message_err); +$app->tpl->setVar('insert_key', $insert_key); +$app->tpl->setVar('install_key', $install_key); +$app->tpl->setVar('package_name', $package_name); +$app->tpl->setVar('server_id', $install_server_id); -include_once('lib/lang/en_software_package_install.lng'); +include_once 'lib/lang/en_software_package_install.lng'; $app->tpl->setVar($wb); -- Gitblit v1.9.1