Version 5.0.0 release
This commit is contained in:
1 parent
90e8c7e903
commit
a3a4a9ccbd
651 files changed
+7275
-9481
No files matched your search
@@ -25,7 +25,6 @@ use IPS\Helpers\Form\Node;
|
||||
use IPS\Helpers\Form\Number;
|
||||
use IPS\Helpers\Form\Select;
|
||||
use IPS\Helpers\Form\Text;
|
||||
use IPS\Helpers\Form\Translatable;
|
||||
use IPS\Helpers\Form\YesNo;
|
||||
use IPS\Http\Url;
|
||||
use IPS\IPS;
|
||||
@@ -90,16 +89,6 @@ class Setting extends Model
|
||||
*/
|
||||
public static ?string $databaseColumnOrder = 'position';
|
||||
|
||||
/**
|
||||
* @brief [Node] Title prefix. If specified, will look for a language key with "{$titleLangPrefix}_{$id}" as the key
|
||||
*/
|
||||
public static ?string $titleLangPrefix = 'themeeditor_var_';
|
||||
|
||||
/**
|
||||
* @brief [Node] Description suffix. If specified, will look for a language key with "{$titleLangPrefix}_{$id}_{$descriptionLangSuffix}" as the key
|
||||
*/
|
||||
public static ?string $descriptionLangSuffix = '_desc';
|
||||
|
||||
/**
|
||||
* @brief [Node] Parent Node ID Database Column
|
||||
*/
|
||||
@@ -134,7 +123,7 @@ class Setting extends Model
|
||||
*/
|
||||
protected function get__title(): string
|
||||
{
|
||||
return Member::loggedIn()->language()->addToStack( static::$titleLangPrefix . $this->key, NULL, array( 'escape' => TRUE ) );
|
||||
return $this->name ?? '';
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -147,7 +136,7 @@ class Setting extends Model
|
||||
*/
|
||||
public function getTitleForLanguage( Lang $language, array $options=array() ): string
|
||||
{
|
||||
return $language->addToStack( static::$titleLangPrefix . $this->key, NULL, $options );
|
||||
return $this->_title;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -157,7 +146,7 @@ class Setting extends Model
|
||||
*/
|
||||
protected function get__titleLanguageKey(): ?string
|
||||
{
|
||||
return static::$titleLangPrefix . $this->key;
|
||||
return $this->_title;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -167,7 +156,7 @@ class Setting extends Model
|
||||
*/
|
||||
protected function get_description(): ?string
|
||||
{
|
||||
return Member::loggedIn()->language()->addToStack( static::$titleLangPrefix . $this->key . static::$descriptionLangSuffix );
|
||||
return $this->desc;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -237,27 +226,6 @@ class Setting extends Model
|
||||
return $return;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function get_name() : string
|
||||
{
|
||||
return Member::loggedIn()->language()->addToStack( 'themeeditor_var_' . $this->key );
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function get_desc() : string
|
||||
{
|
||||
if( Member::loggedIn()->language()->checkKeyExists( 'themeeditor_var_' . $this->key . '_desc' ) )
|
||||
{
|
||||
return Member::loggedIn()->language()->addToStack( 'themeeditor_var_' . $this->key . '_desc' );
|
||||
}
|
||||
|
||||
return '';
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
@@ -427,10 +395,6 @@ class Setting extends Model
|
||||
|
||||
switch( $this->type )
|
||||
{
|
||||
case static::SETTING_IMAGE:
|
||||
$value = 'url("' . $value . '")';
|
||||
break;
|
||||
|
||||
case static::SETTING_TEXT:
|
||||
$value = strip_tags( $value );
|
||||
$value = str_replace( array( '/*', ';' ), '', $value );
|
||||
@@ -495,16 +459,8 @@ class Setting extends Model
|
||||
*/
|
||||
public function form( Form &$form ) : void
|
||||
{
|
||||
$form->add( new Translatable( 'themeeditor_setting_name', null, true, array(
|
||||
'app' => 'core',
|
||||
'key' => ( $this->id ? 'themeeditor_var_' . $this->key : null )
|
||||
) ) );
|
||||
|
||||
$form->add( new Translatable( 'themeeditor_setting_desc', null, false, array(
|
||||
'app' => 'core',
|
||||
'key' => ( $this->id ? 'themeeditor_var_' . $this->key . '_desc' : null )
|
||||
) ) );
|
||||
|
||||
$form->add( new Text( 'themeeditor_setting_name', $this->name, true ) );
|
||||
$form->add( new Text( 'themeeditor_setting_desc', $this->desc, false ) );
|
||||
$form->add( new Text( 'themeeditor_setting_key', $this->key, true, array(
|
||||
'regex' => '/[A-Z]+/i',
|
||||
'maxLength' => 150
|
||||
@@ -606,6 +562,8 @@ class Setting extends Model
|
||||
}
|
||||
|
||||
$return = [
|
||||
'setting_name' => $values['themeeditor_setting_name'],
|
||||
'setting_desc' => $values['themeeditor_setting_desc'],
|
||||
'setting_key' => $values['themeeditor_setting_key'],
|
||||
'setting_category_id' => ( $values['themeeditor_setting_category'] instanceof Category ) ? $values['themeeditor_setting_category']->id : 0,
|
||||
'setting_type' => $values['themeeditor_setting_type'],
|
||||
@@ -651,22 +609,6 @@ class Setting extends Model
|
||||
$return['setting_app'] = $values['themeeditor_setting_app']->directory;
|
||||
}
|
||||
|
||||
Lang::saveCustom( 'core', static::$titleLangPrefix . $values['themeeditor_setting_key'], $values['themeeditor_setting_name'] );
|
||||
Lang::saveCustom( 'core', static::$titleLangPrefix . $values['themeeditor_setting_key'] . '_desc', $values['themeeditor_setting_desc'] );
|
||||
|
||||
return $return;
|
||||
}
|
||||
|
||||
/**
|
||||
* [ActiveRecord] Delete Record
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function delete(): void
|
||||
{
|
||||
parent::delete();
|
||||
|
||||
Lang::deleteCustom( 'core', static::$titleLangPrefix . $this->key );
|
||||
Lang::deleteCustom( 'core', static::$titleLangPrefix . $this->key . '_desc' );
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user