[Formatted file Tijmen de Mes **20180418130124 Ignore-this: 160696628f566228394d80d8ca8d016f ] hunk ./accounts.phtml 4 -page_open(array("sess" => "CDRTool_Session", - "auth" => "CDRTool_Auth", - "perm" => "CDRTool_Perm") - ); +page_open( + array( + "sess" => "CDRTool_Session", + "auth" => "CDRTool_Auth", + "perm" => "CDRTool_Perm" + ) +); hunk ./accounts.phtml 12 -$title = "Login accounts"; +$title = "Login accounts"; hunk ./accounts.phtml 21 -function log_accounts_action($action){ +function log_accounts_action($action) +{ hunk ./accounts.phtml 25 - $_loc=geoip_record_by_name($_SERVER['REMOTE_ADDR']); + $_loc = geoip_record_by_name($_SERVER['REMOTE_ADDR']); hunk ./accounts.phtml 27 - $location = $_loc['country_name']; + $location = $_loc['country_name']; hunk ./accounts.phtml 84 + print " + + "; hunk ./accounts.phtml 91 - print ""; - - - $uid=$auth->auth["uid"]; + $uid = $auth->auth["uid"]; hunk ./accounts.phtml 93 - $id=$uid; + $id = $uid; hunk ./accounts.phtml 100 - $perms = implode($perms,","); - $sources = implode($sources,","); + $perms = implode($perms, ","); + $sources = implode($sources, ","); hunk ./accounts.phtml 105 - $perms_text = implode($perms,","); - $sources_text = implode($sources,","); + $perms_text = implode($perms, ","); + $sources_text = implode($sources, ","); hunk ./accounts.phtml 109 - $query="delete from auth_user"; + $query = "delete from auth_user"; hunk ./accounts.phtml 112 - $query=sprintf("update auth_user set - username = '%s', - name = '%s', - organization = '%s', - tel = '%s', - email = '%s', - yubikey = '%s', - auth_method = '%s' - ", - addslashes($username), - addslashes($name), - addslashes($organization), - addslashes($tel), - addslashes($email), - addslashes($otp_yubikey), - addslashes($auth_method) + $query = sprintf( + "update auth_user set + username = '%s', + name = '%s', + organization = '%s', + tel = '%s', + email = '%s', + yubikey = '%s', + auth_method = '%s' + ", + addslashes($username), + addslashes($name), + addslashes($organization), + addslashes($tel), + addslashes($email), + addslashes($otp_yubikey), + addslashes($auth_method) hunk ./accounts.phtml 131 - if ($CDRTool['provider']['clear_text_passwords'] != 1 ) { - $query.=sprintf(", - password = '', - password_hashed = '%s'", - addslashes(md5($password)) + if ($CDRTool['provider']['clear_text_passwords'] != 1) { + $query .= sprintf( + ", + password = '', + password_hashed = '%s'", + addslashes(md5($password)) hunk ./accounts.phtml 139 - $query.=sprintf(", - password = '%s', - password_hashed = ''", - addslashes($password) + $query .= sprintf( + ", + password = '%s', + password_hashed = ''", + addslashes($password) hunk ./accounts.phtml 150 - if (!preg_match("/^[0-9]*\.[0-9]*$/",$impersonate)) { - printf ("
Warning! Impersonate must be formated as CustomerId.ResellerId
"); + if (!preg_match("/^[0-9]*\.[0-9]*$/", $impersonate)) { + printf("
Warning! Impersonate must be formated as CustomerId.ResellerId
"); hunk ./accounts.phtml 156 - $query.= sprintf(", - perms = '%s', - sources = '%s', - expire = '%s', - gatewayFilter = '%s', - domainFilter = '%s', - serviceFilter = '%s', - compidFilter = '%s', - aNumberFilter = '%s', - cscodeFilter = '%s', - afterDateFilter = '%s', - aclFilter = '%s', - impersonate = '%s' - ", - addslashes($perms_text), - addslashes($sources_text), - addslashes($expire), - addslashes($gatewayFilter), - addslashes($domainFilter), - addslashes($serviceFilter), - addslashes($compidFilter), - addslashes($aNumberFilter), - addslashes($cscodeFilter), - addslashes($afterDateFilter), - addslashes($aclFilter), - addslashes($impersonate) + $query.= sprintf( + ", + perms = '%s', + sources = '%s', + expire = '%s', + gatewayFilter = '%s', + domainFilter = '%s', + serviceFilter = '%s', + compidFilter = '%s', + aNumberFilter = '%s', + cscodeFilter = '%s', + afterDateFilter = '%s', + aclFilter = '%s', + impersonate = '%s' + ", + addslashes($perms_text), + addslashes($sources_text), + addslashes($expire), + addslashes($gatewayFilter), + addslashes($domainFilter), + addslashes($serviceFilter), + addslashes($compidFilter), + addslashes($aNumberFilter), + addslashes($cscodeFilter), + addslashes($afterDateFilter), + addslashes($aclFilter), + addslashes($impersonate) hunk ./accounts.phtml 187 - $query.=sprintf(" where user_id = '%s'", addslashes($id)); + $query .= sprintf(" where user_id = '%s'", addslashes($id)); hunk ./accounts.phtml 193 - } else { + } else { hunk ./accounts.phtml 195 - log_accounts_action(sprintf("account %s deleted", $username)); + log_accounts_action(sprintf("account %s deleted", $username)); hunk ./accounts.phtml 198 - log_accounts_action(sprintf("account %s updated", $username)); + log_accounts_action(sprintf("account %s updated", $username)); hunk ./accounts.phtml 207 - $body.=sprintf("The following login account for CDRTool has been created for you:\n\n"); - $body.=sprintf("Username: %s\n",$username); - $body.=sprintf("Password: %s\n",$password); - $body.=sprintf("URL: %s%s%s\n\n",$protocolURL,$_SERVER['HTTP_HOST'],$CDRTool['tld']); - $body.=sprintf("You may use your CDRTool account to access call detail records and \n"); - $body.=sprintf("traces from OpenSIPs, MediaProxy and Asterisk servers.\n"); + $body .= sprintf("The following login account for CDRTool has been created for you:\n\n"); + $body .= sprintf("Username: %s\n", $username); + $body .= sprintf("Password: %s\n", $password); + $body .= sprintf("URL: %s%s%s\n\n", $protocolURL, $_SERVER['HTTP_HOST'], $CDRTool['tld']); + $body .= sprintf("You may use your CDRTool account to access call detail records and \n"); + $body .= sprintf("traces from OpenSIPs, MediaProxy and Asterisk servers.\n"); hunk ./accounts.phtml 214 - $from=sprintf("From: %s",$CDRTool['provider']['fromEmail']); - mail($email,"CDRTool login account", $body, $from); + $from = sprintf("From: %s", $CDRTool['provider']['fromEmail']); + mail($email, "CDRTool login account", $body, $from); hunk ./accounts.phtml 222 - hunk ./accounts.phtml 223 - $query="select * from auth_user"; + $query = "select * from auth_user"; hunk ./accounts.phtml 225 - $query.=sprintf(" where user_id = '%s'",addslashes($uid)); + $query .= sprintf(" where user_id = '%s'", addslashes($uid)); hunk ./accounts.phtml 228 - $query.=sprintf(" where user_id = '%s'",addslashes($id)); + $query .= sprintf(" where user_id = '%s'", addslashes($id)); hunk ./accounts.phtml 235 - $username = $db->f('username'); - $name = $db->f('name'); - $email = $db->f('email'); - $tel = $db->f('tel'); - $password = $db->f('password'); - $organization = $db->f('organization'); - $perms = $db->f('perms'); - $sources = $db->f('sources'); - $expire = $db->f('expire'); + $username = $db->f('username'); + $name = $db->f('name'); + $email = $db->f('email'); + $tel = $db->f('tel'); + $password = $db->f('password'); + $organization = $db->f('organization'); + $perms = $db->f('perms'); + $sources = $db->f('sources'); + $expire = $db->f('expire'); hunk ./accounts.phtml 258 - - hunk ./accounts.phtml 259 - hunk ./accounts.phtml 264 - $uid=$auth->auth["uid"]; + $uid = $auth->auth["uid"]; hunk ./accounts.phtml 266 - if (!$password) $password=random_passwd_gen(); + if (!$password) $password = random_passwd_gen(); hunk ./accounts.phtml 269 - if ($perms) $perms = implode($perms,","); + if ($perms) $perms = implode($perms,","); hunk ./accounts.phtml 273 - if (!preg_match("/^[0-9]*\.[0-9]*$/",$impersonate)) { - printf ("

Warning: Impersonate must be formated as CustomerId.ResellerId"); - unset($impersonate); + if (!preg_match("/^[0-9]*\.[0-9]*$/", $impersonate)) { + printf("

Warning: Impersonate must be formated as CustomerId.ResellerId"); + unset($impersonate); hunk ./accounts.phtml 286 - $user_id=md5(uniqid($hash_secret)); + $user_id = md5(uniqid($hash_secret)); hunk ./accounts.phtml 288 - $query=sprintf("insert into auth_user - (user_id, - username, - password, - password_hashed, - name, - organization, - tel, - email, - perms, - sources, - expire, - domainFilter, - aNumberFilter, - serviceFilter, - compidFilter, - cscodeFilter, - gatewayFilter, - afterDateFilter, - aclFilter, - impersonate, - yubikey, - auth_method - ) values ( - '%s', - '%s', - '', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s' - )", - addslashes($user_id), - addslashes($username), - addslashes(md5($password)), - addslashes($name), - addslashes($organization), - addslashes($tel), - addslashes($email), - addslashes($perms), - addslashes($sources), - addslashes($expire), - addslashes($domainFilter), - addslashes($aNumberFilter), - addslashes($serviceFilter), - addslashes($compidFilter), - addslashes($cscodeFilter), - addslashes($gatewayFilter), - addslashes($afterDateFilter), - addslashes($aclFilter), - addslashes($impersonate), - addslashes($yubikey), - addslashes($auth_method) + $query = sprintf( + "insert into auth_user + ( + user_id, + username, + password, + password_hashed, + name, + organization, + tel, + email, + perms, + sources, + expire, + domainFilter, + aNumberFilter, + serviceFilter, + compidFilter, + cscodeFilter, + gatewayFilter, + afterDateFilter, + aclFilter, + impersonate, + yubikey, + auth_method + ) values ( + '%s', + '%s', + '', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s' + )", + addslashes($user_id), + addslashes($username), + addslashes(md5($password)), + addslashes($name), + addslashes($organization), + addslashes($tel), + addslashes($email), + addslashes($perms), + addslashes($sources), + addslashes($expire), + addslashes($domainFilter), + addslashes($aNumberFilter), + addslashes($serviceFilter), + addslashes($compidFilter), + addslashes($cscodeFilter), + addslashes($gatewayFilter), + addslashes($afterDateFilter), + addslashes($aclFilter), + addslashes($impersonate), + addslashes($yubikey), + addslashes($auth_method) hunk ./accounts.phtml 360 - $query=sprintf("insert into auth_user - (user_id, - username, - password, - name, - organization, - tel, - email, - perms, - sources, - expire, - domainFilter, - aNumberFilter, - serviceFilter, - compidFilter, - cscodeFilter, - gatewayFilter, - afterDateFilter, - aclFilter, - impersonate, - yubikey, - auth_method - ) values ( - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s', - '%s' - )", - addslashes($user_id), - addslashes($username), - addslashes($password), - addslashes($name), - addslashes($organization), - addslashes($tel), - addslashes($email), - addslashes($perms), - addslashes($sources), - addslashes($expire), - addslashes($domainFilter), - addslashes($aNumberFilter), - addslashes($serviceFilter), - addslashes($compidFilter), - addslashes($cscodeFilter), - addslashes($gatewayFilter), - addslashes($afterDateFilter), - addslashes($aclFilter), - addslashes($impersonate), - addslashes($yubikey), - addslashes($auth_method) + $query = sprintf( + "insert into auth_user + ( + user_id, + username, + password, + name, + organization, + tel, + email, + perms, + sources, + expire, + domainFilter, + aNumberFilter, + serviceFilter, + compidFilter, + cscodeFilter, + gatewayFilter, + afterDateFilter, + aclFilter, + impersonate, + yubikey, + auth_method + ) values ( + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s', + '%s' + )", + addslashes($user_id), + addslashes($username), + addslashes($password), + addslashes($name), + addslashes($organization), + addslashes($tel), + addslashes($email), + addslashes($perms), + addslashes($sources), + addslashes($expire), + addslashes($domainFilter), + addslashes($aNumberFilter), + addslashes($serviceFilter), + addslashes($compidFilter), + addslashes($cscodeFilter), + addslashes($gatewayFilter), + addslashes($afterDateFilter), + addslashes($aclFilter), + addslashes($impersonate), + addslashes($yubikey), + addslashes($auth_method) hunk ./accounts.phtml 433 - printf("

Failed to add user: %s(%s) %s",$db->Error,$db->Errno,$query); - + printf("

Failed to add user: %s(%s) %s", $db->Error, $db->Errno, $query); hunk ./accounts.phtml 444 - $body.=sprintf("The following login account for CDRTool has been created for you:\n\n"); - $body.=sprintf("Username: %s\n",$username); - $body.=sprintf("Password: %s\n",$password); - $body.=sprintf("URL: %s%s%s\n\n",$protocolURL,$_SERVER['HTTP_HOST'],$CDRTool['tld']); - $body.=sprintf("You may use your CDRTool account to access call detail records and \n"); - $body.=sprintf("traces from OpenSIPs, MediaProxy and Asterisk servers.\n"); + $body .= sprintf("The following login account for CDRTool has been created for you:\n\n"); + $body .= sprintf("Username: %s\n", $username); + $body .= sprintf("Password: %s\n", $password); + $body .= sprintf("URL: %s%s%s\n\n", $protocolURL, $_SERVER['HTTP_HOST'], $CDRTool['tld']); + $body .= sprintf("You may use your CDRTool account to access call detail records and \n"); + $body .= sprintf("traces from OpenSIPs, MediaProxy and Asterisk servers.\n"); hunk ./accounts.phtml 451 - $from=sprintf("From: %s",$CDRTool['provider']['fromEmail']); - mail($email,"CDRTool login account", $body, $from); + $from = sprintf("From: %s", $CDRTool['provider']['fromEmail']); + mail($email, "CDRTool login account", $body, $from); hunk ./accounts.phtml 456 - hunk ./accounts.phtml 460 - - hunk ./accounts.phtml 461 - print "

Account list

"; - if ($perm->have_perm("admin")) { + print "

Account list

"; + if ($perm->have_perm("admin")) { hunk ./accounts.phtml 464 - } - accountList(); + } + accountList();