pEp.foundation
/
pEpJSONServerAdapter
8
0
Fork 3
Code Issues Pull Requests 1 Releases 35 Wiki Activity
Browse Source

rename all "pep" in file names etc. into "pEp" as required by pEp branding rules.

JSON-123
Roker 3 years ago
parent
cc1bae3085
commit
549a512732
12 changed files with 25 additions and 25 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      html/index.html
  2. +7
    -7
      html/interactive.js
  3. +3
    -3
      server/ev_server.cc
  4. +3
    -3
      server/json-adapter.cc
  5. +3
    -3
      server/pEp-types.cc
  6. +0
    -0
      server/pEp-types.hh
  7. +0
    -0
      server/pEp-utils-json.hh
  8. +1
    -1
      server/pEp-utils.cc
  9. +0
    -0
      server/pEp-utils.hh
  10. +4
    -4
      server/security-token.cc
  11. +1
    -1
      server/server_version.cc
  12. +1
    -1
      server/servertest.cc

+ 2
- 2
html/index.html View File

@ -17,7 +17,7 @@
pre.red {white-space:pre; background-color:#d99; }
</style>
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="pep_functions.js"></script>
<script type="text/javascript" src="pEp_functions.js"></script>
<script type="text/javascript" src="interactive.js"></script>
</head>
<body>
@ -67,7 +67,7 @@
<div id="doc_out" style="background-color:white;border:1px black solid; padding:10px;"></div>
<script type="text/javascript">
init_pep_functions();
init_pEp_functions();
on_select_change();
</script>


+ 7
- 7
html/interactive.js View File

@ -542,9 +542,9 @@ function prepare_call(f)
function on_select_change()
{
var fn = $( "#fn_name" ).val();
for(var i=0, len=pep_functions.length; i<len; ++i)
for(var i=0, len=pEp_functions.length; i<len; ++i)
{
var f = pep_functions[i];
var f = pEp_functions[i];
if(f.name == fn)
{
prepare_call(f);
@ -553,12 +553,12 @@ function on_select_change()
}
function init_pep_functions()
function init_pEp_functions()
{
var optionList = "";
for(var i=0, len=pep_functions.length; i<len; ++i)
for(var i=0, len=pEp_functions.length; i<len; ++i)
{
var f = pep_functions[i];
var f = pEp_functions[i];
optionList += '<option' + (f.separator? ' disabled> —— ':'>') + f.name + "</option>\n";
}
document.getElementById("fn_name").innerHTML = optionList;
@ -623,9 +623,9 @@ function create_doc()
var fd = format_def[format_name];
var output = "";
for(var i=0, len=pep_functions.length; i<len; ++i)
for(var i=0, len=pEp_functions.length; i<len; ++i)
{
var f = pep_functions[i];
var f = pEp_functions[i];
if(f.separator)
{
if(output.length > 0)


+ 3
- 3
server/ev_server.cc View File

@ -5,9 +5,9 @@
#include "prefix-config.hh"
#include "json-adapter.hh"
#include "function_map.hh"
#include "pep-types.hh"
#include "pEp-types.hh"
#include "json_rpc.hh"
#include "pep-utils.hh"
#include "pEp-utils.hh"
#include "logger.hh"
#include "server_version.hh"
@ -278,7 +278,7 @@ void ev_server::OnGetFunctions(evhttp_request* req, void*)
"var server_version_name = \"" + version.name + "\";\n"
"var server_version = \"" + version.major_minor_patch() + "\";\n"
"var add_sharks = " + (add_sharks?"true":"false") + ";\n"
"var pep_functions = ";
"var pEp_functions = ";
js::Array jsonfunctions;
for(const auto& f : functions)


+ 3
- 3
server/json-adapter.cc View File

@ -17,10 +17,10 @@
#include "json-adapter.hh"
#include "daemonize.hh"
#include "pep-types.hh"
#include "pEp-types.hh"
#include "json_rpc.hh"
#include "security-token.hh"
#include "pep-utils.hh"
#include "pEp-utils.hh"
#include "ev_server.hh"
#include "logger.hh"
#include "server_version.hh"
@ -632,7 +632,7 @@ void JsonAdapter::threadFunc()
if(i->deliver_html)
{
evhttp_set_cb(evHttp.get(), "/pep_functions.js" , ev_server::OnGetFunctions , this);
evhttp_set_cb(evHttp.get(), "/pEp_functions.js" , ev_server::OnGetFunctions , this);
evhttp_set_gencb(evHttp.get(), ev_server::OnOtherRequest, nullptr);
}


server/pep-types.cc → server/pEp-types.cc View File


server/pep-types.hh → server/pEp-types.hh View File


server/pep-utils-json.hh → server/pEp-utils-json.hh View File


server/pep-utils.cc → server/pEp-utils.cc View File


server/pep-utils.hh → server/pEp-utils.hh View File


+ 4
- 4
server/security-token.cc View File

@ -67,21 +67,21 @@ fs::path get_token_filename()
throw std::runtime_error("Cannot get home directory. $HOME environment variable is not set.");
}
const fs::path pep_dir = fs::path(home_dir) / ".pEp";
const fs::path pEp_dir = fs::path(home_dir) / ".pEp";
boost::system::error_code ec;
fs::create_directory( pep_dir, ec );
fs::create_directory( pEp_dir, ec );
if(ec)
{
throw boost::system::system_error(ec, "Cannot create pEp home directory" );
}
fs::permissions( pep_dir, fs::perms(0700), ec);
fs::permissions( pEp_dir, fs::perms(0700), ec);
if(ec)
{
throw boost::system::system_error(ec, "Cannot change permissions of pEp home directory to 0700 ");
}
return pep_dir / "json-token";
return pEp_dir / "json-token";
}


+ 1
- 1
server/server_version.cc View File

@ -3,7 +3,7 @@
#include <fstream>
#include <sstream>
#include "logger.hh"
#include "pep-utils-json.hh"
#include "pEp-utils-json.hh"
#include <pEp/pEpEngine.h> // for PEP_VERSION and get_engine_version()
#include <boost/algorithm/string/trim.hpp>
#include "json_spirit/json_spirit_reader.h"


+ 1
- 1
server/servertest.cc View File

@ -1,4 +1,4 @@
#include <pep/locked_queue.hh>
#include <pEp/locked_queue.hh>
#include <thread>
#include <atomic>
#include <vector>


Write Preview
Loading…
Cancel
Save