Version 4.1.19.4

This commit is contained in:
Neo committed 2025-12-19 05:42:01 -08:00
1 parent 2bd5025018
commit 0dc2aee5ed
312 files changed
+53730 -32118

No files matched your search

+7 -1
View File
@@ -464,7 +464,13 @@ abstract class _Comment extends \IPS\Content
public function canEdit( $member=NULL )
{
$member = $member ?: \IPS\Member::loggedIn();
/* Are we restricted from posting or have an unacknowledged warning? */
if ( $member->restrict_post or ( $member->members_bitoptions['unacknowledged_warnings'] and \IPS\Settings::i()->warn_on and \IPS\Settings::i()->warnings_acknowledge ) )
{
return FALSE;
}
if ( $member->member_id )
{
$item = $this->item();
+1 -1
View File
@@ -708,7 +708,7 @@ class _Controller extends \IPS\Helpers\CoverPhoto\Controller
$container = $item->container();
$form = new \IPS\Helpers\Form( 'form', \IPS\Member::loggedIn()->language()->addToStack( 'move_send_to_container', FALSE, array( 'sprintf' => $container->_title ) ) );
$form = new \IPS\Helpers\Form( 'form', \IPS\Member::loggedIn()->language()->addToStack( 'move_send_to_container', FALSE, array( 'sprintf' => $container->_title ) ), NULL, array( 'data-bypassValidation' => true ) );
$form->actionButtons[] = \IPS\Theme::i()->getTemplate( 'forms', 'core', 'global' )->button( \IPS\Member::loggedIn()->language()->addToStack( 'move_send_to_item', FALSE, array( 'sprintf' => $item->definiteArticle() ) ), 'submit', null, 'ipsButton ipsButton_link', array( 'tabindex' => '3', 'accesskey' => 'i', 'value' => 'item', 'name' => 'returnto' ) );
$form->class = 'ipsForm_vertical';
$form->add( new \IPS\Helpers\Form\Node( 'move_to', NULL, TRUE, array(
+4 -4
View File
@@ -1065,7 +1065,7 @@ class _Query extends \IPS\Content\Search\Query
/* Return */
if ( $prepared )
{
if ( count( $words ) > 1 )
if ( count( $words ) > 1 or mb_strstr( $term, '*' ) )
{
return array( "MATCH({$columns}) AGAINST (? IN BOOLEAN MODE)", $term );
}
@@ -1076,7 +1076,7 @@ class _Query extends \IPS\Content\Search\Query
}
else
{
if ( count( $words ) > 1 )
if ( count( $words ) > 1 or mb_strstr( $term, '*' ) )
{
return "MATCH({$columns}) AGAINST ('" . \IPS\Db::i()->escape_string( $term ) . "' IN BOOLEAN MODE)";
}
@@ -1182,7 +1182,7 @@ class _Query extends \IPS\Content\Search\Query
*/
public function getDefaultDateCutOff()
{
if ( static::getTableSize() >= \IPS\USE_MYSQL_SEARCH_BASIC_MODE_THRESHOLD )
if ( \IPS\USE_MYSQL_SEARCH_BASIC_MODE_THRESHOLD and static::getTableSize() >= \IPS\USE_MYSQL_SEARCH_BASIC_MODE_THRESHOLD )
{
return 'year';
}
@@ -1197,7 +1197,7 @@ class _Query extends \IPS\Content\Search\Query
*/
public function getDefaultSortMethod()
{
if ( static::getTableSize() >= \IPS\USE_MYSQL_SEARCH_BASIC_MODE_THRESHOLD )
if ( \IPS\USE_MYSQL_SEARCH_BASIC_MODE_THRESHOLD and static::getTableSize() >= \IPS\USE_MYSQL_SEARCH_BASIC_MODE_THRESHOLD )
{
return 'newest';
}
@@ -1,54 +0,0 @@
<?php
namespace IPS\Content\ShareServices;
class _Odnoklassniki
{
/**
* @brief URL to the content item
*/
protected $url = NULL;
/**
* @brief Title of the content item
*/
protected $title = NULL;
/**
* Constructor
*
* @param \IPS\Http\Url $url URL to the content [optional - if omitted, some services will figure out on their own]
* @param string $title Default text for the content, usually the title [optional - if omitted, some services will figure out on their own]
* @return void
*/
public function __construct( \IPS\Http\Url $url=NULL, $title=NULL )
{
$this->url = $url;
$this->title = $title;
}
/**
* Add any additional form elements to the configuration form. These must be setting keys that the service configuration form can save as a setting.
*
* @param \IPS\Helpers\Form $form Configuration form for this service
* @return void
*/
public static function modifyForm( \IPS\Helpers\Form &$form )
{
}
static function canAutoshare() {}
/**
* Return the HTML code to show the share link
*
* @return string
*/
public function __toString()
{
return '<a href="http://www.odnoklassniki.ru/dk?st.cmd=addShare&amp;st.s=1&amp;st._surl='.$this->url.'" class="cShareLink cShareLink_ok" style="background-color:#F4811F;" target="_blank" data-controller="core.front.core.sharelink" data-role="shareLink" _title="Поделиться в Одноклассниках" data-ipstooltip="">
<i class="fa fa-odnoklassniki"></i>
</a>';
}
}
@@ -1,54 +0,0 @@
<?php
namespace IPS\Content\ShareServices;
class _Vkontakte
{
/**
* @brief URL to the content item
*/
protected $url = NULL;
/**
* @brief Title of the content item
*/
protected $title = NULL;
/**
* Constructor
*
* @param \IPS\Http\Url $url URL to the content [optional - if omitted, some services will figure out on their own]
* @param string $title Default text for the content, usually the title [optional - if omitted, some services will figure out on their own]
* @return void
*/
public function __construct( \IPS\Http\Url $url=NULL, $title=NULL )
{
$this->url = $url;
$this->title = $title;
}
/**
* Add any additional form elements to the configuration form. These must be setting keys that the service configuration form can save as a setting.
*
* @param \IPS\Helpers\Form $form Configuration form for this service
* @return void
*/
public static function modifyForm( \IPS\Helpers\Form &$form )
{
}
static function canAutoshare() {}
/**
* Return the HTML code to show the share link
*
* @return string
*/
public function __toString()
{
return '<a href="https://vk.com/share.php?url='.$this->url.'&title='.$this->title.'" class="cShareLink cShareLink_vk" style="background-color:#56789C;" target="_blank" data-controller="core.front.core.sharelink" data-role="shareLink" _title="Поделиться в Вконтакте" data-ipstooltip="">
<i class="fa fa-vk"></i>
</a>';
}
}