Bump codemirror from 5.58.1 to 5.58.2 in /web

Bumps [codemirror](https://github.com/codemirror/CodeMirror) from 5.58.1 to 5.58.2.
- [Release notes](https://github.com/codemirror/CodeMirror/releases)
- [Changelog](https://github.com/codemirror/CodeMirror/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codemirror/CodeMirror/compare/5.58.1...5.58.2)

Signed-off-by: dependabot[bot] <support@github.com>

.eslintrc

@@ -0,0 +1,5 @@
+// Use this file as a starting point for your project's .eslintrc.
+// Copy this file, and add rule overrides as needed.
+{
+  "extends": "airbnb"
+}

.gitignore

@@ -13,6 +13,8 @@ keys.dev.pub
 /app/icehrm.key
 /app/data/*.*
 /app/data/keys/*
+!/app/data/index.php
+!/app/data/.htaccess
 icehrm.key
 cache.properties
 node_modules/*

.travis.yml

@@ -14,7 +14,6 @@ install:
 script: ant build-ci
 language: php
 php:
-  - '5.6'
   - '7.0'
   - '7.1'
   - '7.2'

Vagrantfile

@@ -3,8 +3,6 @@ Vagrant.configure("2") do |config|
     config.vm.box_version = "1.0.0"
     config.vm.network "private_network", ip: "192.168.10.12"
     config.vm.synced_folder ".", "/vagrant", type: "nfs"
-    config.vm.synced_folder "./deployment/vagrant/sites-available", "/etc/nginx/sites-enabled", type: "nfs"
-    config.vm.synced_folder "./deployment/vagrant/ssl", "/etc/nginx/ssl", type: "nfs"
 
     config.vm.provider "virtualbox" do |vb|
       vb.memory = "1024"
@@ -13,9 +11,17 @@ Vagrant.configure("2") do |config|
     end
 
     config.vm.provision "shell", inline: <<-SHELL
-    	sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
-        systemctl restart sshd.service
-		sudo service nginx restart
+    	sudo rm /etc/nginx/ssl/icehrm.*
+        sudo ln -s /vagrant/deployment/vagrant/ssl/icehrm.crt /etc/nginx/ssl/icehrm.crt
+        sudo ln -s /vagrant/deployment/vagrant/ssl/icehrm.key /etc/nginx/ssl/icehrm.key
+
+        sudo rm /etc/nginx/sites-enabled/default
+        sudo ln -s /vagrant/deployment/vagrant/sites-available/default /etc/nginx/sites-enabled/default
+
+        sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
+
+        sudo service nginx restart
+        sudo chmod 755 -R /var/log
     SHELL
 
     config.vm.hostname = "icehrm.os"

app/data/.htaccess

@@ -0,0 +1,2 @@
+order deny,allow
+deny from all

app/data/index.php

@@ -0,0 +1 @@
+<?php

app/fileupload-new.php

@@ -0,0 +1,3 @@
+<?php
+include ('config.php');
+include (APP_BASE_PATH.'fileupload-new.php');

app/index.php

@@ -5,7 +5,7 @@ if(!file_exists('config.php')){
 }
 include ('config.php');
 if(!isset($_REQUEST['g']) || !isset($_REQUEST['n'])){
-header("Location:".CLIENT_BASE_URL."login.php");	
+header("Location:".CLIENT_BASE_URL."login.php");
 exit();
 }
 $group = $_REQUEST['g'];
@@ -14,9 +14,16 @@ $name= $_REQUEST['n'];
 $groups = array('admin','modules');
 
 if($group == 'admin' || $group == 'modules'){
-	$name = str_replace("..","",$name);	
+	$name = str_replace("..","",$name);
 	$name = str_replace("/","",$name);
 	include APP_BASE_PATH.'/'.$group.'/'.$name.'/index.php';
+}else if ($group == 'extension'){
+    $name = str_replace("..","",$name);
+    $name = str_replace("/","",$name);
+    $moduleName = $name;
+    $moduleGroup = 'extensions';
+    $extensionIndex = APP_BASE_PATH.'/../extensions/'.$name.'/web/index.php';
+    include APP_BASE_PATH.'extensions/wrapper.php';
 }else{
 	exit();
-}
+}

app/install/index.php

@@ -19,7 +19,10 @@ $isConfigFileWriteable = is_writable(CLIENT_APP_PATH."config.php");
 error_log("Config writable ".$isConfigFileWriteable);
 error_log("Config exists ".file_exists(CLIENT_APP_PATH."config.php"));
 if(!$isConfigFileWriteable){
-	$errorMap[] = array("important","Configuration file [".CLIENT_APP_PATH."config.php] is not writable","Make this file writable",array("sudo touch ".CLIENT_APP_PATH."config.php","sudo chmod 777 ".CLIENT_APP_PATH."config.php"));				
+	$errorMap[] = array("important","Configuration file [".CLIENT_APP_PATH."config.php] is not writable","Make this file writable",array(
+	        "sudo touch ".CLIENT_APP_PATH."config.php","sudo chmod 755 ".CLIENT_APP_PATH."config.php",
+	        "sudo chown -R ".shell_exec('whoami')." ".CLIENT_APP_PATH,
+    ));
 }
 
 $isConfigSampleFileExists = file_exists(CLIENT_APP_PATH."config.sample.php");
@@ -48,7 +51,7 @@ if(!$isDataFolderExists){
 		unlink(CLIENT_APP_PATH."data/test.txt");
 	}
 	if(!$isDataFolderWritable){
-		$errorMap[] = array("important","Data folder is not writable","Provide wirte permission to the web server user to ".CLIENT_APP_PATH."data",array("sudo chmod 777 ".CLIENT_APP_PATH."data"));		
+		$errorMap[] = array("important","Data folder is not writable","Provide wirte permission to the web server user to ".CLIENT_APP_PATH."data",array("sudo chmod 755 ".CLIENT_APP_PATH."data"));
 	}
 }
 

app/rest.php

@@ -1,3 +1,3 @@
 <?php
 include ('config.php');
-include (APP_BASE_PATH.'rest.php');
+include (APP_BASE_PATH.'rest.php');

bin/export-plural-rules

@@ -0,0 +1 @@
+../core/lib/composer/vendor/gettext/languages/bin/export-plural-rules

bin/markdown

@@ -0,0 +1 @@
+../core/lib/composer/vendor/cebe/markdown/bin/markdown

bin/pdepend

@@ -0,0 +1 @@
+../core/lib/composer/vendor/pdepend/pdepend/src/bin/pdepend

bin/phpcb

@@ -0,0 +1 @@
+../core/lib/composer/vendor/mayflower/php-codebrowser/bin/phpcb

bin/phpcbf

@@ -0,0 +1 @@
+../core/lib/composer/vendor/squizlabs/php_codesniffer/scripts/phpcbf

bin/phpcpd

@@ -0,0 +1 @@
+../core/lib/composer/vendor/sebastian/phpcpd/composer/bin/phpcpd

bin/phpcs

@@ -0,0 +1 @@
+../core/lib/composer/vendor/squizlabs/php_codesniffer/scripts/phpcs

bin/phploc

@@ -0,0 +1 @@
+../core/lib/composer/vendor/phploc/phploc/phploc

bin/phpmd

@@ -0,0 +1 @@
+../core/lib/composer/vendor/phpmd/phpmd/src/bin/phpmd

bin/phpunit

@@ -0,0 +1 @@
+../core/lib/composer/vendor/phpunit/phpunit/phpunit

bin/release

@@ -0,0 +1 @@
+../core/lib/composer/vendor/consolidation/self-update/scripts/release

bin/robo

@@ -0,0 +1 @@
+../core/lib/composer/vendor/consolidation/robo/robo

build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="icehrm" default="build">
  <!-- By default, we assume all tools to be on the $PATH -->
- <property name="toolsdir" value="${basedir}/tools/"/>
+ <property name="toolsdir" value="${basedir}/bin/"/>
  <property name="destination" value="${basedir}/build/app"/>
  <property name="testdir" value="${basedir}/build/test"/>
  <property name="origin" value="${basedir}"/>

core/.htaccess

@@ -0,0 +1,2 @@
+order deny,allow
+deny from all

core/admin/clients/index.php

@@ -4,48 +4,48 @@
  Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
  */
 
+use Classes\PermissionManager;
+use Clients\Common\Model\Client;
+
 $moduleName = 'clients';
 $moduleGroup = 'admin';
-define('MODULE_PATH',dirname(__FILE__));
-include APP_BASE_PATH.'header.php';
-include APP_BASE_PATH.'modulejslibs.inc.php';
+define('MODULE_PATH', dirname(__FILE__));
+include APP_BASE_PATH . 'header.php';
+include APP_BASE_PATH . 'modulejslibs.inc.php';
 ?><div class="span9">
 
-	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-		<li class="active"><a id="tabClient" href="#tabPageClient"><?=t('Clients')?></a></li>
-	</ul>
+    <ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
+        <li class="active"><a id="tabClient" href="#tabPageClient"><?= t('Clients') ?></a></li>
+    </ul>
 
-	<div class="tab-content">
-		<div class="tab-pane active" id="tabPageClient">
-			<div id="Client" class="reviewBlock" data-content="List" style="padding-left:5px;">
-
-			</div>
-			<div id="ClientForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
-
-			</div>
-		</div>
-	</div>
+    <div class="tab-content">
+        <div class="tab-pane active" id="tabPageClient">
+            <div id="ClientTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
+            <div id="ClientForm"></div>
+            <div id="ClientFilterForm"></div>
+        </div>
+    </div>
 
 </div>
-<script>
-var modJsList = [];
+<?php
+$moduleData = [
+    'user_level' => $user->user_level,
+    'permissions' => [
+        'Client' => PermissionManager::checkGeneralAccess(new Client()),
+    ]
+];
+?>
+    <script>
+      var data = <?= json_encode($moduleData) ?>;
+      var modJsList = [];
 
-modJsList['tabClient'] = new ClientAdapter('Client','Client');
+      modJsList['tabClient'] = new ClientAdapter('Client');
 
-<?php if(isset($modulePermissions['perm']['Add Clients']) && $modulePermissions['perm']['Add Clients'] == "No"){?>
-modJsList['tabClient'].setShowAddNew(false);
-<?php }?>
+      modJsList.tabClient.setObjectTypeName('Client');
+      modJsList.tabClient.setAccess(data.permissions.Client);
+      modJsList.tabClient.setDataPipe(new IceDataPipe(modJsList.tabClient));
+      modJsList.tabClient.setRemoteTable(true);
 
-<?php if(isset($modulePermissions['perm']['Delete Clients']) && $modulePermissions['perm']['Delete Clients'] == "No"){?>
-modJsList['tabClient'].setShowDelete(false);
-<?php }?>
-
-<?php if(isset($modulePermissions['perm']['Edit Clients']) && $modulePermissions['perm']['Edit Clients'] == "No"){?>
-modJsList['tabClient'].setShowSave(false);
-<?php }?>
-
-
-var modJs = modJsList['tabClient'];
-
-</script>
-<?php include APP_BASE_PATH.'footer.php';?>
+      var modJs = modJsList['tabClient'];
+    </script>
+<?php include APP_BASE_PATH . 'footer.php'; ?>

core/admin/company_structure/index.php

@@ -4,6 +4,7 @@
  Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
  */
 
+use Classes\BaseService;
 use Classes\PermissionManager;
 use Company\Common\Model\CompanyStructure;
 
@@ -60,6 +61,7 @@ path.link {
 <?php
 $moduleData = [
     'user_level' => $user->user_level,
+    'customFields' => BaseService::getInstance()->getCustomFields("CompanyStructure"),
     'permissions' => [
         'CompanyStructure' => PermissionManager::checkGeneralAccess(new CompanyStructure()),
     ]

core/admin/connection/index.php

@@ -0,0 +1,59 @@
+<?php
+use Classes\StatsHelper;
+use Connection\Common\ConnectionService;
+
+$moduleName = 'connection';
+$moduleGroup = 'admin';
+define('MODULE_PATH',dirname(__FILE__));
+include APP_BASE_PATH.'header.php';
+include APP_BASE_PATH.'modulejslibs.inc.php';
+
+$isIceHrmPro = false;
+if (class_exists('\\Classes\\ProVersion')) {
+    $data = \Classes\ProVersion::$data;
+    $isIceHrmPro = true;
+    $data = json_decode($data, true);
+}
+
+$employeeCount = StatsHelper::getEmployeeCount();
+$userCount = StatsHelper::getUserCount();
+$connectionService = new ConnectionService();
+?><div class="span9">
+
+    <ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
+        <li class="active"><a id="tabConnection" href="#tabConnection"><?=t('Connection')?></a></li>
+    </ul>
+
+    <div class="tab-content">
+        <div class="tab-pane active" id="tabConnection">
+            <div class="reviewBlock" data-content="List">
+                <div id="connectionData"></div>
+            </div>
+        </div>
+    </div>
+
+</div>
+<div id="dataGroup"></div>
+<?php
+$moduleData = [
+    'user_level' => $user->user_level,
+    'components' => [
+            'employeeCount' => [
+                    'isIceHrmPro' => $isIceHrmPro,
+                    'count' => $employeeCount,
+                    'allowed' => $isIceHrmPro ? intval($data['employees']) : 'N/A',
+                    'validUntil' => $data['licenseActivated'],
+                    'licenseId' => $data['key'],
+            ],
+            'systemData' => [
+                    'data' => $connectionService->getSystemReport(),
+                    'issues' => $connectionService->getSystemErrors(),
+            ],
+    ]
+];
+?>
+<script>
+  initAdminConnection(<?=json_encode($moduleData)?>);
+</script>
+<?php include APP_BASE_PATH.'footer.php';?>
+

core/admin/connection/meta.json

@@ -0,0 +1,12 @@
+{
+    "label": "Ice Connect",
+    "menu": "System",
+    "order": "9",
+    "icon": "fa-wifi",
+    "user_levels": [
+        "Admin"
+    ],
+    "permissions": [],
+    "model_namespace": "\\Connection\\Common\\Model",
+    "manager": "\\Connection\\Admin\\Api\\ConnectionAdminManager"
+}

core/admin/custom_fields/index.php

@@ -0,0 +1,42 @@
+<?php
+
+use Classes\BaseService;
+use Classes\PermissionManager;
+use FieldNames\Common\Model\CustomField;
+
+$moduleName = 'assets';
+$moduleGroup = 'admin';
+define('MODULE_PATH',dirname(__FILE__));
+include APP_BASE_PATH.'header.php';
+include APP_BASE_PATH.'modulejslibs.inc.php';
+$modelClasses = BaseService::getInstance()->getCustomFieldClassMap();
+?><div class="span9">
+
+    <ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
+        <li class="active"><a id="tabCustomField" href="#tabPageCustomField"><?=t('Custom Fields')?></a></li>
+    </ul>
+
+    <div class="tab-content">
+        <div class="tab-pane active" id="tabPageCustomField">
+            <div id="CustomFieldTable" class="reviewBlock" data-content="List"></div>
+            <div id="CustomFieldForm"></div>
+            <div id="CustomFieldFilterForm"></div>
+        </div>
+    </div>
+
+</div>
+<div id="dataGroup"></div>
+<?php
+$moduleData = [
+    'user_level' => $user->user_level,
+    'types' => $modelClasses,
+    'permissions' => [
+        'CustomField' => PermissionManager::checkGeneralAccess(new CustomField()),
+    ]
+];
+?>
+<script>
+  initAdminCustomFields(<?=json_encode($moduleData)?>);
+</script>
+<?php include APP_BASE_PATH.'footer.php';?>
+

core/admin/custom_fields/meta.json

@@ -0,0 +1,12 @@
+{
+    "label": "Custom Fields",
+    "menu": "Admin",
+    "order": "892",
+    "icon": "fa-code",
+    "user_levels": [
+        "Admin"
+    ],
+    "permissions": [],
+    "model_namespace": "\\FieldNames\\Common\\Model",
+    "manager": "\\CustomField\\Admin\\Api\\CustomFieldAdminManager"
+}

core/admin/fieldnames/index.php

@@ -13,8 +13,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 
 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
         <li class="active"><a id="tabEmployeeFieldName" href="#tabPageEmployeeFieldName"><?=t('Employee Field Names')?></a></li>
-        <li><a id="tabEmployeeCustomField" href="#tabPageEmployeeCustomField"><?=t('Employee Custom Fields')?></a></li>
-	</ul>
+    </ul>
 
 	<div class="tab-content">
         <div class="tab-pane active" id="tabPageEmployeeFieldName">
@@ -25,29 +24,17 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 
             </div>
         </div>
-        <div class="tab-pane" id="tabPageEmployeeCustomField">
-            <div id="EmployeeCustomField" class="reviewBlock" data-content="List" style="padding-left:5px;">
-
-            </div>
-            <div id="EmployeeCustomFieldForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
-
-            </div>
-        </div>
 	</div>
 
 </div>
 <script>
-var modJsList = new Array();
+var modJsList = [];
 
 modJsList['tabEmployeeFieldName'] = new FieldNameAdapter('FieldNameMapping','EmployeeFieldName',{"type":"Employee"});
 modJsList['tabEmployeeFieldName'].setRemoteTable(true);
 modJsList['tabEmployeeFieldName'].setShowDelete(false);
 modJsList['tabEmployeeFieldName'].setShowAddNew(false);
 
-modJsList['tabEmployeeCustomField'] = new CustomFieldAdapter('CustomField','EmployeeCustomField',{"type":"Employee"},"display_order desc");
-modJsList['tabEmployeeCustomField'].setRemoteTable(true);
-modJsList['tabEmployeeCustomField'].setTableType("Employee");
-
 
 var modJs = modJsList['tabEmployeeFieldName'];
 

core/admin/projects/index.php

@@ -4,71 +4,65 @@
  Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
  */
 
+use Classes\PermissionManager;
+use Projects\Common\Model\Project;
+use Projects\Common\Model\EmployeeProject;
+
 $moduleName = 'projects';
 $moduleGroup = 'admin';
-define('MODULE_PATH',dirname(__FILE__));
-include APP_BASE_PATH.'header.php';
-include APP_BASE_PATH.'modulejslibs.inc.php';
+define('MODULE_PATH', dirname(__FILE__));
+include APP_BASE_PATH . 'header.php';
+include APP_BASE_PATH . 'modulejslibs.inc.php';
+
 ?><div class="span9">
 
-	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-		<li class="active"><a id="tabProject" href="#tabPageProject"><?=t('Projects')?></a></li>
-		<li><a id="tabEmployeeProject" href="#tabPageEmployeeProject"><?=t('Employee Projects')?></a></li>
-	</ul>
 
-	<div class="tab-content">
-		<div class="tab-pane active" id="tabPageProject">
-			<div id="Project" class="reviewBlock" data-content="List" style="padding-left:5px;">
+    <ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
+        <li class="active"><a id="tabProject" href="#tabPageProject"><?= t('Projects') ?></a></li>
+        <li><a id="tabEmployeeProject" href="#tabPageEmployeeProject"><?= t('Employee Projects') ?></a></li>
+    </ul>
 
-			</div>
-			<div id="ProjectForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
-
-			</div>
-		</div>
-		<div class="tab-pane" id="tabPageEmployeeProject">
-			<div id="EmployeeProject" class="reviewBlock" data-content="List" style="padding-left:5px;">
-
-			</div>
-			<div id="EmployeeProjectForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
-
-			</div>
-		</div>
-	</div>
+    <div class="tab-content">
+        <div class="tab-pane active" id="tabPageProject">
+            <div id="ProjectTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
+            <div id="ProjectForm"></div>
+            <div id="ProjectFilterForm"></div>
+        </div>
+        <div class="tab-pane" id="tabPageEmployeeProject">
+            <div id="EmployeeProjectTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
+            <div id="EmployeeProjectForm"></div>
+            <div id="EmployeeProjectFilterForm"></div>
+        </div>
+    </div>
 
 </div>
+<?php
+$moduleData = [
+    'user_level' => $user->user_level,
+    'permissions' => [
+        'Project' => PermissionManager::checkGeneralAccess(new Project()),
+        'EmployeeProject' => PermissionManager::checkGeneralAccess(new EmployeeProject()),
+    ]
+];
+?>
 <script>
-var modJsList = [];
+  var modJsList = [];
+  var data = <?= json_encode($moduleData) ?>;
+  modJsList['tabProject'] = new ProjectAdapter('Project', 'Project');
+  modJsList.tabProject.setObjectTypeName('Project');
+  modJsList.tabProject.setAccess(data.permissions.Project);
+  modJsList.tabProject.setDataPipe(new IceDataPipe(modJsList.tabProject));
+  modJsList.tabProject.setRemoteTable(true);
 
-modJsList['tabProject'] = new ProjectAdapter('Project','Project');
-
-<?php if(isset($modulePermissions['perm']['Add Projects']) && $modulePermissions['perm']['Add Projects'] == "No"){?>
-modJsList['tabProject'].setShowAddNew(false);
-<?php }?>
-
-<?php if(isset($modulePermissions['perm']['Delete Projects']) && $modulePermissions['perm']['Delete Projects'] == "No"){?>
-modJsList['tabProject'].setShowDelete(false);
-<?php }?>
-
-<?php if(isset($modulePermissions['perm']['Edit Projects']) && $modulePermissions['perm']['Edit Projects'] == "No"){?>
-modJsList['tabProject'].setShowSave(false);
-<?php }?>
+  modJsList['tabEmployeeProject'] = new EmployeeProjectAdapter('EmployeeProject', 'EmployeeProject');
 
 
-modJsList['tabEmployeeProject'] = new EmployeeProjectAdapter('EmployeeProject','EmployeeProject');
-modJsList['tabEmployeeProject'].setRemoteTable(true);
+  modJsList.tabEmployeeProject.setObjectTypeName('Employee Project');
+  modJsList.tabEmployeeProject.setAccess(data.permissions.EmployeeProject);
+  modJsList.tabEmployeeProject.setDataPipe(new IceDataPipe(modJsList.tabEmployeeProject));
+  modJsList.tabEmployeeProject.setRemoteTable(true);
 
-<?php if(isset($modulePermissions['perm']['Add Projects']) && $modulePermissions['perm']['Add Projects'] == "No"){?>
-modJsList['tabEmployeeProject'].setShowAddNew(false);
-<?php }?>
-<?php if(isset($modulePermissions['perm']['Delete Projects']) && $modulePermissions['perm']['Delete Projects'] == "No"){?>
-modJsList['tabEmployeeProject'].setShowDelete(false);
-<?php }?>
-<?php if(isset($modulePermissions['perm']['Edit Projects']) && $modulePermissions['perm']['Edit Projects'] == "No"){?>
-modJsList['tabEmployeeProject'].setShowEdit(false);
-<?php }?>
-
-
-var modJs = modJsList['tabProject'];
+  var modJs = modJsList['tabProject'];
 
 </script>
-<?php include APP_BASE_PATH.'footer.php';?>
+<?php include APP_BASE_PATH . 'footer.php'; ?>

core/admin/settings/index.php

@@ -6,6 +6,7 @@
 
 use Classes\ModuleBuilder\ModuleBuilder;
 use Classes\ModuleBuilder\ModuleTab;
+use Classes\UIManager;
 
 $moduleName = 'settings';
 $moduleGroup = 'admin';
@@ -19,32 +20,46 @@ $options1 = array();
 $options1['setShowAddNew'] = 'false';
 $options1['setRemoteTable'] = 'true';
 
+$notCloud = !defined('IS_CLOUD') || IS_CLOUD == false;
+
 $moduleBuilder->addModuleOrGroup(new ModuleTab(
     'CompanySetting','Setting','Company','SettingAdapter','{"category":"Company"}','name',true,$options1
 ));
 $moduleBuilder->addModuleOrGroup(new ModuleTab(
     'SystemSetting','Setting','System','SettingAdapter','{"category":"System"}','name',false,$options1
 ));
-if (!defined('CLOUD_INSTALLATION')) {
+if ( $notCloud ) {
     $moduleBuilder->addModuleOrGroup(new ModuleTab(
         'EmailSetting', 'Setting', 'Email', 'SettingAdapter', '{"category":"Email"}', 'name', false, $options1
     ));
 }
+if(defined('LEAVE_ENABLED') && LEAVE_ENABLED == true) {
+    $moduleBuilder->addModuleOrGroup(new ModuleTab(
+        'LeaveSetting', 'Setting', 'Leave', 'SettingAdapter', '{"category":"Leave"}', 'name', false, $options1
+    ));
+}
+
 $moduleBuilder->addModuleOrGroup(new ModuleTab(
-    'LeaveSetting','Setting','Leave / PTO','SettingAdapter','{"category":"Leave"}','name',false,$options1
+    'AttendanceSetting','Setting','Attendance','SettingAdapter','{"category":"Attendance"}','name',false,$options1
 ));
+
 if(!defined('LDAP_ENABLED') || LDAP_ENABLED == true){
     $moduleBuilder->addModuleOrGroup(new ModuleTab(
         'LDAPSetting','Setting','LDAP','SettingAdapter','{"category":"LDAP"}','name',false,$options1
     ));
 }
-$moduleBuilder->addModuleOrGroup(new ModuleTab(
-    'AttendanceSetting','Setting','Attendance','SettingAdapter','{"category":"Attendance"}','name',false,$options1
-));
+
+if(!defined('SAML_ENABLED') || SAML_ENABLED == true){
+    $moduleBuilder->addModuleOrGroup(new ModuleTab(
+        'SAMLSetting','Setting','SAML','SettingAdapter','{"category":"SAML"}','name',false,$options1
+    ));
+}
+
+
 $moduleBuilder->addModuleOrGroup(new ModuleTab(
     'OtherSetting','Setting','Other','SettingAdapter','{"category":["Projects","Recruitment","Notifications","Expense","Travel","Api","Overtime"]}','name',false,$options1
 ));
-echo \Classes\UIManager::getInstance()->renderModule($moduleBuilder);
+echo UIManager::getInstance()->renderModule($moduleBuilder);
 ?>
 </div>
 <script>

core/admin/travel/index.php

@@ -31,22 +31,6 @@ $moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
     $travelRequestOptions
 ));
 
-if ($user->user_level === 'Admin') {
-    $travelCustomFieldOptions = [];
-    $travelCustomFieldOptions['setRemoteTable'] = 'true';
-    $travelCustomFieldOptions['setTableType'] = '\'EmployeeTravelRecord\'';
-
-    $moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
-        'TravelCustomField',
-        'CustomField',
-        'Custom Fields',
-        'CustomFieldAdapter',
-        '{"type":"EmployeeTravelRecord"}',
-        '',
-        false,
-        $travelCustomFieldOptions
-    ));
-}
 
 echo \Classes\UIManager::getInstance()->renderModule($moduleBuilder);
 

core/api-rest.php

@@ -0,0 +1,47 @@
+<?php
+define('CLIENT_PATH',dirname(__FILE__));
+include ("config.base.php");
+include ("include.common.php");
+include("server.includes.inc.php");
+
+if(\Classes\SettingsManager::getInstance()->getSetting('Api: REST Api Enabled') == '1') {
+
+    if (defined('SYM_CLIENT')) {
+        define('REST_API_PATH', '/'.SYM_CLIENT.'/');
+    } else if (!defined('REST_API_PATH')){
+        define('REST_API_PATH', '/');
+    }
+
+
+    \Utils\LogManager::getInstance()->info("Request: " . $_REQUEST);
+
+    if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
+        http_response_code(200);
+        exit();
+    }
+
+    $echoRoute = \Classes\Macaw::get(REST_API_PATH . 'echo', function () {
+        echo "Echo " . rand();
+    });
+
+    \Utils\LogManager::getInstance()->debug('Api registered URI: '.$echoRoute);
+
+    $moduleManagers = \Classes\BaseService::getInstance()->getModuleManagers();
+
+    foreach ($moduleManagers as $moduleManagerObj) {
+
+        $moduleManagerObj->setupRestEndPoints();
+    }
+    $uri = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
+    $method = $_SERVER['REQUEST_METHOD'];
+    \Utils\LogManager::getInstance()->debug('Api dispatch URI: '.$uri);
+    \Utils\LogManager::getInstance()->debug('Api dispatch method: '.$uri);
+    if (!defined('SYM_CLIENT')) {
+        //For hosted installations, dispatch will be done in app/index
+        \Classes\Macaw::dispatch();
+    }
+
+
+}else{
+    echo "REST Api is not enabled. Please set 'Api: REST Api Enabled' setting to true";
+}

core/api-url-based.php

@@ -0,0 +1,39 @@
+<?php
+define('CLIENT_PATH',dirname(__FILE__));
+include ("config.base.php");
+include ("include.common.php");
+include("server.includes.inc.php");
+
+if(\Classes\SettingsManager::getInstance()->getSetting('Api: REST Api Enabled') == '1') {
+
+    if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
+        http_response_code(200);
+        exit();
+    }
+
+    define('REST_API_PATH', '/');
+
+    $echoRoute = \Classes\Macaw::get(REST_API_PATH . 'echo', function () {
+        echo "Echo " . rand();
+    });
+
+    \Utils\LogManager::getInstance()->debug('Api registered URI: '.$echoRoute);
+
+    $moduleManagers = \Classes\BaseService::getInstance()->getModuleManagers();
+
+    foreach ($moduleManagers as $moduleManagerObj) {
+
+        $moduleManagerObj->setupRestEndPoints();
+    }
+    $method = $_SERVER['REQUEST_METHOD'];
+    if (strtoupper($method) === 'GET') {
+        \Classes\IceRoute::dispatch($_GET['url'], $method);
+    } else {
+        $method = strtoupper($_REQUEST['method']);
+        \Classes\IceRoute::dispatch($_REQUEST['url'], $method);
+    }
+
+
+}else{
+    echo "REST Api is not enabled. Please set 'Api: REST Api Enabled' setting to true";
+}

core/config.base.php

@@ -13,14 +13,13 @@ if(!defined('HOME_LINK_OTHERS')){
 }
 
 //Version
-define('VERSION', '28.1.0.OS');
-define('CACHE_VALUE', '28.1.0.OS.2020-10311445');
-define('VERSION_NUMBER', '280100');
-define('VERSION_DATE', '31/10/2020');
+define('VERSION', '30.0.0.OS');
+define('CACHE_VALUE', '30.0.0.OS.2021-06261009');
+define('VERSION_NUMBER', '300000');
+define('VERSION_DATE', '26/06/2021');
 
 if(!defined('CONTACT_EMAIL')){define('CONTACT_EMAIL','icehrm@gamonoid.com');}
 if(!defined('KEY_PREFIX')){define('KEY_PREFIX','IceHrm');}
-if(!defined('APP_SEC')){define('APP_SEC','dbcs234d2saaqw');}
 
 define('UI_SHOW_SWITCH_PROFILE', true);
 define('CRON_LOG', ini_get('error_log'));
@@ -33,6 +32,13 @@ if(!defined('WK_HTML_PATH')){
 }
 define('ALL_CLIENT_BASE_PATH', '/var/www/icehrm.app/icehrmapp/');
 
+define('IS_CLOUD', false);
 define('LDAP_ENABLED', true);
+define('SAML_ENABLED', true);
+define('LEAVE_ENABLED', true);
 define('RECRUITMENT_ENABLED', false);
 define('APP_WEB_URL', 'https://icehrm.com');
+
+if (!defined('EXTENSIONS_URL')) {
+    define('EXTENSIONS_URL', str_replace('/web/', '/extensions/', BASE_URL));
+}

core/fileupload.php

@@ -139,7 +139,7 @@ $result = $uploader->handleUpload(CLIENT_BASE_PATH.'data/',$saveFileName);
 $uploadFilesToS3 = \Classes\SettingsManager::getInstance()->getSetting("Files: Upload Files to S3");
 $uploadFilesToS3Key = \Classes\SettingsManager::getInstance()->getSetting("Files: Amazon S3 Key for File Upload");
 $uploadFilesToS3Secret = \Classes\SettingsManager::getInstance()->getSetting(
-    "Files: Amazone S3 Secret for File Upload"
+    "Files: Amazon S3 Secret for File Upload"
 );
 $s3Bucket = \Classes\SettingsManager::getInstance()->getSetting("Files: S3 Bucket");
 $s3WebUrl = \Classes\SettingsManager::getInstance()->getSetting("Files: S3 Web Url");
@@ -188,7 +188,7 @@ if($result['success'] == 1){
     if($uploadedToS3){
         $result['data'] = $file_url;
     }else{
-        $result['data'] = CLIENT_BASE_URL.'data/'.$result['filename'];
+        $result['data'] = \Classes\FileService::getInstance()->getLocalSecureUrl($result['filename']);
     }
     $result['data'] .= "|".$saveFileName;
     $result['data'] .= "|".$file->id;

core/footer.php

@@ -18,6 +18,7 @@
 				modJsList[prop].setUser(<?=json_encode(\Classes\BaseService::getInstance()->cleanUpUser($user))?>);
                 modJsList[prop].initSourceMappings();
 				modJsList[prop].setBaseUrl('<?=BASE_URL?>');
+				modJsList[prop].setClientUrl('<?=CLIENT_BASE_URL?>');
 				modJsList[prop].setCurrentProfile(<?=json_encode($activeProfile)?>);
 				modJsList[prop].setInstanceId('<?=\Classes\BaseService::getInstance()->getInstanceId()?>');
 				modJsList[prop].setGoogleAnalytics(ga);
@@ -146,7 +147,9 @@
 
 
 	</script>
-	<?php include 'popups.php';?>
+	<?php
+        include 'popups.php';
+    ?>
     <script src="<?=BASE_URL?>js/bootstrap-datatable.js"></script>
     <div id="jt" t="<?=$jwtService->create(3600)?>"></div>
     </body>

core/header.php

@@ -215,6 +215,26 @@ if (defined('SYM_CLIENT')) {
 
                 <?php }?>
 
+                <?php foreach($extensions as $menu){?>
+                    <?php if(count($menu['menu']) == 0){continue;}?>
+                    <li  class="treeview" ref="<?="extension_".str_replace(" ", "_", $menu['name'])?>">
+                        <a href="#">
+                            <i class="fa <?=!isset($mainIcons[$menu['name']])?"fa-th":$mainIcons[$menu['name']];?>"></i></i> <span><?=\Classes\LanguageManager::tran($menu['name'])?></span>
+                            <i class="fa fa-angle-left pull-right"></i>
+                        </a>
+
+                        <ul class="treeview-menu" id="<?="extension_".str_replace(" ", "_", $menu['name'])?>">
+                            <?php foreach ($menu['menu'] as $item){?>
+                                <li>
+                                    <a data-turbolinks="true" href="<?=CLIENT_BASE_URL?>?g=extension&n=<?=$item['name']?>&m=<?="extension_".str_replace(" ", "_", $menu['name'])?>">
+                                        <i class="fa <?=!isset($item['icon'])?"fa-angle-double-right":$item['icon']?>"></i> <?=\Classes\LanguageManager::tran($item['label'])?>
+                                    </a>
+                                </li>
+                            <?php }?>
+                        </ul>
+                    </li>
+                <?php }?>
+
                 <?php
                 if(file_exists(CLIENT_PATH.'/third_party_meta.json')){
                     $tpModules = json_decode(file_get_contents(CLIENT_PATH.'/third_party_meta.json'),true);

core/lib/composer/vendor/gettext/gettext/CONTRIBUTING.md

@@ -1,17 +1,17 @@
-Contributing to Gettext
-=======================
-
-Looking to contribute something to this library? Here's how you can help.
-
-## Bugs
-
-A bug is a demonstrable problem that is caused by the code in the repository. Good bug reports are extremely helpful – thank you!
-
-Please try to be as detailed as possible in your report. Include specific information about the environment – version of PHP, version of gettext, etc, and steps required to reproduce the issue.
-
-## Pull Requests
-
-Good pull requests – patches, improvements, new features – are a fantastic help. New extractors or generator are welcome. Before create a pull request, please follow these instructions:
-
-* The code must be PSR-2 compliant
-* Write some tests
+Contributing to Gettext
+=======================
+
+Looking to contribute something to this library? Here's how you can help.
+
+## Bugs
+
+A bug is a demonstrable problem that is caused by the code in the repository. Good bug reports are extremely helpful – thank you!
+
+Please try to be as detailed as possible in your report. Include specific information about the environment – version of PHP, version of gettext, etc, and steps required to reproduce the issue.
+
+## Pull Requests
+
+Good pull requests – patches, improvements, new features – are a fantastic help. New extractors or generator are welcome. Before create a pull request, please follow these instructions:
+
+* The code must be PSR-2 compliant
+* Write some tests

core/lib/composer/vendor/phpmd/phpmd/src/bin/phpmd.bat

@@ -1,45 +1,45 @@
-@echo off
-REM This file is part of PHP Mess Detector.
-REM
-REM Copyright (c) 2008-2012, Manuel Pichler <mapi@phpmd.org>.
-REM All rights reserved.
-REM
-REM Redistribution and use in source and binary forms, with or without
-REM modification, are permitted provided that the following conditions
-REM are met:
-REM
-REM   * Redistributions of source code must retain the above copyright
-REM     notice, this list of conditions and the following disclaimer.
-REM
-REM   * Redistributions in binary form must reproduce the above copyright
-REM     notice, this list of conditions and the following disclaimer in
-REM     the documentation and/or other materials provided with the
-REM     distribution.
-REM
-REM   * Neither the name of Manuel Pichler nor the names of his
-REM     contributors may be used to endorse or promote products derived
-REM     from this software without specific prior written permission.
-REM
-REM THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-REM "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-REM LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-REM FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-REM COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-REM INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-REM BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-REM LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-REM CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
-REM LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-REM ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-REM POSSIBILITY OF SUCH DAMAGE.
-REM
-REM $Id$
-REM
-
-if "%PHPBIN%" == "" set PHPBIN=@php_bin@
-if not exist "%PHPBIN%" if "%PHP_PEAR_PHP_BIN%" neq "" goto USE_PEAR_PATH
-GOTO RUN
-:USE_PEAR_PATH
-set PHPBIN=%PHP_PEAR_PHP_BIN%
-:RUN
-"%PHPBIN%" "@bin_dir@\phpmd" %*
+@echo off
+REM This file is part of PHP Mess Detector.
+REM
+REM Copyright (c) 2008-2012, Manuel Pichler <mapi@phpmd.org>.
+REM All rights reserved.
+REM
+REM Redistribution and use in source and binary forms, with or without
+REM modification, are permitted provided that the following conditions
+REM are met:
+REM
+REM   * Redistributions of source code must retain the above copyright
+REM     notice, this list of conditions and the following disclaimer.
+REM
+REM   * Redistributions in binary form must reproduce the above copyright
+REM     notice, this list of conditions and the following disclaimer in
+REM     the documentation and/or other materials provided with the
+REM     distribution.
+REM
+REM   * Neither the name of Manuel Pichler nor the names of his
+REM     contributors may be used to endorse or promote products derived
+REM     from this software without specific prior written permission.
+REM
+REM THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+REM "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+REM LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+REM FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+REM COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+REM INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+REM BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+REM LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+REM CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
+REM LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+REM ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+REM POSSIBILITY OF SUCH DAMAGE.
+REM
+REM $Id$
+REM
+
+if "%PHPBIN%" == "" set PHPBIN=@php_bin@
+if not exist "%PHPBIN%" if "%PHP_PEAR_PHP_BIN%" neq "" goto USE_PEAR_PATH
+GOTO RUN
+:USE_PEAR_PATH
+set PHPBIN=%PHP_PEAR_PHP_BIN%
+:RUN
+"%PHPBIN%" "@bin_dir@\phpmd" %*

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testEmptyTable.dat

@@ -1,2 +1,2 @@
-+----------------------------------------------------------------------------------+
++----------------------------------------------------------------------------------+
 +----------------------------------------------------------------------------------+

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testFinish.dat

@@ -1,6 +1,6 @@
- 1 / 10 [+++++>------------------------------------------------------]  10.00%
- 2 / 10 [+++++++++++>------------------------------------------------]  20.00%
- 3 / 10 [+++++++++++++++++>------------------------------------------]  30.00%
- 4 / 10 [+++++++++++++++++++++++>------------------------------------]  40.00%
- 5 / 10 [+++++++++++++++++++++++++++++>------------------------------]  50.00%
+ 1 / 10 [+++++>------------------------------------------------------]  10.00%
+ 2 / 10 [+++++++++++>------------------------------------------------]  20.00%
+ 3 / 10 [+++++++++++++++++>------------------------------------------]  30.00%
+ 4 / 10 [+++++++++++++++++++++++>------------------------------------]  40.00%
+ 5 / 10 [+++++++++++++++++++++++++++++>------------------------------]  50.00%
 10 / 10 [+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++>] 100.00%

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testOneRowOneColumnTable.dat

@@ -1,3 +1,3 @@
-+-----+
-| foo |
++-----+
+| foo |
 +-----+

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgress1.dat

@@ -1,4 +1,4 @@
-13 / 42 [+++++++++++++++++++>----------------------------------------]  30.95%
-26 / 42 [+++++++++++++++++++++++++++++++++++++++>--------------------]  61.90%
-39 / 42 [+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++>]  92.86%
+13 / 42 [+++++++++++++++++++>----------------------------------------]  30.95%
+26 / 42 [+++++++++++++++++++++++++++++++++++++++>--------------------]  61.90%
+39 / 42 [+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++>]  92.86%
 42 / 42 [+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++>] 100.00%

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgress10.dat

@@ -1,10 +1,10 @@
- 10 / 100 [+++++>----------------------------------------------------]  10.00%
- 20 / 100 [+++++++++++>----------------------------------------------]  20.00%
- 30 / 100 [+++++++++++++++++>----------------------------------------]  30.00%
- 40 / 100 [+++++++++++++++++++++++>----------------------------------]  40.00%
- 50 / 100 [++++++++++++++++++++++++++++>-----------------------------]  50.00%
- 60 / 100 [++++++++++++++++++++++++++++++++++>-----------------------]  60.00%
- 70 / 100 [++++++++++++++++++++++++++++++++++++++++>-----------------]  70.00%
- 80 / 100 [++++++++++++++++++++++++++++++++++++++++++++++>-----------]  80.00%
- 90 / 100 [++++++++++++++++++++++++++++++++++++++++++++++++++++>-----]  90.00%
+ 10 / 100 [+++++>----------------------------------------------------]  10.00%
+ 20 / 100 [+++++++++++>----------------------------------------------]  20.00%
+ 30 / 100 [+++++++++++++++++>----------------------------------------]  30.00%
+ 40 / 100 [+++++++++++++++++++++++>----------------------------------]  40.00%
+ 50 / 100 [++++++++++++++++++++++++++++>-----------------------------]  50.00%
+ 60 / 100 [++++++++++++++++++++++++++++++++++>-----------------------]  60.00%
+ 70 / 100 [++++++++++++++++++++++++++++++++++++++++>-----------------]  70.00%
+ 80 / 100 [++++++++++++++++++++++++++++++++++++++++++++++>-----------]  80.00%
+ 90 / 100 [++++++++++++++++++++++++++++++++++++++++++++++++++++>-----]  90.00%
 100 / 100 [+++++++++++++++++++++++++++++++++++++++++++++++++++++++++>] 100.00%

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgress11.dat

@@ -1,40 +1,40 @@
-  2.50 / 100.00 [+>--------------------------------------------------]   2.50%
-  5.00 / 100.00 [++>-------------------------------------------------]   5.00%
-  7.50 / 100.00 [+++>------------------------------------------------]   7.50%
- 10.00 / 100.00 [+++++>----------------------------------------------]  10.00%
- 12.50 / 100.00 [++++++>---------------------------------------------]  12.50%
- 15.00 / 100.00 [+++++++>--------------------------------------------]  15.00%
- 17.50 / 100.00 [+++++++++>------------------------------------------]  17.50%
- 20.00 / 100.00 [++++++++++>-----------------------------------------]  20.00%
- 22.50 / 100.00 [+++++++++++>----------------------------------------]  22.50%
- 25.00 / 100.00 [++++++++++++>---------------------------------------]  25.00%
- 27.50 / 100.00 [++++++++++++++>-------------------------------------]  27.50%
- 30.00 / 100.00 [+++++++++++++++>------------------------------------]  30.00%
- 32.50 / 100.00 [++++++++++++++++>-----------------------------------]  32.50%
- 35.00 / 100.00 [++++++++++++++++++>---------------------------------]  35.00%
- 37.50 / 100.00 [+++++++++++++++++++>--------------------------------]  37.50%
- 40.00 / 100.00 [++++++++++++++++++++>-------------------------------]  40.00%
- 42.50 / 100.00 [++++++++++++++++++++++>-----------------------------]  42.50%
- 45.00 / 100.00 [+++++++++++++++++++++++>----------------------------]  45.00%
- 47.50 / 100.00 [++++++++++++++++++++++++>---------------------------]  47.50%
- 50.00 / 100.00 [+++++++++++++++++++++++++>--------------------------]  50.00%
- 52.50 / 100.00 [+++++++++++++++++++++++++++>------------------------]  52.50%
- 55.00 / 100.00 [++++++++++++++++++++++++++++>-----------------------]  55.00%
- 57.50 / 100.00 [+++++++++++++++++++++++++++++>----------------------]  57.50%
- 60.00 / 100.00 [+++++++++++++++++++++++++++++++>--------------------]  60.00%
- 62.50 / 100.00 [++++++++++++++++++++++++++++++++>-------------------]  62.50%
- 65.00 / 100.00 [+++++++++++++++++++++++++++++++++>------------------]  65.00%
- 67.50 / 100.00 [+++++++++++++++++++++++++++++++++++>----------------]  67.50%
- 70.00 / 100.00 [++++++++++++++++++++++++++++++++++++>---------------]  70.00%
- 72.50 / 100.00 [+++++++++++++++++++++++++++++++++++++>--------------]  72.50%
- 75.00 / 100.00 [++++++++++++++++++++++++++++++++++++++>-------------]  75.00%
- 77.50 / 100.00 [++++++++++++++++++++++++++++++++++++++++>-----------]  77.50%
- 80.00 / 100.00 [+++++++++++++++++++++++++++++++++++++++++>----------]  80.00%
- 82.50 / 100.00 [++++++++++++++++++++++++++++++++++++++++++>---------]  82.50%
- 85.00 / 100.00 [++++++++++++++++++++++++++++++++++++++++++++>-------]  85.00%
- 87.50 / 100.00 [+++++++++++++++++++++++++++++++++++++++++++++>------]  87.50%
- 90.00 / 100.00 [++++++++++++++++++++++++++++++++++++++++++++++>-----]  90.00%
- 92.50 / 100.00 [++++++++++++++++++++++++++++++++++++++++++++++++>---]  92.50%
- 95.00 / 100.00 [+++++++++++++++++++++++++++++++++++++++++++++++++>--]  95.00%
- 97.50 / 100.00 [++++++++++++++++++++++++++++++++++++++++++++++++++>-]  97.50%
+  2.50 / 100.00 [+>--------------------------------------------------]   2.50%
+  5.00 / 100.00 [++>-------------------------------------------------]   5.00%
+  7.50 / 100.00 [+++>------------------------------------------------]   7.50%
+ 10.00 / 100.00 [+++++>----------------------------------------------]  10.00%
+ 12.50 / 100.00 [++++++>---------------------------------------------]  12.50%
+ 15.00 / 100.00 [+++++++>--------------------------------------------]  15.00%
+ 17.50 / 100.00 [+++++++++>------------------------------------------]  17.50%
+ 20.00 / 100.00 [++++++++++>-----------------------------------------]  20.00%
+ 22.50 / 100.00 [+++++++++++>----------------------------------------]  22.50%
+ 25.00 / 100.00 [++++++++++++>---------------------------------------]  25.00%
+ 27.50 / 100.00 [++++++++++++++>-------------------------------------]  27.50%
+ 30.00 / 100.00 [+++++++++++++++>------------------------------------]  30.00%
+ 32.50 / 100.00 [++++++++++++++++>-----------------------------------]  32.50%
+ 35.00 / 100.00 [++++++++++++++++++>---------------------------------]  35.00%
+ 37.50 / 100.00 [+++++++++++++++++++>--------------------------------]  37.50%
+ 40.00 / 100.00 [++++++++++++++++++++>-------------------------------]  40.00%
+ 42.50 / 100.00 [++++++++++++++++++++++>-----------------------------]  42.50%
+ 45.00 / 100.00 [+++++++++++++++++++++++>----------------------------]  45.00%
+ 47.50 / 100.00 [++++++++++++++++++++++++>---------------------------]  47.50%
+ 50.00 / 100.00 [+++++++++++++++++++++++++>--------------------------]  50.00%
+ 52.50 / 100.00 [+++++++++++++++++++++++++++>------------------------]  52.50%
+ 55.00 / 100.00 [++++++++++++++++++++++++++++>-----------------------]  55.00%
+ 57.50 / 100.00 [+++++++++++++++++++++++++++++>----------------------]  57.50%
+ 60.00 / 100.00 [+++++++++++++++++++++++++++++++>--------------------]  60.00%
+ 62.50 / 100.00 [++++++++++++++++++++++++++++++++>-------------------]  62.50%
+ 65.00 / 100.00 [+++++++++++++++++++++++++++++++++>------------------]  65.00%
+ 67.50 / 100.00 [+++++++++++++++++++++++++++++++++++>----------------]  67.50%
+ 70.00 / 100.00 [++++++++++++++++++++++++++++++++++++>---------------]  70.00%
+ 72.50 / 100.00 [+++++++++++++++++++++++++++++++++++++>--------------]  72.50%
+ 75.00 / 100.00 [++++++++++++++++++++++++++++++++++++++>-------------]  75.00%
+ 77.50 / 100.00 [++++++++++++++++++++++++++++++++++++++++>-----------]  77.50%
+ 80.00 / 100.00 [+++++++++++++++++++++++++++++++++++++++++>----------]  80.00%
+ 82.50 / 100.00 [++++++++++++++++++++++++++++++++++++++++++>---------]  82.50%
+ 85.00 / 100.00 [++++++++++++++++++++++++++++++++++++++++++++>-------]  85.00%
+ 87.50 / 100.00 [+++++++++++++++++++++++++++++++++++++++++++++>------]  87.50%
+ 90.00 / 100.00 [++++++++++++++++++++++++++++++++++++++++++++++>-----]  90.00%
+ 92.50 / 100.00 [++++++++++++++++++++++++++++++++++++++++++++++++>---]  92.50%
+ 95.00 / 100.00 [+++++++++++++++++++++++++++++++++++++++++++++++++>--]  95.00%
+ 97.50 / 100.00 [++++++++++++++++++++++++++++++++++++++++++++++++++>-]  97.50%
 100.00 / 100.00 [+++++++++++++++++++++++++++++++++++++++++++++++++++>] 100.00%

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgress12.dat

@@ -1,40 +1,40 @@
-  2.50 / 100.00000000 [+>--------------------------------------------]   2.50%
-  5.00 / 100.00000000 [++>-------------------------------------------]   5.00%
-  7.50 / 100.00000000 [+++>------------------------------------------]   7.50%
- 10.00 / 100.00000000 [++++>-----------------------------------------]  10.00%
- 12.50 / 100.00000000 [+++++>----------------------------------------]  12.50%
- 15.00 / 100.00000000 [++++++>---------------------------------------]  15.00%
- 17.50 / 100.00000000 [++++++++>-------------------------------------]  17.50%
- 20.00 / 100.00000000 [+++++++++>------------------------------------]  20.00%
- 22.50 / 100.00000000 [++++++++++>-----------------------------------]  22.50%
- 25.00 / 100.00000000 [+++++++++++>----------------------------------]  25.00%
- 27.50 / 100.00000000 [++++++++++++>---------------------------------]  27.50%
- 30.00 / 100.00000000 [+++++++++++++>--------------------------------]  30.00%
- 32.50 / 100.00000000 [++++++++++++++>-------------------------------]  32.50%
- 35.00 / 100.00000000 [++++++++++++++++>-----------------------------]  35.00%
- 37.50 / 100.00000000 [+++++++++++++++++>----------------------------]  37.50%
- 40.00 / 100.00000000 [++++++++++++++++++>---------------------------]  40.00%
- 42.50 / 100.00000000 [+++++++++++++++++++>--------------------------]  42.50%
- 45.00 / 100.00000000 [++++++++++++++++++++>-------------------------]  45.00%
- 47.50 / 100.00000000 [+++++++++++++++++++++>------------------------]  47.50%
- 50.00 / 100.00000000 [++++++++++++++++++++++>-----------------------]  50.00%
- 52.50 / 100.00000000 [++++++++++++++++++++++++>---------------------]  52.50%
- 55.00 / 100.00000000 [+++++++++++++++++++++++++>--------------------]  55.00%
- 57.50 / 100.00000000 [++++++++++++++++++++++++++>-------------------]  57.50%
- 60.00 / 100.00000000 [+++++++++++++++++++++++++++>------------------]  60.00%
- 62.50 / 100.00000000 [++++++++++++++++++++++++++++>-----------------]  62.50%
- 65.00 / 100.00000000 [+++++++++++++++++++++++++++++>----------------]  65.00%
- 67.50 / 100.00000000 [+++++++++++++++++++++++++++++++>--------------]  67.50%
- 70.00 / 100.00000000 [++++++++++++++++++++++++++++++++>-------------]  70.00%
- 72.50 / 100.00000000 [+++++++++++++++++++++++++++++++++>------------]  72.50%
- 75.00 / 100.00000000 [++++++++++++++++++++++++++++++++++>-----------]  75.00%
- 77.50 / 100.00000000 [+++++++++++++++++++++++++++++++++++>----------]  77.50%
- 80.00 / 100.00000000 [++++++++++++++++++++++++++++++++++++>---------]  80.00%
- 82.50 / 100.00000000 [+++++++++++++++++++++++++++++++++++++>--------]  82.50%
- 85.00 / 100.00000000 [+++++++++++++++++++++++++++++++++++++++>------]  85.00%
- 87.50 / 100.00000000 [++++++++++++++++++++++++++++++++++++++++>-----]  87.50%
- 90.00 / 100.00000000 [+++++++++++++++++++++++++++++++++++++++++>----]  90.00%
- 92.50 / 100.00000000 [++++++++++++++++++++++++++++++++++++++++++>---]  92.50%
- 95.00 / 100.00000000 [+++++++++++++++++++++++++++++++++++++++++++>--]  95.00%
- 97.50 / 100.00000000 [++++++++++++++++++++++++++++++++++++++++++++>-]  97.50%
+  2.50 / 100.00000000 [+>--------------------------------------------]   2.50%
+  5.00 / 100.00000000 [++>-------------------------------------------]   5.00%
+  7.50 / 100.00000000 [+++>------------------------------------------]   7.50%
+ 10.00 / 100.00000000 [++++>-----------------------------------------]  10.00%
+ 12.50 / 100.00000000 [+++++>----------------------------------------]  12.50%
+ 15.00 / 100.00000000 [++++++>---------------------------------------]  15.00%
+ 17.50 / 100.00000000 [++++++++>-------------------------------------]  17.50%
+ 20.00 / 100.00000000 [+++++++++>------------------------------------]  20.00%
+ 22.50 / 100.00000000 [++++++++++>-----------------------------------]  22.50%
+ 25.00 / 100.00000000 [+++++++++++>----------------------------------]  25.00%
+ 27.50 / 100.00000000 [++++++++++++>---------------------------------]  27.50%
+ 30.00 / 100.00000000 [+++++++++++++>--------------------------------]  30.00%
+ 32.50 / 100.00000000 [++++++++++++++>-------------------------------]  32.50%
+ 35.00 / 100.00000000 [++++++++++++++++>-----------------------------]  35.00%
+ 37.50 / 100.00000000 [+++++++++++++++++>----------------------------]  37.50%
+ 40.00 / 100.00000000 [++++++++++++++++++>---------------------------]  40.00%
+ 42.50 / 100.00000000 [+++++++++++++++++++>--------------------------]  42.50%
+ 45.00 / 100.00000000 [++++++++++++++++++++>-------------------------]  45.00%
+ 47.50 / 100.00000000 [+++++++++++++++++++++>------------------------]  47.50%
+ 50.00 / 100.00000000 [++++++++++++++++++++++>-----------------------]  50.00%
+ 52.50 / 100.00000000 [++++++++++++++++++++++++>---------------------]  52.50%
+ 55.00 / 100.00000000 [+++++++++++++++++++++++++>--------------------]  55.00%
+ 57.50 / 100.00000000 [++++++++++++++++++++++++++>-------------------]  57.50%
+ 60.00 / 100.00000000 [+++++++++++++++++++++++++++>------------------]  60.00%
+ 62.50 / 100.00000000 [++++++++++++++++++++++++++++>-----------------]  62.50%
+ 65.00 / 100.00000000 [+++++++++++++++++++++++++++++>----------------]  65.00%
+ 67.50 / 100.00000000 [+++++++++++++++++++++++++++++++>--------------]  67.50%
+ 70.00 / 100.00000000 [++++++++++++++++++++++++++++++++>-------------]  70.00%
+ 72.50 / 100.00000000 [+++++++++++++++++++++++++++++++++>------------]  72.50%
+ 75.00 / 100.00000000 [++++++++++++++++++++++++++++++++++>-----------]  75.00%
+ 77.50 / 100.00000000 [+++++++++++++++++++++++++++++++++++>----------]  77.50%
+ 80.00 / 100.00000000 [++++++++++++++++++++++++++++++++++++>---------]  80.00%
+ 82.50 / 100.00000000 [+++++++++++++++++++++++++++++++++++++>--------]  82.50%
+ 85.00 / 100.00000000 [+++++++++++++++++++++++++++++++++++++++>------]  85.00%
+ 87.50 / 100.00000000 [++++++++++++++++++++++++++++++++++++++++>-----]  87.50%
+ 90.00 / 100.00000000 [+++++++++++++++++++++++++++++++++++++++++>----]  90.00%
+ 92.50 / 100.00000000 [++++++++++++++++++++++++++++++++++++++++++>---]  92.50%
+ 95.00 / 100.00000000 [+++++++++++++++++++++++++++++++++++++++++++>--]  95.00%
+ 97.50 / 100.00000000 [++++++++++++++++++++++++++++++++++++++++++++>-]  97.50%
 100.00 / 100.00000000 [+++++++++++++++++++++++++++++++++++++++++++++>] 100.00%

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgress13.dat

@@ -1,40 +1,40 @@
-  2.50000000 / 100.00 [+>--------------------------------------------]   2.50%
-  5.00000000 / 100.00 [++>-------------------------------------------]   5.00%
-  7.50000000 / 100.00 [+++>------------------------------------------]   7.50%
- 10.00000000 / 100.00 [++++>-----------------------------------------]  10.00%
- 12.50000000 / 100.00 [+++++>----------------------------------------]  12.50%
- 15.00000000 / 100.00 [++++++>---------------------------------------]  15.00%
- 17.50000000 / 100.00 [++++++++>-------------------------------------]  17.50%
- 20.00000000 / 100.00 [+++++++++>------------------------------------]  20.00%
- 22.50000000 / 100.00 [++++++++++>-----------------------------------]  22.50%
- 25.00000000 / 100.00 [+++++++++++>----------------------------------]  25.00%
- 27.50000000 / 100.00 [++++++++++++>---------------------------------]  27.50%
- 30.00000000 / 100.00 [+++++++++++++>--------------------------------]  30.00%
- 32.50000000 / 100.00 [++++++++++++++>-------------------------------]  32.50%
- 35.00000000 / 100.00 [++++++++++++++++>-----------------------------]  35.00%
- 37.50000000 / 100.00 [+++++++++++++++++>----------------------------]  37.50%
- 40.00000000 / 100.00 [++++++++++++++++++>---------------------------]  40.00%
- 42.50000000 / 100.00 [+++++++++++++++++++>--------------------------]  42.50%
- 45.00000000 / 100.00 [++++++++++++++++++++>-------------------------]  45.00%
- 47.50000000 / 100.00 [+++++++++++++++++++++>------------------------]  47.50%
- 50.00000000 / 100.00 [++++++++++++++++++++++>-----------------------]  50.00%
- 52.50000000 / 100.00 [++++++++++++++++++++++++>---------------------]  52.50%
- 55.00000000 / 100.00 [+++++++++++++++++++++++++>--------------------]  55.00%
- 57.50000000 / 100.00 [++++++++++++++++++++++++++>-------------------]  57.50%
- 60.00000000 / 100.00 [+++++++++++++++++++++++++++>------------------]  60.00%
- 62.50000000 / 100.00 [++++++++++++++++++++++++++++>-----------------]  62.50%
- 65.00000000 / 100.00 [+++++++++++++++++++++++++++++>----------------]  65.00%
- 67.50000000 / 100.00 [+++++++++++++++++++++++++++++++>--------------]  67.50%
- 70.00000000 / 100.00 [++++++++++++++++++++++++++++++++>-------------]  70.00%
- 72.50000000 / 100.00 [+++++++++++++++++++++++++++++++++>------------]  72.50%
- 75.00000000 / 100.00 [++++++++++++++++++++++++++++++++++>-----------]  75.00%
- 77.50000000 / 100.00 [+++++++++++++++++++++++++++++++++++>----------]  77.50%
- 80.00000000 / 100.00 [++++++++++++++++++++++++++++++++++++>---------]  80.00%
- 82.50000000 / 100.00 [+++++++++++++++++++++++++++++++++++++>--------]  82.50%
- 85.00000000 / 100.00 [+++++++++++++++++++++++++++++++++++++++>------]  85.00%
- 87.50000000 / 100.00 [++++++++++++++++++++++++++++++++++++++++>-----]  87.50%
- 90.00000000 / 100.00 [+++++++++++++++++++++++++++++++++++++++++>----]  90.00%
- 92.50000000 / 100.00 [++++++++++++++++++++++++++++++++++++++++++>---]  92.50%
- 95.00000000 / 100.00 [+++++++++++++++++++++++++++++++++++++++++++>--]  95.00%
- 97.50000000 / 100.00 [++++++++++++++++++++++++++++++++++++++++++++>-]  97.50%
+  2.50000000 / 100.00 [+>--------------------------------------------]   2.50%
+  5.00000000 / 100.00 [++>-------------------------------------------]   5.00%
+  7.50000000 / 100.00 [+++>------------------------------------------]   7.50%
+ 10.00000000 / 100.00 [++++>-----------------------------------------]  10.00%
+ 12.50000000 / 100.00 [+++++>----------------------------------------]  12.50%
+ 15.00000000 / 100.00 [++++++>---------------------------------------]  15.00%
+ 17.50000000 / 100.00 [++++++++>-------------------------------------]  17.50%
+ 20.00000000 / 100.00 [+++++++++>------------------------------------]  20.00%
+ 22.50000000 / 100.00 [++++++++++>-----------------------------------]  22.50%
+ 25.00000000 / 100.00 [+++++++++++>----------------------------------]  25.00%
+ 27.50000000 / 100.00 [++++++++++++>---------------------------------]  27.50%
+ 30.00000000 / 100.00 [+++++++++++++>--------------------------------]  30.00%
+ 32.50000000 / 100.00 [++++++++++++++>-------------------------------]  32.50%
+ 35.00000000 / 100.00 [++++++++++++++++>-----------------------------]  35.00%
+ 37.50000000 / 100.00 [+++++++++++++++++>----------------------------]  37.50%
+ 40.00000000 / 100.00 [++++++++++++++++++>---------------------------]  40.00%
+ 42.50000000 / 100.00 [+++++++++++++++++++>--------------------------]  42.50%
+ 45.00000000 / 100.00 [++++++++++++++++++++>-------------------------]  45.00%
+ 47.50000000 / 100.00 [+++++++++++++++++++++>------------------------]  47.50%
+ 50.00000000 / 100.00 [++++++++++++++++++++++>-----------------------]  50.00%
+ 52.50000000 / 100.00 [++++++++++++++++++++++++>---------------------]  52.50%
+ 55.00000000 / 100.00 [+++++++++++++++++++++++++>--------------------]  55.00%
+ 57.50000000 / 100.00 [++++++++++++++++++++++++++>-------------------]  57.50%
+ 60.00000000 / 100.00 [+++++++++++++++++++++++++++>------------------]  60.00%
+ 62.50000000 / 100.00 [++++++++++++++++++++++++++++>-----------------]  62.50%
+ 65.00000000 / 100.00 [+++++++++++++++++++++++++++++>----------------]  65.00%
+ 67.50000000 / 100.00 [+++++++++++++++++++++++++++++++>--------------]  67.50%
+ 70.00000000 / 100.00 [++++++++++++++++++++++++++++++++>-------------]  70.00%
+ 72.50000000 / 100.00 [+++++++++++++++++++++++++++++++++>------------]  72.50%
+ 75.00000000 / 100.00 [++++++++++++++++++++++++++++++++++>-----------]  75.00%
+ 77.50000000 / 100.00 [+++++++++++++++++++++++++++++++++++>----------]  77.50%
+ 80.00000000 / 100.00 [++++++++++++++++++++++++++++++++++++>---------]  80.00%
+ 82.50000000 / 100.00 [+++++++++++++++++++++++++++++++++++++>--------]  82.50%
+ 85.00000000 / 100.00 [+++++++++++++++++++++++++++++++++++++++>------]  85.00%
+ 87.50000000 / 100.00 [++++++++++++++++++++++++++++++++++++++++>-----]  87.50%
+ 90.00000000 / 100.00 [+++++++++++++++++++++++++++++++++++++++++>----]  90.00%
+ 92.50000000 / 100.00 [++++++++++++++++++++++++++++++++++++++++++>---]  92.50%
+ 95.00000000 / 100.00 [+++++++++++++++++++++++++++++++++++++++++++>--]  95.00%
+ 97.50000000 / 100.00 [++++++++++++++++++++++++++++++++++++++++++++>-]  97.50%
 100.00000000 / 100.00 [+++++++++++++++++++++++++++++++++++++++++++++>] 100.00%

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgress3.dat

@@ -1,4 +1,4 @@
-13 / 42 [###################>****************************************]  30.95%
-26 / 42 [#######################################>********************]  61.90%
-39 / 42 [###########################################################>]  92.86%
+13 / 42 [###################>****************************************]  30.95%
+26 / 42 [#######################################>********************]  61.90%
+39 / 42 [###########################################################>]  92.86%
 42 / 42 [###########################################################>] 100.00%

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgress4.dat

@@ -1,3 +1,3 @@
-19 / 55 [+++++++++++++++++++&----------------------------------------]  34.55%
-38 / 55 [+++++++++++++++++++++++++++++++++++++++&--------------------]  69.09%
+19 / 55 [+++++++++++++++++++&----------------------------------------]  34.55%
+38 / 55 [+++++++++++++++++++++++++++++++++++++++&--------------------]  69.09%
 55 / 55 [+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++&] 100.00%

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgress5.dat

@@ -1,4 +1,4 @@
-13 / 42 [++++++++++++&------------------------]  30.95%
-26 / 42 [++++++++++++++++++++++++&------------]  61.90%
-39 / 42 [++++++++++++++++++++++++++++++++++++&]  92.86%
+13 / 42 [++++++++++++&------------------------]  30.95%
+26 / 42 [++++++++++++++++++++++++&------------]  61.90%
+39 / 42 [++++++++++++++++++++++++++++++++++++&]  92.86%
 42 / 42 [++++++++++++++++++++++++++++++++++++&] 100.00%

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgress6.dat

@@ -1,8 +1,8 @@
- 3 / 22 [########&******************************************************]  13.64%
- 6 / 22 [#################&*********************************************]  27.27%
- 9 / 22 [##########################&************************************]  40.91%
-12 / 22 [###################################&***************************]  54.55%
-15 / 22 [############################################&******************]  68.18%
-18 / 22 [#####################################################&*********]  81.82%
-21 / 22 [##############################################################&]  95.45%
+ 3 / 22 [########&******************************************************]  13.64%
+ 6 / 22 [#################&*********************************************]  27.27%
+ 9 / 22 [##########################&************************************]  40.91%
+12 / 22 [###################################&***************************]  54.55%
+15 / 22 [############################################&******************]  68.18%
+18 / 22 [#####################################################&*********]  81.82%
+21 / 22 [##############################################################&]  95.45%
 22 / 22 [##############################################################&] 100.00%

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgress7.dat

@@ -1,6 +1,6 @@
- 7 / 42 [123412341>98769876987698769876987698769876987698769876987698]  16.67%
-14 / 42 [1234123412341234123>9876987698769876987698769876987698769876]  33.33%
-21 / 42 [12341234123412341234123412341>987698769876987698769876987698]  50.00%
-28 / 42 [123412341234123412341234123412341234123>98769876987698769876]  66.67%
-35 / 42 [1234123412341234123412341234123412341234123412341>9876987698]  83.33%
+ 7 / 42 [123412341>98769876987698769876987698769876987698769876987698]  16.67%
+14 / 42 [1234123412341234123>9876987698769876987698769876987698769876]  33.33%
+21 / 42 [12341234123412341234123412341>987698769876987698769876987698]  50.00%
+28 / 42 [123412341234123412341234123412341234123>98769876987698769876]  66.67%
+35 / 42 [1234123412341234123412341234123412341234123412341>9876987698]  83.33%
 42 / 42 [12341234123412341234123412341234123412341234123412341234123>] 100.00%

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgress8.dat

@@ -1,6 +1,6 @@
- 7 / 42 [1231231---98798798798798798798798798798798798798798798798798]  16.67%
-14 / 42 [12312312312312312---9879879879879879879879879879879879879879]  33.33%
-21 / 42 [123123123123123123123123123---987987987987987987987987987987]  50.00%
-28 / 42 [1231231231231231231231231231231231231---98798798798798798798]  66.67%
-35 / 42 [12312312312312312312312312312312312312312312312---9879879879]  83.33%
+ 7 / 42 [1231231---98798798798798798798798798798798798798798798798798]  16.67%
+14 / 42 [12312312312312312---9879879879879879879879879879879879879879]  33.33%
+21 / 42 [123123123123123123123123123---987987987987987987987987987987]  50.00%
+28 / 42 [1231231231231231231231231231231231231---98798798798798798798]  66.67%
+35 / 42 [12312312312312312312312312312312312312312312312---9879879879]  83.33%
 42 / 42 [123123123123123123123123123123123123123123123123123123123---] 100.00%

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgress9.dat

@@ -1,9 +1,9 @@
-Actual progress: <123123---98798798798798798798798798798798798798798798798798798798798798798>  13
-Actual progress: <12312312312312---987987987987987987987987987987987987987987987987987987987>  26
-Actual progress: <1231231231231231231231---9879879879879879879879879879879879879879879879879>  42
-Actual progress: <123123123123123123123123123123---98798798798798798798798798798798798798798>  55
-Actual progress: <123123123123123123123123123123123123123---98798798798798798798798798798798>  71
-Actual progress: <12312312312312312312312312312312312312312312312---987987987987987987987987> 104
-Actual progress: <1231231231231231231231231231231231231231231231231231231---9879879879879879> 120
-Actual progress: <123123123123123123123123123123123123123123123123123123123123123---98798798> 133
+Actual progress: <123123---98798798798798798798798798798798798798798798798798798798798798798>  13
+Actual progress: <12312312312312---987987987987987987987987987987987987987987987987987987987>  26
+Actual progress: <1231231231231231231231---9879879879879879879879879879879879879879879879879>  42
+Actual progress: <123123123123123123123123123123---98798798798798798798798798798798798798798>  55
+Actual progress: <123123123123123123123123123123123123123---98798798798798798798798798798798>  71
+Actual progress: <12312312312312312312312312312312312312312312312---987987987987987987987987> 104
+Actual progress: <1231231231231231231231231231231231231231231231231231231---9879879879879879> 120
+Actual progress: <123123123123123123123123123123123123123123123123123123123123123---98798798> 133
 Actual progress: <12312312312312312312312312312312312312312312312312312312312312312312312---> 144

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgressMonitor1.dat

@@ -1,10 +1,10 @@
-    10.0% UPLOAD /var/upload/test.php
-    20.0% UPLOAD /var/upload/testing.php
-    30.0% UPLOAD /var/upload/foo.php
-    40.0% UPLOAD /var/upload/bar.php
-    50.0% UPLOAD /var/upload/baz.png
-    60.0% UPLOAD /var/upload/image.jpg
-    70.0% UPLOAD /var/upload/bar.gif
-    80.0% UPLOAD /var/upload/ez-logo.jpg
-    90.0% UPLOAD /var/upload/ez-logo.png
-   100.0% UPLOAD /var/upload/ez-components.png
+    10.0% UPLOAD /var/upload/test.php
+    20.0% UPLOAD /var/upload/testing.php
+    30.0% UPLOAD /var/upload/foo.php
+    40.0% UPLOAD /var/upload/bar.php
+    50.0% UPLOAD /var/upload/baz.png
+    60.0% UPLOAD /var/upload/image.jpg
+    70.0% UPLOAD /var/upload/bar.gif
+    80.0% UPLOAD /var/upload/ez-logo.jpg
+    90.0% UPLOAD /var/upload/ez-logo.png
+   100.0% UPLOAD /var/upload/ez-components.png

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgressMonitor2.dat

@@ -1,7 +1,7 @@
-    14.3% UPLOAD /var/upload/test.php
-    28.6% UPLOAD /var/upload/testing.php
-    42.9% UPLOAD /var/upload/foo.php
-    57.1% UPLOAD /var/upload/bar.php
-    71.4% UPLOAD /var/upload/baz.png
-    85.7% UPLOAD /var/upload/image.jpg
-   100.0% UPLOAD /var/upload/bar.gif
+    14.3% UPLOAD /var/upload/test.php
+    28.6% UPLOAD /var/upload/testing.php
+    42.9% UPLOAD /var/upload/foo.php
+    57.1% UPLOAD /var/upload/bar.php
+    71.4% UPLOAD /var/upload/baz.png
+    85.7% UPLOAD /var/upload/image.jpg
+   100.0% UPLOAD /var/upload/bar.gif

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgressMonitor3.dat

@@ -1,7 +1,7 @@
-    UPLOAD  14.29% /var/upload/test.php
-    UPLOAD  28.57% /var/upload/testing.php
-    UPLOAD  42.86% /var/upload/foo.php
-    UPLOAD  57.14% /var/upload/bar.php
-    UPLOAD  71.43% /var/upload/baz.png
-    UPLOAD  85.71% /var/upload/image.jpg
-    UPLOAD 100.00% /var/upload/bar.gif
+    UPLOAD  14.29% /var/upload/test.php
+    UPLOAD  28.57% /var/upload/testing.php
+    UPLOAD  42.86% /var/upload/foo.php
+    UPLOAD  57.14% /var/upload/bar.php
+    UPLOAD  71.43% /var/upload/baz.png
+    UPLOAD  85.71% /var/upload/image.jpg
+    UPLOAD 100.00% /var/upload/bar.gif

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgressMonitor4.dat

@@ -1,7 +1,7 @@
-    UPLOAD  14.29% /var/upload/test.php
-    UPLOAD  28.57% /var/upload/testing.php
-    UPLOAD  42.86% /var/upload/foo.php
-    UPLOAD  57.14% /var/upload/bar.php
-    UPLOAD  71.43% /var/upload/baz.png
-    UPLOAD  85.71% /var/upload/image.jpg
-    UPLOAD 100.00% /var/upload/bar.gif
+    UPLOAD  14.29% /var/upload/test.php
+    UPLOAD  28.57% /var/upload/testing.php
+    UPLOAD  42.86% /var/upload/foo.php
+    UPLOAD  57.14% /var/upload/bar.php
+    UPLOAD  71.43% /var/upload/baz.png
+    UPLOAD  85.71% /var/upload/image.jpg
+    UPLOAD 100.00% /var/upload/bar.gif

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgressUtfInBar.dat

@@ -1,5 +1,5 @@
- 2 / 10 [ööööööööööö>------------------------------------------------]  20.00%
- 4 / 10 [ööööööööööööööööööööööö>------------------------------------]  40.00%
- 6 / 10 [ööööööööööööööööööööööööööööööööööö>------------------------]  60.00%
- 8 / 10 [ööööööööööööööööööööööööööööööööööööööööööööööö>------------]  80.00%
+ 2 / 10 [ööööööööööö>------------------------------------------------]  20.00%
+ 4 / 10 [ööööööööööööööööööööööö>------------------------------------]  40.00%
+ 6 / 10 [ööööööööööööööööööööööööööööööööööö>------------------------]  60.00%
+ 8 / 10 [ööööööööööööööööööööööööööööööööööööööööööööööö>------------]  80.00%
 10 / 10 [ööööööööööööööööööööööööööööööööööööööööööööööööööööööööööö>] 100.00%

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgressUtfInBoth.dat

@@ -1,5 +1,5 @@
- 2ö/ä10ü[ööööööööööö>------------------------------------------------]ß 20.00%
- 4ö/ä10ü[ööööööööööööööööööööööö>------------------------------------]ß 40.00%
- 6ö/ä10ü[ööööööööööööööööööööööööööööööööööö>------------------------]ß 60.00%
- 8ö/ä10ü[ööööööööööööööööööööööööööööööööööööööööööööööö>------------]ß 80.00%
+ 2ö/ä10ü[ööööööööööö>------------------------------------------------]ß 20.00%
+ 4ö/ä10ü[ööööööööööööööööööööööö>------------------------------------]ß 40.00%
+ 6ö/ä10ü[ööööööööööööööööööööööööööööööööööö>------------------------]ß 60.00%
+ 8ö/ä10ü[ööööööööööööööööööööööööööööööööööööööööööööööö>------------]ß 80.00%
 10ö/ä10ü[ööööööööööööööööööööööööööööööööööööööööööööööööööööööööööö>]ß100.00%

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testProgressUtfInText.dat

@@ -1,5 +1,5 @@
- 2ö/ä10ü[+++++++++++>------------------------------------------------]ß 20.00%
- 4ö/ä10ü[+++++++++++++++++++++++>------------------------------------]ß 40.00%
- 6ö/ä10ü[+++++++++++++++++++++++++++++++++++>------------------------]ß 60.00%
- 8ö/ä10ü[+++++++++++++++++++++++++++++++++++++++++++++++>------------]ß 80.00%
+ 2ö/ä10ü[+++++++++++>------------------------------------------------]ß 20.00%
+ 4ö/ä10ü[+++++++++++++++++++++++>------------------------------------]ß 40.00%
+ 6ö/ä10ü[+++++++++++++++++++++++++++++++++++>------------------------]ß 60.00%
+ 8ö/ä10ü[+++++++++++++++++++++++++++++++++++++++++++++++>------------]ß 80.00%
 10ö/ä10ü[+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++>]ß100.00%

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTable1a.dat

@@ -1,11 +1,11 @@
-+----------------------------------------+----------------------+-------------+
-| Heading no. 1                          | Longer heading no. 2 | Head 3      |
-+----------------------------------------+----------------------+-------------+
-| Data cell 1                            | Data cell 2          | Data cell 3 |
-+----------------------------------------+----------------------+-------------+
-| Long long data cell with even more     | Data cell 4          | Data cell 5 |
-| text in it...                          |                      |             |
-+----------------------------------------+----------------------+-------------+
-| a b c d e f g h i j k l m n o p q r s  | Data cell            | Data cell   |
-| t u v w x                              |                      |             |
++----------------------------------------+----------------------+-------------+
+| Heading no. 1                          | Longer heading no. 2 | Head 3      |
++----------------------------------------+----------------------+-------------+
+| Data cell 1                            | Data cell 2          | Data cell 3 |
++----------------------------------------+----------------------+-------------+
+| Long long data cell with even more     | Data cell 4          | Data cell 5 |
+| text in it...                          |                      |             |
++----------------------------------------+----------------------+-------------+
+| a b c d e f g h i j k l m n o p q r s  | Data cell            | Data cell   |
+| t u v w x                              |                      |             |
 +----------------------------------------+----------------------+-------------+

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTable1b.dat

@@ -1,20 +1,20 @@
-+------------+------------+------------+
-| Heading    | Longer     | Head 3     |
-| no. 1      | heading    |            |
-|            | no. 2      |            |
-+------------+------------+------------+
-| Data cell  | Data cell  | Data cell  |
-| 1          | 2          | 3          |
-+------------+------------+------------+
-| Long long  | Data cell  | Data cell  |
-| data cell  | 4          | 5          |
-| with even  |            |            |
-| more text  |            |            |
-| in it...   |            |            |
-+------------+------------+------------+
-| a b c d e  | Data cell  | Data cell  |
-| f g h i j  |            |            |
-| k l m n o  |            |            |
-| p q r s t  |            |            |
-| u v w x    |            |            |
++------------+------------+------------+
+| Heading    | Longer     | Head 3     |
+| no. 1      | heading    |            |
+|            | no. 2      |            |
++------------+------------+------------+
+| Data cell  | Data cell  | Data cell  |
+| 1          | 2          | 3          |
++------------+------------+------------+
+| Long long  | Data cell  | Data cell  |
+| data cell  | 4          | 5          |
+| with even  |            |            |
+| more text  |            |            |
+| in it...   |            |            |
++------------+------------+------------+
+| a b c d e  | Data cell  | Data cell  |
+| f g h i j  |            |            |
+| k l m n o  |            |            |
+| p q r s t  |            |            |
+| u v w x    |            |            |
 +------------+------------+------------+

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTable2a.dat

@@ -1,5 +1,5 @@
-+---------+---------+---------+---------+---------+--------+
-|       a |       b |       c |       d |       e |      f |
-+---------+---------+---------+---------+---------+--------+
-|       g |       h |       i |       j |       k |      l |
++---------+---------+---------+---------+---------+--------+
+|       a |       b |       c |       d |       e |      f |
++---------+---------+---------+---------+---------+--------+
+|       g |       h |       i |       j |       k |      l |
 +---------+---------+---------+---------+---------+--------+

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTable2b.dat

@@ -1,5 +1,5 @@
-+---+---+---+---+---+---+
-| a | b | c | d | e | f |
-+---+---+---+---+---+---+
-| g | h | i | j | k | l |
++---+---+---+---+---+---+
+| a | b | c | d | e | f |
++---+---+---+---+---+---+
+| g | h | i | j | k | l |
 +---+---+---+---+---+---+

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTable3a.dat

@@ -1,11 +1,11 @@
-#########################################################################################################################
-#                                          Parameter                                           # Shortcut  # Descrition #
-#########################################################################################################################
-#  Append text to a file. This parameter takes a string value and may be used multiple times.  # --append  #     -a     #
-#########################################################################################################################
-# Prepend text to a file. This parameter takes a string value and may be used multiple times.  # --prepend #     -p     #
-#########################################################################################################################
-#              Forces the action desired without paying attention to any errors.               #  --force  #     -f     #
-#########################################################################################################################
-#                    Silence all kinds of warnings issued by this program.                     # --silent  #     -s     #
+#########################################################################################################################
+#                                          Parameter                                           # Shortcut  # Descrition #
+#########################################################################################################################
+#  Append text to a file. This parameter takes a string value and may be used multiple times.  # --append  #     -a     #
+#########################################################################################################################
+# Prepend text to a file. This parameter takes a string value and may be used multiple times.  # --prepend #     -p     #
+#########################################################################################################################
+#              Forces the action desired without paying attention to any errors.               #  --force  #     -f     #
+#########################################################################################################################
+#                    Silence all kinds of warnings issued by this program.                     # --silent  #     -s     #
 #########################################################################################################################

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTable3b.dat

@@ -1,15 +1,15 @@
-cvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvcvvvvvvvvvvvcvvvvvvvvvvvvc
-h Parameter                                          h Shortcut  h Descrition h
-cvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvcvvvvvvvvvvvcvvvvvvvvvvvvc
-h Append text to a file. This parameter takes a      h --append  h -a         h
-h string value and may be used multiple times.       h           h            h
-cvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvcvvvvvvvvvvvcvvvvvvvvvvvvc
-h Prepend text to a file. This parameter takes a     h --prepend h -p         h
-h string value and may be used multiple times.       h           h            h
-cvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvcvvvvvvvvvvvcvvvvvvvvvvvvc
-h Forces the action desired without paying attention h --force   h -f         h
-h to any errors.                                     h           h            h
-cvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvcvvvvvvvvvvvcvvvvvvvvvvvvc
-h Silence all kinds of warnings issued by this       h --silent  h -s         h
-h program.                                           h           h            h
+cvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvcvvvvvvvvvvvcvvvvvvvvvvvvc
+h Parameter                                          h Shortcut  h Descrition h
+cvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvcvvvvvvvvvvvcvvvvvvvvvvvvc
+h Append text to a file. This parameter takes a      h --append  h -a         h
+h string value and may be used multiple times.       h           h            h
+cvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvcvvvvvvvvvvvcvvvvvvvvvvvvc
+h Prepend text to a file. This parameter takes a     h --prepend h -p         h
+h string value and may be used multiple times.       h           h            h
+cvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvcvvvvvvvvvvvcvvvvvvvvvvvvc
+h Forces the action desired without paying attention h --force   h -f         h
+h to any errors.                                     h           h            h
+cvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvcvvvvvvvvvvvcvvvvvvvvvvvvc
+h Silence all kinds of warnings issued by this       h --silent  h -s         h
+h program.                                           h           h            h
 cvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvcvvvvvvvvvvvcvvvvvvvvvvvvc

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTable3c.dat

@@ -1,11 +1,11 @@
-+---------+---------+---------+
-| Parameter | Shortcut | Descrition |
-+---------+---------+---------+
-| Append text to a file. This parameter takes a string value and may be used multiple times. | --append | -a      |
-+---------+---------+---------+
-| Prepend text to a file. This parameter takes a string value and may be used multiple times. | --prepend | -p      |
-+---------+---------+---------+
-| Forces the action desired without paying attention to any errors. | --force | -f      |
-+---------+---------+---------+
-| Silence all kinds of warnings issued by this program. | --silent | -s      |
++---------+---------+---------+
+| Parameter | Shortcut | Descrition |
++---------+---------+---------+
+| Append text to a file. This parameter takes a string value and may be used multiple times. | --append | -a      |
++---------+---------+---------+
+| Prepend text to a file. This parameter takes a string value and may be used multiple times. | --prepend | -p      |
++---------+---------+---------+
+| Forces the action desired without paying attention to any errors. | --force | -f      |
++---------+---------+---------+
+| Silence all kinds of warnings issued by this program. | --silent | -s      |
 +---------+---------+---------+

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTable3d.dat

@@ -1,11 +1,11 @@
-+-----+-----+-----+
-| Par | Sho | Des |
-+-----+-----+-----+
-| App | --a | -a  |
-+-----+-----+-----+
-| Pre | --p | -p  |
-+-----+-----+-----+
-| For | --f | -f  |
-+-----+-----+-----+
-| Sil | --s | -s  |
++-----+-----+-----+
+| Par | Sho | Des |
++-----+-----+-----+
+| App | --a | -a  |
++-----+-----+-----+
+| Pre | --p | -p  |
++-----+-----+-----+
+| For | --f | -f  |
++-----+-----+-----+
+| Sil | --s | -s  |
 +-----+-----+-----+

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTable4a.dat

@@ -1,9 +1,9 @@
-+-----------------------------+-----------------------------+-----------------------------+-----------------------------+
-| Some very very long data he |            Short            | Some very very long data he |            Short            |
-+-----------------------------+-----------------------------+-----------------------------+-----------------------------+
-|            Short            | Some very very long data he |            Short            | Some very very long data he |
-|                             |                             |                             |                             |
-|                             | and it becomes even much mu |                             |                             |
-|                             |                             |                             |                             |
-|                             |     and even longer....     |                             |                             |
++-----------------------------+-----------------------------+-----------------------------+-----------------------------+
+| Some very very long data he |            Short            | Some very very long data he |            Short            |
++-----------------------------+-----------------------------+-----------------------------+-----------------------------+
+|            Short            | Some very very long data he |            Short            | Some very very long data he |
+|                             |                             |                             |                             |
+|                             | and it becomes even much mu |                             |                             |
+|                             |                             |                             |                             |
+|                             |     and even longer....     |                             |                             |
 +-----------------------------+-----------------------------+-----------------------------+-----------------------------+

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTable4b.dat

@@ -1,14 +1,14 @@
-+-----------------------------+-----------------------------+-----------------------------+-----------------------------+
-| Some very very long data    | Short                       | Some very very long data    | Short                       |
-| here.... and it becomes     |                             | here.... and it becomes     |                             |
-| even much much longer...    |                             | even much much longer...    |                             |
-| and even longer....         |                             | and even longer....         |                             |
-+-----------------------------+-----------------------------+-----------------------------+-----------------------------+
-| Short                       | Some very very long data    | Short                       | Some very very long data    |
-|                             | here....                    |                             | here.... and it becomes     |
-|                             |                             |                             | even much much longer...    |
-|                             | and it becomes even much    |                             | and even longer....         |
-|                             | much longer...              |                             |                             |
-|                             |                             |                             |                             |
-|                             | and even longer....         |                             |                             |
++-----------------------------+-----------------------------+-----------------------------+-----------------------------+
+| Some very very long data    | Short                       | Some very very long data    | Short                       |
+| here.... and it becomes     |                             | here.... and it becomes     |                             |
+| even much much longer...    |                             | even much much longer...    |                             |
+| and even longer....         |                             | and even longer....         |                             |
++-----------------------------+-----------------------------+-----------------------------+-----------------------------+
+| Short                       | Some very very long data    | Short                       | Some very very long data    |
+|                             | here....                    |                             | here.... and it becomes     |
+|                             |                             |                             | even much much longer...    |
+|                             | and it becomes even much    |                             | and even longer....         |
+|                             | much longer...              |                             |                             |
+|                             |                             |                             |                             |
+|                             | and even longer....         |                             |                             |
 +-----------------------------+-----------------------------+-----------------------------+-----------------------------+

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTable4c.dat

@@ -1,9 +1,9 @@
-+-----------------------------+-----------------------------+-----------------------------+-----------------------------+
-| Some very very long data he |            Short            | Some very very long data he |            Short            |
-+-----------------------------+-----------------------------+-----------------------------+-----------------------------+
-|            Short            | Some very very long data he |            Short            | Some very very long data he |
-|                             |                             |                             |                             |
-|                             | and it becomes even much mu |                             |                             |
-|                             |                             |                             |                             |
-|                             |     and even longer....     |                             |                             |
++-----------------------------+-----------------------------+-----------------------------+-----------------------------+
+| Some very very long data he |            Short            | Some very very long data he |            Short            |
++-----------------------------+-----------------------------+-----------------------------+-----------------------------+
+|            Short            | Some very very long data he |            Short            | Some very very long data he |
+|                             |                             |                             |                             |
+|                             | and it becomes even much mu |                             |                             |
+|                             |                             |                             |                             |
+|                             |     and even longer....     |                             |                             |
 +-----------------------------+-----------------------------+-----------------------------+-----------------------------+

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTable5autowidth.dat

@@ -1,12 +1,12 @@
-+-----------------------------------------------------------+-----------------------------------------------------------+
-| Short text                                                | More short text                                           |
-+-----------------------------------------------------------+-----------------------------------------------------------+
-| Short text                                                | More short text                                           |
-| Short text                                                | More short text                                           |
-| Short text                                                | More short text                                           |
-| Short text                                                |      Short text                                           |
-| Short text                                                |                                                           |
-| Short text                                                |                                                           |
-| Short text                                                |                                                           |
-|                                                           |                                                           |
++-----------------------------------------------------------+-----------------------------------------------------------+
+| Short text                                                | More short text                                           |
++-----------------------------------------------------------+-----------------------------------------------------------+
+| Short text                                                | More short text                                           |
+| Short text                                                | More short text                                           |
+| Short text                                                | More short text                                           |
+| Short text                                                |      Short text                                           |
+| Short text                                                |                                                           |
+| Short text                                                |                                                           |
+| Short text                                                |                                                           |
+|                                                           |                                                           |
 +-----------------------------------------------------------+-----------------------------------------------------------+

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTableColPadding1.dat

@@ -1,5 +1,5 @@
-+----------------+----------------+----------------+----------------+----------------+-------------+
-|~~~    a     ~~~|~~~    b     ~~~|~~~    c     ~~~|~~~    d     ~~~|~~~    e     ~~~|~~~   f   ~~~|
-+----------------+----------------+----------------+----------------+----------------+-------------+
-|~~~    g     ~~~|~~~    h     ~~~|~~~    i     ~~~|~~~    j     ~~~|~~~    k     ~~~|~~~   l   ~~~|
++----------------+----------------+----------------+----------------+----------------+-------------+
+|~~~    a     ~~~|~~~    b     ~~~|~~~    c     ~~~|~~~    d     ~~~|~~~    e     ~~~|~~~   f   ~~~|
++----------------+----------------+----------------+----------------+----------------+-------------+
+|~~~    g     ~~~|~~~    h     ~~~|~~~    i     ~~~|~~~    j     ~~~|~~~    k     ~~~|~~~   l   ~~~|
 +----------------+----------------+----------------+----------------+----------------+-------------+

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTableColPadding2.dat

@@ -1,5 +1,5 @@
-+-------+-------+-------+-------+-------+-------+
-|~~~a~~~|~~~b~~~|~~~c~~~|~~~d~~~|~~~e~~~|~~~f~~~|
-+-------+-------+-------+-------+-------+-------+
-|~~~g~~~|~~~h~~~|~~~i~~~|~~~j~~~|~~~k~~~|~~~l~~~|
++-------+-------+-------+-------+-------+-------+
+|~~~a~~~|~~~b~~~|~~~c~~~|~~~d~~~|~~~e~~~|~~~f~~~|
++-------+-------+-------+-------+-------+-------+
+|~~~g~~~|~~~h~~~|~~~i~~~|~~~j~~~|~~~k~~~|~~~l~~~|
 +-------+-------+-------+-------+-------+-------+

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTableWithSpaceBorders.dat

@@ -1,14 +1,14 @@
-                                                                                                                         
-  Some very very long data      Short                         Some very very long data      Short                        
-  here.... and it becomes                                     here.... and it becomes                                    
-  even much much longer...                                    even much much longer...                                   
-  and even longer....                                         and even longer....                                        
-                                                                                                                         
-  Short                         Some very very long data      Short                         Some very very long data     
-                                here....                                                    here.... and it becomes      
-                                                                                            even much much longer...     
-                                and it becomes even much                                    and even longer....          
-                                much longer...                                                                           
-                                                                                                                         
-                                and even longer....                                                                      
+                                                                                                                         
+  Some very very long data      Short                         Some very very long data      Short                        
+  here.... and it becomes                                     here.... and it becomes                                    
+  even much much longer...                                    even much much longer...                                   
+  and even longer....                                         and even longer....                                        
+                                                                                                                         
+  Short                         Some very very long data      Short                         Some very very long data     
+                                here....                                                    here.... and it becomes      
+                                                                                            even much much longer...     
+                                and it becomes even much                                    and even longer....          
+                                much longer...                                                                           
+                                                                                                                         
+                                and even longer....                                                                      
                                                                                                                          

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTableWithoutBorders.dat

@@ -1,11 +1,11 @@
- Some very very long data      Short                         Some very very long data      Short                        
- here.... and it becomes even                                here.... and it becomes even                               
- much much longer... and even                                much much longer... and even                               
- longer....                                                  longer....                                                 
- Short                         Some very very long data      Short                         Some very very long data     
-                               here....                                                    here.... and it becomes even 
-                                                                                           much much longer... and even 
-                               and it becomes even much                                    longer....                   
-                               much longer...                                                                           
-                                                                                                                        
+ Some very very long data      Short                         Some very very long data      Short                        
+ here.... and it becomes even                                here.... and it becomes even                               
+ much much longer... and even                                much much longer... and even                               
+ longer....                                                  longer....                                                 
+ Short                         Some very very long data      Short                         Some very very long data     
+                               here....                                                    here.... and it becomes even 
+                                                                                           much much longer... and even 
+                               and it becomes even much                                    longer....                   
+                               much longer...                                                                           
+                                                                                                                        
                                and even longer....                                                                      

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTableWithoutFormatting.dat

@@ -1,5 +1,5 @@
-+---+---+---+---+---+---+
-| a | b | c | d | e | f |
-+---+---+---+---+---+---+
-| g | h | i | j | k | l |
++---+---+---+---+---+---+
+| a | b | c | d | e | f |
++---+---+---+---+---+---+
+| g | h | i | j | k | l |
 +---+---+---+---+---+---+

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTableWithoutHorizontalBorders.dat

@@ -1,14 +1,14 @@
-------------------------------------------------------------------------------------------------------------------------
- Some very very long data      Short                         Some very very long data      Short                        
- here.... and it becomes even                                here.... and it becomes even                               
- much much longer... and even                                much much longer... and even                               
- longer....                                                  longer....                                                 
-------------------------------------------------------------------------------------------------------------------------
- Short                         Some very very long data      Short                         Some very very long data     
-                               here....                                                    here.... and it becomes even 
-                                                                                           much much longer... and even 
-                               and it becomes even much                                    longer....                   
-                               much longer...                                                                           
-                                                                                                                        
-                               and even longer....                                                                      
+------------------------------------------------------------------------------------------------------------------------
+ Some very very long data      Short                         Some very very long data      Short                        
+ here.... and it becomes even                                here.... and it becomes even                               
+ much much longer... and even                                much much longer... and even                               
+ longer....                                                  longer....                                                 
+------------------------------------------------------------------------------------------------------------------------
+ Short                         Some very very long data      Short                         Some very very long data     
+                               here....                                                    here.... and it becomes even 
+                                                                                           much much longer... and even 
+                               and it becomes even much                                    longer....                   
+                               much longer...                                                                           
+                                                                                                                        
+                               and even longer....                                                                      
 ------------------------------------------------------------------------------------------------------------------------

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testTableWithoutVerticalBorders.dat

@@ -1,11 +1,11 @@
-| Some very very long data    | Short                       | Some very very long data    | Short                       |
-| here.... and it becomes     |                             | here.... and it becomes     |                             |
-| even much much longer...    |                             | even much much longer...    |                             |
-| and even longer....         |                             | and even longer....         |                             |
-| Short                       | Some very very long data    | Short                       | Some very very long data    |
-|                             | here....                    |                             | here.... and it becomes     |
-|                             |                             |                             | even much much longer...    |
-|                             | and it becomes even much    |                             | and even longer....         |
-|                             | much longer...              |                             |                             |
-|                             |                             |                             |                             |
+| Some very very long data    | Short                       | Some very very long data    | Short                       |
+| here.... and it becomes     |                             | here.... and it becomes     |                             |
+| even much much longer...    |                             | even much much longer...    |                             |
+| and even longer....         |                             | and even longer....         |                             |
+| Short                       | Some very very long data    | Short                       | Some very very long data    |
+|                             | here....                    |                             | here.... and it becomes     |
+|                             |                             |                             | even much much longer...    |
+|                             | and it becomes even much    |                             | and even longer....         |
+|                             | much longer...              |                             |                             |
+|                             |                             |                             |                             |
 |                             | and even longer....         |                             |                             |

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testUtf8TableHighlightNonUtf8.dat

@@ -1,7 +1,7 @@
-+--------------------+--------------------+-----------------------------------+
-| Non UTF-8 column 1 | Non UTF-8 column 2 | Long long long long long long     |
-|                    |                    | long non UTF-8 column             |
-+--------------------+--------------------+-----------------------------------+
-| Nön UTF-8 cölümn 1 | Nön UTF-8 cölümn 2 | Löng löng löng löng löng löng     |
-|                    |                    | löng nön UTF-8 cölümn             |
++--------------------+--------------------+-----------------------------------+
+| Non UTF-8 column 1 | Non UTF-8 column 2 | Long long long long long long     |
+|                    |                    | long non UTF-8 column             |
++--------------------+--------------------+-----------------------------------+
+| Nön UTF-8 cölümn 1 | Nön UTF-8 cölümn 2 | Löng löng löng löng löng löng     |
+|                    |                    | löng nön UTF-8 cölümn             |
 +--------------------+--------------------+-----------------------------------+

core/lib/composer/vendor/zetacomponents/console-tools/tests/data/windows/testUtf8TableHighlightUtf8.dat

@@ -1,7 +1,7 @@
-+--------------------+--------------------+-----------------------------------+
-| Nön UTF-8 cölümn 1 | Nön UTF-8 cölümn 2 | Löng löng löng löng löng löng     |
-|                    |                    | löng nön UTF-8 cölümn             |
-+--------------------+--------------------+-----------------------------------+
-| Non UTF-8 column 1 | Non UTF-8 column 2 | Long long long long long long     |
-|                    |                    | long non UTF-8 column             |
++--------------------+--------------------+-----------------------------------+
+| Nön UTF-8 cölümn 1 | Nön UTF-8 cölümn 2 | Löng löng löng löng löng löng     |
+|                    |                    | löng nön UTF-8 cölümn             |
++--------------------+--------------------+-----------------------------------+
+| Non UTF-8 column 1 | Non UTF-8 column 2 | Long long long long long long     |
+|                    |                    | long non UTF-8 column             |
 +--------------------+--------------------+-----------------------------------+

core/lib/fpdf/changelog.htm

@@ -0,0 +1,171 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Changelog</title>
+<link type="text/css" rel="stylesheet" href="fpdf.css">
+<style type="text/css">
+dd {margin:1em 0 1em 1em}
+</style>
+</head>
+<body>
+<h1>Changelog</h1>
+<dl>
+<dt><strong>v1.83</strong> (2021-04-18)</dt>
+<dd>
+- Fixed an issue related to annotations.<br>
+</dd>
+<dt><strong>v1.82</strong> (2019-12-07)</dt>
+<dd>
+- Removed a deprecation notice under PHP 7.4.<br>
+</dd>
+<dt><strong>v1.81</strong> (2015-12-20)</dt>
+<dd>
+- Added GetPageWidth() and GetPageHeight().<br>
+- Fixed a bug in SetXY().<br>
+</dd>
+<dt><strong>v1.8</strong> (2015-11-29)</dt>
+<dd>
+- PHP 5.1.0 or higher is now required.<br>
+- The MakeFont utility now subsets fonts, which can greatly reduce font sizes.<br>
+- Added ToUnicode CMaps to improve text extraction.<br>
+- Added a parameter to AddPage() to rotate the page.<br>
+- Added a parameter to SetY() to indicate whether the x position should be reset or not.<br>
+- Added a parameter to Output() to specify the encoding of the name, and special characters are now properly encoded. Additionally the order of the first two parameters was reversed to be more logical (however the old order is still supported for compatibility).<br>
+- The Error() method now throws an exception.<br>
+- Adding contents before the first AddPage() or after Close() now raises an error.<br>
+- Outputting text with no font selected now raises an error.<br>
+</dd>
+<dt><strong>v1.7</strong> (2011-06-18)</dt>
+<dd>
+- The MakeFont utility has been completely rewritten and doesn't depend on ttf2pt1 anymore.<br>
+- Alpha channel is now supported for PNGs.<br>
+- When inserting an image, it's now possible to specify its resolution.<br>
+- Default resolution for images was increased from 72 to 96 dpi.<br>
+- When inserting a GIF image, no temporary file is used anymore if the PHP version is 5.1 or higher.<br>
+- When output buffering is enabled and the PDF is about to be sent, the buffer is now cleared if it contains only a UTF-8 BOM and/or whitespace (instead of throwing an error).<br>
+- Symbol and ZapfDingbats fonts now support underline style.<br>
+- Custom page sizes are now checked to ensure that width is smaller than height.<br>
+- Standard font files were changed to use the same format as user fonts.<br>
+- A bug in the embedding of Type1 fonts was fixed.<br>
+- A bug related to SetDisplayMode() and the current locale was fixed.<br>
+- A display issue occurring with the Adobe Reader X plug-in was fixed.<br>
+- An issue related to transparency with some versions of Adobe Reader was fixed.<br>
+- The Content-Length header was removed because it caused an issue when the HTTP server applies compression.<br>
+</dd>
+<dt><strong>v1.6</strong> (2008-08-03)</dt>
+<dd>
+- PHP 4.3.10 or higher is now required.<br>
+- GIF image support.<br>
+- Images can now trigger page breaks.<br>
+- Possibility to have different page formats in a single document.<br>
+- Document properties (author, creator, keywords, subject and title) can now be specified in UTF-8.<br>
+- Fixed a bug: when a PNG was inserted through a URL, an error sometimes occurred.<br>
+- An automatic page break in Header() doesn't cause an infinite loop any more.<br>
+- Removed some warning messages appearing with recent PHP versions.<br>
+- Added HTTP headers to reduce problems with IE.<br>
+</dd>
+<dt><strong>v1.53</strong> (2004-12-31)</dt>
+<dd>
+- When the font subdirectory is in the same directory as fpdf.php, it's no longer necessary to define the FPDF_FONTPATH constant.<br>
+- The array $HTTP_SERVER_VARS is no longer used. It could cause trouble on PHP5-based configurations with the register_long_arrays option disabled.<br>
+- Fixed a problem related to Type1 font embedding which caused trouble to some PDF processors.<br>
+- The file name sent to the browser could not contain a space character.<br>
+- The Cell() method could not print the number 0 (you had to pass the string '0').<br>
+</dd>
+<dt><strong>v1.52</strong> (2003-12-30)</dt>
+<dd>
+- Image() now displays the image at 72 dpi if no dimension is given.<br>
+- Output() takes a string as second parameter to indicate destination.<br>
+- Open() is now called automatically by AddPage().<br>
+- Inserting remote JPEG images doesn't generate an error any longer.<br>
+- Decimal separator is forced to dot in the constructor.<br>
+- Added several encodings (Turkish, Thai, Hebrew, Ukrainian and Vietnamese).<br>
+- The last line of a right-aligned MultiCell() was not correctly aligned if it was terminated by a carriage return.<br>
+- No more error message about already sent headers when outputting the PDF to the standard output from the command line.<br>
+- The underlining was going too far for text containing characters \, ( or ).<br>
+- $HTTP_ENV_VARS has been replaced by $HTTP_SERVER_VARS.<br>
+</dd>
+<dt><strong>v1.51</strong> (2002-08-03)</dt>
+<dd>
+- Type1 font support.<br>
+- Added Baltic encoding.<br>
+- The class now works internally in points with the origin at the bottom in order to avoid two bugs occurring with Acrobat 5:<br>&nbsp;&nbsp;* The line thickness was too large when printed under Windows 98 SE and ME.<br>&nbsp;&nbsp;* TrueType fonts didn't appear immediately inside the plug-in (a substitution font was used), one had to cause a window refresh to make them show up.<br>
+- It's no longer necessary to set the decimal separator as dot to produce valid documents.<br>
+- The clickable area in a cell was always on the left independently from the text alignment.<br>
+- JPEG images in CMYK mode appeared in inverted colors.<br>
+- Transparent PNG images in grayscale or true color mode were incorrectly handled.<br>
+- Adding new fonts now works correctly even with the magic_quotes_runtime option set to on.<br>
+</dd>
+<dt><strong>v1.5</strong> (2002-05-28)</dt>
+<dd>
+- TrueType font (AddFont()) and encoding support (Western and Eastern Europe, Cyrillic and Greek).<br>
+- Added Write() method.<br>
+- Added underlined style.<br>
+- Internal and external link support (AddLink(), SetLink(), Link()).<br>
+- Added right margin management and methods SetRightMargin(), SetTopMargin().<br>
+- Modification of SetDisplayMode() to select page layout.<br>
+- The border parameter of MultiCell() now lets choose borders to draw as Cell().<br>
+- When a document contains no page, Close() now calls AddPage() instead of causing a fatal error.<br>
+</dd>
+<dt><strong>v1.41</strong> (2002-03-13)</dt>
+<dd>
+- Fixed SetDisplayMode() which no longer worked (the PDF viewer used its default display).<br>
+</dd>
+<dt><strong>v1.4</strong> (2002-03-02)</dt>
+<dd>
+- PHP3 is no longer supported.<br>
+- Page compression (SetCompression()).<br>
+- Choice of page format and possibility to change orientation inside document.<br>
+- Added AcceptPageBreak() method.<br>
+- Ability to print the total number of pages (AliasNbPages()).<br>
+- Choice of cell borders to draw.<br>
+- New mode for Cell(): the current position can now move under the cell.<br>
+- Ability to include an image by specifying height only (width is calculated automatically).<br>
+- Fixed a bug: when a justified line triggered a page break, the footer inherited the corresponding word spacing.<br>
+</dd>
+<dt><strong>v1.31</strong> (2002-01-12)</dt>
+<dd>
+- Fixed a bug in drawing frame with MultiCell(): the last line always started from the left margin.<br>
+- Removed Expires HTTP header (gives trouble in some situations).<br>
+- Added Content-disposition HTTP header (seems to help in some situations).<br>
+</dd>
+<dt><strong>v1.3</strong> (2001-12-03)</dt>
+<dd>
+- Line break and text justification support (MultiCell()).<br>
+- Color support (SetDrawColor(), SetFillColor(), SetTextColor()). Possibility to draw filled rectangles and paint cell background.<br>
+- A cell whose width is declared null extends up to the right margin of the page.<br>
+- Line width is now retained from page to page and defaults to 0.2 mm.<br>
+- Added SetXY() method.<br>
+- Fixed a passing by reference done in a deprecated manner for PHP4.<br>
+</dd>
+<dt><strong>v1.2</strong> (2001-11-11)</dt>
+<dd>
+- Added font metric files and GetStringWidth() method.<br>
+- Centering and right-aligning text in cells.<br>
+- Display mode control (SetDisplayMode()).<br>
+- Added methods to set document properties (SetAuthor(), SetCreator(), SetKeywords(), SetSubject(), SetTitle()).<br>
+- Possibility to force PDF download by browser.<br>
+- Added SetX() and GetX() methods.<br>
+- During automatic page break, current abscissa is now retained.<br>
+</dd>
+<dt><strong>v1.11</strong> (2001-10-20)</dt>
+<dd>
+- PNG support doesn't require PHP4/zlib any more. Data are now put directly into PDF without any decompression/recompression stage.<br>
+- Image insertion now works correctly even with magic_quotes_runtime option set to on.<br>
+</dd>
+<dt><strong>v1.1</strong> (2001-10-07)</dt>
+<dd>
+- JPEG and PNG image support.<br>
+</dd>
+<dt><strong>v1.01</strong> (2001-10-03)</dt>
+<dd>
+- Fixed a bug involving page break: in case when Header() doesn't specify a font, the one from previous page was not restored and produced an incorrect document.<br>
+</dd>
+<dt><strong>v1.0</strong> (2001-09-17)</dt>
+<dd>
+- First version.<br>
+</dd>
+</dl>
+</body>
+</html>

core/lib/fpdf/font/courier.php

@@ -0,0 +1,10 @@
+<?php
+$type = 'Core';
+$name = 'Courier';
+$up = -100;
+$ut = 50;
+for($i=0;$i<=255;$i++)
+	$cw[chr($i)] = 600;
+$enc = 'cp1252';
+$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+?>

core/lib/fpdf/font/courierb.php

@@ -0,0 +1,10 @@
+<?php
+$type = 'Core';
+$name = 'Courier-Bold';
+$up = -100;
+$ut = 50;
+for($i=0;$i<=255;$i++)
+	$cw[chr($i)] = 600;
+$enc = 'cp1252';
+$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+?>

core/lib/fpdf/font/courierbi.php

@@ -0,0 +1,10 @@
+<?php
+$type = 'Core';
+$name = 'Courier-BoldOblique';
+$up = -100;
+$ut = 50;
+for($i=0;$i<=255;$i++)
+	$cw[chr($i)] = 600;
+$enc = 'cp1252';
+$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+?>

core/lib/fpdf/font/courieri.php

@@ -0,0 +1,10 @@
+<?php
+$type = 'Core';
+$name = 'Courier-Oblique';
+$up = -100;
+$ut = 50;
+for($i=0;$i<=255;$i++)
+	$cw[chr($i)] = 600;
+$enc = 'cp1252';
+$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+?>

core/lib/fpdf/font/helvetica.php

@@ -0,0 +1,21 @@
+<?php
+$type = 'Core';
+$name = 'Helvetica';
+$up = -100;
+$ut = 50;
+$cw = array(
+	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
+	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
+	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+	'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
+	'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
+	chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
+	chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+$enc = 'cp1252';
+$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+?>

core/lib/fpdf/font/helveticab.php

@@ -0,0 +1,21 @@
+<?php
+$type = 'Core';
+$name = 'Helvetica-Bold';
+$up = -100;
+$ut = 50;
+$cw = array(
+	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
+	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
+	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
+	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
+	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
+	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
+$enc = 'cp1252';
+$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+?>

core/lib/fpdf/font/helveticabi.php

@@ -0,0 +1,21 @@
+<?php
+$type = 'Core';
+$name = 'Helvetica-BoldOblique';
+$up = -100;
+$ut = 50;
+$cw = array(
+	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
+	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
+	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
+	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
+	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
+	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
+$enc = 'cp1252';
+$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+?>

core/lib/fpdf/font/helveticai.php

@@ -0,0 +1,21 @@
+<?php
+$type = 'Core';
+$name = 'Helvetica-Oblique';
+$up = -100;
+$ut = 50;
+$cw = array(
+	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
+	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
+	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+	'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
+	'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
+	chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
+	chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+$enc = 'cp1252';
+$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+?>

core/lib/fpdf/font/symbol.php

@@ -0,0 +1,20 @@
+<?php
+$type = 'Core';
+$name = 'Symbol';
+$up = -100;
+$ut = 50;
+$cw = array(
+	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>713,'#'=>500,'$'=>549,'%'=>833,'&'=>778,'\''=>439,'('=>333,')'=>333,'*'=>500,'+'=>549,
+	','=>250,'-'=>549,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>549,'='=>549,'>'=>549,'?'=>444,'@'=>549,'A'=>722,
+	'B'=>667,'C'=>722,'D'=>612,'E'=>611,'F'=>763,'G'=>603,'H'=>722,'I'=>333,'J'=>631,'K'=>722,'L'=>686,'M'=>889,'N'=>722,'O'=>722,'P'=>768,'Q'=>741,'R'=>556,'S'=>592,'T'=>611,'U'=>690,'V'=>439,'W'=>768,
+	'X'=>645,'Y'=>795,'Z'=>611,'['=>333,'\\'=>863,']'=>333,'^'=>658,'_'=>500,'`'=>500,'a'=>631,'b'=>549,'c'=>549,'d'=>494,'e'=>439,'f'=>521,'g'=>411,'h'=>603,'i'=>329,'j'=>603,'k'=>549,'l'=>549,'m'=>576,
+	'n'=>521,'o'=>549,'p'=>549,'q'=>521,'r'=>549,'s'=>603,'t'=>439,'u'=>576,'v'=>713,'w'=>686,'x'=>493,'y'=>686,'z'=>494,'{'=>480,'|'=>200,'}'=>480,'~'=>549,chr(127)=>0,chr(128)=>0,chr(129)=>0,chr(130)=>0,chr(131)=>0,
+	chr(132)=>0,chr(133)=>0,chr(134)=>0,chr(135)=>0,chr(136)=>0,chr(137)=>0,chr(138)=>0,chr(139)=>0,chr(140)=>0,chr(141)=>0,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
+	chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>750,chr(161)=>620,chr(162)=>247,chr(163)=>549,chr(164)=>167,chr(165)=>713,chr(166)=>500,chr(167)=>753,chr(168)=>753,chr(169)=>753,chr(170)=>753,chr(171)=>1042,chr(172)=>987,chr(173)=>603,chr(174)=>987,chr(175)=>603,
+	chr(176)=>400,chr(177)=>549,chr(178)=>411,chr(179)=>549,chr(180)=>549,chr(181)=>713,chr(182)=>494,chr(183)=>460,chr(184)=>549,chr(185)=>549,chr(186)=>549,chr(187)=>549,chr(188)=>1000,chr(189)=>603,chr(190)=>1000,chr(191)=>658,chr(192)=>823,chr(193)=>686,chr(194)=>795,chr(195)=>987,chr(196)=>768,chr(197)=>768,
+	chr(198)=>823,chr(199)=>768,chr(200)=>768,chr(201)=>713,chr(202)=>713,chr(203)=>713,chr(204)=>713,chr(205)=>713,chr(206)=>713,chr(207)=>713,chr(208)=>768,chr(209)=>713,chr(210)=>790,chr(211)=>790,chr(212)=>890,chr(213)=>823,chr(214)=>549,chr(215)=>250,chr(216)=>713,chr(217)=>603,chr(218)=>603,chr(219)=>1042,
+	chr(220)=>987,chr(221)=>603,chr(222)=>987,chr(223)=>603,chr(224)=>494,chr(225)=>329,chr(226)=>790,chr(227)=>790,chr(228)=>786,chr(229)=>713,chr(230)=>384,chr(231)=>384,chr(232)=>384,chr(233)=>384,chr(234)=>384,chr(235)=>384,chr(236)=>494,chr(237)=>494,chr(238)=>494,chr(239)=>494,chr(240)=>0,chr(241)=>329,
+	chr(242)=>274,chr(243)=>686,chr(244)=>686,chr(245)=>686,chr(246)=>384,chr(247)=>384,chr(248)=>384,chr(249)=>384,chr(250)=>384,chr(251)=>384,chr(252)=>494,chr(253)=>494,chr(254)=>494,chr(255)=>0);
+$uv = array(32=>160,33=>33,34=>8704,35=>35,36=>8707,37=>array(37,2),39=>8715,40=>array(40,2),42=>8727,43=>array(43,2),45=>8722,46=>array(46,18),64=>8773,65=>array(913,2),67=>935,68=>array(916,2),70=>934,71=>915,72=>919,73=>921,74=>977,75=>array(922,4),79=>array(927,2),81=>920,82=>929,83=>array(931,3),86=>962,87=>937,88=>926,89=>936,90=>918,91=>91,92=>8756,93=>93,94=>8869,95=>95,96=>63717,97=>array(945,2),99=>967,100=>array(948,2),102=>966,103=>947,104=>951,105=>953,106=>981,107=>array(954,4),111=>array(959,2),113=>952,114=>961,115=>array(963,3),118=>982,119=>969,120=>958,121=>968,122=>950,123=>array(123,3),126=>8764,160=>8364,161=>978,162=>8242,163=>8804,164=>8725,165=>8734,166=>402,167=>9827,168=>9830,169=>9829,170=>9824,171=>8596,172=>array(8592,4),176=>array(176,2),178=>8243,179=>8805,180=>215,181=>8733,182=>8706,183=>8226,184=>247,185=>array(8800,2),187=>8776,188=>8230,189=>array(63718,2),191=>8629,192=>8501,193=>8465,194=>8476,195=>8472,196=>8855,197=>8853,198=>8709,199=>array(8745,2),201=>8835,202=>8839,203=>8836,204=>8834,205=>8838,206=>array(8712,2),208=>8736,209=>8711,210=>63194,211=>63193,212=>63195,213=>8719,214=>8730,215=>8901,216=>172,217=>array(8743,2),219=>8660,220=>array(8656,4),224=>9674,225=>9001,226=>array(63720,3),229=>8721,230=>array(63723,10),241=>9002,242=>8747,243=>8992,244=>63733,245=>8993,246=>array(63734,9));
+?>

core/lib/fpdf/font/times.php

@@ -0,0 +1,21 @@
+<?php
+$type = 'Core';
+$name = 'Times-Roman';
+$up = -100;
+$ut = 50;
+$cw = array(
+	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>408,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>180,'('=>333,')'=>333,'*'=>500,'+'=>564,
+	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>564,'='=>564,'>'=>564,'?'=>444,'@'=>921,'A'=>722,
+	'B'=>667,'C'=>667,'D'=>722,'E'=>611,'F'=>556,'G'=>722,'H'=>722,'I'=>333,'J'=>389,'K'=>722,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>556,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>722,'W'=>944,
+	'X'=>722,'Y'=>722,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>469,'_'=>500,'`'=>333,'a'=>444,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
+	'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>333,'s'=>389,'t'=>278,'u'=>500,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>480,'|'=>200,'}'=>480,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+	chr(132)=>444,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>889,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>444,chr(148)=>444,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>980,
+	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>200,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>564,chr(173)=>333,chr(174)=>760,chr(175)=>333,
+	chr(176)=>400,chr(177)=>564,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>453,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>444,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+	chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>564,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>722,chr(222)=>556,chr(223)=>500,chr(224)=>444,chr(225)=>444,chr(226)=>444,chr(227)=>444,chr(228)=>444,chr(229)=>444,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
+	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>564,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>500,chr(254)=>500,chr(255)=>500);
+$enc = 'cp1252';
+$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+?>

core/lib/fpdf/font/timesb.php

@@ -0,0 +1,21 @@
+<?php
+$type = 'Core';
+$name = 'Times-Bold';
+$up = -100;
+$ut = 50;
+$cw = array(
+	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>555,'#'=>500,'$'=>500,'%'=>1000,'&'=>833,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
+	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>930,'A'=>722,
+	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>778,'I'=>389,'J'=>500,'K'=>778,'L'=>667,'M'=>944,'N'=>722,'O'=>778,'P'=>611,'Q'=>778,'R'=>722,'S'=>556,'T'=>667,'U'=>722,'V'=>722,'W'=>1000,
+	'X'=>722,'Y'=>722,'Z'=>667,'['=>333,'\\'=>278,']'=>333,'^'=>581,'_'=>500,'`'=>333,'a'=>500,'b'=>556,'c'=>444,'d'=>556,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>333,'k'=>556,'l'=>278,'m'=>833,
+	'n'=>556,'o'=>500,'p'=>556,'q'=>556,'r'=>444,'s'=>389,'t'=>333,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>394,'|'=>220,'}'=>394,'~'=>520,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+	chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>667,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>300,chr(171)=>500,chr(172)=>570,chr(173)=>333,chr(174)=>747,chr(175)=>333,
+	chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>556,chr(182)=>540,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>330,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>570,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>722,chr(222)=>611,chr(223)=>556,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
+	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+$enc = 'cp1252';
+$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+?>

core/lib/fpdf/font/timesbi.php

@@ -0,0 +1,21 @@
+<?php
+$type = 'Core';
+$name = 'Times-BoldItalic';
+$up = -100;
+$ut = 50;
+$cw = array(
+	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>389,'"'=>555,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
+	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>832,'A'=>667,
+	'B'=>667,'C'=>667,'D'=>722,'E'=>667,'F'=>667,'G'=>722,'H'=>778,'I'=>389,'J'=>500,'K'=>667,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>611,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>667,'W'=>889,
+	'X'=>667,'Y'=>611,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>570,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
+	'n'=>556,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>556,'v'=>444,'w'=>667,'x'=>500,'y'=>444,'z'=>389,'{'=>348,'|'=>220,'}'=>348,'~'=>570,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+	chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>389,chr(159)=>611,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>266,chr(171)=>500,chr(172)=>606,chr(173)=>333,chr(174)=>747,chr(175)=>333,
+	chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>576,chr(182)=>500,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>300,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
+	chr(198)=>944,chr(199)=>667,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>570,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>611,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
+	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>444,chr(254)=>500,chr(255)=>444);
+$enc = 'cp1252';
+$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+?>

core/lib/fpdf/font/timesi.php

@@ -0,0 +1,21 @@
+<?php
+$type = 'Core';
+$name = 'Times-Italic';
+$up = -100;
+$ut = 50;
+$cw = array(
+	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>420,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>214,'('=>333,')'=>333,'*'=>500,'+'=>675,
+	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>675,'='=>675,'>'=>675,'?'=>500,'@'=>920,'A'=>611,
+	'B'=>611,'C'=>667,'D'=>722,'E'=>611,'F'=>611,'G'=>722,'H'=>722,'I'=>333,'J'=>444,'K'=>667,'L'=>556,'M'=>833,'N'=>667,'O'=>722,'P'=>611,'Q'=>722,'R'=>611,'S'=>500,'T'=>556,'U'=>722,'V'=>611,'W'=>833,
+	'X'=>611,'Y'=>556,'Z'=>556,'['=>389,'\\'=>278,']'=>389,'^'=>422,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>278,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>444,'l'=>278,'m'=>722,
+	'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>500,'v'=>444,'w'=>667,'x'=>444,'y'=>444,'z'=>389,'{'=>400,'|'=>275,'}'=>400,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+	chr(132)=>556,chr(133)=>889,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>500,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>556,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>556,chr(148)=>556,chr(149)=>350,chr(150)=>500,chr(151)=>889,chr(152)=>333,chr(153)=>980,
+	chr(154)=>389,chr(155)=>333,chr(156)=>667,chr(157)=>350,chr(158)=>389,chr(159)=>556,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>275,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>675,chr(173)=>333,chr(174)=>760,chr(175)=>333,
+	chr(176)=>400,chr(177)=>675,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>523,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>611,chr(193)=>611,chr(194)=>611,chr(195)=>611,chr(196)=>611,chr(197)=>611,
+	chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>667,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>675,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>556,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
+	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>675,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>444,chr(254)=>500,chr(255)=>444);
+$enc = 'cp1252';
+$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+?>