Skip to content

Commit

Permalink
Merge pull request #294 from gigamaster/master
Browse files Browse the repository at this point in the history
Render Help modifier path to module + Builtin Help Documentation
Pico History Revision
  • Loading branch information
gigamaster committed May 27, 2023
2 parents 3e8660c + efbe9a4 commit 343506c
Show file tree
Hide file tree
Showing 125 changed files with 4,005 additions and 3,177 deletions.
13 changes: 9 additions & 4 deletions html/common/css/x-icons.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions html/include/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ function redirect_header($url, $time = 3, $message = '', $addredirect = true)
if (!defined('XOOPS_CPFUNC_LOADED')) {
require_once XOOPS_ROOT_PATH.'/class/template.php';
$xoopsTpl = new XoopsTpl();
//@gigamaster changed this to save memory
//TODO PHP8 'strpos' call can be converted to 'str_contains'
if ($addredirect && strpos($url, 'user.php') !== false) {
if (strpos($url, '?') === false) {
$url .= '?xoops_redirect='.urlencode($xoopsRequestUri);
Expand All @@ -431,7 +431,7 @@ function redirect_header($url, $time = 3, $message = '', $addredirect = true)
}
}
if (defined('SID') && (! isset($_COOKIE[session_name()]) || ($xoopsConfig['use_mysession'] && '' !== $xoopsConfig['session_name'] && !isset($_COOKIE[$xoopsConfig['session_name']])))) {
// Goodbye strpos and strstr: str_contains in PHP8
// TODO Goodbye strpos and strstr: str_contains in PHP8
if (strpos($url, (string) XOOPS_URL) === 0) {
//@gigamaster changed this to save memory
if (strpos($url, '?') === false) {
Expand Down Expand Up @@ -483,7 +483,7 @@ function redirect_header($url, $time = 3, $message = '', $addredirect = true)
} else {
$message = urlencode("Unable to load redirect template! The form Redirect to the previous page.");
// $_SERVER['HTTP_REFERER'], Returns the complete URL of the current page
header("Location:".$_SERVER[HTTP_REFERER]."?message=".$message);
header("Location:".$_SERVER['HTTP_REFERER']."?message=".$message);
}
exit;

Expand Down
2 changes: 1 addition & 1 deletion html/language/english/comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
define('_CM_DOSMILEY', 'Enable Smiley Icons');
define('_CM_DOHTML', 'Enable HTML Tags');
define('_CM_DOAUTOWRAP', 'Auto wrap lines');
define('_CM_DOXCODE', 'Enable XOOPS Codes');
define('_CM_DOXCODE', 'Enable XCode BBCode');
define('_CM_REFRESH', 'Refresh');
define('_CM_PENDING', 'Pending');
define('_CM_HIDDEN', 'Hidden');
Expand Down
2 changes: 1 addition & 1 deletion html/language/fr_utf8/comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
define('_CM_DOSMILEY', 'Permettre les émoticônes');
define('_CM_DOHTML', 'Permettre les balises HTML');
define('_CM_DOAUTOWRAP', 'Retour à la ligne automatique');
define('_CM_DOXCODE', 'Permettre les codes XOOPS');
define('_CM_DOXCODE', 'Permettre XCode BBCode');
define('_CM_REFRESH', 'Actualiser');
define('_CM_PENDING', 'En suspens');
define('_CM_HIDDEN', 'Cacher');
Expand Down
2 changes: 1 addition & 1 deletion html/language/ja_utf8/comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
define('_CM_DOSMILEY', '顔アイコンを有効にする');
define('_CM_DOHTML', 'HTMLタグを有効にする');
define('_CM_DOAUTOWRAP', '改行を自動挿入する');
define('_CM_DOXCODE', 'XOOPSコードを有効にする');
define('_CM_DOXCODE', 'XCode BBCodeコードを有効にする');
define('_CM_REFRESH', '更新');
define('_CM_PENDING', '承認待ち');
define('_CM_HIDDEN', '非表示');
Expand Down
2 changes: 1 addition & 1 deletion html/language/pt_utf8/comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
define("_CM_DOSMILEY", "Habilitar emos");
define("_CM_DOHTML", "Habilitar códigos em HTML");
define("_CM_DOAUTOWRAP", "Quebra automática de linhas");
define("_CM_DOXCODE", "Habilitar os códigos do XOOPS");
define("_CM_DOXCODE", "Habilitar código XCode BBCode");
define("_CM_REFRESH", "Atualizar");
define("_CM_PENDING", "Pendente");
define("_CM_HIDDEN", "Oculto");
Expand Down
2 changes: 1 addition & 1 deletion html/language/ru_utf8/comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
define('_CM_DOSMILEY', 'Включить смайлики');
define('_CM_DOHTML', 'Включить HTML');
define('_CM_DOAUTOWRAP', 'Автоматический перенос строк');
define('_CM_DOXCODE', 'Включить XOOPS коды');
define('_CM_DOXCODE', 'Включить XCode BBCode коды');
define('_CM_REFRESH', 'Обновить');
define('_CM_PENDING', 'Ожидает');
define('_CM_HIDDEN', 'Скрыт');
Expand Down

0 comments on commit 343506c

Please sign in to comment.