mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-26 01:11:28 +02:00
Code Issues Releases Wiki Activity

Merge branch 'e107inc:master' into master

Browse Source
This commit is contained in:
rica-carv
2025-02-27 17:21:32 +00:00
committed by GitHub
parent 8c9fe7895f ff26bcd96b
commit b886a03ede
9 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test-unit.yml vendored
View File

@@ -90,7 +90,7 @@ jobs:
run: | run: |
if [ $(php -r 'printf(version_compare(PHP_VERSION, "8.2.99", ">=") ? 1 : 0);') = '1' ] if [ $(php -r 'printf(version_compare(PHP_VERSION, "8.2.99", ">=") ? 1 : 0);') = '1' ]
then then
pecl install https://xdebug.org/files/xdebug-3.3.0alpha2.tgz pecl install https://xdebug.org/files/xdebug-3.4.1.tgz
elif [ $(php -r 'printf(version_compare(PHP_VERSION, "8.0.0", ">=") ? 1 : 0);') = '1' ] elif [ $(php -r 'printf(version_compare(PHP_VERSION, "8.0.0", ">=") ? 1 : 0);') = '1' ]
then then
pecl install xdebug pecl install xdebug

2
e107_admin/cpage.php
View File

@@ -143,7 +143,7 @@ class page_admin_form_ui extends e_admin_form_ui
$query['id'] = $id; $query['id'] = $id;
$query = http_build_query($query, '', '&'); $query = http_build_query($query, '', '&');
$text = "<a href='".e_SELF."?{$query}' class='btn btn-primary' title='".LAN_EDIT."' data-toggle='tooltip' data-bs-toggle='tooltip' data-placement='left'> $text = "<a href='".e_SELF."?{$query}' class='btn btn-success' title='".LAN_EDIT."' data-toggle='tooltip' data-bs-toggle='tooltip' data-placement='left'>
".defset('ADMIN_EDIT_ICON')."</a>"; ".defset('ADMIN_EDIT_ICON')."</a>";
if($this->getController()->getMode() === 'overview' && getperms('J1')) // Page/Menu Delete Perms. if($this->getController()->getMode() === 'overview' && getperms('J1')) // Page/Menu Delete Perms.

6
e107_admin/mailout.php
View File

@@ -1465,8 +1465,10 @@ class mailout_main_ui extends e_admin_ui
$bounceOpts = array('none' => LAN_MAILOUT_232, 'auto' => LAN_MAILOUT_233, 'mail' => LAN_MAILOUT_234); $bounceOpts = array('none' => LAN_MAILOUT_232, 'auto' => LAN_MAILOUT_233, 'mail' => LAN_MAILOUT_234);
unset($temp); unset($temp);
if (!in_array($_POST['mailer'], array('smtp', 'sendmail', 'php'))) $_POST['mailer'] = 'php';
$temp['mailer'] = $_POST['mailer']; //if (!in_array($_POST['mailer'], array('smtp', 'sendmail', 'php'))) $_POST['mailer'] = 'php';
//$temp['mailer'] = $_POST['mailer'];
// Allow qmail as an option as well - works much as sendmail // Allow qmail as an option as well - works much as sendmail
if ((strpos($_POST['sendmail'],'sendmail') !== FALSE) || (strpos($_POST['sendmail'],'qmail') !== FALSE)) if ((strpos($_POST['sendmail'],'sendmail') !== FALSE) || (strpos($_POST['sendmail'],'qmail') !== FALSE))
{ {

4
e107_admin/search.php
View File

@@ -404,7 +404,7 @@ else
</select> </select>
</td> </td>
<td class='center'> <td class='center'>
<a class='btn btn-default btn-secondary btn-large' href='".e_SELF."?edit.c.".$key."'>".ADMIN_EDIT_ICON."</a> <a class='btn btn-success btn-large' href='".e_SELF."?edit.c.".$key."'>".ADMIN_EDIT_ICON."</a>
</td> </td>
</tr> </tr>
"; ";
@@ -458,7 +458,7 @@ else
</select> </select>
</td> </td>
<td class='center'> <td class='center'>
<a class='btn btn-default btn-secondary btn-large' href='".e_SELF."?edit.p.".$plug_dir."'>".ADMIN_EDIT_ICON."</a> <a class='btn btn-success btn-large' href='".e_SELF."?edit.p.".$plug_dir."'>".ADMIN_EDIT_ICON."</a>
</td> </td>
</tr> </tr>
"; ";

2
e107_admin/users_extended.php
View File

@@ -16,6 +16,8 @@ if (!getperms('4'))
exit; exit;
} }
e107::css('inline', '#admin-users-extended-main-list td.options .btn-group { justify-content: left } ');
e107::coreLan('users_extended', true); e107::coreLan('users_extended', true);
if(varset($_GET['mode']) == "ajax") if(varset($_GET['mode']) == "ajax")

6
e107_handlers/form_handler.php
View File

@@ -3817,12 +3817,12 @@ var_dump($select_options);*/
{ {
case 'edit': case 'edit':
$icon = deftrue('e_ADMIN_AREA') ? defset('ADMIN_EDIT_ICON') : $tp->toIcon('e-edit-32'); $icon = deftrue('e_ADMIN_AREA') ? defset('ADMIN_EDIT_ICON') : $tp->toIcon('e-edit-32');
$options['class'] = $options['class'] === 'action' ? 'btn btn-default btn-secondary action edit' : $options['class']; $options['class'] = $options['class'] === 'action' ? 'btn btn-success action edit' : $options['class'];
break; break;
case 'delete': case 'delete':
$icon = deftrue('e_ADMIN_AREA') ? defset('ADMIN_DELETE_ICON') : $tp->toIcon('fa-trash.glyph'); $icon = deftrue('e_ADMIN_AREA') ? defset('ADMIN_DELETE_ICON') : $tp->toIcon('fa-trash.glyph');
$options['class'] = $options['class'] === 'action' ? 'btn btn-default btn-secondary action delete' : $options['class']; $options['class'] = $options['class'] === 'action' ? 'btn btn-danger action delete' : $options['class'];
$options['data-confirm'] = LAN_JSCONFIRM; $options['data-confirm'] = LAN_JSCONFIRM;
break; break;
@@ -5301,7 +5301,7 @@ var_dump($select_options);*/
$att = [ $att = [
'href' => e_SELF . "?$query", 'href' => e_SELF . "?$query",
'class' => "btn btn-default btn-primary$eModal", 'class' => "btn btn-default btn-success$eModal",
'data-modal-caption' => $eModalCap, 'data-modal-caption' => $eModalCap,
'title' => LAN_EDIT, 'title' => LAN_EDIT,
// 'data-toggle' => 'tooltip', // 'data-toggle' => 'tooltip',

1
e107_plugins/faqs/templates/faqs_template.php
View File

@@ -34,7 +34,6 @@ $FAQS_TEMPLATE['all']['end'] = "
$FAQS_TEMPLATE['caption'] = "{FAQ_CAPTION} <small>{FAQ_COUNT}</small>"; $FAQS_TEMPLATE['caption'] = "{FAQ_CAPTION} <small>{FAQ_COUNT}</small>";
/** @experimental */
$FAQS_TEMPLATE['schema'] = ' $FAQS_TEMPLATE['schema'] = '
{ {
"@context": "https://schema.org", "@context": "https://schema.org",

4
e107_plugins/forum/forum.php
View File

@@ -434,6 +434,10 @@ class forum_front
$data['LASTPOSTUSER'] = !empty($row['user_name']) ? "<a href='" . e107::url('user/profile/view', array('name' => $row['user_name'], 'id' => $row['thread_lastuser'])) . "'>" . $row['user_name'] . "</a>" : LAN_ANONYMOUS; $data['LASTPOSTUSER'] = !empty($row['user_name']) ? "<a href='" . e107::url('user/profile/view', array('name' => $row['user_name'], 'id' => $row['thread_lastuser'])) . "'>" . $row['user_name'] . "</a>" : LAN_ANONYMOUS;
$data['LASTPOSTDATE'] = $tp->toDate($row['thread_lastpost'], 'relative'); $data['LASTPOSTDATE'] = $tp->toDate($row['thread_lastpost'], 'relative');
$data['LASTPOSTUSERAVATAR'] = $tp->toAvatar(e107::user($row['thread_lastuser']));
$data['VIEWS'] = $tp->toNumber($row['thread_views']);
$data['REPLIES'] = $tp->toNumber($row['thread_total_replies']);
$buttonId = "forum-track-button-" . intval($row['thread_id']); $buttonId = "forum-track-button-" . intval($row['thread_id']);
$forumUrl = e107::url('forum', 'forum', $row); $forumUrl = e107::url('forum', 'forum', $row);

9
e107_tests/tests/unit/e_parseTest.php
View File

@@ -625,8 +625,8 @@ EXPECTED;
"url": "https://localhost/e107/e107_images/button.png" "url": "https://localhost/e107/e107_images/button.png"
} }
}, },
"datePublished": "2025-01-01T12:00:00+00:00", "datePublished": "2025-01-01T",
"dateModified": "2025-01-01T09:00:00+00:00", "dateModified": "2025-01-01T",
"articleBody": "Body of the news item" "articleBody": "Body of the news item"
}'; }';
@@ -635,8 +635,8 @@ EXPECTED;
self::assertSame($expectedDecoded['headline'],$resultDecoded['headline']); self::assertSame($expectedDecoded['headline'],$resultDecoded['headline']);
self::assertSame($expectedDecoded['description'],$resultDecoded['description']); self::assertSame($expectedDecoded['description'],$resultDecoded['description']);
self::assertSame($expectedDecoded['datePublished'],$resultDecoded['datePublished']); self::assertStringContainsString($expectedDecoded['datePublished'],$resultDecoded['datePublished']);
self::assertSame($expectedDecoded['dateModified'],$resultDecoded['dateModified']); self::assertStringContainsString($expectedDecoded['dateModified'],$resultDecoded['dateModified']);
self::assertSame($expectedDecoded['articleBody'],$resultDecoded['articleBody']); self::assertSame($expectedDecoded['articleBody'],$resultDecoded['articleBody']);
self::assertSame($expectedDecoded['author']['name'],$resultDecoded['author']['name']); self::assertSame($expectedDecoded['author']['name'],$resultDecoded['author']['name']);
self::assertSame($expectedDecoded['publisher']['name'],$resultDecoded['publisher']['name']); self::assertSame($expectedDecoded['publisher']['name'],$resultDecoded['publisher']['name']);
@@ -2027,6 +2027,7 @@ EXPECTED;
self::assertStringContainsString('https://static2.mydomain.com', $map['e107-themes/bootstrap3/images/myimage2.jpg'] ); self::assertStringContainsString('https://static2.mydomain.com', $map['e107-themes/bootstrap3/images/myimage2.jpg'] );
$this->tp->setStaticUrl(null); $this->tp->setStaticUrl(null);
e107::getParser()->setStaticUrl(null);
} }
/* /*