';
echo '| ';
- echo __('Add a target', 'news') . ': ';
+ echo __s('Add a target', 'news') . ': ';
$addrand = Dropdown::showItemTypes('itemtype', $types, ['width' => '']);
echo ' | ';
$params = ['type' => '__VALUE__',
@@ -138,7 +141,7 @@ public static function showForAlert(PluginNewsAlert $alert)
Ajax::updateItemOnSelectEvent(
'dropdown_itemtype' . $addrand,
"visibility$rand",
- Plugin::getWebDir('news') . '/ajax/targets.php',
+ $CFG_GLPI['root_doc'] . '/plugins/news/ajax/targets.php',
$params,
);
echo '';
@@ -152,10 +155,10 @@ public static function showForAlert(PluginNewsAlert $alert)
$target = new self();
$found_target = $target->find(['plugin_news_alerts_id' => $alert->getID()]);
if ($nb = count($found_target) > 0) {
- Html::openMassiveActionsForm('mass' . __CLASS__ . $rand);
+ Html::openMassiveActionsForm('mass' . self::class . $rand);
$massiveactionparams
= ['num_displayed' => $nb,
- 'container' => 'mass' . __CLASS__ . $rand,
+ 'container' => 'mass' . self::class . $rand,
'specific_actions' => ['delete' => _x('button', 'Delete permanently', 'news')],
];
Html::showMassiveActions($massiveactionparams);
@@ -163,23 +166,23 @@ public static function showForAlert(PluginNewsAlert $alert)
echo "";
echo '';
- echo "| " . Html::getCheckAllAsCheckbox('mass' . __CLASS__ . $rand) . ' | ';
- echo '' . __('Type', 'news') . ' | ';
- echo '' . __('Recipient', 'news') . ' | ';
+ echo "" . Html::getCheckAllAsCheckbox('mass' . self::class . $rand) . ' | ';
+ echo '' . __s('Type', 'news') . ' | ';
+ echo '' . __s('Recipient', 'news') . ' | ';
echo ' ';
foreach ($found_target as $current_target) {
- if (class_exists($current_target['itemtype'])) {
+ if (is_a($current_target['itemtype'], CommonDBTM::class, true)) {
$item = new $current_target['itemtype']();
$item->getFromDB($current_target['items_id']);
$name = ($current_target['all_items'] == 1
&& $current_target['itemtype'] == 'Profile')
- ? __('All', 'news')
+ ? __s('All', 'news')
: $item->getName(['complete' => true]);
echo "";
echo '| ';
- Html::showMassiveActionCheckBox(__CLASS__, $current_target['id']);
+ Html::showMassiveActionCheckBox(self::class, $current_target['id']);
echo ' | ';
echo '' . $item->getTypeName() . ' | ';
echo "$name | ";
@@ -197,4 +200,9 @@ public static function showForAlert(PluginNewsAlert $alert)
return true;
}
+
+ public static function getIcon()
+ {
+ return 'ti ti-target';
+ }
}
diff --git a/inc/alert_user.class.php b/inc/alert_user.class.php
index 16a6a1f..33a4931 100644
--- a/inc/alert_user.class.php
+++ b/inc/alert_user.class.php
@@ -29,7 +29,8 @@
*/
if (!defined('GLPI_ROOT')) {
- die("Sorry. You can't access directly to this file");
+ echo "Sorry. You can't access directly to this file";
+ return;
}
// @codingStandardsIgnoreStart
@@ -71,13 +72,9 @@ public static function hideAlert($params = [])
);
}
- public function canCreateItem()
+ public function canCreateItem(): bool
{
- if ($this->fields['users_id'] != Session::getLoginUserID()) {
- return false;
- }
-
- return true;
+ return $this->fields['users_id'] == Session::getLoginUserID();
}
public function rawSearchOptions()
@@ -88,7 +85,7 @@ public function rawSearchOptions()
'id' => 5,
'table' => $this->getTable(),
'field' => 'state',
- 'name' => __('Status', 'news'),
+ 'name' => __s('Status', 'news'),
'datatype' => 'dropdown',
];
diff --git a/phpstan.neon b/phpstan.neon
index 455f2e7..db69ea1 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,19 +1,20 @@
+includes:
+ - ../../vendor/glpi-project/phpstan-glpi/extension.neon
+ - ../../vendor/phpstan/phpstan-deprecation-rules/rules.neon
+ - ../../vendor/thecodingmachine/phpstan-safe-rule/phpstan-safe-rule.neon
+
parameters:
- parallel:
- maximumNumberOfProcesses: 2
level: 5
- bootstrapFiles:
- - ../../inc/based_config.php
paths:
- - inc
- - front
- ajax
+ - front
+ - inc
- hook.php
- setup.php
scanDirectories:
- - ../../inc
- ../../src
- stubFiles:
+ bootstrapFiles:
- ../../stubs/glpi_constants.php
-rules:
- - GlpiProject\Tools\PHPStan\Rules\GlobalVarTypeRule
+ - ../../vendor/autoload.php
+ - setup.php
+ treatPhpDocTypesAsCertain: false
diff --git a/plugin.xml b/plugin.xml
index 48db6f4..d2a03db 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -54,9 +54,9 @@ Fonctionnalités
- 1.13.0-beta2
+ 1.13.0
~11.0.0
- https://github.com/pluginsGLPI/news/releases/download/1.13.0-beta2/glpi-news-1.13.0-beta2.tar.bz2
+ https://github.com/pluginsGLPI/news/releases/download/1.13.0/glpi-news-1.13.0.tar.bz2
1.12.5
diff --git a/psalm.xml b/psalm.xml
new file mode 100644
index 0000000..f051d3d
--- /dev/null
+++ b/psalm.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/css/styles.css b/public/css/styles.css
similarity index 100%
rename from css/styles.css
rename to public/css/styles.css
diff --git a/js/news.js b/public/js/news.js
similarity index 96%
rename from js/news.js
rename to public/js/news.js
index d948468..85450c5 100644
--- a/js/news.js
+++ b/public/js/news.js
@@ -30,7 +30,7 @@ pluginNewsCloseAlerts = function() {
$(document).on("mousedown", ".plugin_news_alert .alert a[data-bs-dismiss=alert]", function(event) {
var alert = $(this).closest(".plugin_news_alert");
var id = alert.attr('data-id');
- var a_url = CFG_GLPI.root_doc+"/"+GLPI_PLUGINS_PATH.news+"/ajax";
+ var a_url = CFG_GLPI.root_doc+"/plugins/news/ajax";
$.post(a_url+"/hide_alert.php", {'id' : id});
});
};
diff --git a/pics/icon.png b/public/pics/icon.png
similarity index 100%
rename from pics/icon.png
rename to public/pics/icon.png
diff --git a/pics/toggle_down.png b/public/pics/toggle_down.png
similarity index 100%
rename from pics/toggle_down.png
rename to public/pics/toggle_down.png
diff --git a/pics/toggle_up.png b/public/pics/toggle_up.png
similarity index 100%
rename from pics/toggle_up.png
rename to public/pics/toggle_up.png
diff --git a/rector.php b/rector.php
new file mode 100644
index 0000000..e4c2568
--- /dev/null
+++ b/rector.php
@@ -0,0 +1,100 @@
+.
+ * -------------------------------------------------------------------------
+ * @copyright Copyright (C) 2015-2023 by News plugin team.
+ * @copyright Copyright (C) 2018-2023 by Metabase plugin team.
+ * @license GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
+ * @link https://github.com/pluginsGLPI/news
+ * @link https://github.com/pluginsGLPI/metabase
+ * -------------------------------------------------------------------------
+ */
+
+require_once __DIR__ . '/../../src/Plugin.php';
+
+use Rector\Caching\ValueObject\Storage\FileCacheStorage;
+use Rector\CodeQuality\Rector as CodeQuality;
+use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector as DeadCode;
+use Rector\ValueObject\PhpVersion;
+
+return RectorConfig::configure()
+ ->withPaths([
+ __DIR__ . '/ajax',
+ __DIR__ . '/front',
+ __DIR__ . '/inc',
+ ])
+ ->withPhpVersion(PhpVersion::PHP_82)
+ ->withCache(
+ cacheClass: FileCacheStorage::class,
+ cacheDirectory: sys_get_temp_dir() . '/metabase-rector',
+ )
+ ->withRootFiles()
+ ->withParallel(timeoutSeconds: 300)
+ ->withImportNames(removeUnusedImports: true)
+ ->withRules([
+ CodeQuality\Assign\CombinedAssignRector::class,
+ CodeQuality\BooleanAnd\RemoveUselessIsObjectCheckRector::class,
+ CodeQuality\BooleanAnd\SimplifyEmptyArrayCheckRector::class,
+ CodeQuality\BooleanNot\ReplaceMultipleBooleanNotRector::class,
+ CodeQuality\Catch_\ThrowWithPreviousExceptionRector::class,
+ CodeQuality\Empty_\SimplifyEmptyCheckOnEmptyArrayRector::class,
+ CodeQuality\Expression\InlineIfToExplicitIfRector::class,
+ CodeQuality\Expression\TernaryFalseExpressionToIfRector::class,
+ CodeQuality\For_\ForRepeatedCountToOwnVariableRector::class,
+ CodeQuality\Foreach_\ForeachItemsAssignToEmptyArrayToAssignRector::class,
+ CodeQuality\Foreach_\ForeachToInArrayRector::class,
+ CodeQuality\Foreach_\SimplifyForeachToCoalescingRector::class,
+ CodeQuality\Foreach_\UnusedForeachValueToArrayKeysRector::class,
+ CodeQuality\FuncCall\ChangeArrayPushToArrayAssignRector::class,
+ CodeQuality\FuncCall\CompactToVariablesRector::class,
+ CodeQuality\FuncCall\InlineIsAInstanceOfRector::class,
+ CodeQuality\FuncCall\IsAWithStringWithThirdArgumentRector::class,
+ CodeQuality\FuncCall\RemoveSoleValueSprintfRector::class,
+ CodeQuality\FuncCall\SetTypeToCastRector::class,
+ CodeQuality\FuncCall\SimplifyFuncGetArgsCountRector::class,
+ CodeQuality\FuncCall\SimplifyInArrayValuesRector::class,
+ CodeQuality\FuncCall\SimplifyStrposLowerRector::class,
+ CodeQuality\FuncCall\UnwrapSprintfOneArgumentRector::class,
+ CodeQuality\Identical\BooleanNotIdenticalToNotIdenticalRector::class,
+ CodeQuality\Identical\SimplifyArraySearchRector::class,
+ CodeQuality\Identical\SimplifyConditionsRector::class,
+ CodeQuality\Identical\StrlenZeroToIdenticalEmptyStringRector::class,
+ CodeQuality\If_\CombineIfRector::class,
+ CodeQuality\If_\CompleteMissingIfElseBracketRector::class,
+ CodeQuality\If_\ConsecutiveNullCompareReturnsToNullCoalesceQueueRector::class,
+ CodeQuality\If_\ExplicitBoolCompareRector::class,
+ CodeQuality\If_\ShortenElseIfRector::class,
+ CodeQuality\If_\SimplifyIfElseToTernaryRector::class,
+ CodeQuality\If_\SimplifyIfNotNullReturnRector::class,
+ CodeQuality\If_\SimplifyIfNullableReturnRector::class,
+ CodeQuality\If_\SimplifyIfReturnBoolRector::class,
+ CodeQuality\Include_\AbsolutizeRequireAndIncludePathRector::class,
+ CodeQuality\LogicalAnd\AndAssignsToSeparateLinesRector::class,
+ CodeQuality\LogicalAnd\LogicalToBooleanRector::class,
+ CodeQuality\NotEqual\CommonNotEqualRector::class,
+ CodeQuality\Ternary\UnnecessaryTernaryExpressionRector::class,
+ DeadCode\Assign\RemoveUnusedVariableAssignRector::class,
+ ])
+ ->withPhpSets(php74: true) // apply PHP sets up to PHP 7.4
+;
diff --git a/setup.php b/setup.php
index f7bf5bb..b7b13a9 100644
--- a/setup.php
+++ b/setup.php
@@ -28,12 +28,14 @@
* -------------------------------------------------------------------------
*/
-define('PLUGIN_NEWS_VERSION', '1.12.5');
+use function Safe\define;
+
+define('PLUGIN_NEWS_VERSION', '1.13.0');
// Minimal GLPI version, inclusive
-define('PLUGIN_NEWS_MIN_GLPI', '10.0.0');
+define('PLUGIN_NEWS_MIN_GLPI', '11.0.0');
// Maximum GLPI version, exclusive
-define('PLUGIN_NEWS_MAX_GLPI', '10.0.99');
+define('PLUGIN_NEWS_MAX_GLPI', '11.0.99');
function plugin_init_news()
{
@@ -79,7 +81,7 @@ function plugin_init_news()
function plugin_version_news()
{
return [
- 'name' => __('Alerts', 'news'),
+ 'name' => __s('Alerts', 'news'),
'version' => PLUGIN_NEWS_VERSION,
'author' => "TECLIB'",
'license' => 'GPLv2+',
diff --git a/templates/alert_form.html.twig b/templates/alert_form.html.twig
index 1701e1c..9f68d41 100644
--- a/templates/alert_form.html.twig
+++ b/templates/alert_form.html.twig
@@ -181,7 +181,7 @@
// Load preview
$(".alert-preview").load(
- "{{ get_plugin_web_dir('news') }}/ajax/alert_preview.php",
+ "{{ path('/plugins/news/ajax/alert_preview.php') }}",
$("form[name=asset_form]").serialize()
);
};
diff --git a/templates/components/news_fields_macros.html.twig b/templates/components/news_fields_macros.html.twig
index 0d86e8f..7e8bb49 100644
--- a/templates/components/news_fields_macros.html.twig
+++ b/templates/components/news_fields_macros.html.twig
@@ -39,8 +39,8 @@
type="checkbox"
value="1"
{{ current_values[key] ? 'checked' : '' }}
- {{ options.readonly ? 'readonly' : '' }}
- {{ options.disabled ? 'disabled' : '' }}
+ {{ options.readonly|default(false) ? 'readonly' : '' }}
+ {{ options.disabled|default(false) ? 'disabled' : '' }}
>
{{ label }}
@@ -62,7 +62,7 @@
name="{{ name }}"
value=""
class="form-selectgroup-input"
- {{ value == key ? 'checked' : '' }}
+ {{ value is empty ? 'checked' : '' }}
>
{{ __('No icon', 'news') }}
diff --git a/templates/display_alert.html.twig b/templates/display_alert.html.twig
index 2bbc131..23881c7 100644
--- a/templates/display_alert.html.twig
+++ b/templates/display_alert.html.twig
@@ -50,7 +50,7 @@
- {{ alert_fields.name|verbatim_value }}
+ {{ alert_fields.name }}
{% if show_only_login_alerts %}
{% endif %}
|