kopia lustrzana https://github.com/magicbug/Cloudlog
Dashboard map now shows SAT name if its available
Peter Goodhall
rodzic
8b52f6926c
commit
fae53f59f6
|
|
@ -52,7 +52,7 @@ $autoload['packages'] = array(APPPATH.'third_party');
|
|||
| $autoload['libraries'] = array('database', 'session', 'xmlrpc');
|
||||
*/
|
||||
|
||||
$autoload['libraries'] = array('database', 'session');
|
||||
$autoload['libraries'] = array('database', 'session', 'curl');
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -75,7 +75,11 @@ class Dashboard extends CI_Controller {
|
|||
echo ",";
|
||||
}
|
||||
|
||||
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
|
||||
if($row->COL_SAT_NAME != null) {
|
||||
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
|
||||
} else {
|
||||
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
|
||||
}
|
||||
|
||||
$count++;
|
||||
|
||||
|
|
@ -140,11 +144,9 @@ class Dashboard extends CI_Controller {
|
|||
|
||||
function test() {
|
||||
|
||||
$this->load->library('callbytxt');
|
||||
$this->load->library('clublog');
|
||||
|
||||
$callbook = $this->callbytxt->callsign('m3ph');
|
||||
|
||||
print_r($callbook);
|
||||
echo $this->clublog->send();
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,24 @@ class Clublog {
|
|||
Communicates with the Clublog.org API functions
|
||||
*/
|
||||
|
||||
public function send(){}
|
||||
/* Send QSO in real time */
|
||||
public function send() {
|
||||
|
||||
// Load Librarys
|
||||
$CI =& get_instance();
|
||||
$CI->load->library('curl');
|
||||
|
||||
// API Key
|
||||
$key = "a11c3235cd74b88212ce726857056939d52372bd";
|
||||
|
||||
$username = "";
|
||||
$password = "";
|
||||
|
||||
$qso = "QSO_DATE TIME_ON QSLRDATE QSLSDATE CALL OPERATOR MODE BAND FREQ QSL_RCVD LOTW_QSL_RCVD QSL_SENT DXCC PROP_MODE";
|
||||
|
||||
echo $CI->curl->simple_post('curl_test/message', array('message'=>'Sup buddy'));
|
||||
|
||||
}
|
||||
public function check(){}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,372 @@
|
|||
<?php defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
|
||||
/**
|
||||
* CodeIgniter Curl Class
|
||||
*
|
||||
* Work with remote servers via cURL much easier than using the native PHP bindings.
|
||||
*
|
||||
* @package CodeIgniter
|
||||
* @subpackage Libraries
|
||||
* @category Libraries
|
||||
* @author Philip Sturgeon
|
||||
* @license http://philsturgeon.co.uk/code/dbad-license
|
||||
* @link http://getsparks.org/packages/curl/show
|
||||
*/
|
||||
class Curl {
|
||||
|
||||
private $_ci; // CodeIgniter instance
|
||||
private $response = ''; // Contains the cURL response for debug
|
||||
private $session; // Contains the cURL handler for a session
|
||||
private $url; // URL of the session
|
||||
private $options = array(); // Populates curl_setopt_array
|
||||
private $headers = array(); // Populates extra HTTP headers
|
||||
public $error_code; // Error code returned as an int
|
||||
public $error_string; // Error message returned as a string
|
||||
public $info; // Returned after request (elapsed time, etc)
|
||||
|
||||
function __construct($url = '')
|
||||
{
|
||||
$this->_ci = & get_instance();
|
||||
log_message('debug', 'cURL Class Initialized');
|
||||
|
||||
if ( ! $this->is_enabled())
|
||||
{
|
||||
log_message('error', 'cURL Class - PHP was not built with cURL enabled. Rebuild PHP with --with-curl to use cURL.');
|
||||
}
|
||||
|
||||
$url AND $this->create($url);
|
||||
}
|
||||
|
||||
function __call($method, $arguments)
|
||||
{
|
||||
if (in_array($method, array('simple_get', 'simple_post', 'simple_put', 'simple_delete')))
|
||||
{
|
||||
// Take off the "simple_" and past get/post/put/delete to _simple_call
|
||||
$verb = str_replace('simple_', '', $method);
|
||||
array_unshift($arguments, $verb);
|
||||
return call_user_func_array(array($this, '_simple_call'), $arguments);
|
||||
}
|
||||
}
|
||||
|
||||
/* =================================================================================
|
||||
* SIMPLE METHODS
|
||||
* Using these methods you can make a quick and easy cURL call with one line.
|
||||
* ================================================================================= */
|
||||
|
||||
public function _simple_call($method, $url, $params = array(), $options = array())
|
||||
{
|
||||
// Get acts differently, as it doesnt accept parameters in the same way
|
||||
if ($method === 'get')
|
||||
{
|
||||
// If a URL is provided, create new session
|
||||
$this->create($url.($params ? '?'.http_build_query($params) : ''));
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
// If a URL is provided, create new session
|
||||
$this->create($url);
|
||||
|
||||
$this->{$method}($params);
|
||||
}
|
||||
|
||||
// Add in the specific options provided
|
||||
$this->options($options);
|
||||
|
||||
return $this->execute();
|
||||
}
|
||||
|
||||
public function simple_ftp_get($url, $file_path, $username = '', $password = '')
|
||||
{
|
||||
// If there is no ftp:// or any protocol entered, add ftp://
|
||||
if ( ! preg_match('!^(ftp|sftp)://! i', $url))
|
||||
{
|
||||
$url = 'ftp://' . $url;
|
||||
}
|
||||
|
||||
// Use an FTP login
|
||||
if ($username != '')
|
||||
{
|
||||
$auth_string = $username;
|
||||
|
||||
if ($password != '')
|
||||
{
|
||||
$auth_string .= ':' . $password;
|
||||
}
|
||||
|
||||
// Add the user auth string after the protocol
|
||||
$url = str_replace('://', '://' . $auth_string . '@', $url);
|
||||
}
|
||||
|
||||
// Add the filepath
|
||||
$url .= $file_path;
|
||||
|
||||
$this->option(CURLOPT_BINARYTRANSFER, TRUE);
|
||||
$this->option(CURLOPT_VERBOSE, TRUE);
|
||||
|
||||
return $this->execute();
|
||||
}
|
||||
|
||||
/* =================================================================================
|
||||
* ADVANCED METHODS
|
||||
* Use these methods to build up more complex queries
|
||||
* ================================================================================= */
|
||||
|
||||
public function post($params = array(), $options = array())
|
||||
{
|
||||
// If its an array (instead of a query string) then format it correctly
|
||||
if (is_array($params))
|
||||
{
|
||||
$params = http_build_query($params, NULL, '&');
|
||||
}
|
||||
|
||||
// Add in the specific options provided
|
||||
$this->options($options);
|
||||
|
||||
$this->http_method('post');
|
||||
|
||||
$this->option(CURLOPT_POST, TRUE);
|
||||
$this->option(CURLOPT_POSTFIELDS, $params);
|
||||
}
|
||||
|
||||
public function put($params = array(), $options = array())
|
||||
{
|
||||
// If its an array (instead of a query string) then format it correctly
|
||||
if (is_array($params))
|
||||
{
|
||||
$params = http_build_query($params, NULL, '&');
|
||||
}
|
||||
|
||||
// Add in the specific options provided
|
||||
$this->options($options);
|
||||
|
||||
$this->http_method('put');
|
||||
$this->option(CURLOPT_POSTFIELDS, $params);
|
||||
|
||||
// Override method, I think this overrides $_POST with PUT data but... we'll see eh?
|
||||
$this->option(CURLOPT_HTTPHEADER, array('X-HTTP-Method-Override: PUT'));
|
||||
}
|
||||
|
||||
public function delete($params, $options = array())
|
||||
{
|
||||
// If its an array (instead of a query string) then format it correctly
|
||||
if (is_array($params))
|
||||
{
|
||||
$params = http_build_query($params, NULL, '&');
|
||||
}
|
||||
|
||||
// Add in the specific options provided
|
||||
$this->options($options);
|
||||
|
||||
$this->http_method('delete');
|
||||
|
||||
$this->option(CURLOPT_POSTFIELDS, $params);
|
||||
}
|
||||
|
||||
public function set_cookies($params = array())
|
||||
{
|
||||
if (is_array($params))
|
||||
{
|
||||
$params = http_build_query($params, NULL, '&');
|
||||
}
|
||||
|
||||
$this->option(CURLOPT_COOKIE, $params);
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function http_header($header, $content = NULL)
|
||||
{
|
||||
$this->headers[] = $content ? $header . ': ' . $content : $header;
|
||||
}
|
||||
|
||||
public function http_method($method)
|
||||
{
|
||||
$this->options[CURLOPT_CUSTOMREQUEST] = strtoupper($method);
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function http_login($username = '', $password = '', $type = 'any')
|
||||
{
|
||||
$this->option(CURLOPT_HTTPAUTH, constant('CURLAUTH_' . strtoupper($type)));
|
||||
$this->option(CURLOPT_USERPWD, $username . ':' . $password);
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function proxy($url = '', $port = 80)
|
||||
{
|
||||
$this->option(CURLOPT_HTTPPROXYTUNNEL, TRUE);
|
||||
$this->option(CURLOPT_PROXY, $url . ':' . $port);
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function proxy_login($username = '', $password = '')
|
||||
{
|
||||
$this->option(CURLOPT_PROXYUSERPWD, $username . ':' . $password);
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function ssl($verify_peer = TRUE, $verify_host = 2, $path_to_cert = NULL)
|
||||
{
|
||||
if ($verify_peer)
|
||||
{
|
||||
$this->option(CURLOPT_SSL_VERIFYPEER, TRUE);
|
||||
$this->option(CURLOPT_SSL_VERIFYHOST, $verify_host);
|
||||
$this->option(CURLOPT_CAINFO, $path_to_cert);
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->option(CURLOPT_SSL_VERIFYPEER, FALSE);
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function options($options = array())
|
||||
{
|
||||
// Merge options in with the rest - done as array_merge() does not overwrite numeric keys
|
||||
foreach ($options as $option_code => $option_value)
|
||||
{
|
||||
$this->option($option_code, $option_value);
|
||||
}
|
||||
|
||||
// Set all options provided
|
||||
curl_setopt_array($this->session, $this->options);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function option($code, $value)
|
||||
{
|
||||
if (is_string($code) && !is_numeric($code))
|
||||
{
|
||||
$code = constant('CURLOPT_' . strtoupper($code));
|
||||
}
|
||||
|
||||
$this->options[$code] = $value;
|
||||
return $this;
|
||||
}
|
||||
|
||||
// Start a session from a URL
|
||||
public function create($url)
|
||||
{
|
||||
// If no a protocol in URL, assume its a CI link
|
||||
if ( ! preg_match('!^\w+://! i', $url))
|
||||
{
|
||||
$this->_ci->load->helper('url');
|
||||
$url = site_url($url);
|
||||
}
|
||||
|
||||
$this->url = $url;
|
||||
$this->session = curl_init($this->url);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
// End a session and return the results
|
||||
public function execute()
|
||||
{
|
||||
// Set two default options, and merge any extra ones in
|
||||
if ( ! isset($this->options[CURLOPT_TIMEOUT]))
|
||||
{
|
||||
$this->options[CURLOPT_TIMEOUT] = 30;
|
||||
}
|
||||
if ( ! isset($this->options[CURLOPT_RETURNTRANSFER]))
|
||||
{
|
||||
$this->options[CURLOPT_RETURNTRANSFER] = TRUE;
|
||||
}
|
||||
if ( ! isset($this->options[CURLOPT_FAILONERROR]))
|
||||
{
|
||||
$this->options[CURLOPT_FAILONERROR] = TRUE;
|
||||
}
|
||||
|
||||
// Only set follow location if not running securely
|
||||
if ( ! ini_get('safe_mode') && !ini_get('open_basedir'))
|
||||
{
|
||||
// Ok, follow location is not set already so lets set it to true
|
||||
if ( ! isset($this->options[CURLOPT_FOLLOWLOCATION]))
|
||||
{
|
||||
$this->options[CURLOPT_FOLLOWLOCATION] = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
if ( ! empty($this->headers))
|
||||
{
|
||||
$this->option(CURLOPT_HTTPHEADER, $this->headers);
|
||||
}
|
||||
|
||||
$this->options();
|
||||
|
||||
// Execute the request & and hide all output
|
||||
$this->response = curl_exec($this->session);
|
||||
$this->info = curl_getinfo($this->session);
|
||||
|
||||
// Request failed
|
||||
if ($this->response === FALSE)
|
||||
{
|
||||
$this->error_code = curl_errno($this->session);
|
||||
$this->error_string = curl_error($this->session);
|
||||
|
||||
curl_close($this->session);
|
||||
$this->set_defaults();
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
// Request successful
|
||||
else
|
||||
{
|
||||
curl_close($this->session);
|
||||
$response = $this->response;
|
||||
$this->set_defaults();
|
||||
return $response;
|
||||
}
|
||||
}
|
||||
|
||||
public function is_enabled()
|
||||
{
|
||||
return function_exists('curl_init');
|
||||
}
|
||||
|
||||
public function debug()
|
||||
{
|
||||
echo "=============================================<br/>\n";
|
||||
echo "<h2>CURL Test</h2>\n";
|
||||
echo "=============================================<br/>\n";
|
||||
echo "<h3>Response</h3>\n";
|
||||
echo "<code>" . nl2br(htmlentities($this->response)) . "</code><br/>\n\n";
|
||||
|
||||
if ($this->error_string)
|
||||
{
|
||||
echo "=============================================<br/>\n";
|
||||
echo "<h3>Errors</h3>";
|
||||
echo "<strong>Code:</strong> " . $this->error_code . "<br/>\n";
|
||||
echo "<strong>Message:</strong> " . $this->error_string . "<br/>\n";
|
||||
}
|
||||
|
||||
echo "=============================================<br/>\n";
|
||||
echo "<h3>Info</h3>";
|
||||
echo "<pre>";
|
||||
print_r($this->info);
|
||||
echo "</pre>";
|
||||
}
|
||||
|
||||
public function debug_request()
|
||||
{
|
||||
return array(
|
||||
'url' => $this->url
|
||||
);
|
||||
}
|
||||
|
||||
private function set_defaults()
|
||||
{
|
||||
$this->response = '';
|
||||
$this->headers = array();
|
||||
$this->options = array();
|
||||
$this->error_code = NULL;
|
||||
$this->error_string = '';
|
||||
$this->session = NULL;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* End of file Curl.php */
|
||||
/* Location: ./application/libraries/Curl.php */
|
||||
|
|
@ -55,7 +55,8 @@ class Logbook_model extends CI_Model {
|
|||
'COL_IOTA' => $this->input->post('iota_ref'),
|
||||
'COL_MY_GRIDSQUARE' => $locator,
|
||||
'COL_DISTANCE' => "0",
|
||||
'COL_FREQ_RX' => '0',
|
||||
'COL_FREQ_RX' => 0,
|
||||
'COL_BAND_RX' => 0,
|
||||
'COL_ANT_AZ' => '0',
|
||||
'COL_ANT_EL' => '0',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -5,49 +5,145 @@
|
|||
[
|
||||
[
|
||||
"text",
|
||||
"text: text-transform: capitalize/upper/lower"
|
||||
],
|
||||
[
|
||||
"font",
|
||||
"font: font-weight: weight"
|
||||
"text: text-align: left/center/right"
|
||||
],
|
||||
[
|
||||
"background",
|
||||
"background: background-color: hex"
|
||||
],
|
||||
[
|
||||
"font",
|
||||
"font: font-family: family"
|
||||
],
|
||||
[
|
||||
"cursor",
|
||||
"cursor: cursor: type"
|
||||
],
|
||||
[
|
||||
"border",
|
||||
"border: border: size style color"
|
||||
]
|
||||
]
|
||||
},
|
||||
"buffers":
|
||||
[
|
||||
{
|
||||
"file": "application/views/search/main.php",
|
||||
"file": "application/libraries/Clublog.php",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 2036,
|
||||
"buffer_size": 659,
|
||||
"line_ending": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"file": "application/views/view_log/index.php",
|
||||
"file": "/C/Users/Peter/Documents/Business/Client Work/Alpine Adventure/website/index.html",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 3756,
|
||||
"buffer_size": 7810,
|
||||
"line_ending": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"file": "application/controllers/logbook.php",
|
||||
"file": "/C/Users/Peter/Documents/Business/Client Work/Alpine Adventure/email/index.html",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 7213,
|
||||
"buffer_size": 2306,
|
||||
"line_ending": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"file": "application/models/logbook_model.php",
|
||||
"contents": "Last weekend I decided to have a little dabble in the WAE RTTY Contest, this wasn’t a serious effort; more a have a play and see what could be added to my logbook. Doing a little bit of search and pounce and in the end called CQ a few times, but only got very short runs on 20 and 80m (the only QSOs on the band).\n\nI found conditions hard going, but they didn’t look any different to the usual averages; so I’m guessing this was purely related to the antennas 1/2 G5RV and a 80m quarter wave L and the 50w from the Yaesu FT-950 none the less I had fun. This was also the first contest where I used Win-Test, for the whole operation with MMTTY and it worked pretty much flawlessly. Only one issue where clicking on the DX Cluster spots; it would switch the rig to LSB which got very annoying, but this was down to operating in AFSK I believe. \n\nTotal operating time was 7 hours 26 minutes according to Win-Test, and I can report some reasonable stuff worked including Japan and Mexico and lots of North America (All bands but 80m!) ending up with 200 QSOs. ",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 14741,
|
||||
"buffer_size": 1056,
|
||||
"line_ending": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"file": "/C/Users/Peter/Desktop/nuke_users.csv",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 0,
|
||||
"line_ending": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"file": "/C/Users/Peter/git/aprs.bz/config/database.yml",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 353,
|
||||
"line_ending": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"contents": "ruby 1.9.3p0 (2011-10-30) [i386-mingw32]\n\nC:\\Users\\Peter>cd git\n\nC:\\Users\\Peter\\git>ls\n'ls' is not recognized as an internal or external command,\noperable program or batch file.\n\nC:\\Users\\Peter\\git>cd aprs.bz\n\nC:\\Users\\Peter\\git\\aprs.bz>bundle\n'bundle' is not recognized as an internal or external command,\noperable program or batch file.\n\nC:\\Users\\Peter\\git\\aprs.bz>gem install bundler\nFetching: bundler-1.0.21.gem (100%)\nSuccessfully installed bundler-1.0.21\n1 gem installed\nInstalling ri documentation for bundler-1.0.21...\nInstalling RDoc documentation for bundler-1.0.21...\n\nC:\\Users\\Peter\\git\\aprs.bz>bundle\nFetching source index for http://rubygems.org/\nUsing rake (0.9.2.2)\nInstalling multi_json (1.0.3)\nInstalling activesupport (3.1.2)\nInstalling builder (3.0.0)\nUsing i18n (0.6.0)\nInstalling activemodel (3.1.2)\nUsing erubis (2.7.0)\nInstalling rack (1.3.5)\nInstalling rack-cache (1.1)\nInstalling rack-mount (0.8.3)\nInstalling rack-test (0.6.1)\nInstalling hike (1.2.1)\nInstalling tilt (1.3.3)\nInstalling sprockets (2.1.0)\nInstalling actionpack (3.1.2)\nInstalling mime-types (1.17.2)\nInstalling polyglot (0.3.3)\nInstalling treetop (1.4.10)\nInstalling mail (2.3.0)\nInstalling actionmailer (3.1.2)\nInstalling arel (2.2.1)\nInstalling tzinfo (0.3.31)\nInstalling activerecord (3.1.2)\nInstalling activeresource (3.1.2)\nInstalling addressable (2.2.6)\nInstalling bcrypt-ruby (3.0.1)\nUsing bundler (1.0.21)\nInstalling nokogiri (1.5.0)\nUsing ffi (1.0.11)\nInstalling childprocess (0.2.2)\nInstalling json_pure (1.6.1)\nInstalling rubyzip (0.9.4)\nInstalling selenium-webdriver (2.13.0)\nInstalling xpath (0.1.4)\nInstalling capybara (1.1.2)\nInstalling coffee-script-source (1.1.3)\nInstalling execjs (1.2.9)\nInstalling coffee-script (2.2.0)\nInstalling rack-ssl (1.3.2)\nInstalling json (1.6.1)\nGem::InstallError: The 'json' native gem requires installed build tools.\n\nPlease update your PATH to include build tools or download the DevKit\nfrom 'http://rubyinstaller.org/downloads' and follow the instructions\nat 'http://github.com/oneclick/rubyinstaller/wiki/Development-Kit'\nAn error occured while installing json (1.6.1), and Bundler cannot continue.\nMake sure that `gem install json -v '1.6.1'` succeeds before bundling.\n\nC:\\Users\\Peter\\git\\aprs.bz>",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 2241,
|
||||
"line_ending": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"contents": "ruby 1.9.3p0 (2011-10-30) [i386-mingw32]\n\nC:\\Users\\Peter>cd git\n\nC:\\Users\\Peter\\git>ls\n'ls' is not recognized as an internal or external command,\noperable program or batch file.\n\nC:\\Users\\Peter\\git>cd aprs.bz\n\nC:\\Users\\Peter\\git\\aprs.bz>bundle\n'bundle' is not recognized as an internal or external command,\noperable program or batch file.\n\nC:\\Users\\Peter\\git\\aprs.bz>gem install bundler\nFetching: bundler-1.0.21.gem (100%)\nSuccessfully installed bundler-1.0.21\n1 gem installed\nInstalling ri documentation for bundler-1.0.21...\nInstalling RDoc documentation for bundler-1.0.21...\n\nC:\\Users\\Peter\\git\\aprs.bz>bundle\nFetching source index for http://rubygems.org/\nUsing rake (0.9.2.2)\nInstalling multi_json (1.0.3)\nInstalling activesupport (3.1.2)\nInstalling builder (3.0.0)\nUsing i18n (0.6.0)\nInstalling activemodel (3.1.2)\nUsing erubis (2.7.0)\nInstalling rack (1.3.5)\nInstalling rack-cache (1.1)\nInstalling rack-mount (0.8.3)\nInstalling rack-test (0.6.1)\nInstalling hike (1.2.1)\nInstalling tilt (1.3.3)\nInstalling sprockets (2.1.0)\nInstalling actionpack (3.1.2)\nInstalling mime-types (1.17.2)\nInstalling polyglot (0.3.3)\nInstalling treetop (1.4.10)\nInstalling mail (2.3.0)\nInstalling actionmailer (3.1.2)\nInstalling arel (2.2.1)\nInstalling tzinfo (0.3.31)\nInstalling activerecord (3.1.2)\nInstalling activeresource (3.1.2)\nInstalling addressable (2.2.6)\nInstalling bcrypt-ruby (3.0.1)\nUsing bundler (1.0.21)\nInstalling nokogiri (1.5.0)\nUsing ffi (1.0.11)\nInstalling childprocess (0.2.2)\nInstalling json_pure (1.6.1)\nInstalling rubyzip (0.9.4)\nInstalling selenium-webdriver (2.13.0)\nInstalling xpath (0.1.4)\nInstalling capybara (1.1.2)\nInstalling coffee-script-source (1.1.3)\nInstalling execjs (1.2.9)\nInstalling coffee-script (2.2.0)\nInstalling rack-ssl (1.3.2)\nInstalling json (1.6.1)\nGem::InstallError: The 'json' native gem requires installed build tools.\n\nPlease update your PATH to include build tools or download the DevKit\nfrom 'http://rubyinstaller.org/downloads' and follow the instructions\nat 'http://github.com/oneclick/rubyinstaller/wiki/Development-Kit'\nAn error occured while installing json (1.6.1), and Bundler cannot continue.\nMake sure that `gem install json -v '1.6.1'` succeeds before bundling.\n\nC:\\Users\\Peter\\git\\aprs.bz>gem install json -v '1.6.1'\nERROR: Error installing json:\n The 'json' native gem requires installed build tools.\n\nPlease update your PATH to include build tools or download the DevKit\nfrom 'http://rubyinstaller.org/downloads' and follow the instructions\nat 'http://github.com/oneclick/rubyinstaller/wiki/Development-Kit'\n\nC:\\Users\\Peter\\git\\aprs.bz>",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 2598,
|
||||
"line_ending": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"file": "/C/Users/Peter/git/aprs.bz/app/views/users/show.html.haml",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 67,
|
||||
"line_ending": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"file": "/C/Users/Peter/git/aprs.bz/app/views/home/index.html.haml",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 71,
|
||||
"line_ending": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"file": "/C/Users/Peter/git/aprs.bz/app/models/user.rb",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 1122,
|
||||
"line_ending": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"file": "/C/Users/Peter/git/aprs.bz/app/models/packet.rb",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 1506,
|
||||
"line_ending": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"file": "/C/VM/Ubuntu/Ubuntu.vmwarevm/Ubuntu.vmx",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 2095,
|
||||
"line_ending": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"file": "/C/Users/Peter/Documents/Virtual Machines/Ubuntu/Ubuntu.vmx",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 2044,
|
||||
"line_ending": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"file": "/C/Users/Peter/git/aprs.bz/db/schema.rb",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 2790,
|
||||
"line_ending": "Windows"
|
||||
}
|
||||
}
|
||||
|
|
@ -84,22 +180,37 @@
|
|||
},
|
||||
"file_history":
|
||||
[
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/search.php",
|
||||
"/C/Users/Peter/Desktop/Thrus/website/index.html",
|
||||
"/C/Users/Peter/Desktop/Thrus/email/Peugeot-email.html",
|
||||
"/C/Users/Peter/Desktop/Thrus/emailnew/Peugeot-email.html",
|
||||
"/C/Users/Peter/Desktop/email.html",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/dashboard.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/libraries/Clublog.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/models/logbook_model.php",
|
||||
"/C/Users/Peter/Desktop/tma2.css",
|
||||
"/C/Users/Peter/Desktop/standard/header.html",
|
||||
"/C/Users/Peter/Desktop/standardwhite/header.html",
|
||||
"/C/Users/Peter/Desktop/standardwhite/footer.html",
|
||||
"/C/Users/Peter/Desktop/standard/styles_layout.css",
|
||||
"/C/Users/Peter/Desktop/standard/styles_color.css",
|
||||
"/C/Users/Peter/Desktop/standardwhite/gradients.css",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/config/autoload.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/qso/index.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/libraries/callbytxt.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/search/main.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/view_log/index.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/logbook.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/search.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/dxcluster/main.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/dxcluster/custom.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/layout/header.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/dxcluster.php",
|
||||
"/C/Users/Peter/Downloads/FT2000scripts/ClearRIT.wts",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/libraries/callbytxt.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/notes/main.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/welcome.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/qso.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/search/main.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/libraries/Qra.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/dashboard/index.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/dashboard.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/logbook.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/css/main.css",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/js/global.js",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/notes/add.php",
|
||||
|
|
@ -118,7 +229,6 @@
|
|||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/statistics/index.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/notes/view.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/notes/edit.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/view_log/index.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/layout/footer.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/css/global.css",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/user.php",
|
||||
|
|
@ -128,7 +238,6 @@
|
|||
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/backup.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/api.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/config/config.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/models/logbook_model.php",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/qso/edit.php",
|
||||
"/C/Users/Peter/Desktop/.htaccess",
|
||||
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/layout/mini_header.php",
|
||||
|
|
@ -191,6 +300,17 @@
|
|||
"case_sensitive": false,
|
||||
"find_history":
|
||||
[
|
||||
"Lebkuchen herz",
|
||||
"What do you taste?",
|
||||
".navbar",
|
||||
"header",
|
||||
"background-image",
|
||||
"th.header, td.header, h1.header, h2.header, h3.header, div.header",
|
||||
"th.header, td.header, h1.header, h2.header, h3.header, div.header {",
|
||||
"h2.headingblock",
|
||||
"header",
|
||||
"th.header, td.header, h1.header, h2.header, h3.heade",
|
||||
"body#site-index .headingblock, body#course-view .headingblock",
|
||||
"rst",
|
||||
"edit",
|
||||
"created",
|
||||
|
|
@ -215,23 +335,23 @@
|
|||
"groups":
|
||||
[
|
||||
{
|
||||
"selected": 3,
|
||||
"selected": 12,
|
||||
"sheets":
|
||||
[
|
||||
{
|
||||
"buffer": 0,
|
||||
"file": "application/views/search/main.php",
|
||||
"file": "application/libraries/Clublog.php",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 2036,
|
||||
"buffer_size": 659,
|
||||
"regions":
|
||||
{
|
||||
},
|
||||
"selection":
|
||||
[
|
||||
[
|
||||
542,
|
||||
542
|
||||
500,
|
||||
500
|
||||
]
|
||||
],
|
||||
"settings":
|
||||
|
|
@ -247,50 +367,50 @@
|
|||
},
|
||||
{
|
||||
"buffer": 1,
|
||||
"file": "application/views/view_log/index.php",
|
||||
"file": "/C/Users/Peter/Documents/Business/Client Work/Alpine Adventure/website/index.html",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 3756,
|
||||
"buffer_size": 7810,
|
||||
"regions":
|
||||
{
|
||||
},
|
||||
"selection":
|
||||
[
|
||||
[
|
||||
3248,
|
||||
3084
|
||||
3094,
|
||||
3094
|
||||
]
|
||||
],
|
||||
"settings":
|
||||
{
|
||||
"syntax": "Packages/PHP/PHP.tmLanguage",
|
||||
"syntax": "Packages/HTML/HTML.tmLanguage",
|
||||
"translate_tabs_to_spaces": false
|
||||
},
|
||||
"translation.x": 0.0,
|
||||
"translation.y": 1682.0,
|
||||
"translation.y": 1239.0,
|
||||
"zoom_level": 1.0
|
||||
},
|
||||
"type": "text"
|
||||
},
|
||||
{
|
||||
"buffer": 2,
|
||||
"file": "application/controllers/logbook.php",
|
||||
"file": "/C/Users/Peter/Documents/Business/Client Work/Alpine Adventure/email/index.html",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 7213,
|
||||
"buffer_size": 2306,
|
||||
"regions":
|
||||
{
|
||||
},
|
||||
"selection":
|
||||
[
|
||||
[
|
||||
113,
|
||||
113
|
||||
243,
|
||||
243
|
||||
]
|
||||
],
|
||||
"settings":
|
||||
{
|
||||
"syntax": "Packages/PHP/PHP.tmLanguage",
|
||||
"syntax": "Packages/HTML/HTML.tmLanguage",
|
||||
"translate_tabs_to_spaces": false
|
||||
},
|
||||
"translation.x": 0.0,
|
||||
|
|
@ -301,28 +421,313 @@
|
|||
},
|
||||
{
|
||||
"buffer": 3,
|
||||
"file": "application/models/logbook_model.php",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 14741,
|
||||
"buffer_size": 1056,
|
||||
"regions":
|
||||
{
|
||||
},
|
||||
"selection":
|
||||
[
|
||||
[
|
||||
2256,
|
||||
2256
|
||||
1056,
|
||||
0
|
||||
]
|
||||
],
|
||||
"settings":
|
||||
{
|
||||
"syntax": "Packages/PHP/PHP.tmLanguage",
|
||||
"syntax": "Packages/Text/Plain text.tmLanguage"
|
||||
},
|
||||
"translation.x": 0.0,
|
||||
"translation.y": 0.0,
|
||||
"zoom_level": 1.0
|
||||
},
|
||||
"type": "text"
|
||||
},
|
||||
{
|
||||
"buffer": 4,
|
||||
"file": "/C/Users/Peter/Desktop/nuke_users.csv",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 0,
|
||||
"regions":
|
||||
{
|
||||
},
|
||||
"selection":
|
||||
[
|
||||
[
|
||||
0,
|
||||
0
|
||||
]
|
||||
],
|
||||
"settings":
|
||||
{
|
||||
"syntax": "Packages/Text/Plain text.tmLanguage"
|
||||
},
|
||||
"translation.x": 0.0,
|
||||
"translation.y": 0.0,
|
||||
"zoom_level": 1.0
|
||||
},
|
||||
"type": "text"
|
||||
},
|
||||
{
|
||||
"buffer": 5,
|
||||
"file": "/C/Users/Peter/git/aprs.bz/config/database.yml",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 353,
|
||||
"regions":
|
||||
{
|
||||
},
|
||||
"selection":
|
||||
[
|
||||
[
|
||||
99,
|
||||
99
|
||||
]
|
||||
],
|
||||
"settings":
|
||||
{
|
||||
"syntax": "Packages/YAML/YAML.tmLanguage",
|
||||
"tab_size": 2,
|
||||
"translate_tabs_to_spaces": true
|
||||
},
|
||||
"translation.x": 0.0,
|
||||
"translation.y": 0.0,
|
||||
"zoom_level": 1.0
|
||||
},
|
||||
"type": "text"
|
||||
},
|
||||
{
|
||||
"buffer": 6,
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 2241,
|
||||
"regions":
|
||||
{
|
||||
},
|
||||
"selection":
|
||||
[
|
||||
[
|
||||
2241,
|
||||
2241
|
||||
]
|
||||
],
|
||||
"settings":
|
||||
{
|
||||
"syntax": "Packages/Text/Plain text.tmLanguage"
|
||||
},
|
||||
"translation.x": 0.0,
|
||||
"translation.y": 860.0,
|
||||
"zoom_level": 1.0
|
||||
},
|
||||
"type": "text"
|
||||
},
|
||||
{
|
||||
"buffer": 7,
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 2598,
|
||||
"regions":
|
||||
{
|
||||
},
|
||||
"selection":
|
||||
[
|
||||
[
|
||||
2507,
|
||||
2568
|
||||
]
|
||||
],
|
||||
"settings":
|
||||
{
|
||||
"syntax": "Packages/Text/Plain text.tmLanguage"
|
||||
},
|
||||
"translation.x": 0.0,
|
||||
"translation.y": 68.0,
|
||||
"zoom_level": 1.0
|
||||
},
|
||||
"type": "text"
|
||||
},
|
||||
{
|
||||
"buffer": 8,
|
||||
"file": "/C/Users/Peter/git/aprs.bz/app/views/users/show.html.haml",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 67,
|
||||
"regions":
|
||||
{
|
||||
},
|
||||
"selection":
|
||||
[
|
||||
[
|
||||
67,
|
||||
67
|
||||
]
|
||||
],
|
||||
"settings":
|
||||
{
|
||||
"syntax": "Packages/Rails/Ruby Haml.tmLanguage"
|
||||
},
|
||||
"translation.x": 0.0,
|
||||
"translation.y": 0.0,
|
||||
"zoom_level": 1.0
|
||||
},
|
||||
"type": "text"
|
||||
},
|
||||
{
|
||||
"buffer": 9,
|
||||
"file": "/C/Users/Peter/git/aprs.bz/app/views/home/index.html.haml",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 71,
|
||||
"regions":
|
||||
{
|
||||
},
|
||||
"selection":
|
||||
[
|
||||
[
|
||||
71,
|
||||
71
|
||||
]
|
||||
],
|
||||
"settings":
|
||||
{
|
||||
"syntax": "Packages/Rails/Ruby Haml.tmLanguage"
|
||||
},
|
||||
"translation.x": 0.0,
|
||||
"translation.y": 0.0,
|
||||
"zoom_level": 1.0
|
||||
},
|
||||
"type": "text"
|
||||
},
|
||||
{
|
||||
"buffer": 10,
|
||||
"file": "/C/Users/Peter/git/aprs.bz/app/models/user.rb",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 1122,
|
||||
"regions":
|
||||
{
|
||||
},
|
||||
"selection":
|
||||
[
|
||||
[
|
||||
0,
|
||||
0
|
||||
]
|
||||
],
|
||||
"settings":
|
||||
{
|
||||
"syntax": "Packages/Ruby/Ruby.tmLanguage"
|
||||
},
|
||||
"translation.x": 0.0,
|
||||
"translation.y": 0.0,
|
||||
"zoom_level": 1.0
|
||||
},
|
||||
"type": "text"
|
||||
},
|
||||
{
|
||||
"buffer": 11,
|
||||
"file": "/C/Users/Peter/git/aprs.bz/app/models/packet.rb",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 1506,
|
||||
"regions":
|
||||
{
|
||||
},
|
||||
"selection":
|
||||
[
|
||||
[
|
||||
207,
|
||||
207
|
||||
]
|
||||
],
|
||||
"settings":
|
||||
{
|
||||
"syntax": "Packages/Ruby/Ruby.tmLanguage"
|
||||
},
|
||||
"translation.x": 0.0,
|
||||
"translation.y": 0.0,
|
||||
"zoom_level": 1.0
|
||||
},
|
||||
"type": "text"
|
||||
},
|
||||
{
|
||||
"buffer": 12,
|
||||
"file": "/C/VM/Ubuntu/Ubuntu.vmwarevm/Ubuntu.vmx",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 2095,
|
||||
"regions":
|
||||
{
|
||||
},
|
||||
"selection":
|
||||
[
|
||||
[
|
||||
0,
|
||||
0
|
||||
]
|
||||
],
|
||||
"settings":
|
||||
{
|
||||
"syntax": "Packages/Text/Plain text.tmLanguage"
|
||||
},
|
||||
"translation.x": 0.0,
|
||||
"translation.y": 14.0,
|
||||
"zoom_level": 1.0
|
||||
},
|
||||
"type": "text"
|
||||
},
|
||||
{
|
||||
"buffer": 13,
|
||||
"file": "/C/Users/Peter/Documents/Virtual Machines/Ubuntu/Ubuntu.vmx",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 2044,
|
||||
"regions":
|
||||
{
|
||||
},
|
||||
"selection":
|
||||
[
|
||||
[
|
||||
0,
|
||||
2044
|
||||
]
|
||||
],
|
||||
"settings":
|
||||
{
|
||||
"syntax": "Packages/Text/Plain text.tmLanguage"
|
||||
},
|
||||
"translation.x": 0.0,
|
||||
"translation.y": 594.0,
|
||||
"zoom_level": 1.0
|
||||
},
|
||||
"type": "text"
|
||||
},
|
||||
{
|
||||
"buffer": 14,
|
||||
"file": "/C/Users/Peter/git/aprs.bz/db/schema.rb",
|
||||
"settings":
|
||||
{
|
||||
"buffer_size": 2790,
|
||||
"regions":
|
||||
{
|
||||
},
|
||||
"selection":
|
||||
[
|
||||
[
|
||||
1513,
|
||||
1513
|
||||
]
|
||||
],
|
||||
"settings":
|
||||
{
|
||||
"syntax": "Packages/Ruby/Ruby.tmLanguage",
|
||||
"tab_size": 4,
|
||||
"translate_tabs_to_spaces": true
|
||||
},
|
||||
"translation.x": 0.0,
|
||||
"translation.y": 706.0,
|
||||
"translation.y": 352.0,
|
||||
"zoom_level": 1.0
|
||||
},
|
||||
"type": "text"
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue