Mercurial > hg > rc2
comparison program/include/rcmail.php @ 19:b6a96bdd6b29
More cleaning up php8 Warnings/deprecations
| author | Charlie Root |
|---|---|
| date | Wed, 08 Oct 2025 08:50:44 -0400 |
| parents | dd5ed6ef69c9 |
| children | 73124dd49283 |
comparison
equal
deleted
inserted
replaced
| 18:b631c1c7a3ce | 19:b6a96bdd6b29 |
|---|---|
| 486 if (!$_SESSION['user_id']) { | 486 if (!$_SESSION['user_id']) { |
| 487 $_SESSION['temp'] = true; | 487 $_SESSION['temp'] = true; |
| 488 } | 488 } |
| 489 | 489 |
| 490 // restore skin selection after logout | 490 // restore skin selection after logout |
| 491 if ($_SESSION['temp'] && !empty($_SESSION['skin'])) { | 491 if (!empty($_SESSION['temp']) && !empty($_SESSION['skin'])) { |
| 492 $this->config->set('skin', $_SESSION['skin']); | 492 $this->config->set('skin', $_SESSION['skin']); |
| 493 } | 493 } |
| 494 } | 494 } |
| 495 | 495 |
| 496 /** | 496 /** |
| 821 | 821 |
| 822 $p = array('_action' => @func_get_arg(0)); | 822 $p = array('_action' => @func_get_arg(0)); |
| 823 } | 823 } |
| 824 | 824 |
| 825 $pre = array(); | 825 $pre = array(); |
| 826 $task = ($p['_task']??null) ?: ($p['task'] ?: $this->task); | 826 $task = ($p['_task']??null) ?: (($p['task']??null) ?: $this->task); |
| 827 $pre['_task'] = $task; | 827 $pre['_task'] = $task; |
| 828 unset($p['task'], $p['_task']); | 828 unset($p['task'], $p['_task']); |
| 829 | 829 |
| 830 $url = $this->filename; | 830 $url = $this->filename; |
| 831 $delm = '?'; | 831 $delm = '?'; |
| 1803 | 1803 |
| 1804 $quota_result = (array) $quota; | 1804 $quota_result = (array) $quota; |
| 1805 $quota_result['type'] = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : ''; | 1805 $quota_result['type'] = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : ''; |
| 1806 $quota_result['folder'] = $folder !== null && $folder !== '' ? $folder : 'INBOX'; | 1806 $quota_result['folder'] = $folder !== null && $folder !== '' ? $folder : 'INBOX'; |
| 1807 | 1807 |
| 1808 if ($quota['total'] > 0) { | 1808 if (($quota['total']??0) > 0) { |
| 1809 if (!isset($quota['percent'])) { | 1809 if (!isset($quota['percent'])) { |
| 1810 $quota_result['percent'] = min(100, round(($quota['used']/max(1,$quota['total']))*100)); | 1810 $quota_result['percent'] = min(100, round(($quota['used']/max(1,$quota['total']))*100)); |
| 1811 } | 1811 } |
| 1812 | 1812 |
| 1813 $title = sprintf('%s / %s (%.0f%%)', | 1813 $title = sprintf('%s / %s (%.0f%%)', |
