Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1923

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

Opravy:
- fixes #564: prazdny vyber zprav pro akci v soukrome poste

Zobrazit rozdíly:

freenetis/branches/1.1/application/i18n/cs_CZ/texts.php
'map' => 'Mapa',
'march' => 'Březen',
'mark all' => 'Označit vše',
'mark selected messages as read' => 'Označit všechny vybrané zprávy jako přečtené',
'mark selected messages as unread' => 'Označit všechny vybrané zprávy jako nepřečtené',
'mark this invoice as filled in' => 'Označ tuto fakturu jako vyplněnou',
'maximal count' => 'Maximální počet',
'maximal latency' => 'Maximální odezva',
......
'percent for majority' => 'Procent pro většinu',
'percent for majority must be number' => 'Procent pro většinu musí být číslo.',
'percent for majority must be in interval 51 - 100' => 'Procent pro většinu musí být v intervalu 51 - 100.',
'perform' => 'Provést',
'period' => 'Období',
'permanent' => 'Trvalé',
'permanent whitelist' => 'Trvalá',
freenetis/branches/1.1/application/controllers/mail.php
))
);
$grid->form_submit_value = __('Submit');
$grid->form_submit_value = __('Perform');
$grid->datasource($messages);
// form is post
......
$user_id = $this->session->get('user_id');
$mail_message_model = new Mail_message_Model();
// for each checked messages
foreach ($_POST['delete'] as $message_id => $true)
if (isset($_POST['delete']) && is_array($_POST['delete']))
{
$message = $mail_message_model->where('id', $message_id)->find();
foreach ($_POST['delete'] as $message_id => $true)
{
$message = $mail_message_model->where('id', $message_id)->find();
// message doesn't exist
if (!$message->id)
continue;
// message doesn't exist
if (!$message->id)
continue;
// deletes message
if ($operation == 'delete')
{
// check if message is really from user inbox
if ($message->to_id == $user_id)
// deletes message
if ($operation == 'delete')
{
if ($message->from_deleted || $message->from_id == $user_id)
$message->delete();
else
// check if message is really from user inbox
if ($message->to_id == $user_id)
{
$message->to_deleted = 1;
$message->readed = 1;
$message->save();
if ($message->from_deleted || $message->from_id == $user_id)
$message->delete();
else
{
$message->to_deleted = 1;
$message->readed = 1;
$message->save();
}
}
}
// marks as read
else if ($operation == 'read')
{
$message->readed = 1;
$message->save();
}
// marks as unread
else if ($operation == 'unread')
{
$message->readed = 0;
$message->save();
}
}
// marks as read
else if ($operation == 'read')
{
$message->readed = 1;
$message->save();
}
// marks as unread
else if ($operation == 'unread')
{
$message->readed = 0;
$message->save();
}
}
url::redirect(url::base(TRUE).url::current(TRUE));
}
......
$user_id = $this->session->get('user_id');
$mail_message_model = new Mail_message_Model();
// for each checked messages
foreach ($_POST['delete'] as $message_id => $true)
if (isset($_POST['delete']) && is_array($_POST['delete']))
{
$message = $mail_message_model->where('id', $message_id)->find();
foreach ($_POST['delete'] as $message_id => $true)
{
$message = $mail_message_model->where('id', $message_id)->find();
// message doesn't exist
if (!$message->id)
continue;
// message doesn't exist
if (!$message->id)
continue;
// deletes message
if ($operation == 'delete')
{
// check if message is really from user inbox
if ($message->from_id == $user_id)
// deletes message
if ($operation == 'delete')
{
if ($message->to_deleted || $message->to_id == $user_id)
$message->delete();
else
// check if message is really from user inbox
if ($message->from_id == $user_id)
{
$message->from_deleted = 1;
$message->save();
if ($message->to_deleted || $message->to_id == $user_id)
$message->delete();
else
{
$message->from_deleted = 1;
$message->save();
}
}
}
}

Také k dispozici: Unified diff