Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.98 php8 deprecation fixes and small improvements #317

Open
wants to merge 16 commits into
base: 0.98-php8
Choose a base branch
from
Open

0.98 php8 deprecation fixes and small improvements #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b4fcd6b
Fix path to jQuery.
amshikov Aug 17, 2022
a85c225
strftime function is deprecated since PHP 8.0.
amshikov Aug 22, 2022
b355e10
Get rid of implicit cinversion from float to int.
amshikov Aug 22, 2022
d54db8f
Comment out spine debugging calls.
amshikov Aug 22, 2022
095c7a9
Clean up CSS for editor.
amshikov Aug 22, 2022
63eea7e
* CSS fix: correct wrapping in object editing textbox
amshikov Aug 22, 2022
f33d22d
$num_points in imagepolygon() is deprecated since PHP 8.1.
amshikov Aug 22, 2022
cb648ad
PHP 8.2 is more type strict.
amshikov Jun 7, 2024
91a496f
In editor make it possible to use not only "images" directory but som…
amshikov Jun 7, 2024
aafd155
Fixes of PHP 8 deprecations:
amshikov Jun 7, 2024
c7f0c7b
Deprecation fix:
amshikov Jun 7, 2024
cca77b2
Improvement: try to detect rrdtool binary location instead hard-coded…
amshikov Jun 7, 2024
d323f46
Quick fix of deprecated assert options in PHP 8.2.
amshikov Jun 7, 2024
0b60413
Add some more functionality to Special Tokens.
amshikov Jun 7, 2024
0772d94
Add some UI tweaks to editor.
amshikov Jun 7, 2024
779c440
Store INCOMMENT and OUTCOMMENT as-is in order to make it possible to …
amshikov Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cacti-pick.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ function update_source_step2(graphid)
?>
<html>
<head>
<script type="text/javascript" src="vendor/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="vendor/jquery.min.js"></script>
<script type="text/javascript">

function filterlist(previous)
Expand Down Expand Up @@ -336,7 +336,7 @@ function applyDSFilterChange(objForm) {
?>
<html>
<head>
<script type="text/javascript" src="vendor/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="vendor/jquery.min.js"></script>
<script type="text/javascript">

function filterlist(previous)
Expand Down
20 changes: 16 additions & 4 deletions docs/pages/advanced.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ <h3 id= "tokens">Special String Processing Tokens</h3>

<p>The format for the tokens is simple: </p>

<div class = "definition">{node:<em>nodename</em>:<em>variablename</em>}
<div class = "definition">{node:<em>nodename</em>:<em>variablename</em>[:<em>format</em>]}
</div>

<div class = "definition">{link:<em>linkname</em>:<em>variablename</em>}
<div class = "definition">{link:<em>linkname</em>:<em>variablename</em>[:<em>format</em>]}
</div>

<div class = "definition">{map:<em>variablename</em>}
Expand Down Expand Up @@ -297,8 +297,10 @@ <h3 id = "formatting">Formatting in Special Tokens</h3>
<p>To allow you to control better how the values of special tokens are used,
you can add a final part inside the token that specifies the format. </p>

<p>This borrows the '%' format from the printf() function in C, PHP, perl
and many other languages, but adds a couple of Weathermap-specific extras: </p>
<p>Format can be provided with two options:
<ul>
<li>One which borrows the '%' format from the printf() function in C, PHP, perl
and many other languages, but adds a couple of Weathermap-specific extras:

<table>
<tr><th>{link:this:bandwidth_in:%d}</th><td>force to integer</td>
Expand Down Expand Up @@ -327,6 +329,16 @@ <h3 id = "formatting">Formatting in Special Tokens</h3>

</tr>
</table>
</li>
<li>Second form is a comma-separated list of modifiers. Currently supported modifiers are: <em>uc</em> - will convert result value to uppercase; <em>lc</em> - will convert
result value to lowercase; and finally you can use a <em>regular expression</em> to modify result value. Here is some examples:
<table>
<tr><th>{node:_linkstart_:label:lc}</th><td>Get the label of NODE where link starts and convert it to lowercase</td></tr>
<tr><th>{node:_linkstart_:label:uc, /a/b/}</th><td>Get the label of NODE where link starts, convert it to uppercase and then replace all occurrences of &quot;a&quot; with &quot;b&quot;</td></tr>
</table>
</li>
</ul>
</p>

<h2 id = "tweaks"><a href="config-reference.html#GLOBAL_SET">SETting</a> Hint Variables to tweak maps</h2>

Expand Down
Loading