removed trailing spaces ([[:space:]]+$)
This commit is contained in:
@@ -42,8 +42,8 @@ struct private_peer_controller_t {
|
||||
* active user session
|
||||
*/
|
||||
user_t *user;
|
||||
|
||||
/**
|
||||
|
||||
/**
|
||||
* underlying database
|
||||
*/
|
||||
database_t *db;
|
||||
@@ -55,19 +55,19 @@ struct private_peer_controller_t {
|
||||
static void list(private_peer_controller_t *this, request_t *request)
|
||||
{
|
||||
enumerator_t *query;
|
||||
|
||||
|
||||
query = this->db->query(this->db,
|
||||
"SELECT id, alias, keyid FROM peer WHERE user = ? ORDER BY alias",
|
||||
DB_UINT, this->user->get_user(this->user),
|
||||
DB_UINT, DB_TEXT, DB_BLOB);
|
||||
|
||||
|
||||
if (query)
|
||||
{
|
||||
u_int id;
|
||||
char *alias;
|
||||
chunk_t keyid;
|
||||
identification_t *identifier;
|
||||
|
||||
|
||||
while (query->enumerate(query, &id, &alias, &keyid))
|
||||
{
|
||||
request->setf(request, "peers.%d.alias=%s", id, alias);
|
||||
@@ -89,7 +89,7 @@ static bool verify_alias(private_peer_controller_t *this, request_t *request,
|
||||
if (!alias || *alias == '\0')
|
||||
{
|
||||
request->setf(request, "error=Alias is missing.");
|
||||
return FALSE;
|
||||
return FALSE;
|
||||
}
|
||||
while (*alias != '\0')
|
||||
{
|
||||
@@ -122,7 +122,7 @@ static bool parse_public_key(private_peer_controller_t *this,
|
||||
{
|
||||
public_key_t *public;
|
||||
chunk_t blob, id;
|
||||
|
||||
|
||||
if (!public_key || *public_key == '\0')
|
||||
{
|
||||
request->setf(request, "error=Public key is missing.");
|
||||
@@ -156,7 +156,7 @@ static bool parse_public_key(private_peer_controller_t *this,
|
||||
static void add(private_peer_controller_t *this, request_t *request)
|
||||
{
|
||||
char *alias = "", *public_key = "";
|
||||
|
||||
|
||||
if (request->get_query_data(request, "back"))
|
||||
{
|
||||
return request->redirect(request, "peer/list");
|
||||
@@ -164,10 +164,10 @@ static void add(private_peer_controller_t *this, request_t *request)
|
||||
while (request->get_query_data(request, "add"))
|
||||
{
|
||||
chunk_t encoding, keyid;
|
||||
|
||||
|
||||
alias = request->get_query_data(request, "alias");
|
||||
public_key = request->get_query_data(request, "public_key");
|
||||
|
||||
|
||||
if (!verify_alias(this, request, alias))
|
||||
{
|
||||
break;
|
||||
@@ -194,7 +194,7 @@ static void add(private_peer_controller_t *this, request_t *request)
|
||||
}
|
||||
request->set(request, "alias", alias);
|
||||
request->set(request, "public_key", public_key);
|
||||
|
||||
|
||||
return request->render(request, "templates/peer/add.cs");
|
||||
}
|
||||
|
||||
@@ -209,7 +209,7 @@ char* pem_encode(chunk_t der)
|
||||
char *pem;
|
||||
chunk_t base64;
|
||||
int i = 0;
|
||||
|
||||
|
||||
base64 = chunk_to_base64(der, NULL);
|
||||
len = strlen(begin) + base64.len + base64.len/64 + strlen(end) + 2;
|
||||
pem = malloc(len + 1);
|
||||
@@ -223,7 +223,7 @@ char* pem_encode(chunk_t der)
|
||||
}
|
||||
while (i < base64.len - 2);
|
||||
strcat(pem, end);
|
||||
|
||||
|
||||
free(base64.ptr);
|
||||
return pem;
|
||||
}
|
||||
@@ -235,7 +235,7 @@ static void edit(private_peer_controller_t *this, request_t *request, int id)
|
||||
{
|
||||
char *alias = "", *public_key = "", *pem;
|
||||
chunk_t encoding, keyid;
|
||||
|
||||
|
||||
if (request->get_query_data(request, "back"))
|
||||
{
|
||||
return request->redirect(request, "peer/list");
|
||||
@@ -253,7 +253,7 @@ static void edit(private_peer_controller_t *this, request_t *request, int id)
|
||||
{
|
||||
alias = request->get_query_data(request, "alias");
|
||||
public_key = request->get_query_data(request, "public_key");
|
||||
|
||||
|
||||
if (!verify_alias(this, request, alias))
|
||||
{
|
||||
break;
|
||||
@@ -333,7 +333,7 @@ static void handle(private_peer_controller_t *this, request_t *request,
|
||||
{
|
||||
id = atoi(idstr);
|
||||
}
|
||||
|
||||
|
||||
if (streq(action, "list"))
|
||||
{
|
||||
return list(this, request);
|
||||
|
||||
Reference in New Issue
Block a user