mirror of
https://github.com/FOSSBilling/FOSSBilling.git
synced 2026-11-21 20:34:57 +09:00
Merge pull request #23 from boxbilling/master
Merge boxbilling/boxbilling into timothygwebb/boxbilling
This commit is contained in:
9 files changed
+5077
-4423
No files matched your search
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
require('tfpdf.php');
|
||||
|
||||
class PDF_ImageAlpha extends FPDF
|
||||
class PDF_ImageAlpha extends TFPDF
|
||||
{
|
||||
//Private properties
|
||||
var $tmpFiles = array();
|
||||
|
||||
@@ -68,7 +68,7 @@ class Payment_Adapter_Custom
|
||||
$vars = array(
|
||||
'_client_id' => $invoice['client']['id'],
|
||||
'invoice' => $invoice,
|
||||
'_tpl' => ($subscription) ? $this->config['recurrent'] : $this->config['single'],
|
||||
'_tpl' => $subscription ? (isset($this->config['recurrent']) ? $this->config['recurrent'] : null) : (isset($this->config['single']) ? $this->config['single'] : null),
|
||||
);
|
||||
$systemService = $this->di['mod_service']('System');
|
||||
return $systemService->renderString($vars['_tpl'], true, $vars);
|
||||
|
||||
+2
-2
@@ -229,9 +229,9 @@ if(!file_exists($configPath) || 0 == filesize($configPath)) {
|
||||
// Try to create an empty configuration file
|
||||
@file_put_contents($configPath, '');
|
||||
|
||||
$base_url = "http://".$_SERVER['HTTP_HOST'];
|
||||
$base_url = "http".(isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] == 1) || isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' ? 's' : '')."://".$_SERVER['HTTP_HOST'];
|
||||
$base_url .= preg_replace('@/+$@','',dirname($_SERVER['SCRIPT_NAME']));
|
||||
$url = $base_url . 'install/index.php';
|
||||
$url = $base_url . '/install/index.php';
|
||||
$configFile = pathinfo($configPath, PATHINFO_BASENAME);
|
||||
$msg = sprintf("The <em>$configFile</em> path seems to be invalid. You may have not generated the configuration file yet, or the configuration file may not contain the required configuration parameters. BoxBilling needs to have a valid configuration file present in order to function properly.</p><p>Need some help with the installation? <a target='_blank' href='http://docs.boxbilling.com/en/latest/reference/installation.html'>We got it</a>. You can create the configuration file using the interactive installer, or manually create the configuration file.</p><p>If it's your first time setting up BoxBilling, you can <a href='%s' class='button'>continue with the web-based interactive BoxBilling installation</a>.", $url);
|
||||
throw new Exception($msg, 101);
|
||||
|
||||
Binary file not shown.
+5072
-4350
File diff suppressed because it is too large.
Load diff
@@ -3259,16 +3259,6 @@ msgstr ""
|
||||
msgid "Module settings"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"After purchase you have received an e-mail with license key. Update license "
|
||||
"key to unlock all features of BoxBilling"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"To change license key, change <em>BB_LICENSE</em> value in <em>bb-config."
|
||||
"php</em> file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Edit bb-config.php file"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@@ -18,16 +18,6 @@ namespace Box\Mod\System\Api;
|
||||
|
||||
class Admin extends \Api_Abstract
|
||||
{
|
||||
/**
|
||||
* Returns licensing information
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function license_info($data)
|
||||
{
|
||||
return $this->getService()->getLicenseInfo($data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return system setting param
|
||||
* @deprecated
|
||||
|
||||
@@ -182,16 +182,7 @@ class Service
|
||||
|
||||
return $details;
|
||||
}
|
||||
|
||||
public function getLicenseInfo($data)
|
||||
{
|
||||
$result = array(
|
||||
'licensed_to' => 'BoxBilling CE',
|
||||
'key' => 'BoxBilling CE',
|
||||
);
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
public function getParams($data)
|
||||
{
|
||||
$query = "SELECT param, value
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
|
||||
<ul class="tabs">
|
||||
<li><a href="#tab-index">{% trans 'Settings' %}</a></li>
|
||||
<li><a href="#tab-license">{% trans 'License' %}</a></li>
|
||||
</ul>
|
||||
|
||||
<div class="tabs_container">
|
||||
@@ -28,44 +27,6 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div id="tab-license" class="tab_content nopadding">
|
||||
|
||||
<div class="help">
|
||||
<h3>{% trans 'License' %}</h3>
|
||||
<p>{% trans 'After purchase you have received an e-mail with license key. Update license key to unlock all features of BoxBilling' %}</p>
|
||||
<p>{% trans 'To change license key, change <em>BB_LICENSE</em> value in <em>bb-config.php</em> file' %}. </p>
|
||||
<p><a href="{{ 'filemanager/ide'|alink({'open' : 'bb-config.php'}) }}" target="_blank" target="_blank">{% trans 'Edit bb-config.php file' %}</a> (File must be writable by web server)</p>
|
||||
</div>
|
||||
|
||||
{% set env = admin.system_env %}
|
||||
{% set license = admin.system_license_info %}
|
||||
<table class="tableStatic wide">
|
||||
<tbody>
|
||||
<tr class="noborder">
|
||||
<td>{% trans 'Licensed to' %}</td>
|
||||
<td align="right">{{ license.licensed_to }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{% trans 'Key' %}</td>
|
||||
<td align="right">{{ license.key }}</td>
|
||||
</tr>
|
||||
|
||||
{% if license.expires_at %}
|
||||
<tr>
|
||||
<td>{% trans 'Expires at' %}</td>
|
||||
<td align="right">{{ license.expires_at }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
<tr>
|
||||
<td>{% trans 'IP' %}</td>
|
||||
<td align="right">{{ env.ip }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
Reference in new issue
Block a user