Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1936

Přidáno uživatelem Ondřej Fibich před více než 11 roky(ů)

Opravy:
- chyba pri aktivaci specialnich zprav upozorneni (drobne prehlednuti ve vypnuti SMS modulu)
- closes #387: Komentar v pripojne zprave (pridan odkaz do systemu)
- drobne opravy v prekladech

Zobrazit rozdíly:

freenetis/branches/1.1/application/i18n/cs_CZ/texts.php
'cannot load services - data missing' => 'Nemohu načíst služby - data chybí',
'cannot open uploaded bank listing file!' => 'Nelze otevřít nahraný soubor s bankovním výpisem!',
'cannot parse fio listing header!' => 'Nelze parsovat hlavičku Fio výpisu!',
'cannot reject connection request' => 'Nelze zamítnou požadavek k připojení.',
'cannot reject connection request' => 'Nelze zamítnout požadavek k připojení.',
'cannot remove default vlan' => 'Nelze odstranit výchozí VLAN',
'cannot save form' => 'Nemohu uložit formulář',
'cannot save gps, this address point has already gps coordinates' => 'Nemohu uložit GPS, adresní bod má již přiřazeny GPS souřadnice',
freenetis/branches/1.1/application/helpers/html.php
* @param string link text
* @param array HTML anchor attributes
* @param string non-default protocol, eg: https
* @param $id_as_title if title is empty and link ends with ID, use ID or full uri as title?
* @return string
*/
public static function anchor($uri, $title = FALSE, $attributes = FALSE, $protocol = FALSE)
public static function anchor($uri, $title = FALSE, $attributes = FALSE,
$protocol = FALSE, $id_as_title = TRUE)
{
if ($uri === '')
{
......
// Title empty? Use the parsed URL or ID
if (empty($title))
{
if (mb_eregi('/([0-9]+)$', $site_url, $r))
if ($id_as_title && mb_eregi('/([0-9]+)$', $site_url, $r))
{
$title = "<span style=\"color: red\">[$r[1]]</span>";
}
freenetis/branches/1.1/application/models/message.php
}
// send SMS messages
if ($sms == Notifications_Controller::ACTIVATE)
if (Settings::get('sms_enabled') &&
$sms == Notifications_Controller::ACTIVATE)
{
// find phone numbers of debtors
$smss = $uc_model->get_all_contacts_by_type(
......
}
// send SMS messages
if ($sms == Notifications_Controller::ACTIVATE)
if (Settings::get('sms_enabled') &&
$sms == Notifications_Controller::ACTIVATE)
{
// find phone numbers of debtors
$smss = $uc_model->get_contacts_by_member_and_type(
freenetis/branches/1.1/application/controllers/messages.php
$redirections = Settings::get('redirection_enabled') ? $_POST["redirection"] : array();
$emails = (isset($_POST["email"])) ? $_POST["email"] : array();
$smss = (isset($_POST["sms"])) ? $_POST["sms"] : array();
$smss = (isset($_POST["sms"]) && Settings::get('sms_enabled')) ? $_POST["sms"] : array();
$user_id = $this->session->get('user_id');
......
$member_id, Contact_Model::TYPE_PHONE, TRUE
);
// send email
// send SMS
$sent_sms += Message_Model::send_sms_messages(
$message, $contacts,
$user_id, $comment
freenetis/branches/1.1/application/controllers/connection_requests.php
// only if user sended request by him self
if ($cr_model->member_id == $cr_model->added_user->member_id)
{
$link = html::anchor(
'/connection_requests/show/' . $cr_model->id,
FALSE, FALSE, FALSE, FALSE
);
// create comment for user
$comment = '<table>'
. '<tr><th>' . __('Rejected by') . ':</th>'
. '<td>' . $cr_model->decided_user->get_full_name() . '</td></tr>'
. '<tr><th>' . __('Date') . ':</th>'
. '<td>' . $cr_model->decided_at . '</td></tr>'
. '<tr><th>' . __('Details') . ':</th>'
. '<td>' . $link . '</td></tr>'
. '</table>';
// trigger notice for member (if request was not added by some other)
freenetis/branches/1.1/application/controllers/devices.php
// only if request made by owner of device and ovner not
// decided the request by him self
if (isset($cr_model) &&
$cr_model->member_id == $cr_model->added_user->member_id &&
$cr_model->member_id != $this->member_id)
$cr_model->member_id == $cr_model->added_user->member_id)
{
// create comment for user
$link = html::anchor('devices/show/' . $cr_model->device_id,

Také k dispozici: Unified diff