Revize 1852
Přidáno uživatelem Ondřej Fibich před více než 11 roky(ů)
| freenetis/branches/1.1/application/i18n/cs_CZ/texts.php | ||
|---|---|---|
|
'add address point' => 'Přidat adresní bod',
|
||
|
'add all records' => 'Přidávat všechny záznamy',
|
||
|
'add backup' => 'Přidat zálohu',
|
||
|
'add comment' => 'Přidat komentář',
|
||
|
'add comment to financial state of member' => 'Přidat komentář k finančnímu stavu člena',
|
||
|
'add comment to connection request' => 'Přidat komentář k žádosti o připojení',
|
||
|
'add comment to log' => 'Přidat komentář k záznamu o činnosti',
|
||
| ... | ... | |
|
'search' => 'Hledat',
|
||
|
'searching' => 'Vyhledávání',
|
||
|
'searching of term' => 'Vyhledávání výrazu',
|
||
|
'second' => 'sekunda',
|
||
|
'second-degree certified engineers' => 'Certifikovaní technici druhého stupně',
|
||
|
'seconds' => 'sekund',
|
||
|
'secondary dns' => 'Sekundární DNS.',
|
||
| freenetis/branches/1.1/application/vendors/dhcp/freenetis-dhcp-sync.sh | ||
|---|---|---|
|
# Description: This script generates config file of ISC DHCP server #
|
||
|
# from FreenetIS #
|
||
|
# #
|
||
|
# Version: 0.1.0 #
|
||
|
# Version: 0.1.1 #
|
||
|
# #
|
||
|
################################################################################
|
||
|
|
||
|
CONFIG=/etc/freenetis/freenetis-dhcp.conf
|
||
|
CUSTOM_DHCP_CONF=/etc/dhcp/dhcp.conf.custom
|
||
|
FORCED=1
|
||
|
|
||
|
# Load variables
|
||
|
if [ -e $CONFIG ]; then
|
||
| ... | ... | |
|
# endless loop
|
||
|
while true;
|
||
|
do
|
||
|
#path
|
||
|
if [ "$FORCED" = 1 ]; then # forced download (#474)
|
||
|
DOWN_PATH="$FULL_PATH/1"
|
||
|
FORCED=0
|
||
|
else
|
||
|
DOWN_PATH="$FULL_PATH"
|
||
|
fi
|
||
|
# download
|
||
|
TMPFILE=`mktemp`
|
||
|
echo "[INFO] `date -R` Downloading ISC DHCP SERVER config from (${PATH_FN})"
|
||
|
status=`wget --no-check-certificate --server-response -q "$FULL_PATH" -O "$TMPFILE" 2>&1 | awk '/^ HTTP/{print $2}'`
|
||
|
status=`wget --no-check-certificate --server-response -q "$DOWN_PATH" -O "$TMPFILE" 2>&1 | awk '/^ HTTP/{print $2}'`
|
||
|
|
||
|
# make sure that config exist
|
||
|
touch "$DHCP_CONF"
|
||
| ... | ... | |
|
else
|
||
|
echo "[INFO] `date -R` No change -> keeping old configuration"
|
||
|
fi
|
||
|
else if [[ "$status" =~ ^30[0-9] ]]; then
|
||
|
echo "[INFO] `date -R` DHCP configuration not changed"
|
||
|
else if [ "$status" = "404" ]
|
||
|
echo "[ERROR] `date -R` Download failed (code: $status). Wrong path to FreenetIS."
|
||
|
else if [ "$status" = "403" ]
|
||
|
echo "[ERROR] `date -R` Download failed (code: $status). Device $DEVICE_ID not configured properly."
|
||
|
else
|
||
|
echo "[ERROR] `date -R` Download failed (code: $status)"
|
||
|
fi
|
||
| freenetis/branches/1.1/application/vendors/dhcp/freenetis-dhcp.init.sh | ||
|---|---|---|
|
# Email ondrej.fibic@gmail.com #
|
||
|
# #
|
||
|
# Name freenetis-dhcp.init.sh #
|
||
|
# Version 0.1.0 #
|
||
|
# Version 0.1.1 #
|
||
|
# #
|
||
|
################################################################################
|
||
|
|
||
| freenetis/branches/1.1/application/models/subnet.php | ||
|---|---|---|
|
protected $has_and_belongs_to_many = array('clouds');
|
||
|
|
||
|
/**
|
||
|
* Sets all subnets as (not) expired.
|
||
|
*
|
||
|
* @param int $flag expired (1) or not (0) [optional]
|
||
|
*/
|
||
|
public function set_expired_all_subnets($flag = 1)
|
||
|
{
|
||
|
$this->db->query("
|
||
|
UPDATE subnets
|
||
|
SET dhcp_expired = ?
|
||
|
WHERE dhcp = 1
|
||
|
", $flag);
|
||
|
}
|
||
|
|
||
|
/**
|
||
|
* Sets subnets as (not) expired.
|
||
|
*
|
||
|
* @param array|int $subnets Multiple subnet IDs or a single subnet ID
|
||
| freenetis/branches/1.1/application/models/member.php | ||
|---|---|---|
|
* @property ORM_Iterator $bank_accounts
|
||
|
* @property ORM_Iterator $membership_interrupts
|
||
|
* @property ORM_Iterator $connection_requests
|
||
|
* @property ORM_Iterator $members_whitelists
|
||
|
*/
|
||
|
class Member_Model extends ORM
|
||
|
{
|
||
| ... | ... | |
|
(
|
||
|
'allowed_subnets', 'invoices', 'users', 'accounts',
|
||
|
'transfers', 'bank_accounts', 'membership_interrupts',
|
||
|
'connection_requests'
|
||
|
'connection_requests', 'members_whitelists'
|
||
|
);
|
||
|
|
||
|
protected $belongs_to = array('address_point', 'user');
|
||
| freenetis/branches/1.1/application/controllers/settings.php | ||
|---|---|---|
|
|
||
|
$this->form->textarea('dns_servers')
|
||
|
->help('dns_servers')
|
||
|
->rules('valid_address_ranges')
|
||
|
->rules('valid_ip_address')
|
||
|
->value(str_replace(",","\n", Settings::get('dns_servers')))
|
||
|
->class('autosize');
|
||
|
|
||
| ... | ... | |
|
{
|
||
|
$value = min(50, max(1, $value)); // <1..50>
|
||
|
}
|
||
|
else if ($name == 'dns_servers')
|
||
|
{
|
||
|
$old_value = Settings::get('dns_servers');
|
||
|
// expire DHCP? (#472)
|
||
|
if (trim($value) != trim($old_value))
|
||
|
{
|
||
|
ORM::factory('subnet')->set_expired_all_subnets();
|
||
|
}
|
||
|
}
|
||
|
|
||
|
$issaved = $issaved && Settings::set($name, $value);
|
||
|
}
|
||
| freenetis/branches/1.1/version.php | ||
|---|---|---|
|
* The current version of FreenetIS.
|
||
|
* This value must be changed by developers in a new release of FreenetIS.
|
||
|
*/
|
||
|
define('FREENETIS_VERSION', '1.1.0~alpha9');
|
||
|
define('FREENETIS_VERSION', '1.1.0~alpha10');
|
||
Také k dispozici: Unified diff
Vydani freenetis-dhcp 0.1.1 a freenetis 1.1.0~aplha10
Opravy:
- fixes #472: Expirace DHCP serveru pri zmene DNS serveru
- fixes #473: Chybne kody pri stahovani DHCP konfigurace
- fixes #474: Vynuceni stahnuti konfigurace DHCP