Skip to content

Commit b4ae5a4

Browse files
alorbachalorbach
authored
Merge pull request #68 from alorbach/pr-issue-67
ThirdParty: Updated jpgraph to 4.3.1 (2020-04-24)
2 parents 9525d4f + 546d932 commit b4ae5a4

29 files changed

+392
-127
lines changed

‎src/chartgenerator.php‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -238,25 +238,25 @@
238238

239239
// Setup the tab title
240240
$graph->tabtitle->Set( GetAndReplaceLangStr($content['LN_STATS_CHARTTITLE'], $content['maxrecords'], $fields[$content['chart_field']]['FieldCaption']) );
241-
$graph->tabtitle->SetFont(FF_VERA,FS_BOLD,9);
241+
$graph->tabtitle->SetFont(FF_DV_SANSSERIF,FS_BOLD,9);
242242
$graph->tabtitle->SetPos('left');
243243

244244
// Set Graph footer
245245
$graph->footer->left->Set ("LogAnalyzer v" . $content['BUILDNUMBER'] . "\n" . GetAndReplaceLangStr($content['LN_STATS_GENERATEDAT'], date("Y-m-d")) );
246-
$graph->footer->left->SetFont( FF_VERA, FS_NORMAL, 7);
246+
$graph->footer->left->SetFont( FF_DV_SANSSERIF, FS_NORMAL, 7);
247247
// $graph->footer->right->Set ( GetAndReplaceLangStr($content['LN_STATS_GENERATEDAT'], date("Y-m-d")) );
248-
// $graph->footer->right->SetFont( FF_VERA, FS_NORMAL, 8);
248+
// $graph->footer->right->SetFont( FF_DV_SANSSERIF, FS_NORMAL, 8);
249249
// $graph->footer->left->Set ("LogAnalyzer v" . $content['BUILDNUMBER'] . "\n" . GetAndReplaceLangStr($content['LN_STATS_GENERATEDAT'], date("Y-m-d")) );
250-
// $graph->footer->left->SetFont( FF_VERA, FS_NORMAL, 8);
250+
// $graph->footer->left->SetFont( FF_DV_SANSSERIF, FS_NORMAL, 8);
251251
// $graph->footer->right->SetColor("darkred");
252252

253253
// Show 0 label on Y-axis (default is not to show)
254254
$graph->yscale->ticks->SupressZeroLabel(false);
255255

256256
// Set Fonts for graph!
257-
$graph->xaxis->SetFont(FF_VERA,FS_NORMAL,8);
258-
$graph->yaxis->SetFont(FF_VERA,FS_NORMAL,8);
259-
$graph->legend->SetFont(FF_VERA,FS_NORMAL,8);
257+
$graph->xaxis->SetFont(FF_DV_SANSSERIF,FS_NORMAL,8);
258+
$graph->yaxis->SetFont(FF_DV_SANSSERIF,FS_NORMAL,8);
259+
$graph->legend->SetFont(FF_DV_SANSSERIF,FS_NORMAL,8);
260260

261261
// Create
262262
$p1 = new PiePlot3D($YchartData);
@@ -282,7 +282,7 @@
282282
// Set label properties
283283
$p1->SetLabelPos(1.0);
284284
$p1->SetSliceColors(array('#FFF584','#CBFF84','#FF6B9E','#FF9584','#EAFF84','#7BFF51','#51FFA6','#51FF52','#6BCFFF','#5170FF','#519CFF','#EAE3AD','#FFF184','#8584FF','#E698FF','#C384FF','#FF84EC','#FF98A3','#E5C285','#FFDA98' ));
285-
$p1->value->SetFont(FF_VERA, FS_NORMAL, 8);
285+
$p1->value->SetFont(FF_DV_SANSSERIF, FS_NORMAL, 8);
286286
$p1->value->SetColor("black");
287287

288288
// Adjust other Pie Properties
@@ -307,7 +307,7 @@
307307
$graph->img->SetAlphaBlending(true);
308308

309309
// Setup X-AXIS
310-
// $graph->xaxis->SetFont(FF_VERA,FS_NORMAL,10);
310+
// $graph->xaxis->SetFont(FF_DV_SANSSERIF,FS_NORMAL,10);
311311
$graph->xaxis->SetTickLabels($XchartData);
312312

313313
if ( count($XchartData) > 5 )
@@ -326,17 +326,17 @@
326326
$graph->yscale->ticks->SupressZeroLabel(false);
327327

328328
// Set Fonts for graph!
329-
$graph->xaxis->SetFont(FF_VERA,FS_NORMAL,7);
330-
$graph->yaxis->SetFont(FF_VERA,FS_NORMAL,8);
329+
$graph->xaxis->SetFont(FF_DV_SANSSERIF,FS_NORMAL,7);
330+
$graph->yaxis->SetFont(FF_DV_SANSSERIF,FS_NORMAL,8);
331331

332332
// Setup the tab title
333333
$graph->tabtitle->Set( GetAndReplaceLangStr($content['LN_STATS_CHARTTITLE'], $content['maxrecords'], $fields[$content['chart_field']]['FieldCaption']) );
334-
$graph->tabtitle->SetFont(FF_VERA,FS_BOLD,9);
334+
$graph->tabtitle->SetFont(FF_DV_SANSSERIF,FS_BOLD,9);
335335
$graph->tabtitle->SetPos('left');
336336

337337
// Set Graph footer
338338
$graph->footer->left->Set ("LogAnalyzer v" . $content['BUILDNUMBER'] . "\n" . GetAndReplaceLangStr($content['LN_STATS_GENERATEDAT'], date("Y-m-d")) );
339-
$graph->footer->left->SetFont( FF_VERA, FS_NORMAL, 7);
339+
$graph->footer->left->SetFont( FF_DV_SANSSERIF, FS_NORMAL, 7);
340340

341341
// Setup the X and Y grid
342342
$graph->ygrid->SetFill(true,'#DDDDDD@0.5','#BBBBBB@0.5');
@@ -358,7 +358,7 @@
358358

359359
// Display value in bars
360360
$bplot->value->Show();
361-
$bplot->value->SetFont(FF_VERA,FS_NORMAL,8);
361+
$bplot->value->SetFont(FF_DV_SANSSERIF,FS_NORMAL,8);
362362
$bplot->value->SetFormat('%d');
363363

364364
// Add links
@@ -392,6 +392,12 @@
392392
$graph->SetMarginColor('white');
393393
$graph->SetBox(); // Box around plotarea
394394

395+
$graph->xgrid->Show();
396+
$graph->xgrid->SetLineStyle("solid");
397+
$graph->xaxis->SetTickLabels(array('A','B','C','D'));
398+
$graph->xgrid->SetColor('#E3E3E3');
399+
400+
395401
// Setup X-AXIS
396402
$graph->xaxis->SetTickLabels($XchartData);
397403
$graph->xaxis->SetLabelAngle(0);
@@ -413,18 +419,18 @@
413419
$graph->yscale->ticks->SupressZeroLabel(false);
414420

415421
// Set Fonts for graph!
416-
$graph->xaxis->SetFont(FF_VERA,FS_NORMAL,7);
417-
$graph->yaxis->SetFont(FF_VERA,FS_NORMAL,8);
422+
$graph->xaxis->SetFont(FF_DV_SANSSERIF,FS_NORMAL,7);
423+
$graph->yaxis->SetFont(FF_DV_SANSSERIF,FS_NORMAL,8);
418424

419425
// Setup the tab title
420426
$graph->tabtitle->Set( GetAndReplaceLangStr($content['LN_STATS_CHARTTITLE'], $content['maxrecords'], $fields[$content['chart_field']]['FieldCaption']) );
421-
$graph->tabtitle->SetFont(FF_VERA,FS_BOLD,9);
427+
$graph->tabtitle->SetFont(FF_DV_SANSSERIF,FS_BOLD,9);
422428
$graph->tabtitle->SetPos('right');
423429
$graph->tabtitle->SetTabAlign('right');
424430

425431
// Set Graph footer
426432
$graph->footer->left->Set ("LogAnalyzer v" . $content['BUILDNUMBER'] . "\n" . GetAndReplaceLangStr($content['LN_STATS_GENERATEDAT'], date("Y-m-d")) );
427-
$graph->footer->left->SetFont( FF_VERA, FS_NORMAL, 7);
433+
$graph->footer->left->SetFont( FF_DV_SANSSERIF, FS_NORMAL, 7);
428434

429435
// Setup the X and Y grid
430436
$graph->ygrid->SetFill(true,'#DDDDDD@0.5','#BBBBBB@0.5');
@@ -446,7 +452,7 @@
446452

447453
// Display value in bars
448454
$bplot->value->Show();
449-
$bplot->value->SetFont(FF_VERA,FS_NORMAL, 8);
455+
$bplot->value->SetFont(FF_DV_SANSSERIF,FS_NORMAL, 8);
450456
$bplot->value->SetFormat('%d');
451457

452458
// Add links

‎src/classes/jpgraph/README‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
README FOR JPGRAPH 4.0.1
1+
README FOR JPGRAPH 4.3.1
22
=========================
33

4-
This package contains the JpGraph PHP library version 4.0.1
4+
This package contains the JpGraph PHP library version 4.3.1
55

66
The library is Copyright (C) 2000-2010 Asial Corporatoin and
77
released under dual license QPL 1.0 for open source and educational
@@ -11,10 +11,7 @@ Please see full license details at
1111
http://jpgraph.net/pro/
1212
http://jpgraph.net/download/
1313

14-
* --------------------------------------------------------------------
15-
* PHP4 IS NOT SUPPORTED IN 3.x or 4.x SERIES
16-
* --------------------------------------------------------------------
17-
14+
1815
Requirements:
1916
-------------
2017
Miminum:

‎src/classes/jpgraph/flag_mapping‎

Lines changed: 237 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,237 @@
1+
class JpCountryFlags {
2+
3+
$iCountryFlags = array(
4+
'Afghanistan' => 'afgh.gif',
5+
'Republic of Angola' => 'agla.gif',
6+
'Republic of Albania' => 'alba.gif',
7+
'Alderney' => 'alde.gif',
8+
'Democratic and Popular Republic of Algeria' => 'alge.gif',
9+
'Territory of American Samoa' => 'amsa.gif',
10+
'Principality of Andorra' => 'andr.gif',
11+
'British Overseas Territory of Anguilla' => 'angu.gif',
12+
'Antarctica' => 'anta.gif',
13+
'Argentine Republic' => 'arge.gif',
14+
'League of Arab States' => 'arle.gif',
15+
'Republic of Armenia' => 'arme.gif',
16+
'Aruba' => 'arub.gif',
17+
'Commonwealth of Australia' => 'astl.gif',
18+
'Republic of Austria' => 'aust.gif',
19+
'Azerbaijani Republic' => 'azer.gif',
20+
'British Antarctic Territory' => 'bant.gif',
21+
'Kingdom of Belgium' => 'belg.gif',
22+
'British Overseas Territory of Bermuda' => 'berm.gif',
23+
'Commonwealth of the Bahamas' => 'bhms.gif',
24+
'Kingdom of Bahrain' => 'bhrn.gif',
25+
'Republic of Belarus' => 'blru.gif',
26+
'Republic of Bolivia' => 'blva.gif',
27+
'Belize' => 'blze.gif',
28+
'Republic of Benin' => 'bnin.gif',
29+
'Republic of Botswana' => 'bots.gif',
30+
'Federative Republic of Brazil' => 'braz.gif',
31+
'Barbados' => 'brbd.gif',
32+
'British Indian Ocean Territory' => 'brin.gif',
33+
'Brunei Darussalam' => 'brun.gif',
34+
'Republic of Burkina' => 'bufa.gif',
35+
'Republic of Bulgaria' => 'bulg.gif',
36+
'Republic of Burundi' => 'buru.gif',
37+
'Overseas Territory of the British Virgin Islands' => 'bvis.gif',
38+
'Central African Republic' => 'cafr.gif',
39+
'Kingdom of Cambodia' => 'camb.gif',
40+
'Republic of Cameroon' => 'came.gif',
41+
'Dominion of Canada' => 'cana.gif',
42+
'Caribbean Community' => 'cari.gif',
43+
'Republic of Cape Verde' => 'cave.gif',
44+
'Republic of Chad' => 'chad.gif',
45+
'Republic of Chile' => 'chil.gif',
46+
'Territory of Christmas Island' => 'chms.gif',
47+
'Commonwealth of Independent States' => 'cins.gif',
48+
'Cook Islands' => 'ckis.gif',
49+
'Republic of Colombia' => 'clmb.gif',
50+
'Territory of Cocos Islands' => 'cois.gif',
51+
'Commonwealth' => 'comn.gif',
52+
'Union of the Comoros' => 'como.gif',
53+
'Republic of the Congo' => 'cong.gif',
54+
'Republic of Costa Rica' => 'corc.gif',
55+
'Republic of Croatia' => 'croa.gif',
56+
'Republic of Cuba' => 'cuba.gif',
57+
'British Overseas Territory of the Cayman Islands' => 'cyis.gif',
58+
'Republic of Cyprus' => 'cypr.gif',
59+
'The Czech Republic' => 'czec.gif',
60+
'Kingdom of Denmark' => 'denm.gif',
61+
'Republic of Djibouti' => 'djib.gif',
62+
'Commonwealth of Dominica' => 'domn.gif',
63+
'Dominican Republic' => 'dore.gif',
64+
'Republic of Ecuador' => 'ecua.gif',
65+
'Arab Republic of Egypt' => 'egyp.gif',
66+
'Republic of El Salvador' => 'elsa.gif',
67+
'England' => 'engl.gif',
68+
'Republic of Equatorial Guinea' => 'eqgu.gif',
69+
'State of Eritrea' => 'erit.gif',
70+
'Republic of Estonia' => 'estn.gif',
71+
'Ethiopia' => 'ethp.gif',
72+
'European Union' => 'euun.gif',
73+
'British Overseas Territory of the Falkland Islands' => 'fais.gif',
74+
'International Federation of Vexillological Associations' => 'fiav.gif',
75+
'Republic of Fiji' => 'fiji.gif',
76+
'Republic of Finland' => 'finl.gif',
77+
'Territory of French Polynesia' => 'fpol.gif',
78+
'French Republic' => 'fran.gif',
79+
'Overseas Department of French Guiana' => 'frgu.gif',
80+
'Gabonese Republic' => 'gabn.gif',
81+
'Republic of the Gambia' => 'gamb.gif',
82+
'Republic of Georgia' => 'geor.gif',
83+
'Federal Republic of Germany' => 'germ.gif',
84+
'Republic of Ghana' => 'ghan.gif',
85+
'Gibraltar' => 'gibr.gif',
86+
'Hellenic Republic' => 'grec.gif',
87+
'State of Grenada' => 'gren.gif',
88+
'Overseas Department of Guadeloupe' => 'guad.gif',
89+
'Territory of Guam' => 'guam.gif',
90+
'Republic of Guatemala' => 'guat.gif',
91+
'The Bailiwick of Guernsey' => 'guer.gif',
92+
'Republic of Guinea' => 'guin.gif',
93+
'Republic of Haiti' => 'hait.gif',
94+
'Hong Kong Special Administrative Region' => 'hokn.gif',
95+
'Republic of Honduras' => 'hond.gif',
96+
'Republic of Hungary' => 'hung.gif',
97+
'Republic of Iceland' => 'icel.gif',
98+
'International Committee of the Red Cross' => 'icrc.gif',
99+
'Republic of India' => 'inda.gif',
100+
'Republic of Indonesia' => 'indn.gif',
101+
'Republic of Iraq' => 'iraq.gif',
102+
'Republic of Ireland' => 'irel.gif',
103+
'Organization of the Islamic Conference' => 'isco.gif',
104+
'Isle of Man' => 'isma.gif',
105+
'State of Israel' => 'isra.gif',
106+
'Italian Republic' => 'ital.gif',
107+
'Jamaica' => 'jama.gif',
108+
'Japan' => 'japa.gif',
109+
'The Bailiwick of Jersey' => 'jers.gif',
110+
'Hashemite Kingdom of Jordan' => 'jord.gif',
111+
'Republic of Kazakhstan' => 'kazk.gif',
112+
'Republic of Kenya' => 'keny.gif',
113+
'Republic of Kiribati' => 'kirb.gif',
114+
'State of Kuwait' => 'kuwa.gif',
115+
'Kyrgyz Republic' => 'kyrg.gif',
116+
'Republic of Latvia' => 'latv.gif',
117+
'Lebanese Republic' => 'leba.gif',
118+
'Kingdom of Lesotho' => 'lest.gif',
119+
'Republic of Liberia' => 'libe.gif',
120+
'Principality of Liechtenstein' => 'liec.gif',
121+
'Republic of Lithuania' => 'lith.gif',
122+
'Grand Duchy of Luxembourg' => 'luxe.gif',
123+
'Macao Special Administrative Region' => 'maca.gif',
124+
'Republic of Macedonia' => 'mace.gif',
125+
'Republic of Madagascar' => 'mada.gif',
126+
'Republic of the Marshall Islands' => 'mais.gif',
127+
'Republic of Maldives' => 'mald.gif',
128+
'Republic of Mali' => 'mali.gif',
129+
'Federation of Malaysia' => 'mals018.gif',
130+
'Republic of Malta' => 'malt.gif',
131+
'Republic of Malawi' => 'malw.gif',
132+
'Overseas Department of Martinique' => 'mart.gif',
133+
'Islamic Republic of Mauritania' => 'maur.gif',
134+
'Territorial Collectivity of Mayotte' => 'mayt.gif',
135+
'United Mexican States' => 'mexc.gif',
136+
'Federated States of Micronesia' => 'micr.gif',
137+
'Midway Islands' => 'miis.gif',
138+
'Republic of Moldova' => 'mold.gif',
139+
'Principality of Monaco' => 'mona.gif',
140+
'Republic of Mongolia' => 'mong.gif',
141+
'British Overseas Territory of Montserrat' => 'mont.gif',
142+
'Kingdom of Morocco' => 'morc.gif',
143+
'Republic of Mozambique' => 'moza.gif',
144+
'Republic of Mauritius' => 'mrts.gif',
145+
'Union of Myanmar' => 'myan.gif',
146+
'Republic of Namibia' => 'namb.gif',
147+
'North Atlantic Treaty Organization' => 'nato.gif',
148+
'Republic of Nauru' => 'naur.gif',
149+
'Turkish Republic of Northern Cyprus' => 'ncyp.gif',
150+
'Netherlands Antilles' => 'nean.gif',
151+
'Kingdom of Nepal' => 'nepa.gif',
152+
'Kingdom of the Netherlands' => 'neth.gif',
153+
'Territory of Norfolk Island' => 'nfis.gif',
154+
'Federal Republic of Nigeria' => 'ngra.gif',
155+
'Republic of Nicaragua' => 'nica.gif',
156+
'Republic of Niger' => 'nigr.gif',
157+
'Niue' => 'niue.gif',
158+
'Commonwealth of the Northern Mariana Islands' => 'nmar.gif',
159+
'Province of Northern Ireland' => 'noir.gif',
160+
'Nordic Council' => 'nord.gif',
161+
'Kingdom of Norway' => 'norw.gif',
162+
'Territory of New Caledonia and Dependencies' => 'nwca.gif',
163+
'New Zealand' => 'nwze.gif',
164+
'Organization of American States' => 'oast.gif',
165+
'Organization of African Unity' => 'oaun.gif',
166+
'International Olympic Committee' => 'olym.gif',
167+
'Sultanate of Oman' => 'oman.gif',
168+
'Organization of Petroleum Exporting Countries' => 'opec.gif',
169+
'Islamic Republic of Pakistan' => 'paks.gif',
170+
'Republic of Palau' => 'pala.gif',
171+
'Independent State of Papua New Guinea' => 'pang.gif',
172+
'Republic of Paraguay' => 'para.gif',
173+
'Republic of the Philippines' => 'phil.gif',
174+
'British Overseas Territory of the Pitcairn Islands' => 'piis.gif',
175+
'Republic of Poland' => 'pola.gif',
176+
'Republic of Portugal' => 'port.gif',
177+
'Commonwealth of Puerto Rico' => 'purc.gif',
178+
'State of Qatar' => 'qata.gif',
179+
'Russian Federation' => 'russ.gif',
180+
'Republic of Rwanda' => 'rwan.gif',
181+
'Kingdom of Saudi Arabia' => 'saar.gif',
182+
'Republic of San Marino' => 'sama.gif',
183+
'Nordic Sami Conference' => 'sami.gif',
184+
'Sark' => 'sark.gif',
185+
'Scotland' => 'scot.gif',
186+
'Principality of Seborga' => 'sebo.gif',
187+
'Republic of Sierra Leone' => 'sile.gif',
188+
'Republic of Singapore' => 'sing.gif',
189+
'Republic of Korea' => 'skor.gif',
190+
'Republic of Slovenia' => 'slva.gif',
191+
'Somali Republic' => 'smla.gif',
192+
'Republic of Somaliland' => 'smld.gif',
193+
'Republic of South Africa' => 'soaf.gif',
194+
'Solomon Islands' => 'sois.gif',
195+
'Kingdom of Spain' => 'span.gif',
196+
'Secretariat of the Pacific Community' => 'spco.gif',
197+
'Democratic Socialist Republic of Sri Lanka' => 'srla.gif',
198+
'Saint Lucia' => 'stlu.gif',
199+
'Republic of the Sudan' => 'suda.gif',
200+
'Republic of Suriname' => 'surn.gif',
201+
'Slovak Republic' => 'svka.gif',
202+
'Kingdom of Sweden' => 'swdn.gif',
203+
'Swiss Confederation' => 'swit.gif',
204+
'Syrian Arab Republic' => 'syra.gif',
205+
'Kingdom of Swaziland' => 'szld.gif',
206+
'Republic of China' => 'taiw.gif',
207+
'Republic of Tajikistan' => 'tajk.gif',
208+
'United Republic of Tanzania' => 'tanz.gif',
209+
'Kingdom of Thailand' => 'thal.gif',
210+
'Autonomous Region of Tibet' => 'tibe.gif',
211+
'Turkmenistan' => 'tkst.gif',
212+
'Togolese Republic' => 'togo.gif',
213+
'Tokelau' => 'toke.gif',
214+
'Kingdom of Tonga' => 'tong.gif',
215+
'Tristan da Cunha' => 'trdc.gif',
216+
'Tromelin' => 'tris.gif',
217+
'Republic of Tunisia' => 'tuns.gif',
218+
'Republic of Turkey' => 'turk.gif',
219+
'Tuvalu' => 'tuva.gif',
220+
'United Arab Emirates' => 'uaem.gif',
221+
'Republic of Uganda' => 'ugan.gif',
222+
'Ukraine' => 'ukrn.gif',
223+
'United Kingdom of Great Britain' => 'unkg.gif',
224+
'United Nations' => 'unna.gif',
225+
'United States of America' => 'unst.gif',
226+
'Oriental Republic of Uruguay' => 'urgy.gif',
227+
'Virgin Islands of the United States' => 'usvs.gif',
228+
'Republic of Uzbekistan' => 'uzbk.gif',
229+
'State of the Vatican City' => 'vacy.gif',
230+
'Republic of Vanuatu' => 'vant.gif',
231+
'Bolivarian Republic of Venezuela' => 'venz.gif',
232+
'Republic of Yemen' => 'yemn.gif',
233+
'Democratic Republic of Congo' => 'zare.gif',
234+
'Republic of Zimbabwe' => 'zbwe.gif'
235+
) ;
236+
237+

‎src/classes/jpgraph/flags.dat‎

960 KB
Binary file not shown.

‎src/classes/jpgraph/flags_thumb100x100.dat‎

671 KB
Binary file not shown.

‎src/classes/jpgraph/flags_thumb35x35.dat‎

209 KB
Binary file not shown.

‎src/classes/jpgraph/flags_thumb60x60.dat‎

367 KB
Binary file not shown.

0 commit comments

Comments
 (0)