[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14867] Merge 14848:14866 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14867] Merge 14848:14866 from trunk |
|
Date: |
Sat, 26 Mar 2016 16:04:41 +0000 |
Revision: 14867
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14867
Author: sigurdne
Date: 2016-03-26 16:04:41 +0000 (Sat, 26 Mar 2016)
Log Message:
-----------
Merge 14848:14866 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/activitycalendar/inc/class.soactivity.inc.php
branches/Version-2_0-branch/activitycalendar/inc/class.soarena.inc.php
branches/Version-2_0-branch/activitycalendar/inc/class.socontactperson.inc.php
branches/Version-2_0-branch/activitycalendar/inc/class.sogroup.inc.php
branches/Version-2_0-branch/activitycalendar/inc/class.soorganization.inc.php
branches/Version-2_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
branches/Version-2_0-branch/admin/inc/class.uiaccounts.inc.php
branches/Version-2_0-branch/controller/inc/class.uicontrol_register_to_component.inc.php
branches/Version-2_0-branch/controller/inc/class.uicontrol_register_to_location.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.phpgw.inc.php
branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/css/frontend.css
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_inline.xsl
branches/Version-2_0-branch/phpgwapi/templates/bkbooking/css/frontend.css
branches/Version-2_0-branch/property/inc/class.bocommon.inc.php
branches/Version-2_0-branch/property/inc/class.bos_agreement.inc.php
branches/Version-2_0-branch/property/inc/class.sos_agreement.inc.php
branches/Version-2_0-branch/property/inc/class.uiagreement.inc.php
branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
branches/Version-2_0-branch/property/inc/class.uis_agreement.inc.php
branches/Version-2_0-branch/property/js/portico/s_agreement.edit.js
branches/Version-2_0-branch/property/setup/phpgw_no.lang
branches/Version-2_0-branch/property/templates/base/admin.xsl
branches/Version-2_0-branch/property/templates/base/admin_entity.xsl
branches/Version-2_0-branch/property/templates/base/admin_location.xsl
branches/Version-2_0-branch/property/templates/base/agreement.xsl
branches/Version-2_0-branch/property/templates/base/b_account_form.xsl
branches/Version-2_0-branch/property/templates/base/budget.xsl
branches/Version-2_0-branch/property/templates/base/cat_filter.xsl
branches/Version-2_0-branch/property/templates/base/cat_select.xsl
branches/Version-2_0-branch/property/templates/base/document.xsl
branches/Version-2_0-branch/property/templates/base/ecodimb_form.xsl
branches/Version-2_0-branch/property/templates/base/filter_member_of.xsl
branches/Version-2_0-branch/property/templates/base/invoice.xsl
branches/Version-2_0-branch/property/templates/base/lookup.entity.xsl
branches/Version-2_0-branch/property/templates/base/s_agreement.xsl
branches/Version-2_0-branch/property/templates/base/tenant_claim.xsl
branches/Version-2_0-branch/property/templates/base/wo_hour.xsl
branches/Version-2_0-branch/property/templates/base/workorder.xsl
branches/Version-2_0-branch/rental/inc/class.uicontract.inc.php
branches/Version-2_0-branch/rental/inc/class.uifrontpage.inc.php
Added Paths:
-----------
branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/images/newlayout/logo_bk.svg
branches/Version-2_0-branch/phpgwapi/templates/bkbooking/images/newlayout/logo_bk.svg
Property Changed:
----------------
branches/Version-2_0-branch/
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847
+ /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866
Modified:
branches/Version-2_0-branch/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- branches/Version-2_0-branch/activitycalendar/inc/class.soactivity.inc.php
2016-03-26 16:00:21 UTC (rev 14866)
+++ branches/Version-2_0-branch/activitycalendar/inc/class.soactivity.inc.php
2016-03-26 16:04:41 UTC (rev 14867)
@@ -513,14 +513,13 @@
function get_category_name( $category_id )
{
$result = "Ingen";
- if ($category_id != null)
+ $category_id = (int)$category_id;
+ if ($category_id)
{
- $sql = "SELECT name FROM bb_activity where
id=$category_id";
+ $sql = "SELECT name FROM bb_activity where
id={$category_id}";
$this->db->query($sql, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('name');
- }
+ $this->db->next_record();
+ $result = $this->db->f('name');
}
return $result;
}
@@ -534,7 +533,7 @@
{
$category = new
activitycalendar_category($this->db->f('id'));
$category->set_parent_id($this->db->f('parent_id'));
- $category->set_name($this->db->f('name'));
+ $category->set_name($this->db->f('name', true));
$categories[] = $category;
}
return $categories;
@@ -543,13 +542,13 @@
function select_district_list()
{
$this->db->query("SELECT id, descr FROM fm_district
where id >'0' AND NOT descr LIKE '%vrige%' ORDER BY id ", __LINE__, __FILE__);
-
- $i = 0;
+ $district = array();
while ($this->db->next_record())
{
- $district[$i]['id'] = $this->db->f('id');
- $district[$i]['name'] =
stripslashes($this->db->f('descr'));
- $i++;
+ $district[] = array(
+ 'id' => $this->db->f('id'),
+ 'name' => $this->db->f('descr', true)
+ );
}
return $district;
@@ -558,26 +557,20 @@
function get_district_from_name( $name )
{
$this->db->query("SELECT part_of_town_id FROM
fm_part_of_town where name like UPPER('%{$name}%') ", __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('part_of_town_id');
- }
- return $result;
+ $this->db->next_record();
+ return $this->db->f('part_of_town_id');
}
function get_district_from_id( $d_id )
{
- $this->db->query("SELECT name FROM fm_part_of_town
where part_of_town_id={$d_id} ", __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('name');
- }
- return $result;
+ $d_id = (int)$d_id;
+ $this->db->query("SELECT name FROM fm_part_of_town
where part_of_town_id={$d_id}", __LINE__, __FILE__);
+ $this->db->next_record();
+ return $this->db->f('name', true);
}
function get_district_name( $district_id )
{
- //$result = "Ingen";
$values = array();
if ($district_id != null)
{
@@ -585,9 +578,7 @@
$this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record())
{
- $name = $this->db->f('name');
- $values[] = $name;
- //$result .= $name . ',';
+ $values[] = $this->db->f('name', true);
}
$result = implode(", ", $values);
return $result;
@@ -598,17 +589,18 @@
function get_districts()
{
$this->db->query("SELECT part_of_town_id, name FROM
fm_part_of_town district_id ", __LINE__, __FILE__);
-
- $i = 0;
+ $district = array();
while ($this->db->next_record())
{
$name = $this->db->f('name');
- if ($name != 'ØVRIGE')
+ if ($name == 'ØVRIGE')
{
- $district[$i]['part_of_town_id'] =
$this->db->f('part_of_town_id');
- $district[$i]['name'] =
stripslashes($this->db->f('name'));
- $i++;
+ continue;
}
+ $district[] = array(
+ 'part_of_town_id' =>
$this->db->f('part_of_town_id'),
+ 'name' => stripslashes($name)
+ );
}
return $district;
@@ -622,20 +614,27 @@
$q1 = "SELECT office FROM bb_office_user WHERE
account_id={$user_id}";
//var_dump($q1);
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $office_id = $this->db->f('office');
- }
+ $this->db->next_record();
+
+ $office_id = $this->db->f('office', true);
}
return $office_id;
}
- function get_office_name( $district_id )
+ /**
+ * DEMO::This one is vulnerable to SQL-injection
+ *
+ *
+ */
+ function get_district( $id )
{
$result = "Ingen";
- if ($district_id != null)
+// $district_id = (int)$district_id;
+ $table = 'fm_district';// id is integer
+// $table = 'fm_request_status';// id is varchar
+ if ($id != null)
{
- $sql = "SELECT descr FROM fm_district where
id=$district_id";
+ $sql = "SELECT descr FROM {$table} WHERE
id={$id}";
$this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record())
{
@@ -645,17 +644,30 @@
return $result;
}
+ function get_office_name( $district_id )
+ {
+ $district_id = (int)$district_id;
+ $result = "Ingen";
+ if ($district_id)
+ {
+ $sql = "SELECT descr FROM fm_district where id
= {$district_id}";
+ $this->db->query($sql, __LINE__, __FILE__);
+ $this->db->next_record();
+ $result = $this->db->f('descr', true);
+ }
+ return $result;
+ }
+
function get_office_description( $office_id )
{
$result = "";
- if ($office_id != null)
+ $office_id = (int)$office_id;
+ if ($office_id)
{
- $sql = "SELECT description FROM bb_office where
id=$office_id";
+ $sql = "SELECT description FROM bb_office where
id={$office_id}";
$this->db->query($sql, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('description');
- }
+ $this->db->next_record();
+ $result = $this->db->f('description', true);
}
return $result;
}
@@ -663,14 +675,14 @@
function get_target_name( $target_id )
{
$result = "Ingen";
- if ($target_id != null)
+ $target_id = (int)$target_id;
+ if ($target_id)
{
- $sql = "SELECT name FROM bb_agegroup where
id=$target_id";
+ $sql = "SELECT name FROM bb_agegroup where
id={$target_id}";
$this->db->query($sql, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('name');
- }
+ $this->db->next_record();
+
+ $result = $this->db->f('name', true);
}
return $result;
}
@@ -682,14 +694,15 @@
$this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record())
{
- $name = $this->db->f('name');
- if ($name != 'Tilskuere')
+ $name = $this->db->f('name', true);
+ if ($name == 'Tilskuere')
{
- $target = new
activitycalendar_target($this->db->f('id'));
-
$target->set_description($this->db->f('description'));
- $target->set_name($this->db->f('name'));
- $targets[] = $target;
+ continue;
}
+ $target = new
activitycalendar_target($this->db->f('id'));
+
$target->set_description($this->db->f('description', true));
+ $target->set_name($name);
+ $targets[] = $target;
}
return $targets;
}
@@ -700,24 +713,22 @@
{
$sql = "select id from bb_activity where name
like '%{$name}%'";
$this->db->query($sql, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('id');
- }
+ $this->db->next_record();
+ $result = $this->db->f('id');
}
return $result;
}
function get_target_from_sort_id( $id )
{
- if ($id != null && is_numeric($id))
+ $id = (int)$id;
+ if ($id)
{
$sql = "select id from bb_agegroup where
sort={$id} and active=1";
$this->db->query($sql, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('id');
- }
+ $this->db->next_record();
+
+ $result = $this->db->f('id');
}
return $result;
}
@@ -728,32 +739,33 @@
{
$sql = "select id from bb_organization where
organization_number='{$orgno}'";
$this->db->query($sql, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('id');
- }
+ $this->db->next_record();
+ $result = $this->db->f('id');
}
return $result;
}
function update_org_description( $org_id, $description )
{
- if ($org_id != null)
+ $description = $this->db->db_addslashes($description);
+ $org_id = (int)$org_id;
+ if ($org_id)
{
$sql = "update bb_organization set
description='{$description}' where id={$org_id}";
$result = $this->db->query($sql, __LINE__,
__FILE__);
}
- return isset($result);
+ return ($result);
}
function set_org_active( $org_id )
{
- if ($org_id != null)
+ $org_id = (int)$org_id;
+ if ($org_id)
{
$sql = "update bb_organization set
show_in_portal=1 where id={$org_id}";
$result = $this->db->query($sql, __LINE__,
__FILE__);
}
- return isset($result);
+ return ($result);
}
function get_activities( $parameters = array() )
@@ -817,49 +829,46 @@
function get_contact_person( $org_id, $group_id, $cont_pers )
{
+ $org_id = (int)$org_id;
+ $group_id = (int)$group_id;
if ($group_id)
{
- $group_id = (int)$group_id;
- // $this->db->query("SELECT * FROM
bb_group_contact WHERE id={$cont_pers}", __LINE__, __FILE__);
$this->db->query("SELECT * FROM
bb_group_contact WHERE group_id={$group_id} LIMIT 1", __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = array('name' => $this->soap ?
$this->db->f('name') : utf8_decode($this->db->f('name')),
- 'phone' =>
$this->db->f('phone'), 'email' => $this->db->f('email'));
- }
+ $this->db->next_record();
+
+ $result = array(
+ 'name' => $this->soap ?
$this->db->f('name', true) : utf8_decode($this->db->f('name', true)),
+ 'phone' => $this->db->f('phone'),
'email' => $this->db->f('email')
+ );
}
else if ($org_id)
{
- $org_id = (int)$org_id;
$this->db->query("SELECT * FROM
bb_organization_contact WHERE organization_id={$org_id} LIMIT 1", __LINE__,
__FILE__);
- while ($this->db->next_record())
- {
- $result = array('name' => $this->soap ?
$this->db->f('name') : utf8_decode($this->db->f('name')),
- 'phone' =>
$this->db->f('phone'), 'email' => $this->db->f('email'));
- }
+ $this->db->next_record();
+ $result = array(
+ 'name' => $this->soap ?
$this->db->f('name', true) : utf8_decode($this->db->f('name', true)),
+ 'phone' => $this->db->f('phone'),
'email' => $this->db->f('email'));
}
return $result;
}
function get_activity_description( $org_id, $group_id )
{
+ $org_id = (int)$org_id;
+ $group_id = (int)$group_id;
if ($group_id)
{
- $group_id = (int)$group_id;
$this->db->query("SELECT * FROM bb_group WHERE
id={$group_id}", __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->soap ?
$this->db->f('description') : utf8_decode($this->db->f('description'));
- }
+ $this->db->next_record();
+
+ $result = $this->soap ?
$this->db->f('description', true) : utf8_decode($this->db->f('description',
true));
}
else if ($org_id)
{
- $org_id = (int)$org_id;
$this->db->query("SELECT * FROM bb_organization
WHERE id={$org_id}", __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->soap ?
$this->db->f('description') : utf8_decode($this->db->f('description'));
- }
+ $this->db->next_record();
+
+ $result = $this->soap ?
$this->db->f('description', true) : utf8_decode($this->db->f('description',
true));
}
return $result;
}
@@ -878,9 +887,9 @@
$organizations[] = array
(
'id' => (int)$this->db->f('id'),
- 'name' =>
utf8_decode($this->db->f('name')),
- 'shortname' =>
utf8_decode($this->db->f('shortname')),
- 'description' =>
utf8_decode($this->db->f('description')),
+ 'name' =>
utf8_decode($this->db->f('name', true)),
+ 'shortname' =>
utf8_decode($this->db->f('shortname', true)),
+ 'description' =>
utf8_decode($this->db->f('description', true)),
'homepage' => $homepage,
'phone' => $this->db->f('phone'),
'email' => $this->db->f('email')
@@ -892,17 +901,16 @@
function get_org_info( $org_id )
{
+ $org_id = (int)$org_id;
$result = array();
if ($org_id)
{
- $org_id = (int)$org_id;
$this->db->query("SELECT * FROM bb_organization
WHERE id={$org_id}", __LINE__, __FILE__);
$this->db->next_record();
- $result = array
- (
- 'name' =>
utf8_decode($this->db->f('name')),
- 'shortname' =>
utf8_decode($this->db->f('shortname')),
- 'description' =>
utf8_decode($this->db->f('description')),
+ $result = array(
+ 'name' =>
utf8_decode($this->db->f('name', true)),
+ 'shortname' =>
utf8_decode($this->db->f('shortname', true)),
+ 'description' =>
utf8_decode($this->db->f('description', true)),
'homepage' => $this->db->f('homepage'),
'phone' => $this->db->f('phone'),
'email' => $this->db->f('email')
@@ -921,9 +929,9 @@
$groups[] = array
(
'id' => (int)$this->db->f('id'),
- 'name' =>
utf8_decode($this->db->f('name')),
- 'shortname' =>
utf8_decode($this->db->f('shortname')),
- 'description' =>
utf8_decode($this->db->f('description')),
+ 'name' =>
utf8_decode($this->db->f('name', true)),
+ 'shortname' =>
utf8_decode($this->db->f('shortname', true)),
+ 'description' =>
utf8_decode($this->db->f('description', true)),
'homepage' =>
utf8_decode($this->db->f('homepage')),
'organization_id' =>
$this->db->f('organization_id')
);
@@ -949,17 +957,17 @@
function get_group_info( $group_id )
{
+ $group_id = (int)$group_id;
$result = array();
if ($group_id)
{
- $group_id = (int)$group_id;
$this->db->query("SELECT * FROM bb_group WHERE
id={$group_id}", __LINE__, __FILE__);
$this->db->next_record();
$result = array
(
- 'name' =>
utf8_decode($this->db->f('name')),
- 'shortname' =>
utf8_decode($this->db->f('shortname')),
- 'description' =>
utf8_decode($this->db->f('description')),
+ 'name' =>
utf8_decode($this->db->f('name', true)),
+ 'shortname' =>
utf8_decode($this->db->f('shortname', true)),
+ 'description' =>
utf8_decode($this->db->f('description', true)),
'organization_id' =>
$this->db->f('organization_id')
);
}
@@ -969,26 +977,24 @@
function get_all_arena_info( $arena_id, $int_arena_id )
{
$result = array();
- if ($arena_id && is_numeric($arena_id))
+ $arena_id = (int)$arena_id;
+ $int_arena_id = (int)$int_arena_id;
+ if ($arena_id)
{
- $arena_id = (int)$arena_id;
$this->db->query("SELECT * FROM activity_arena
WHERE id={$arena_id}", __LINE__, __FILE__);
$this->db->next_record();
- $result = array
- (
- 'arena_name' => $this->soap ?
$this->db->f('arena_name') : utf8_decode($this->db->f('arena_name')),
- 'address' => $this->soap ?
$this->db->f('address') : utf8_decode($this->db->f('address'))
+ $result = array(
+ 'arena_name' => $this->soap ?
$this->db->f('arena_name', true) : utf8_decode($this->db->f('arena_name',
true)),
+ 'address' => $this->soap ?
$this->db->f('address', true) : utf8_decode($this->db->f('address', true))
);
}
- else if ($int_arena_id && is_numeric($int_arena_id))
+ else if ($int_arena_id)
{
- $int_arena_id = (int)$int_arena_id;
$this->db->query("SELECT id, name, street FROM
bb_building WHERE id={$int_arena_id}", __LINE__, __FILE__);
$this->db->next_record();
- $result = array
- (
- 'arena_name' => $this->soap ?
$this->db->f('name') : utf8_decode($this->db->f('name')),
- 'address' => $this->soap ?
$this->db->f('street') : utf8_decode($this->db->f('street'))
+ $result = array(
+ 'arena_name' => $this->soap ?
$this->db->f('name', true) : utf8_decode($this->db->f('name', true)),
+ 'address' => $this->soap ?
$this->db->f('street', true) : utf8_decode($this->db->f('street', true))
);
}
return $result;
@@ -997,15 +1003,14 @@
function get_arena_info( $arena_id )
{
$result = array();
+ $arena_id = (int)$arena_id;
if ($arena_id)
{
- $arena_id = (int)$arena_id;
$this->db->query("SELECT * FROM activity_arena
WHERE id={$arena_id}", __LINE__, __FILE__);
$this->db->next_record();
- $result = array
- (
- 'arena_name' => $this->soap ?
$this->db->f('arena_name') : utf8_decode($this->db->f('arena_name')),
- 'address' => $this->soap ?
$this->db->f('address') : utf8_decode($this->db->f('address'))
+ $result = array(
+ 'arena_name' => $this->soap ?
$this->db->f('arena_name', true) : utf8_decode($this->db->f('arena_name',
true)),
+ 'address' => $this->soap ?
$this->db->f('address', true) : utf8_decode($this->db->f('address', true))
);
}
return $result;
@@ -1014,15 +1019,14 @@
function get_internal_arena_info( $arena_id )
{
$result = array();
+ $arena_id = (int)$arena_id;
if ($arena_id)
{
- $arena_id = (int)$arena_id;
$this->db->query("SELECT id, name, street FROM
bb_building WHERE id={$arena_id}", __LINE__, __FILE__);
$this->db->next_record();
- $result = array
- (
- 'arena_name' => $this->soap ?
$this->db->f('name') : utf8_decode($this->db->f('name')),
- 'address' => $this->soap ?
$this->db->f('street') : utf8_decode($this->db->f('street'))
+ $result = array(
+ 'arena_name' => $this->soap ?
$this->db->f('name', true) : utf8_decode($this->db->f('name', true)),
+ 'address' => $this->soap ?
$this->db->f('street', true) : utf8_decode($this->db->f('street', true))
);
}
return $result;
@@ -1059,6 +1063,7 @@
{
$sql = "SELECT * FROM bb_activity where active=1 and
parent_id=1";
$this->db->query($sql, __LINE__, __FILE__);
+ $categories = array();
while ($this->db->next_record())
{
$categories[] = array(
@@ -1131,7 +1136,7 @@
'show_in_portal = 1'
);
- $result = $this->db->query('UPDATE bb_organization SET
' . join(',', $values) . " WHERE id=$orgid", __LINE__, __FILE__);
+ $result = $this->db->query('UPDATE bb_organization SET
' . join(',', $values) . " WHERE id = {$orgid}", __LINE__, __FILE__);
}
function add_organization( $org_info )
@@ -1328,10 +1333,10 @@
function delete_contact_persons( $org_id )
{
+ $org_id = (int)$org_id;
if ($org_id)
{
- $org = (int)$org_id;
- $sql = "DELETE FROM bb_organization_contact
WHERE organization_id={$org}";
+ $sql = "DELETE FROM bb_organization_contact
WHERE organization_id={$org_id}";
$result = $this->db->query($sql, __LINE__,
__FILE__);
return isset($result);
}
@@ -1441,6 +1446,7 @@
function get_activities_for_update( $org_id, $group = false )
{
+ $org_id = (int)$org_id;
$activity_ids = array();
if ($group)
{
@@ -1462,6 +1468,7 @@
function get_connected_activities( $org_id )
{
+ $org_id = (int)$org_id;
$activities = array();
$sql = "SELECT * FROM activity_activity WHERE
organization_id={$org_id}";
@@ -1498,12 +1505,9 @@
function update_organization_connection( $activity_id,
$organization_id )
{
- $id = intval($activity_id);
- $org_id = intval($organization_id);
-
- $result = $this->db->query("UPDATE activity_activity
SET organization_id={$org_id} WHERE id={$id}", __LINE__, __FILE__);
-
- return isset($result);
+ $id = (int)$activity_id;
+ $org_id = (int)$organization_id;
+ return $this->db->query("UPDATE activity_activity SET
organization_id={$org_id} WHERE id={$id}", __LINE__, __FILE__);
}
function get_activities_without_groups()
@@ -1514,9 +1518,9 @@
while ($this->db->next_record())
{
$activity_id = $this->db->f('id');
- $activity_title = $this->db->f('title');
+ $activity_title = $this->db->f('title', true);
$activity_organization =
$this->db->f('organization_id');
- $description = $this->db->f('org_desc');
+ $description = $this->db->f('org_desc', true);
$activities[] = array(
'id' => $activity_id,
@@ -1540,7 +1544,7 @@
function remove_old_activities( $activity_id )
{
- //$sql = "delete from activity_activity where id in
(1293,1294,1297,1299)"; //1293,1294,1297,1299
+ $activity_id = (int)$activity_id;
$sql = "delete from activity_activity where
id={$activity_id}";
$result = $this->db->query($sql, __LINE__, __FILE__);
@@ -1549,7 +1553,7 @@
function save_with_no_changes( $activity )
{
- $id = intval($activity->get_id());
+ $id = (int)$activity->get_id();
$ts_now = strtotime('now');
$values = "last_change_date = " .
$this->marshal($ts_now, 'int');
@@ -1561,15 +1565,9 @@
function update_activity_group( $activity_id, $group_id )
{
- $id = intval($activity_id);
- $g_id = intval($group_id);
-
+ $id = (int)$activity_id;
+ $g_id = (int)$group_id;
$values = "group_id = " . $g_id;
- //var_dump("UPDATE activity_activity SET {$values}
WHERE id={$id}");
- //die;
-
- $result = $this->db->query("UPDATE activity_activity
SET {$values} WHERE id={$id}", __LINE__, __FILE__);
-
- return isset($result);
+ return $this->db->query("UPDATE activity_activity SET
{$values} WHERE id={$id}", __LINE__, __FILE__);
}
}
\ No newline at end of file
Modified: branches/Version-2_0-branch/activitycalendar/inc/class.soarena.inc.php
===================================================================
--- branches/Version-2_0-branch/activitycalendar/inc/class.soarena.inc.php
2016-03-26 16:00:21 UTC (rev 14866)
+++ branches/Version-2_0-branch/activitycalendar/inc/class.soarena.inc.php
2016-03-26 16:04:41 UTC (rev 14867)
@@ -184,14 +184,14 @@
function get_arena_name( $arena_id )
{
$result = "Ingen";
- if (isset($arena_id) && $arena_id != '')
+ $arena_id = (int)$arena_id;
+ if ($arena_id)
{
$q1 = "SELECT arena_name FROM activity_arena
WHERE id={$arena_id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('arena_name');
- }
+ $this->db->next_record();
+
+ $result = $this->db->f('arena_name', true);
}
return $result;
@@ -211,7 +211,7 @@
while ($this->db->next_record())
{
$id = $this->db->f('id');
- $buildings[$id] = $this->db->f('name');
+ $buildings[$id] = $this->db->f('name', true);
}
return $buildings;
}
@@ -224,9 +224,9 @@
*/
function get_building_name( $building_id )
{
- if (isset($building_id))
+ $building_id = (int)$building_id;
+ if ($building_id)
{
- $building_id = (int)$building_id;
$q1 = "SELECT name FROM bb_building WHERE
id={$building_id}";
$this->db->query($q1, __LINE__, __FILE__);
while ($this->db->next_record())
@@ -249,7 +249,7 @@
$q = "INSERT INTO activity_arena (arena_name) VALUES
('test')";
$result = $this->db->query($q);
- if (isset($result))
+ if ($result)
{
// Set the new party ID
$arena->set_id($this->db->get_last_insert_id('activity_arena', 'id'));
@@ -270,7 +270,7 @@
*/
function update( $arena )
{
- $id = intval($arena->get_id());
+ $id = (int)$arena->get_id();
$values = array(
'arena_name = ' .
$this->marshal($arena->get_arena_name(), 'string'),
@@ -282,9 +282,9 @@
'active = ' .
$this->marshal(($arena->is_active() ? 'true' : 'false'), 'bool'),
);
- $result = $this->db->query('UPDATE activity_arena SET '
. join(',', $values) . " WHERE id=$id", __LINE__, __FILE__);
+ $result = $this->db->query('UPDATE activity_arena SET '
. join(',', $values) . " WHERE id={$id}", __LINE__, __FILE__);
- return isset($result);
+ return $result;
}
public function get_id_field_name( $extended_info = false )
@@ -315,15 +315,9 @@
$this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record())
{
- //$result_arr = $this->db->f('name');
- /* if($curr_index == 0)
- {
- $result_arr[] = "<option
value='0'>Velg gateadresse</option>";
- }
- $result_arr[] = "<option value='" .
$this->db->f('descr') . "'>" . $this->db->f('descr') . "</option>";
- $curr_index++; */
-
- $result_arr[]['name'] =
$this->db->f('descr');
+ $result_arr[] = array(
+ 'name' => $this->db->f('descr',
true)
+ );
}
}
//$result = implode(' ', $result_arr);
@@ -334,14 +328,12 @@
public function get_arena_id_by_name( $arena_name )
{
$result = 0;
- if (isset($arena_name) && $arena_name != '')
+ if ($arena_name)
{
$q1 = "SELECT id FROM activity_arena WHERE
UPPER(arena_name) = UPPER('{$arena_name}')";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('id');
- }
+ $this->db->next_record();
+ $result = $this->db->f('id');
}
return $result;
}
Modified:
branches/Version-2_0-branch/activitycalendar/inc/class.socontactperson.inc.php
===================================================================
---
branches/Version-2_0-branch/activitycalendar/inc/class.socontactperson.inc.php
2016-03-26 16:00:21 UTC (rev 14866)
+++
branches/Version-2_0-branch/activitycalendar/inc/class.socontactperson.inc.php
2016-03-26 16:04:41 UTC (rev 14867)
@@ -194,14 +194,13 @@
function get_group_contact_name( $id )
{
$result = "Ingen";
- if (isset($id) && $id != '')
+ $id = (int)$id;
+ if ($id)
{
$q1 = "SELECT name, phone, email FROM
bb_group_contact WHERE id={$id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('name') .
"<br/>" . $this->db->f('phone') . "<br/>" . $this->db->f('email');
- }
+ $this->db->next_record();
+ $result = $this->db->f('name', true) . "<br/>"
. $this->db->f('phone') . "<br/>" . $this->db->f('email');
}
return $result;
}
@@ -209,14 +208,14 @@
function get_group_contact_name_local( $id )
{
$result = "Ingen";
- if (isset($id) && $id != '')
+ $id = (int)$id;
+ if ($id)
{
$q1 = "SELECT name, phone, email FROM
activity_contact_person WHERE id={$id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('name') .
"<br/>" . $this->db->f('phone') . "<br/>" . $this->db->f('email');
- }
+ $this->db->next_record();
+
+ $result = $this->db->f('name', true) . "<br/>"
. $this->db->f('phone') . "<br/>" . $this->db->f('email');
}
return $result;
}
@@ -224,14 +223,14 @@
function get_org_contact_name( $id )
{
$result = "Ingen";
- if (isset($id) && $id != '')
+ $id = (int)$id;
+ if ($id)
{
$q1 = "SELECT name, phone, email FROM
bb_organization_contact WHERE id={$id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('name') .
"<br/>" . $this->db->f('phone') . "<br/>" . $this->db->f('email');
- }
+ $this->db->next_record();
+
+ $result = $this->db->f('name', true) . "<br/>"
. $this->db->f('phone') . "<br/>" . $this->db->f('email');
}
return $result;
}
@@ -239,42 +238,39 @@
function get_org_contact_name_local( $id )
{
$result = "Ingen";
- if (isset($id) && $id != '')
+ $id = (int)$id;
+ if ($id)
{
$q1 = "SELECT name, phone, email FROM
activity_contact_person WHERE id={$id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('name') .
"<br/>" . $this->db->f('phone') . "<br/>" . $this->db->f('email');
- }
+ $this->db->next_record();
+ $result = $this->db->f('name', true) . "<br/>"
. $this->db->f('phone') . "<br/>" . $this->db->f('email');
}
return $result;
}
function get_mailaddress_for_group_contact( $contact_person_id )
{
+ $contact_person_id = (int)$contact_person_id;
if ($contact_person_id)
{
$q1 = "SELECT email FROM bb_group_contact WHERE
id={$contact_person_id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('email');
- }
+ $this->db->next_record();
+ $result = $this->db->f('email');
}
return $result;
}
function get_mailaddress_for_org_contact( $contact_person_id )
{
+ $contact_person_id = (int)$contact_person_id;
if ($contact_person_id)
{
$q1 = "SELECT email FROM
bb_organization_contact WHERE id={$contact_person_id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('email');
- }
+ $this->db->next_record();
+ $result = $this->db->f('email');
}
return $result;
}
@@ -339,7 +335,8 @@
function get_local_contact_persons( $id, $group = false )
{
$result = array();
- if (isset($id))
+ $id = (int)$id;
+ if ($id)
{
if ($group)
{
@@ -367,7 +364,8 @@
function get_booking_contact_persons( $id, $group = false )
{
$result = array();
- if (isset($id))
+ $id = (int)$id;
+ if ($id)
{
$columns[] = 'group_contact.id';
$columns[] = 'group_contact.name';
@@ -399,7 +397,7 @@
function update_local_contact_person( $contact )
{
- $id = $contact['id'];
+ $id = (int)$contact['id'];
$name = $contact['name'];
$phone = $contact['phone'];
$mail = $contact['mail'];
Modified: branches/Version-2_0-branch/activitycalendar/inc/class.sogroup.inc.php
===================================================================
--- branches/Version-2_0-branch/activitycalendar/inc/class.sogroup.inc.php
2016-03-26 16:00:21 UTC (rev 14866)
+++ branches/Version-2_0-branch/activitycalendar/inc/class.sogroup.inc.php
2016-03-26 16:04:41 UTC (rev 14867)
@@ -185,7 +185,9 @@
function update_group_description( $group_id, $desc )
{
- $sql = "UPDATE bb_group SET description='{$desc}' WHERE
ID={$group_id}";
+ $desc = $this->db->db_addslashes($desc);
+ $group_id = (int)$group_id;
+ $sql = "UPDATE bb_group SET description='{$desc}' WHERE
id={$group_id}";
$result = $this->db->query($sql, __LINE__, __FILE__);
if (isset($result))
{
@@ -199,12 +201,12 @@
function update_group_contact( $contact )
{
- $id = intval($contact['original_id']);
- $name = $contact['name'];
+ $id = (int)$contact['original_id'];
+ $name = $this->db->db_addslashes($contact['name']);
$phone = $contact['phone'];
$mail = $contact['mail'];
- $sql = "UPDATE bb_group_contact SET NAME='{$name}',
PHONE='{$phone}', EMAIL='{$mail}' WHERE id={$id}";
+ $sql = "UPDATE bb_group_contact SET name='{$name}',
phone='{$phone}', email='{$mail}' WHERE id={$id}";
$result = $this->db->query($sql, __LINE__, __FILE__);
if (isset($result))
{
@@ -218,7 +220,7 @@
function add_group_contact_local( $contact )
{
- $name = $contact['name'];
+ $name = $this->db->db_addslashes($contact['name']);
$phone = $contact['phone'];
$mail = $contact['mail'];
$original_id = $contact['original_id'];
@@ -278,14 +280,14 @@
function get_group_name( $group_id )
{
$result = "Ingen";
- if (isset($group_id))
+ $group_id = (int)$group_id;
+ if ($group_id)
{
$q1 = "SELECT name FROM bb_group WHERE
id={$group_id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('name');
- }
+ $this->db->next_record();
+
+ $result = $this->db->f('name', true);
}
return $result;
@@ -294,14 +296,14 @@
function get_group_name_local( $group_id )
{
$result = "Ingen";
- if (isset($group_id))
+ $group_id = (int)$group_id;
+ if ($group_id)
{
$q1 = "SELECT name FROM activity_group WHERE
id={$group_id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('name');
- }
+ $this->db->next_record();
+
+ $result = $this->db->f('name', true);
}
return $result;
@@ -310,14 +312,14 @@
function get_orgid_from_group( $group_id )
{
$result = 0;
- if (isset($group_id))
+ $group_id = (int)$group_id;
+ if ($group_id)
{
$q1 = "SELECT organization_id FROM bb_group
WHERE id={$group_id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result =
$this->db->f('organization_id');
- }
+ $this->db->next_record();
+
+ $result = $this->db->f('organization_id');
}
return $result;
@@ -326,14 +328,14 @@
function get_orgid_from_group_local( $group_id )
{
$result = 0;
- if (isset($group_id))
+ $group_id = (int)$group_id;
+ if ($group_id)
{
$q1 = "SELECT organization_id FROM
activity_group WHERE id={$group_id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result =
$this->db->f('organization_id');
- }
+ $this->db->next_record();
+
+ $result = $this->db->f('organization_id');
}
return $result;
@@ -342,7 +344,8 @@
function get_contacts( $group_id )
{
$contacts = array();
- if (isset($group_id))
+ $group_id = (int)$group_id;
+ if ($group_id)
{
$q1 = "SELECT id FROM bb_group_contact WHERE
group_id={$group_id}";
$this->db->query($q1, __LINE__, __FILE__);
@@ -350,7 +353,6 @@
{
$contacts[] = $this->db->f('id');
}
- //$result = $contacts;
}
return $contacts;
@@ -359,7 +361,8 @@
function get_contacts_as_objects( $group_id )
{
$contacts = array();
- if (isset($group_id))
+ $group_id = (int)$group_id;
+ if ($group_id)
{
$q1 = "SELECT * FROM bb_group_contact WHERE
group_id={$group_id}";
$this->db->query($q1, __LINE__, __FILE__);
@@ -373,7 +376,6 @@
$contact_person->set_email($this->unmarshal($this->db->f('email'), 'string'));
$contacts[] = $contact_person;
}
- //$result = $contacts;
}
return $contacts;
@@ -382,7 +384,8 @@
function get_contacts_local( $group_id )
{
$contacts = array();
- if (isset($group_id))
+ $group_id = (int)$group_id;
+ if ($group_id)
{
$q1 = "SELECT id FROM activity_contact_person
WHERE group_id='{$group_id}'";
$this->db->query($q1, __LINE__, __FILE__);
@@ -390,7 +393,6 @@
{
$contacts[] = $this->db->f('id');
}
- //$result = $contacts;
}
return $contacts;
@@ -399,7 +401,8 @@
function get_contacts_local_as_objects( $group_id )
{
$contacts = array();
- if (isset($group_id))
+ $group_id = (int)$group_id;
+ if ($group_id)
{
$q1 = "SELECT * FROM activity_contact_person
WHERE group_id='{$group_id}'";
$this->db->query($q1, __LINE__, __FILE__);
@@ -413,7 +416,6 @@
$contact_person->set_email($this->unmarshal($this->db->f('email'), 'string'));
$contacts[] = $contact_person;
}
- //$result = $contacts;
}
return $contacts;
@@ -421,28 +423,28 @@
function get_description( $group_id )
{
- if (isset($group_id))
+ $group_id = (int)$group_id;
+ if ($group_id)
{
$q1 = "SELECT description FROM bb_group WHERE
id={$group_id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $desc = $this->db->f('description');
- }
+ $this->db->next_record();
+
+ $desc = $this->db->f('description', true);
}
return $desc;
}
function get_description_local( $group_id )
{
- if (isset($group_id))
+ $group_id = (int)$group_id;
+ if ($group_id)
{
$q1 = "SELECT description FROM activity_group
WHERE id={$group_id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $desc = $this->db->f('description');
- }
+ $this->db->next_record();
+
+ $desc = $this->db->f('description', true);
}
return $desc;
}
@@ -474,14 +476,15 @@
$change_type = $group->get_change_type();
$transferred = ($group->get_transferred() == 1 ||
$group->get_transferred() == true) ? 'true' : 'false';
- $values[] = "NAME='{$name}'";
- $values[] = "DESCRIPTION='{$description}'";
- $values[] = "ORGANIZATION_ID='{$orgid}'";
- $values[] = "CHANGE_TYPE='{$change_type}'";
- $values[] = "TRANSFERRED={$transferred}";
+ $values[] = "name='{$name}'";
+ $values[] = "description='{$description}'";
+ $values[] = "organization_id='{$orgid}'";
+ $values[] = "change_type='{$change_type}'";
+ $values[] = "transferred={$transferred}";
$vals = implode(',', $values);
- $sql = "UPDATE activity_group SET {$vals} WHERE
ID={$group->get_id()}";
+ $id = (int)$group->get_id();
+ $sql = "UPDATE activity_group SET {$vals} WHERE
id={$id}";
$result = $this->db->query($sql, __LINE__, __FILE__);
if (isset($result))
{
@@ -529,6 +532,7 @@
function get_group_local( $g_id )
{
+ $g_id = (int)$g_id;
$columns[] = 'activity_group.id';
$columns[] = 'activity_group.name';
$columns[] = 'activity_group.description';
@@ -545,28 +549,27 @@
$sql = "SELECT {$cols} FROM {$table} WHERE
activity_group.id={$g_id}";
$result = $this->db->query($sql, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $group = new activitycalendar_group((int)$g_id);
+ $this->db->next_record();
-
$group->set_name($this->unmarshal($this->db->f('name'), 'string'));
-
$group->set_organization_id($this->unmarshal($this->db->f('organization_id'),
'int'));
-
$group->set_shortname($this->unmarshal($this->db->f('shortname'), 'string'));
-
$group->set_description($this->unmarshal($this->db->f('description'),
'string'));
-
$group->set_show_in_portal($this->unmarshal($this->db->f('show_in_portal'),
'int'));
-
$group->set_change_type($this->unmarshal($this->db->f('change_type'),
'string'));
-
$group->set_transferred($this->unmarshal($this->db->f('transferred'), 'bool'));
-
$group->set_original_group_id($this->unmarshal($this->db->f('original_group_id'),
'int'));
+ $group = new activitycalendar_group($g_id);
- return $group;
- }
+ $group->set_name($this->unmarshal($this->db->f('name'),
'string'));
+
$group->set_organization_id($this->unmarshal($this->db->f('organization_id'),
'int'));
+
$group->set_shortname($this->unmarshal($this->db->f('shortname'), 'string'));
+
$group->set_description($this->unmarshal($this->db->f('description'),
'string'));
+
$group->set_show_in_portal($this->unmarshal($this->db->f('show_in_portal'),
'int'));
+
$group->set_change_type($this->unmarshal($this->db->f('change_type'),
'string'));
+
$group->set_transferred($this->unmarshal($this->db->f('transferred'), 'bool'));
+
$group->set_original_group_id($this->unmarshal($this->db->f('original_group_id'),
'int'));
+
+ return $group;
}
function add_new_group_from_activity( $group_info )
{
- $name = $group_info['name'];
+ $name = $this->db->db_addslashes($group_info['name']);
$orgid = $group_info['organization_id'];
- $description = $group_info['description'];
+ $description =
$this->db->db_addslashes($group_info['description']);
$activity_id = 1;
$show_in_portal = 1;
Modified:
branches/Version-2_0-branch/activitycalendar/inc/class.soorganization.inc.php
===================================================================
---
branches/Version-2_0-branch/activitycalendar/inc/class.soorganization.inc.php
2016-03-26 16:00:21 UTC (rev 14866)
+++
branches/Version-2_0-branch/activitycalendar/inc/class.soorganization.inc.php
2016-03-26 16:04:41 UTC (rev 14867)
@@ -210,15 +210,15 @@
function get_organization_name( $org_id )
{
$result = "Ingen";
- if (isset($org_id))
+ $org_id = (int)$org_id;
+ if ($org_id)
{
$org_id = intval($org_id);
$q1 = "SELECT name FROM bb_organization WHERE
id={$org_id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('name');
- }
+ $this->db->next_record();
+
+ $result = $this->db->f('name', true);
}
return $result;
@@ -352,14 +352,14 @@
function get_organization_name_local( $org_id )
{
$result = "Ingen";
- if (isset($org_id))
+ $org_id = (int)$org_id;
+ if ($org_id)
{
$q1 = "SELECT name FROM activity_organization
WHERE id={$org_id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('name');
- }
+ $this->db->next_record();
+
+ $result = $this->db->f('name', true);
}
return $result;
@@ -368,16 +368,15 @@
function get_contacts( $organization_id )
{
$contacts = array();
- if (isset($organization_id))
+ $organization_id = (int)$organization_id;
+ if ($organization_id)
{
$q1 = "SELECT id FROM bb_organization_contact
WHERE organization_id={$organization_id}";
$this->db->query($q1, __LINE__, __FILE__);
while ($this->db->next_record())
{
- $cont_id = $this->db->f('id');
- $contacts[] = $cont_id;
+ $contacts[] = $this->db->f('id');
}
- //$result=$contacts;
}
return $contacts;
}
@@ -385,10 +384,10 @@
function get_contacts_as_objects( $organization_id )
{
$contacts = array();
- if (isset($organization_id))
+ $organization_id = (int)$organization_id;
+ if ($organization_id)
{
$q1 = "SELECT * FROM bb_organization_contact
WHERE organization_id={$organization_id}";
- //var_dump($q1);
$this->db->query($q1, __LINE__, __FILE__);
while ($this->db->next_record())
{
@@ -407,17 +406,15 @@
function get_contacts_local( $organization_id )
{
$contacts = array();
- if (isset($organization_id))
+ $organization_id = (int)$organization_id;
+ if ($organization_id)
{
$q1 = "SELECT id FROM activity_contact_person
WHERE organization_id='{$organization_id}'";
- //var_dump($q1);
$this->db->query($q1, __LINE__, __FILE__);
while ($this->db->next_record())
{
- $cont_id = $this->db->f('id');
- $contacts[] = $cont_id;
+ $contacts[] = $this->db->f('id');
}
- //$result=$contacts;
}
return $contacts;
}
@@ -425,10 +422,10 @@
function get_contacts_local_as_objects( $organization_id )
{
$contacts = array();
- if (isset($organization_id))
+ $organization_id = (int)$organization_id;
+ if ($organization_id)
{
$q1 = "SELECT * FROM activity_contact_person
WHERE organization_id='{$organization_id}'";
- //var_dump($q1);
$this->db->query($q1, __LINE__, __FILE__);
while ($this->db->next_record())
{
@@ -446,28 +443,28 @@
function get_description( $organization_id )
{
- if (isset($organization_id))
+ $organization_id = (int)$organization_id;
+ if ($organization_id)
{
$q1 = "SELECT description FROM bb_organization
WHERE id={$organization_id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $desc = $this->db->f('description');
- }
+ $this->db->next_record();
+
+ $desc = $this->db->f('description', true);
}
return $desc;
}
function get_description_local( $organization_id )
{
- if (isset($organization_id))
+ $organization_id = (int)$organization_id;
+ if ($organization_id)
{
$q1 = "SELECT description FROM
activity_organization WHERE id={$organization_id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $desc = $this->db->f('description');
- }
+ $this->db->next_record();
+
+ $desc = $this->db->f('description', true);
}
return $desc;
}
@@ -475,10 +472,10 @@
function get_district_from_name( $name )
{
$this->db->query("SELECT part_of_town_id FROM
fm_part_of_town where name like UPPER('%{$name}%') ", __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('part_of_town_id');
- }
+ $this->db->next_record();
+
+ $result = $this->db->f('part_of_town_id');
+
return $result;
}
@@ -490,10 +487,9 @@
$q1 = "SELECT fm_district.descr FROM
fm_part_of_town,fm_district WHERE
fm_part_of_town.part_of_town_id={$district_id} AND fm_district.id =
fm_part_of_town.district_id";
//var_dump($q1);
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $office_name = $this->db->f('descr');
- }
+ $this->db->next_record();
+
+ $office_name = $this->db->f('descr', true);
}
return $office_name;
}
@@ -532,23 +528,24 @@
$transferred = ($organization->get_transferred() == 1
|| $organization->get_transferred() == true) ? 'true' : 'false';
$original_org_id =
($organization->get_original_org_id() && $organization->get_original_org_id()
!= '') ? $organization->get_original_org_id() : 0;
- $values[] = "NAME='{$name}'";
- $values[] = "HOMEPAGE='{$homepage}'";
- $values[] = "PHONE='{$phone}'";
- $values[] = "EMAIL='{$email}'";
- $values[] = "DESCRIPTION='{$description}'";
- $values[] = "ADDRESS='{$street}'";
- $values[] = "ADDRESSNUMBER='{$streetnumber}'";
- $values[] = "ZIP_CODE='{$zip_code}'";
- $values[] = "CITY='{$city}'";
- $values[] = "ORGNO='{$orgnr}'";
- $values[] = "DISTRICT='{$district}'";
- $values[] = "CHANGE_TYPE='{$change_type}'";
- $values[] = "TRANSFERRED={$transferred}";
- $values[] = "ORIGINAL_ORG_ID={$original_org_id}";
+ $values[] = "name='{$name}'";
+ $values[] = "homepage='{$homepage}'";
+ $values[] = "phone='{$phone}'";
+ $values[] = "email='{$email}'";
+ $values[] = "description='{$description}'";
+ $values[] = "address='{$street}'";
+ $values[] = "addressnumber='{$streetnumber}'";
+ $values[] = "zip_code='{$zip_code}'";
+ $values[] = "city='{$city}'";
+ $values[] = "orgno='{$orgnr}'";
+ $values[] = "district='{$district}'";
+ $values[] = "change_type='{$change_type}'";
+ $values[] = "transferred={$transferred}";
+ $values[] = "original_org_id={$original_org_id}";
$vals = implode(',', $values);
- $sql = "UPDATE activity_organization SET {$vals} WHERE
ID={$organization->get_id()}";
+ $id = (int)$organization->get_id();
+ $sql = "UPDATE activity_organization SET {$vals} WHERE
id={$id}";
$result = $this->db->query($sql, __LINE__, __FILE__);
if (isset($result))
{
@@ -622,19 +619,19 @@
$original_org_id = 0;
}
-
- $values[] = "NAME='{$name}'";
- $values[] = "HOMEPAGE='{$homepage}'";
- $values[] = "ADDRESS='{$street}'";
- $values[] = "ADDRESSNUMBER='{$streetnumber}'";
- $values[] = "ZIP_CODE='{$zip_code}'";
- $values[] = "CITY='{$city}'";
- $values[] = "ORGNO='{$orgnr}'";
- $values[] = "ORIGINAL_ORG_ID={$original_org_id}";
+ $values[] = "name='{$name}'";
+ $values[] = "homepage='{$homepage}'";
+ $values[] = "address='{$street}'";
+ $values[] = "addressnumber='{$streetnumber}'";
+ $values[] = "zip_code='{$zip_code}'";
+ $values[] = "city='{$city}'";
+ $values[] = "orgno='{$orgnr}'";
+ $values[] = "original_org_id={$original_org_id}";
$vals = implode(',', $values);
//var_dump("INSERT INTO activity_organization ({$cols})
VALUES ({$vals})");
- $sql = "UPDATE activity_organization SET {$vals} WHERE
ID={$organization->get_id()}";
+ $id = (int)$organization->get_id();
+ $sql = "UPDATE activity_organization SET {$vals} WHERE
id={$id}";
$result = $this->db->query($sql, __LINE__, __FILE__);
if (isset($result))
{
@@ -705,6 +702,8 @@
function get_organization_local( $org_id )
{
+ $org_id = (int)$org_id;
+
$sql = "SELECT * FROM activity_organization WHERE
id={$org_id}";
//var_dump($sql);
$this->db->query($sql, __LINE__, __FILE__);
@@ -819,14 +818,15 @@
function set_organization_inactive( $org_id )
{
- $orgid = (int)$org_id;
+ $org_id = (int)$org_id;
//var_dump("UPDATE bb_organization SET active=0,
show_in_portal=0 WHERE id={$orgid}");
- $result = $this->db->query("UPDATE bb_organization SET
active=0, show_in_portal=0 WHERE id={$orgid}", __LINE__, __FILE__);
+ $result = $this->db->query("UPDATE bb_organization SET
active=0, show_in_portal=0 WHERE id={$org_id}", __LINE__, __FILE__);
}
function get_affected_allocations( $org_id )
{
+ $org_id = (int)$org_id;
$result = array();
$sql = "select id from bb_allocation where
organization_id={$org_id}";
$this->db->query($sql, __LINE__, __FILE__);
@@ -840,11 +840,14 @@
function update_affected_allocations( $id, $org_id )
{
- $result = $this->db->query("update bb_allocation set
organization_id={$org_id} where id={$id}", __LINE__, __FILE__);
+ $id = (int)$id;
+ $org_id = (int)$org_id;
+ return $this->db->query("update bb_allocation set
organization_id={$org_id} where id={$id}", __LINE__, __FILE__);
}
function get_affected_reservations( $org_id )
{
+ $org_id = (int)$org_id;
$result = array();
$sql = "select id from bb_completed_reservation where
organization_id={$org_id}";
$this->db->query($sql, __LINE__, __FILE__);
@@ -858,11 +861,14 @@
function update_affected_reservations( $id, $org_id )
{
- $result = $this->db->query("update
bb_completed_reservation set organization_id={$org_id} where id={$id}",
__LINE__, __FILE__);
+ $id = (int)$id;
+ $org_id = (int)$org_id;
+ return $this->db->query("update
bb_completed_reservation set organization_id={$org_id} where id={$id}",
__LINE__, __FILE__);
}
function get_affected_events( $org_id )
{
+ $org_id = (int)$org_id;
$result = array();
$sql = "select id from bb_event where
customer_organization_id={$org_id}";
$this->db->query($sql, __LINE__, __FILE__);
@@ -876,7 +882,9 @@
function update_affected_events( $id, $org_id )
{
- $result = $this->db->query("update bb_event set
customer_organization_id={$org_id} where id={$id}", __LINE__, __FILE__);
+ $id = (int)$id;
+ $org_id = (int)$org_id;
+ return $this->db->query("update bb_event set
customer_organization_id={$org_id} where id={$id}", __LINE__, __FILE__);
}
function update( $organization )
@@ -886,7 +894,9 @@
function update_org_district_local( $org_id, $district_id )
{
- $sql = "UPDATE activity_organization SET
district='{$district_id}' WHERE ID={$org_id}";
+ $district_id = (int)$district_id;
+ $org_id = (int)$org_id;
+ $sql = "UPDATE activity_organization SET
district='{$district_id}' WHERE id={$org_id}";
$result = $this->db->query($sql, __LINE__, __FILE__);
if (isset($result))
{
@@ -901,15 +911,13 @@
function get_organization_homepage( $org_id )
{
$result = "Ingen";
- if (isset($org_id))
+ $org_id = (int)$org_id;
+ if ($org_id)
{
- $org_id = intval($org_id);
$q1 = "SELECT homepage FROM bb_organization
WHERE id={$org_id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('homepage');
- }
+ $this->db->next_record();
+ $result = $this->db->f('homepage');
}
return $result;
@@ -918,14 +926,14 @@
function get_organization_homepage_local( $org_id )
{
$result = "Ingen";
- if (isset($org_id))
+ $org_id = (int)$org_id;
+ if ($org_id)
{
$q1 = "SELECT homepage FROM
activity_organization WHERE id={$org_id}";
$this->db->query($q1, __LINE__, __FILE__);
- while ($this->db->next_record())
- {
- $result = $this->db->f('homepage');
- }
+ $this->db->next_record();
+
+ $result = $this->db->f('homepage');
}
return $result;
@@ -934,18 +942,11 @@
//$org->set_change_type("rejected");
function reject_organization( $org_id )
{
- if (isset($org_id))
+ $org_id = (int)$org_id;
+ if ($org_id)
{
$query = "UPDATE activity_organization set
change_type='rejected' where id={$org_id}";
- $result = $this->db->query($query, __LINE__,
__FILE__);
- if (isset($result))
- {
- return true;
- }
- else
- {
- return false;
- }
+ return $this->db->query($query, __LINE__,
__FILE__);
}
return false;
}
Modified:
branches/Version-2_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
---
branches/Version-2_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
2016-03-26 16:00:21 UTC (rev 14866)
+++
branches/Version-2_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
2016-03-26 16:04:41 UTC (rev 14867)
@@ -25,7 +25,8 @@
'get_organization_groups' => true,
'get_address_search' => true,
'edit_organization_values' => true,
- 'get_organization_activities' => true
+ 'get_organization_activities' => true,
+ 'test_sql_injection' => true
);
public function __construct()
@@ -35,6 +36,17 @@
// $this->so_activity = activitycalendar_soactivity::get_instance();
}
+ public function test_sql_injection()
+ {
+ $GLOBALS['phpgw_info']['flags']['noheader'] = true;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
+ $district_id = phpgw::get_var('district_id');
+
+ $district = $this->so_activity->get_district(
$district_id );
+ print_r($district);
+ }
+
/**
* Public method. Add new activity.
*/
Modified: branches/Version-2_0-branch/admin/inc/class.uiaccounts.inc.php
===================================================================
--- branches/Version-2_0-branch/admin/inc/class.uiaccounts.inc.php
2016-03-26 16:00:21 UTC (rev 14866)
+++ branches/Version-2_0-branch/admin/inc/class.uiaccounts.inc.php
2016-03-26 16:04:41 UTC (rev 14867)
@@ -1076,9 +1076,13 @@
$all_groups = $account->get_list('groups');
-
if(!$GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
{
+ $test_admins =
$GLOBALS['phpgw']->acl->get_ids_for_location('run', phpgwapi_acl::READ,
'admin');
+ foreach ($test_admins as $test_admin)
+ {
+ unset($all_groups[$test_admin]); // not
allowed to elevate privileges
+ }
$available_apps =
$GLOBALS['phpgw_info']['apps'];
$valid_groups = array();
foreach($available_apps as $_app => $dummy)
Modified:
branches/Version-2_0-branch/controller/inc/class.uicontrol_register_to_component.inc.php
===================================================================
---
branches/Version-2_0-branch/controller/inc/class.uicontrol_register_to_component.inc.php
2016-03-26 16:00:21 UTC (rev 14866)
+++
branches/Version-2_0-branch/controller/inc/class.uicontrol_register_to_component.inc.php
2016-03-26 16:04:41 UTC (rev 14867)
@@ -28,7 +28,6 @@
* @subpackage controller
* @version $Id$
*/
- phpgw::import_class('phpgwapi.yui');
/**
* Import the jQuery class
Modified:
branches/Version-2_0-branch/controller/inc/class.uicontrol_register_to_location.inc.php
===================================================================
---
branches/Version-2_0-branch/controller/inc/class.uicontrol_register_to_location.inc.php
2016-03-26 16:00:21 UTC (rev 14866)
+++
branches/Version-2_0-branch/controller/inc/class.uicontrol_register_to_location.inc.php
2016-03-26 16:04:41 UTC (rev 14867)
@@ -28,7 +28,6 @@
* @subpackage controller
* @version $Id$
*/
- phpgw::import_class('phpgwapi.yui');
/**
* Import the jQuery class
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php 2016-03-26
16:00:21 UTC (rev 14866)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php 2016-03-26
16:04:41 UTC (rev 14867)
@@ -737,4 +737,28 @@
{
return $this->Transaction;
}
+
+ final public function sanitize($sql)
+ {
+// return;
+ $sql_parts = preg_split('/where/i', $sql);
+ if (is_array($sql_parts) && count($sql_parts) >1 )
+ {
+ $first_element = true;
+ foreach ($sql_parts as $sql_part)
+ {
+ if($first_element == true)
+ {
+ $first_element = false;
+ continue;
+ }
+
if(preg_match("/((?=.*\bUNION\b)(?=.*\bALL\b)|\bPG_SLEEP\b|\bCHR\b|\bGENERATE_SERIES\b)/i",
$sql))
+ {
+ $this->transaction_abort();
+ trigger_error('Attempt on
SQL-injection', E_USER_ERROR);
+ exit;
+ }
+ }
+ }
+ }
}
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
2016-03-26 16:00:21 UTC (rev 14866)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
2016-03-26 16:04:41 UTC (rev 14867)
@@ -357,8 +357,7 @@
* CREATE OPERATOR ~@| (LEFTARG = jsonb, RIGHTARG = text[], PROCEDURE =
jsonb_exists_any);
* CREATE OPERATOR ~@& (LEFTARG = jsonb, RIGHTARG = text[], PROCEDURE =
jsonb_exists_all);
*/
-
-
+ self::sanitize($sql);
self::_get_fetchmode();
self::set_fetch_single($_fetch_single);
@@ -458,6 +457,8 @@
function limit_query($sql, $offset, $line = '', $file = '',
$num_rows = 0)
{
+ self::sanitize($sql);
+
$this->_get_fetchmode();
$sql = parent::get_offset($sql, $offset, $num_rows);
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.phpgw.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.phpgw.inc.php
2016-03-26 16:00:21 UTC (rev 14866)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.phpgw.inc.php
2016-03-26 16:04:41 UTC (rev 14867)
@@ -400,7 +400,8 @@
case 'string':
default:
$value = filter_var($value,
FILTER_SANITIZE_STRING, FILTER_FLAG_NO_ENCODE_QUOTES);
- $value =
htmlspecialchars($value, ENT_COMPAT, 'UTF-8');
+ $value =
htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
+ $value = str_replace(array('(',
')', '=', ';'),array('(', ')', '=', ';'), $value); // prevent
SQL-injection
break;
case 'boolean':
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/common.js 2016-03-26
16:00:21 UTC (rev 14866)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/common.js 2016-03-26
16:04:41 UTC (rev 14867)
@@ -294,7 +294,7 @@
}
catch (err)
{
- lengthMenu = [10, 25, 50, 100];
+ lengthMenu = [[10, 25, 50, 100],[10, 25, 50, 100]];
}
if (allrows == true)
@@ -305,15 +305,17 @@
{
lengthmenu_allrows =
JqueryPortico.i18n.lengthmenu_allrows();
- if (lengthMenu.length == 2)
- {
- lengthMenu[0].push(lengthmenu_allrows[0]);
- lengthMenu[1].push(lengthmenu_allrows[1]);
- }
}
catch (err)
{
+ lengthmenu_allrows = [-1, 'All'];
}
+
+ if (lengthMenu.length == 2)
+ {
+ lengthMenu[0].push(lengthmenu_allrows[0]);
+ lengthMenu[1].push(lengthmenu_allrows[1]);
+ }
}
var language = null;
Modified:
branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/css/frontend.css
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/css/frontend.css
2016-03-26 16:00:21 UTC (rev 14866)
+++
branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/css/frontend.css
2016-03-26 16:04:41 UTC (rev 14867)
@@ -44,7 +44,7 @@
float: left;
}
div#logo {
- width: 125px; height: 114px; margin-left: 10px;
+ width: 170px; height: 114px; margin-left: 10px;
}
div#centerimage {
margin: 0px auto; height: 109px; overflow: hidden; padding-top: 4px;
@@ -299,7 +299,8 @@
padding: 0px 0.5em; line-height: 1.2em; border-right-color: rgb(87, 87,
87); border-right-width: 1px; border-right-style: solid;
}
#logo {
- background: url("../images/newlayout/logo.png") no-repeat; margin: 14px
0px 0px 49px !important; width: 102px; height: 75px; float: left;
+ background: url(../images/newlayout/logo_bk.svg) no-repeat;
+ margin: 14px 0px 0px 49px !important; width: 102px; height: 75px;
float: left;
}
#centerimage {
padding: 22px 0px 0px 100px !important; width: 172px !important;
height: 108px !important; margin-right: 5px !important; display: block
!important;
Copied:
branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/images/newlayout/logo_bk.svg
(from rev 14866,
trunk/phpgwapi/templates/activitycalendar/images/newlayout/logo_bk.svg)
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/images/newlayout/logo_bk.svg
(rev 0)
+++
branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/images/newlayout/logo_bk.svg
2016-03-26 16:04:41 UTC (rev 14867)
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="180px" height="81px" viewBox="0 0 180 81" version="1.1"
xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:sketch="http://www.bohemiancoding.com/sketch/ns";>
+ <!-- Generator: Sketch 3.5 (25232) - http://www.bohemiancoding.com/sketch
-->
+ <title>logo_pre_ruu</title>
+ <desc>Created with Sketch.</desc>
+ <defs></defs>
+ <g id="Page-1" stroke="none" stroke-width="1" fill="none"
fill-rule="evenodd" sketch:type="MSPage">
+ <g id="logo_pre_ruu" sketch:type="MSArtboardGroup"
transform="translate(-20.000000, -20.000000)">
+ <g id=".logo" sketch:type="MSLayerGroup"
transform="translate(30.000000, 30.000000)">
+ <g id="Våpen" sketch:type="MSShapeGroup">
+ <g id="Group-7">
+ <path d="M0.12991453,30.2892308 C0.12991453,13.6806838
13.5935043,0.217094017 30.2022222,0.217094017 C46.8107692,0.217094017
60.274359,13.6806838 60.274359,30.2892308 C60.274359,46.8979487
46.8107692,60.3615385 30.2022222,60.3615385 C13.5935043,60.3615385
0.12991453,46.8979487 0.12991453,30.2892308" id="Fill-4" fill="#FFFFFF"></path>
+ <path d="M30.2235897,54.822735 C16.674359,54.822735
5.69008547,43.8386325 5.69008547,30.2892308 C5.69008547,16.7401709
16.674359,5.75589744 30.2235897,5.75589744 C43.7728205,5.75589744
54.757094,16.7401709 54.757094,30.2892308 C54.757094,43.8386325
43.7728205,54.822735 30.2235897,54.822735 L30.2235897,54.822735 Z
M30.2235897,0.0658119658 C13.5317949,0.0658119658 0,13.5976068 0,30.2892308
C0,46.9811966 13.5317949,60.5128205 30.2235897,60.5128205
C46.9152137,60.5128205 60.4468376,46.9811966 60.4468376,30.2892308
C60.4468376,13.5976068 46.9152137,0.0658119658 30.2235897,0.0658119658
L30.2235897,0.0658119658 Z" id="Fill-6" fill="#BB922C"></path>
+ </g>
+ <path d="M2.3434188,23.5167521 C2.41196581,23.2586325
2.62307692,23.12 2.87162393,23.1861538 C3.12034188,23.2523077
3.23196581,23.4868376 3.16581197,23.7355556 C3.09965812,23.9841026
2.86273504,24.1054701 2.65230769,24.0495726 C2.44188034,23.9936752
2.27470085,23.7750427 2.3434188,23.5167521" id="Fill-1" fill="#FFFFFF"></path>
+ <path d="M25.9297436,58.5904274 C25.6663248,58.5463248
25.5087179,58.3494017 25.5512821,58.0955556 C25.5938462,57.8417094
25.8169231,57.7087179 26.0705983,57.7511111 C26.3242735,57.7938462
26.4673504,58.0184615 26.431453,58.2329915 C26.3952137,58.4476923
26.1933333,58.6348718 25.9297436,58.5904274" id="Fill-2" fill="#FFFFFF"></path>
+ <path d="M57.9832479,23.022906 C58.0507692,23.2813675
57.9357265,23.5059829 57.6868376,23.5711111 C57.4379487,23.6362393
57.2251282,23.4875214 57.16,23.2384615 C57.0948718,22.9895726
57.2411966,22.7670085 57.4517949,22.7119658 C57.6623932,22.6569231
57.9155556,22.7646154 57.9832479,23.022906" id="Fill-3" fill="#FFFFFF"></path>
+ <path d="M8.50444444,13.6964103 C8.45521368,13.7976068
8.34940171,13.9225641 8.30974359,13.9666667 C8.27008547,14.0104274 8.2374359,14
8.18820513,13.9675214 C7.92102564,13.7911111 7.47521368,13.4377778
7.41846154,13.4047863 C7.36153846,13.3719658 7.34649573,13.337094
7.39076923,13.2642735 C7.43521368,13.1916239 7.59401709,12.9598291
7.68615385,12.9215385 C7.77811966,12.8832479 8.07982906,12.8107692
8.35897436,13.0601709 C8.70752137,13.3716239 8.57111111,13.5591453
8.50444444,13.6964103 L8.50444444,13.6964103 Z M9.8982906,12.6360684
C9.83863248,12.617265 9.80735043,12.6435897 9.83008547,12.6967521
C9.85282051,12.7497436 9.90205128,12.8338462 9.73196581,13.0528205
C9.56188034,13.2717949 8.87487179,13.5993162 8.80017094,13.6271795
C8.71675214,13.6586325 8.70871795,13.6403419 8.7434188,13.5618803
C8.96854701,13.0565812 9.28239316,12.7290598 8.86290598,12.3292308
C8.50615385,11.9892308 7.97538462,12.1899145 7.76529915,12.38
C7.62974359,12.5023932 7.32239316,12.9270085 7.09675214,13.24
C6.87111111,13.5533333 6.60940171,13.9502564 6.53435897,14.0547009
C6.4591453,14.1589744 6.48769231,14.2041026 6.61333333,14.1482051
C6.73897436,14.0923077 7.00683761,14.1266667 7.77760684,14.6822222
C8.54837607,15.2374359 8.53111111,15.5664957 8.52837607,15.6377778
C8.52581197,15.7088889 8.54632479,15.7483761 8.6008547,15.6897436
C8.65504274,15.6312821 8.9025641,15.3217094 9.04717949,15.1210256
C9.19162393,14.9201709 9.3982906,14.6420513 9.45384615,14.5478632
C9.50940171,14.4538462 9.43606838,14.4519658 9.33606838,14.4998291
C9.23179487,14.5492308 8.91487179,14.4389744 8.49162393,14.1463248
C8.45094017,14.1181197 8.46649573,14.0793162 8.52188034,14.0705983
C8.57709402,14.0615385 9.01948718,14.1013675 9.47435897,14.02
C9.92923077,13.9389744 10.2606838,13.8699145 10.4005128,13.3271795
C10.5063248,12.9162393 9.95794872,12.6547009 9.8982906,12.6360684
L9.8982906,12.6360684 Z" id="Fill-8" fill="#FFFFFF"></path>
+ <path d="M5.6991453,20.6365812 C5.74786325,20.9647863
5.59760684,21.2905983 5.58666667,21.3430769 C5.5757265,21.3958974
5.56324786,21.4135043 5.50444444,21.4037607 C5.24905983,21.3615385
4.74649573,21.1994872 4.70512821,21.1921368 C4.66393162,21.1849573
4.6242735,21.1531624 4.64273504,21.0967521 C4.66119658,21.0403419
4.8017094,20.5223932 4.88512821,20.4326496 C5.17435897,20.1211966
5.67076923,20.4471795 5.6991453,20.6365812 L5.6991453,20.6365812 Z
M3.59025641,20.7547009 C3.5357265,20.7304274 3.52615385,20.7023932
3.55589744,20.6309402 C3.57418803,20.5868376 3.66358974,20.208547
3.77452991,20.1152137 C4.08478632,19.854359 4.45025641,20.0844444
4.53777778,20.2649573 C4.63897436,20.4745299 4.43811966,20.9317949
4.41965812,20.988547 C4.40854701,21.0223932 4.3817094,21.0488889
4.31846154,21.0304274 C3.87350427,20.9001709 3.64478632,20.7788034
3.59025641,20.7547009 L3.59025641,20.7547009 Z M4.92683761,19.7911111
C4.88957265,19.8411966 4.8634188,19.8328205 4.85863248,19.7608547
C4.85350427,19.6811966 4.83982906,19.3251282 4.36957265,19.1712821
C4.02136752,19.0574359 3.79435897,19.3059829 3.70769231,19.4442735
C3.6208547,19.5823932 3.39897436,20.2282051 3.26666667,20.6328205
C3.13435897,21.037265 2.93452991,21.7112821 2.91931624,21.7895726
C2.90410256,21.8678632 2.96376068,21.8769231 3.01042735,21.8297436
C3.05692308,21.7825641 3.13709402,21.5379487 4.28461538,21.9133333
C5.40393162,22.2794872 5.29623932,22.6403419 5.30598291,22.705812
C5.3157265,22.7716239 5.36615385,22.8087179 5.40615385,22.7177778
C5.44649573,22.6268376 5.71145299,21.8805128 5.80376068,21.5982906
C5.89606838,21.3160684 6.14888889,20.6075214 6.15025641,20.2851282
C6.15145299,19.962735 5.99059829,19.5634188 5.62923077,19.4586325
C5.18188034,19.3288889 4.96410256,19.7408547 4.92683761,19.7911111
L4.92683761,19.7911111 Z" id="Fill-9" fill="#FFFFFF"></path>
+ <path d="M5.99931624,17.4230769 C5.97128205,17.4699145
5.93948718,17.4776068 5.87230769,17.4418803 C5.67025641,17.3348718
5.24803419,16.765812 5.43965812,16.3870085 C5.69538462,15.8817094
6.17675214,15.902906 6.35965812,16 C6.80205128,16.2345299 6.05521368,17.3294017
5.99931624,17.4230769 L5.99931624,17.4230769 Z M7.51982906,17.3560684
C7.24547009,17.9312821 6.77264957,17.8695726 6.29230769,17.6723077
C6.23094017,17.6471795 6.21299145,17.6242735 6.2391453,17.5517949
C6.26529915,17.4793162 6.69487179,16.622735 6.79880342,16.5547009
C6.93008547,16.4682051 7.15606838,16.4852991 7.28102564,16.5516239
C7.43606838,16.6338462 7.72632479,16.9232479 7.51982906,17.3560684
L7.51982906,17.3560684 Z M5.54803419,15.0138462 C5.79692308,15.8964103
5.46017094,15.7290598 5.07521368,16.4547009 C4.69042735,17.1803419
4.9208547,18.0974359 5.64222222,18.4694017 C6.40752137,18.8641026
7.23333333,18.7305983 7.68358974,17.8940171 C8.12017094,17.0835897
7.70410256,17.0297436 8.22529915,16.7249573 C8.34888889,16.6529915
8.33487179,16.5815385 8.18820513,16.6046154 C8.09811966,16.6188034
7.60649573,16.4976068 6.88940171,16.1174359 C6.17264957,15.737265
5.68444444,15.0526496 5.62478632,14.9536752 C5.56512821,14.8550427
5.51777778,14.9059829 5.54803419,15.0138462 L5.54803419,15.0138462 Z"
id="Fill-10" fill="#FFFFFF"></path>
+ <path d="M18.8682051,55.5415385 C18.9169231,55.5661538
18.9270085,55.597265 18.8960684,55.6670085 C18.8032479,55.8757265
18.2652991,56.3367521 17.8740171,56.1721368 C17.3521368,55.9526496
17.3394872,55.4709402 17.4234188,55.2815385 C17.6264957,54.8237607
18.7709402,55.4923077 18.8682051,55.5415385 L18.8682051,55.5415385 Z
M18.6948718,54.0294017 C19.2880342,54.262735 19.2596581,54.7388034
19.0964103,55.2317949 C19.0755556,55.2947009 19.0538462,55.314188
18.9798291,55.2933333 C18.905812,55.2723077 18.0211966,54.9034188
17.9459829,54.8046154 C17.8507692,54.6798291 17.8517949,54.4531624
17.9092308,54.3239316 C17.9803419,54.1634188 18.2488889,53.8538462
18.6948718,54.0294017 L18.6948718,54.0294017 Z M16.4965812,56.1601709
C17.3594872,55.8502564 17.2162393,56.1979487 17.9670085,56.5309402
C18.7179487,56.8641026 19.6164103,56.5697436 19.9369231,55.8244444
C20.277094,55.0333333 20.0861538,54.2188034 19.2201709,53.8283761
C18.3811966,53.4497436 18.3565812,53.8683761 18.0160684,53.3699145
C17.9355556,53.2516239 17.8652991,53.2705983 17.8984615,53.4150427
C17.9188034,53.5041026 17.8326496,54.002906 17.5034188,54.7449573
C17.174359,55.4864957 16.525641,56.0215385 16.4312821,56.0878632
C16.3367521,56.154188 16.3911111,56.1979487 16.4965812,56.1601709
L16.4965812,56.1601709 Z" id="Fill-11" fill="#FFFFFF"></path>
+ <path d="M14.0194872,8.24717949 C13.9740171,8.27726496
13.9420513,8.27059829 13.8967521,8.20923077 C13.7606838,8.02547009
13.625812,7.32991453 13.9625641,7.07094017 C14.411453,6.72581197
14.8364103,6.95282051 14.9594872,7.11948718 C15.2569231,7.52222222
14.1102564,8.18666667 14.0194872,8.24717949 L14.0194872,8.24717949 Z
M15.4196581,8.84358974 C14.9235897,9.24393162 14.5237607,8.98393162
14.1758974,8.59846154 C14.1316239,8.54940171 14.1254701,8.5208547
14.1801709,8.46683761 C14.2350427,8.41282051 14.9924786,7.82598291
15.1157265,7.80940171 C15.271453,7.78820513 15.4676923,7.90119658
15.5517949,8.01504274 C15.6560684,8.15623932 15.7926496,8.5425641
15.4196581,8.84358974 L15.4196581,8.84358974 Z M14.6535043,5.87948718
C14.4967521,6.78290598 14.2652991,6.48649573 13.6046154,6.97452991
C12.9439316,7.4625641 12.7555556,8.38923077 13.2452991,9.03641026
C13.7649573,9.72290598 14.5673504,9.95948718 15.3348718,9.39982906
C16.0786325,8.8574359 15.7268376,8.62905983 16.328547,8.57931624
C16.4711111,8.56803419 16.4894017,8.4974359 16.3471795,8.45470085
C16.2598291,8.42871795 15.8687179,8.10717949 15.3864957,7.45435897
C14.9042735,6.8017094 14.7598291,5.97333333 14.7487179,5.85846154
C14.7376068,5.74358974 14.6728205,5.76923077 14.6535043,5.87948718
L14.6535043,5.87948718 Z" id="Fill-12" fill="#FFFFFF"></path>
+ <path d="M2.87811966,27.6119658 C2.86974359,27.6608547
2.84529915,27.6779487 2.7765812,27.6699145 C2.57025641,27.645641
2.02495726,27.302906 2.06239316,26.9186325 C2.11230769,26.4063248
2.52700855,26.265641 2.71418803,26.2875214 C3.16615385,26.3403419
2.89435897,27.514188 2.87811966,27.6119658 L2.87811966,27.6119658 Z
M4.2374359,27.0635897 C4.19470085,27.6415385 3.77367521,27.7451282
3.30188034,27.7364103 C3.24153846,27.7352137 3.21880342,27.7217094
3.21709402,27.6516239 C3.21538462,27.5817094 3.29692308,26.714359
3.36239316,26.6223932 C3.44512821,26.5059829 3.64205128,26.4459829
3.76991453,26.4608547 C3.92837607,26.4794872 4.26957265,26.6288889
4.2374359,27.0635897 L4.2374359,27.0635897 Z M1.61008547,25.5902564
C2.16205128,26.3225641 1.78735043,26.2887179 1.69179487,27.1046154
C1.59641026,27.9205128 2.14393162,28.691453 2.95111111,28.7764103
C3.80735043,28.8666667 4.52837607,28.442735 4.64461538,27.5
C4.75760684,26.5863248 4.35025641,26.6870085 4.72529915,26.2138462
C4.81452991,26.1020513 4.77555556,26.0405128 4.64717949,26.1152137
C4.56837607,26.1610256 4.06632479,26.2264957 3.26034188,26.1323077
C2.45435897,26.0379487 1.75111111,25.577094 1.65965812,25.5066667
C1.56820513,25.4360684 1.5425641,25.5010256 1.61008547,25.5902564
L1.61008547,25.5902564 Z" id="Fill-13" fill="#FFFFFF"></path>
+ <path d="M22.5358974,55.5832479 C22.6511111,55.5512821
22.8165812,55.6054701 22.8835897,55.6230769 C22.9505983,55.6403419
22.9622222,55.6740171 22.9688889,55.7271795 C22.9755556,55.78
22.8928205,56.2338462 22.7728205,56.6936752 C22.6528205,57.1531624
22.4817094,57.5533333 22.4451282,57.6153846 C22.4083761,57.6774359
22.3868376,57.6820513 22.3268376,57.6765812 C22.2668376,57.6709402
21.9991453,57.5936752 21.937094,57.5237607 C21.8304274,57.4037607
21.7319658,57.1735043 21.9215385,56.4866667 C22.1112821,55.7996581
22.3264957,55.6411966 22.5358974,55.5832479 L22.5358974,55.5832479 Z
M21.1560684,57.4555556 C21.405641,57.6875214 21.7275214,57.7793162
22.3938462,57.9294017 C22.7025641,57.9988034 23.4924786,58.2264957
23.5716239,58.2369231 C23.6507692,58.2473504 23.6803419,58.1731624
23.6136752,58.1148718 C23.5470085,58.0567521 23.3981197,57.9047863
23.6239316,56.9003419 C23.8717949,55.7989744 24.1155556,55.8015385
24.1854701,55.768547 C24.2553846,55.7358974 24.2965812,55.6952137
24.2034188,55.6608547 C24.1102564,55.6261538 23.6697436,55.5112821
23.1717949,55.3810256 C22.9010256,55.3104274 22.1764103,55.054359
21.8352137,55.1596581 C21.4287179,55.2846154 21.1211966,55.7131624
20.985641,56.2317949 C20.8321368,56.82 20.8699145,57.1895726
21.1560684,57.4555556 L21.1560684,57.4555556 Z" id="Fill-14"
fill="#FFFFFF"></path>
+ <path d="M3.53726496,35.2866667 C3.55982906,35.3528205
3.64820513,35.8196581 3.65931624,35.8779487 C3.67589744,35.9654701
3.66991453,35.9868376 3.6,35.9899145 C3.52991453,35.9929915
2.92051282,36.0299145 2.84837607,36.0292308 C2.79777778,36.0287179
2.7765812,36.0225641 2.75401709,35.9562393 C2.73128205,35.8900855
2.6591453,35.7121368 2.63675214,35.6562393 C2.60820513,35.5859829
2.60854701,35.5606838 2.66324786,35.5302564 C2.71794872,35.4998291
3.36222222,35.2680342 3.40940171,35.2504274 C3.48940171,35.2201709
3.51470085,35.2203419 3.53726496,35.2866667 L3.53726496,35.2866667 Z
M4.24717949,33.322906 C4.24615385,33.4237607 4.12358974,33.8398291
3.42529915,34.3548718 C3.01948718,34.6540171 2.53333333,34.8560684
2.46512821,34.8688889 C2.39709402,34.8818803 2.33333333,34.8637607
2.2965812,34.8302564 C2.26017094,34.797094 1.85025641,34.4413675
1.79675214,34.3709402 C1.74307692,34.3005128 1.69008547,34.3805128
1.73555556,34.4731624 C2.03025641,35.0721368 2.15264957,35.8246154
2.35316239,36.8846154 C2.36803419,36.9622222 2.4165812,36.962906
2.46581197,36.8935043 C2.68837607,36.5793162 3.39948718,36.694359
3.76957265,36.757265 C4.77897436,36.9288889 4.9625641,37.1471795
5.0208547,37.1953846 C5.08051282,37.2444444 5.12905983,37.2352137
5.12410256,37.1557265 C5.1191453,37.0760684 5.04974359,36.6560684
5.0165812,36.4810256 C4.98324786,36.3059829 4.86820513,35.8041026
4.84376068,35.7280342 C4.81931624,35.6521368 4.74940171,35.6553846
4.74273504,35.7270085 C4.73623932,35.7988034 4.55452991,36.0094017
4.02683761,35.988547 C3.9642735,35.985812 3.9425641,35.9692308
3.93145299,35.9109402 C3.92051282,35.8524786 3.81418803,35.2379487
3.80307692,35.1796581 C3.79213675,35.1213675 3.78632479,35.0849573
3.85094017,35.0598291 C4.4957265,34.8131624 4.52239316,34.8822222
4.57059829,34.9235897 C4.61863248,34.9647863 4.6842735,34.9926496
4.66598291,34.8955556 C4.64752137,34.7981197 4.62564103,34.4700855
4.56307692,34.1393162 C4.50051282,33.8087179 4.39811966,33.3748718
4.3565812,33.2618803 C4.31504274,33.1487179 4.24820513,33.2218803
4.24717949,33.322906 L4.24717949,33.322906 Z" id="Fill-15"
fill="#FFFFFF"></path>
+ <path d="M41.2733333,55.2123077 C41.3321368,55.174359
41.7641026,54.9764103 41.8179487,54.9516239 C41.8988034,54.914359
41.9210256,54.9152137 41.9408547,54.9823932 C41.9608547,55.0494017
42.1430769,55.6321368 42.1596581,55.7023932 C42.1711111,55.7516239
42.1705983,55.7736752 42.1116239,55.8116239 C42.0526496,55.8494017
41.897265,55.9622222 41.848547,55.9974359 C41.7871795,56.0418803
41.762735,56.0478632 41.7198291,56.0020513 C41.677265,55.9564103
41.2974359,55.3866667 41.2688889,55.3447863 C41.2203419,55.2745299
41.2145299,55.2500855 41.2733333,55.2123077 L41.2733333,55.2123077 Z
M39.1964103,54.9950427 C39.2947009,54.9717949 39.7280342,54.9907692
40.3955556,55.5446154 C40.7837607,55.8668376 41.0967521,56.2902564
41.125641,56.3533333 C41.1545299,56.4160684 41.1521368,56.4825641
41.1287179,56.5261538 C41.1049573,56.5695726 40.8582906,57.0528205
40.802906,57.1217094 C40.7473504,57.1905983 40.8376068,57.2230769
40.9167521,57.1564103 C41.4273504,56.7264957 42.1283761,56.4268376
43.1090598,55.977265 C43.1810256,55.9444444 43.1697436,55.897265
43.0905983,55.8659829 C42.7323077,55.725641 42.6728205,55.0075214
42.6451282,54.6331624 C42.5688889,53.6121368 42.7367521,53.3813675
42.7695726,53.3133333 C42.802906,53.2437607 42.7822222,53.1986325
42.7061538,53.222735 C42.6300855,53.2464957 42.2391453,53.4150427
42.077265,53.4892308 C41.9152137,53.5632479 41.4557265,53.7958974
41.3876923,53.8379487 C41.3198291,53.8798291 41.3398291,53.9470085
41.4109402,53.9362393 C41.4822222,53.9252991 41.7302564,54.0511111
41.837094,54.5682051 C41.8495726,54.6295726 41.8386325,54.6548718
41.7844444,54.6796581 C41.7302564,54.7041026 41.1596581,54.9550427
41.105641,54.9798291 C41.0516239,55.0046154 41.0179487,55.0191453
40.9777778,54.9622222 C40.5832479,54.3957265 40.6442735,54.3531624
40.6724786,54.2964103 C40.7010256,54.2398291 40.7123077,54.1694017
40.6222222,54.2105983 C40.5323077,54.2519658 40.2189744,54.3517949
39.9131624,54.4923077 C39.6073504,54.6323077 39.2105983,54.8360684
39.1111111,54.9034188 C39.0112821,54.9711111 39.0982906,55.0181197
39.1964103,54.9950427 L39.1964103,54.9950427 Z" id="Fill-16"
fill="#FFFFFF"></path>
+ <path d="M1.61230769,31.354188 C1.58239316,30.8502564
1.70905983,30.3075214 1.07367521,29.7897436 C1.00803419,29.7360684
0.996410256,29.6444444 1.10735043,29.6887179 C1.41196581,29.8094017
1.90358974,29.9092308 2.23247863,29.9394872 C2.32307692,29.9476923
2.35452991,29.9916239 2.28888889,30.0550427 C2.22324786,30.1182906
2.14769231,30.1823932 2.11111111,30.2340171 C2.07435897,30.2859829
2.05589744,30.3066667 2.06,30.3760684 C2.06410256,30.4451282
2.08512821,30.8006838 2.08974359,30.8798291 C2.09384615,30.9488889
2.13401709,30.9564103 2.1834188,30.9535043 C2.23264957,30.9505983
2.85213675,30.882735 3.16769231,30.8358974 C3.83606838,30.7367521
4.08034188,30.5512821 4.10666667,30.4531624 C4.14752137,30.3020513
4.20786325,30.3182906 4.23521368,30.4454701 C4.25179487,30.5235897
4.28239316,30.9088889 4.29880342,31.1852991 C4.31521368,31.4620513
4.31179487,31.9083761 4.31641026,31.9875214 C4.32410256,32.1158974
4.27264957,32.1271795 4.19897436,32.014188 C4.13162393,31.9099145
3.83863248,31.7875214 3.23316239,31.7738462 C2.88632479,31.765812
2.28017094,31.7507692 2.23059829,31.7538462 C2.18119658,31.7567521
2.14461538,31.7788034 2.14649573,31.8379487 C2.15931624,32.2239316
2.23094017,32.5964103 2.40478632,32.6852991 C2.52717949,32.7476923
2.50991453,32.7882051 2.4217094,32.8032479 C2.33333333,32.8182906
1.73418803,32.9133333 1.66683761,32.9470085 C1.59948718,32.9808547
1.56615385,32.9232479 1.60222222,32.8617094 C1.6382906,32.8
1.70273504,32.7169231 1.68991453,32.4994872 C1.67692308,32.2822222
1.64205128,31.8579487 1.61230769,31.354188" id="Fill-17" fill="#FFFFFF"></path>
+ <path d="M3.37794872,40.1140171 C3.20410256,39.6401709
3.16871795,39.0839316 2.41111111,38.771453 C2.33264957,38.7389744
2.29521368,38.6545299 2.41418803,38.6649573 C2.74068376,38.6926496
3.24017094,38.6464957 3.56376068,38.5805128 C3.65299145,38.5622222
3.6957265,38.5953846 3.65128205,38.6750427 C3.60649573,38.7545299
3.55264957,38.8376068 3.53264957,38.8976068 C3.51247863,38.9576068
3.50068376,38.9832479 3.52461538,39.0482051 C3.54854701,39.1133333
3.67111111,39.4476923 3.69846154,39.5220513 C3.72239316,39.5871795
3.76290598,39.582735 3.80940171,39.565641 C3.8557265,39.5487179
4.42905983,39.3051282 4.71794872,39.1692308 C5.32940171,38.8815385
5.50974359,38.6335043 5.50666667,38.5319658 C5.50205128,38.3755556
5.56461538,38.3736752 5.62752137,38.4876923 C5.66581197,38.5574359
5.80615385,38.9174359 5.90153846,39.1776068 C5.99709402,39.4377778
6.12273504,39.8659829 6.14991453,39.9405128 C6.19418803,40.0611966
6.14837607,40.0870085 6.04512821,39.9998291 C5.95042735,39.9196581
5.63487179,39.8870085 5.05111111,40.0483761 C4.71675214,40.1406838
4.13179487,40.3011966 4.08547009,40.3182906 C4.03897436,40.3353846
4.00991453,40.3670085 4.02905983,40.4234188 C4.15264957,40.7892308
4.32871795,41.1251282 4.5208547,41.1601709 C4.65589744,41.1846154
4.65111111,41.2282051 4.57094017,41.2680342 C4.49059829,41.3082051
3.94444444,41.5717949 3.88957265,41.6234188 C3.83470085,41.6752137
3.78649573,41.6297436 3.80307692,41.5603419 C3.82,41.4909402
3.85760684,41.3928205 3.78273504,41.1883761 C3.70769231,40.9839316
3.55179487,40.5878632 3.37794872,40.1140171" id="Fill-18" fill="#FFFFFF"></path>
+ <path d="M37.5070085,58.0873504 C37.0211966,58.2246154
36.4639316,58.2176068 36.0947009,58.9490598 C36.0564103,59.0249573
35.9692308,59.0558974 35.9887179,58.9379487 C36.0413675,58.6145299
36.0333333,58.1128205 35.9923077,57.7851282 C35.9808547,57.6950427
36.017094,57.6547009 36.0928205,57.7052991 C36.1688889,57.7557265
36.2475214,57.8157265 36.3059829,57.8405128 C36.3644444,57.8652991
36.3887179,57.8788034 36.4553846,57.8598291 C36.5222222,57.8410256
36.8649573,57.7442735 36.9410256,57.722906 C37.0080342,57.7039316
37.0066667,57.6630769 36.9931624,57.6153846 C36.9796581,57.5678632
36.7805128,56.9774359 36.6670085,56.6793162 C36.4266667,56.0478632
36.1933333,55.8492308 36.0916239,55.8444444 C35.9353846,55.8369231
35.9381197,55.7747009 36.0565812,55.7205128 C36.1294017,55.6873504
36.4989744,55.5750427 36.7654701,55.4994872 C37.0321368,55.4241026
37.4688889,55.3317949 37.5449573,55.3104274 C37.6688889,55.2753846
37.6911111,55.322906 37.5964103,55.4191453 C37.5090598,55.5073504
37.4523077,55.8196581 37.5690598,56.4140171 C37.6357265,56.7547009
37.7511111,57.3499145 37.7646154,57.3976068 C37.7781197,57.4451282
37.8075214,57.4762393 37.8651282,57.4617094 C38.2391453,57.3661538
38.5875214,57.2164103 38.637094,57.0275214 C38.6717949,56.8947009
38.7148718,56.902735 38.748547,56.985812 C38.7822222,57.0688889
39.0035897,57.6335043 39.0511111,57.6921368 C39.0986325,57.7505983
39.0495726,57.7953846 38.9817094,57.7733333 C38.9135043,57.7516239
38.8186325,57.7064957 38.6088889,57.765641 C38.3994872,57.8249573
37.9928205,57.9500855 37.5070085,58.0873504" id="Fill-19" fill="#FFFFFF"></path>
+ <path d="M45.8601709,54.3471795 C45.4405128,54.6275214
44.9080342,54.7926496 44.7825641,55.6025641 C44.7695726,55.6863248
44.6962393,55.742735 44.6782906,55.6246154 C44.628547,55.3008547
44.4664957,54.8261538 44.3261538,54.5270085 C44.2875214,54.4447863
44.3095726,54.3952137 44.397265,54.42 C44.4854701,54.4444444
44.5786325,54.4774359 44.6415385,54.482735 C44.7049573,54.4882051
44.7323077,54.4938462 44.7899145,54.4552137 C44.8475214,54.4165812
45.1439316,54.2188034 45.2099145,54.1748718 C45.2671795,54.1364103
45.2535043,54.0981197 45.2261538,54.0567521 C45.1986325,54.0157265
44.8270085,53.5155556 44.6270085,53.2670085 C44.2037607,52.7403419
43.9205128,52.6232479 43.8222222,52.6500855 C43.6712821,52.6912821
43.6547009,52.6307692 43.7509402,52.5430769 C43.8097436,52.4892308
44.1266667,52.2683761 44.3569231,52.114188 C44.5875214,51.9605128
44.9745299,51.7376068 45.0403419,51.6936752 C45.1473504,51.6222222
45.1830769,51.6608547 45.1225641,51.7815385 C45.0668376,51.8923077
45.1092308,52.2071795 45.4032479,52.7365812 C45.5717949,53.0398291
45.8652991,53.5704274 45.8926496,53.6116239 C45.9201709,53.6529915
45.9577778,53.6733333 46.0080342,53.6417094 C46.3345299,53.4357265
46.6196581,53.1854701 46.6087179,52.9907692 C46.6006838,52.8536752
46.6441026,52.8480342 46.7018803,52.9164103 C46.7594872,52.9851282
47.1442735,53.4540171 47.2073504,53.4952137 C47.2705983,53.5365812
47.2376068,53.5940171 47.1661538,53.5940171 C47.0948718,53.594188
46.9905983,53.5803419 46.8095726,53.7013675 C46.6283761,53.8223932
46.2801709,54.0670085 45.8601709,54.3471795" id="Fill-20" fill="#FFFFFF"></path>
+ <path d="M56.3911111,31.0208547 C56.3948718,30.9020513
56.7124786,30.5553846 57.5434188,30.5813675 C58.374188,30.6071795
58.7299145,30.9548718 58.7268376,31.0536752 C58.7237607,31.1528205
58.3564103,31.4976068 57.5454701,31.4724786 C56.734188,31.4471795
56.3875214,31.1393162 56.3911111,31.0208547 L56.3911111,31.0208547 Z
M59.034188,31.0435897 C59.0562393,30.3213675 58.7333333,29.5687179
57.5165812,29.5307692 C56.3,29.4929915 56.0982906,30.5659829
56.0851282,30.9912821 C56.0717949,31.4167521 56.3352137,32.5042735
57.5617094,32.5422222 C58.7882051,32.5805128 59.0152137,31.6468376
59.034188,31.0435897 L59.034188,31.0435897 Z" id="Fill-21"
fill="#FFFFFF"></path>
+ <path d="M16.6875214,5.11316239 C16.9888889,4.95606838
17.0993162,4.89777778 17.1791453,4.85623932 C17.2589744,4.81452991
17.3087179,4.82188034 17.3637607,4.85931624 C17.4191453,4.89709402
18.0249573,5.39230769 18.32,5.65401709 C18.6810256,5.97418803
19.1203419,6.20957265 19.2075214,6.2634188 C19.2947009,6.3174359
19.3752137,6.29760684 19.322906,6.20324786 C19.2704274,6.10923077
18.985812,5.63418803 18.8290598,5.37145299 C18.3849573,4.62752137
18.1473504,4.53384615 18.057265,4.53316239 C17.9671795,4.53247863
17.8774359,4.50974359 17.9859829,4.43675214 C18.0947009,4.36376068
18.4064957,4.20547009 18.6594872,4.08598291 C18.9124786,3.96615385
19.1475214,3.88222222 19.2333333,3.85247863 C19.3189744,3.82290598
19.377265,3.84957265 19.3138462,3.92273504 C19.2671795,3.97675214
19.1222222,4.23008547 19.5290598,5.10017094 C19.8117949,5.70444444
20.0900855,6.10752137 20.1902564,6.14376068 C20.2904274,6.18
20.3319658,6.21350427 20.2528205,6.27692308 C20.1974359,6.32102564
20.057265,6.38974359 19.8379487,6.50358974 C19.5933333,6.63094017
19.3415385,6.73589744 19.2950427,6.76 C19.2064957,6.80615385
19.1613675,6.80752137 19.0926496,6.76598291 C19.0237607,6.72444444
18.5415385,6.41213675 18.1444444,6.08871795 C17.7475214,5.76529915
17.405641,5.47931624 17.3271795,5.42068376 C17.2488889,5.36205128
17.1820513,5.38581197 17.2393162,5.48854701 C17.2964103,5.59128205
17.5613675,6.05008547 17.7189744,6.31042735 C18.1410256,7.00769231
18.3500855,7.07538462 18.4810256,7.08444444 C18.6117949,7.09367521
18.585812,7.12940171 18.5198291,7.17487179 C18.4535043,7.22034188
18.077094,7.42752137 17.8555556,7.54290598 C17.6340171,7.6582906
17.3692308,7.77555556 17.2847863,7.80854701 C17.2001709,7.84136752
17.1811966,7.80717949 17.237265,7.72273504 C17.2736752,7.66786325
17.4070085,7.46871795 17.0158974,6.66700855 C16.6076923,5.82991453
16.4553846,5.5557265 16.2338462,5.52752137 C16.1311111,5.51435897
16.0967521,5.46632479 16.1984615,5.40239316 C16.3001709,5.3382906
16.3861538,5.27008547 16.6875214,5.11316239" id="Fill-22" fill="#FFFFFF"></path>
+ <path d="M52.3745299,48.5198291 C52.1499145,48.7748718
52.0676923,48.8690598 52.0082051,48.9364103 C51.9487179,49.0037607
51.8998291,49.0153846 51.8348718,49 C51.7697436,48.9849573
51.0263248,48.7408547 50.6565812,48.6030769 C50.2046154,48.434359
49.7100855,48.3733333 49.6092308,48.354188 C49.508547,48.3352137
49.4405128,48.382735 49.5232479,48.4516239 C49.6061538,48.5208547
50.0425641,48.8613675 50.2837607,49.0500855 C50.965812,49.5841026
51.2211966,49.585812 51.3054701,49.554188 C51.3897436,49.5225641
51.4817094,49.5111111 51.4066667,49.6184615 C51.3316239,49.725641
51.0977778,49.985641 50.9047863,50.1882051 C50.7117949,50.3909402
50.522906,50.5540171 50.4535043,50.6126496 C50.3842735,50.6711111
50.3201709,50.6673504 50.3531624,50.5758974 C50.377094,50.5088889
50.4210256,50.2201709 49.7282051,49.5553846 C49.2470085,49.0933333
48.8420513,48.8174359 48.7355556,48.8198291 C48.6290598,48.8220513
48.5782906,48.805641 48.6294017,48.7181197 C48.6651282,48.657094
48.7712821,48.5425641 48.9347009,48.357265 C49.1169231,48.1504274
49.3140171,47.9618803 49.3487179,47.9225641 C49.4147009,47.8475214
49.4564103,47.8300855 49.5355556,47.8441026 C49.6147009,47.8579487
50.1769231,47.9755556 50.6637607,48.134359 C51.1507692,48.2931624
51.5728205,48.4369231 51.6670085,48.4632479 C51.7611966,48.4897436
51.8147009,48.4435897 51.7244444,48.3682051 C51.6340171,48.2928205
51.2217094,47.9605128 50.9810256,47.774188 C50.3362393,47.2758974
50.1167521,47.2878632 49.991453,47.3264957 C49.865812,47.3649573
49.877265,47.3223932 49.9225641,47.2562393 C49.9678632,47.1899145
50.2444444,46.8611966 50.4095726,46.6738462 C50.5748718,46.4861538
50.7794872,46.2817094 50.8464957,46.2203419 C50.9135043,46.1591453
50.9435897,46.1841026 50.9218803,46.2832479 C50.9075214,46.3478632
50.8548718,46.5815385 51.5083761,47.1887179 C52.1907692,47.8223932
52.4317949,48.0230769 52.6483761,47.9697436 C52.7490598,47.9449573
52.7982906,47.9776068 52.7264957,48.0738462 C52.6548718,48.1700855
52.5991453,48.2647863 52.3745299,48.5198291" id="Fill-23" fill="#FFFFFF"></path>
+ <path d="M13.2976068,52.2300855 C12.5760684,52.8013675
11.6082051,52.5834188 11.1471795,52.0017094 C10.7230769,51.4663248
10.8928205,51.5211966 10.708547,51.2883761 C10.4750427,50.9935043
10.0625641,50.9670085 9.92358974,50.9509402 C9.78444444,50.9347009
9.73264957,50.8413675 9.91641026,50.8302564 C10.1854701,50.8138462
10.7225641,50.6196581 10.9239316,50.5244444 C11.0088889,50.4842735
11.0367521,50.5234188 11.0316239,50.628547 C11.0247863,50.7712821
11.0577778,51.3148718 11.3035897,51.6252991 C11.5494017,51.9355556
12.1338462,51.8765812 12.6613675,51.4586325 C13.1888889,51.0408547
13.2625641,50.5280342 13.0288889,50.2333333 C12.7953846,49.9382906
12.2671795,49.877094 11.9760684,49.9562393 C11.6852991,50.0350427
11.7504274,49.9579487 11.8900855,49.8475214 C12.0297436,49.7369231
12.3155556,49.46 12.4182906,49.3030769 C12.5210256,49.145812
12.5644444,49.1367521 12.5916239,49.2666667 C12.6188034,49.3967521
12.7046154,49.5639316 13.0157265,49.7388034 C13.7434188,50.1471795
14.4611966,51.3083761 13.2976068,52.2300855" id="Fill-24" fill="#FFFFFF"></path>
+ <path d="M57.0875214,25.5295726 C57.9962393,25.3835897
58.734188,26.0468376 58.8517949,26.7798291 C58.9603419,27.4540171
58.8388034,27.3230769 58.8859829,27.6164103 C58.945812,27.9875214
59.2926496,28.2124786 59.4059829,28.2945299 C59.5193162,28.3765812
59.5191453,28.4834188 59.3531624,28.4032479 C59.1104274,28.2859829
58.5470085,28.1928205 58.3247863,28.1776068 C58.2311111,28.1709402
58.225641,28.1232479 58.2815385,28.034188 C58.3574359,27.9129915
58.594359,27.4225641 58.531453,27.0316239 C58.4687179,26.6408547
57.9300855,26.4066667 57.265641,26.5135043 C56.6011966,26.62
56.2864957,27.0316239 56.3459829,27.402906 C56.405641,27.774188
56.8365812,28.085812 57.1290598,28.1589744 C57.4213675,28.2324786
57.3268376,28.2676923 57.1511111,28.2960684 C56.9752137,28.3242735
56.5904274,28.4259829 56.4241026,28.5128205 C56.2576068,28.5998291
56.2155556,28.5864957 56.2553846,28.4598291 C56.2950427,28.3331624
56.3017094,28.1452991 56.1157265,27.8406838 C55.6806838,27.1288889
55.6220513,25.7649573 57.0875214,25.5295726" id="Fill-25" fill="#FFFFFF"></path>
+ <path d="M21.8275214,2.75692308 C22.2398291,2.61692308
22.7,2.66461538 22.9232479,2.52102564 C23.1976068,2.34444444
23.3201709,2.15128205 23.3605128,2.08529915 C23.4008547,2.01931624
23.4478632,2.03487179 23.4389744,2.10051282 C23.4299145,2.16632479
23.4553846,2.85794872 23.4526496,2.94239316 C23.4500855,3.02683761
23.3936752,3.01452991 23.3405128,3.01179487 C23.2871795,3.00888889
22.4731624,2.88410256 21.9464957,3.09264957 C21.5781197,3.23863248
21.4870085,3.42068376 21.534359,3.57213675 C21.6444444,3.92358974
22.4123077,3.60974359 22.7955556,3.56239316 C23.385641,3.48957265
23.8194872,3.65384615 23.9752137,4.11316239 C24.1309402,4.57230769
23.8025641,5.20632479 22.9871795,5.48273504 C22.4529915,5.66410256
22.3162393,5.46991453 21.9767521,5.58512821 C21.7988034,5.64564103
21.6875214,5.80393162 21.6873504,5.87145299 C21.6864957,5.98205128
21.5817094,6.02239316 21.5622222,5.9034188 C21.5492308,5.82461538
21.2861538,5.15059829 21.0688889,4.91076923 C20.9252991,4.75213675
21.042735,4.71076923 21.1747009,4.8225641 C21.2876923,4.91880342
22.0634188,5.37811966 22.8505983,5.11128205 C23.3379487,4.94598291
23.3993162,4.69504274 23.3420513,4.52649573 C23.2625641,4.29213675
22.6552137,4.35196581 22.3182906,4.46615385 C21.5851282,4.71521368
21.0509402,4.42700855 20.8916239,3.95726496 C20.6841026,3.34495726
21.4150427,2.89675214 21.8275214,2.75692308" id="Fill-26" fill="#FFFFFF"></path>
+ <path d="M35.465641,2.04820513 C35.8894017,2.14769231
36.2548718,2.43179487 36.5201709,2.42803419 C36.8463248,2.42324786
37.0526496,2.3242735 37.1218803,2.28974359 C37.1909402,2.25487179
37.2225641,2.29299145 37.1803419,2.34410256 C37.1376068,2.39487179
36.7935043,2.99521368 36.7464957,3.06547009 C36.6996581,3.13589744
36.6582906,3.0957265 36.6147009,3.06512821 C36.5709402,3.03452991
35.9461538,2.49777778 35.3890598,2.39623932 C34.9989744,2.32512821
34.8254701,2.43145299 34.785641,2.58495726 C34.6929915,2.94153846
35.5105983,3.08153846 35.8610256,3.24410256 C36.4001709,3.49435897
36.6811966,3.8634188 36.5704274,4.33538462 C36.46,4.80769231
35.845812,5.17179487 35.0075214,4.97504274 C34.4581197,4.84632479
34.4449573,4.60923077 34.0958974,4.52735043 C33.9128205,4.48461538
33.7347009,4.55982906 33.6988034,4.61709402 C33.6398291,4.71076923
33.5295726,4.68923077 33.5757265,4.5782906 C33.6064957,4.5042735
33.7396581,3.79316239 33.6822222,3.47470085 C33.6444444,3.2642735
33.765812,3.29111111 33.8188034,3.45589744 C33.8635897,3.5974359
34.2789744,4.39760684 35.0883761,4.58752137 C35.5892308,4.70512821
35.7738462,4.52478632 35.8145299,4.35128205 C35.8709402,4.11042735
35.3239316,3.83965812 34.9777778,3.75863248 C34.2237607,3.5817094
33.9230769,3.05487179 34.0364103,2.57179487 C34.1839316,1.94239316
35.0417094,1.94888889 35.465641,2.04820513" id="Fill-27" fill="#FFFFFF"></path>
+ <path d="M30.1521368,59.1017094 C29.7165812,59.1017094
29.2958974,58.9087179 29.0386325,58.9731624 C28.7220513,59.0523077
28.5437607,59.1957265 28.4844444,59.2452991 C28.4251282,59.2947009
28.385641,59.2651282 28.4152137,59.205641 C28.4449573,59.1461538
28.642906,58.4832479 28.6724786,58.4041026 C28.7022222,58.3249573
28.7517949,58.3547009 28.8011966,58.374188 C28.8505983,58.394188
29.5815385,58.7740171 30.1471795,58.745641 C30.542906,58.725812
30.6876923,58.5825641 30.691453,58.4241026 C30.7,58.0553846
29.8721368,58.1063248 29.4940171,58.0280342 C28.9117949,57.9073504
28.5538462,57.6123077 28.5538462,57.1275214 C28.5538462,56.6425641
29.0683761,56.1478632 29.9294017,56.1478632 C30.4935043,56.1478632
30.5605128,56.3752137 30.9189744,56.3752137 C31.1070085,56.3752137
31.2632479,56.2611966 31.2852991,56.197094 C31.3215385,56.0926496
31.4338462,56.0883761 31.4138462,56.2070085 C31.4008547,56.2859829
31.4338462,57.008547 31.5623932,57.305812 C31.6475214,57.5020513
31.522906,57.5035897 31.4338462,57.3550427 C31.3577778,57.2276923
30.7705983,56.5435897 29.9393162,56.5435897 C29.4246154,56.5435897
29.2861538,56.7611966 29.2861538,56.9394872 C29.2861538,57.1868376
29.8805128,57.3254701 30.2362393,57.3254701 C31.0105983,57.3251282
31.4237607,57.7695726 31.4237607,58.2654701 C31.4237607,58.9123077
30.5875214,59.1017094 30.1521368,59.1017094" id="Fill-28" fill="#FFFFFF"></path>
+ <path d="M30.2044444,1.44136752 C30.6398291,1.44136752
30.7388034,1.46615385 30.8476923,1.4957265 C30.9564103,1.52547009
30.9516239,1.55025641 30.8526496,1.58991453 C30.737265,1.63589744
30.6102564,1.77282051 30.5408547,2.22820513 C30.4717949,2.6834188
30.4517949,2.72290598 30.4717949,2.74273504 C30.491453,2.7625641
30.6299145,2.74273504 31.0158974,2.69316239 C31.4018803,2.64376068
31.5726496,2.57504274 31.6444444,2.47059829 C31.6988034,2.39145299
31.7382906,2.40632479 31.7482051,2.47555556 C31.7582906,2.54478632
31.7878632,2.63880342 31.7878632,3.01487179 C31.7878632,3.39094017
31.7482051,3.47504274 31.7087179,3.58393162 C31.6690598,3.69282051
31.6394872,3.67299145 31.6,3.59384615 C31.5700855,3.53452991
31.2931624,3.29692308 31.0158974,3.25726496 C30.7388034,3.21777778
30.4765812,3.18307692 30.4617094,3.19794872 C30.4470085,3.21282051
30.4617094,3.34649573 30.5210256,3.72239316 C30.5805128,4.09863248
30.6993162,4.36564103 30.8179487,4.38564103 C30.9367521,4.40529915
30.9564103,4.46478632 30.8377778,4.48461538 C30.7191453,4.5042735
30.5805128,4.52410256 30.214359,4.52410256 C29.8482051,4.52410256
29.6403419,4.49435897 29.5512821,4.46478632 C29.4622222,4.43504274
29.4622222,4.41504274 29.5411966,4.3757265 C29.6205128,4.33606838
29.7887179,4.12820513 29.8482051,3.73247863 C29.9075214,3.33641026
29.9223932,3.22273504 29.9075214,3.20786325 C29.8926496,3.19299145
29.7788034,3.16820513 29.3235897,3.30683761 C28.8682051,3.44529915
28.8088889,3.51470085 28.7495726,3.59384615 C28.6902564,3.67299145
28.6505983,3.70273504 28.6307692,3.59384615 C28.6109402,3.48512821
28.6011966,3.38666667 28.6011966,3.04957265 C28.6011966,2.72290598
28.6208547,2.63384615 28.6505983,2.52495726 C28.6803419,2.41606838
28.7198291,2.42615385 28.7495726,2.50529915 C28.7793162,2.58444444
28.848547,2.64376068 29.3037607,2.71316239 C29.7589744,2.78239316
29.8728205,2.74769231 29.8878632,2.73282051 C29.9025641,2.71794872
29.9075214,2.61401709 29.8678632,2.27760684 C29.8283761,1.94102564
29.7184615,1.68136752 29.5512821,1.61965812 C29.4176068,1.57008547
29.4622222,1.52547009 29.5411966,1.51555556 C29.6205128,1.50581197
29.7688889,1.44136752 30.2044444,1.44136752" id="Fill-29" fill="#FFFFFF"></path>
+ <path d="M25.6350427,1.92358974 C26.0052991,1.85777778
26.3211966,1.82444444 26.4001709,1.81760684 C26.5090598,1.80820513
26.5095726,1.86854701 26.4369231,1.91162393 C26.3641026,1.95470085
26.1323077,2.17675214 26.2969231,3.10239316 C26.5032479,4.26188034
26.7538462,4.25760684 26.8678632,4.2774359 C26.9820513,4.2974359
27.0119658,4.35230769 26.8789744,4.39606838 C26.7459829,4.44
26.4847863,4.49641026 26.1535043,4.55538462 C25.8220513,4.61435897
25.4420513,4.67128205 25.3509402,4.67811966 C25.2517949,4.68564103
25.2218803,4.63059829 25.3203419,4.56290598 C25.3825641,4.52017094
25.6536752,4.40290598 25.4526496,3.27282051 C25.2758974,2.27863248
25.0235897,2.20940171 24.8991453,2.19521368 C24.7965812,2.1834188
24.805641,2.12136752 24.891453,2.09606838 C24.9776068,2.07076923
25.2647863,1.98940171 25.6350427,1.92358974" id="Fill-30" fill="#FFFFFF"></path>
+ <path d="M4.73247863,43.3661538 C4.56854701,43.0276923
4.45076923,42.7324786 4.42273504,42.6584615 C4.3842735,42.5560684
4.44205128,42.5389744 4.50307692,42.5974359 C4.56444444,42.6557265
4.84119658,42.8188034 5.68752137,42.4090598 C6.74752137,41.8957265
6.67521368,41.6560684 6.66324786,41.5406838 C6.65162393,41.4254701
6.69641026,41.3818803 6.77470085,41.4977778 C6.85264957,41.6140171
6.97811966,41.8500855 7.12478632,42.1529915 C7.27145299,42.4560684
7.42923077,42.8063248 7.46051282,42.8919658 C7.49470085,42.9854701
7.44991453,43.0290598 7.35794872,42.9528205 C7.3,42.9046154
7.11367521,42.6750427 6.08051282,43.1753846 C5.17162393,43.6155556
5.17350427,43.877094 5.19350427,44.0006838 C5.20991453,44.1025641
5.14786325,44.1105983 5.10017094,44.0348718 C5.05230769,43.9589744
4.89623932,43.7046154 4.73247863,43.3661538" id="Fill-31" fill="#FFFFFF"></path>
+ <path d="M8.80478632,49.3476923 C8.54683761,49.0740171
8.34581197,48.8276923 8.29675214,48.765641 C8.22940171,48.6796581
8.27931624,48.6459829 8.35521368,48.6832479 C8.43111111,48.7205128
8.74410256,48.7926496 9.42803419,48.1476923 C10.2849573,47.3398291
10.1439316,47.1324786 10.0979487,47.0263248 C10.0521368,46.9198291
10.0818803,46.8646154 10.1912821,46.9519658 C10.3006838,47.0389744
10.4912821,47.2270085 10.7220513,47.4717949 C10.9528205,47.7165812
11.2087179,48.0032479 11.2644444,48.0757265 C11.3251282,48.1545299
11.2955556,48.2097436 11.1847863,48.1642735 C11.1150427,48.1357265
10.8683761,47.9728205 10.0331624,48.7605128 C9.29846154,49.4533333
9.37897436,49.7022222 9.43521368,49.8140171 C9.48153846,49.9064957
9.42478632,49.9326496 9.35641026,49.8747009 C9.28803419,49.8167521
9.06273504,49.6210256 8.80478632,49.3476923" id="Fill-32" fill="#FFFFFF"></path>
+ <path d="M33.8271795,58.7811966 C33.4526496,58.8160684
33.1348718,58.822735 33.0553846,58.8230769 C32.9461538,58.8232479
32.9505983,58.7632479 33.0268376,58.7263248 C33.102906,58.6895726
33.3523077,58.4873504 33.265641,57.5512821 C33.1567521,56.3786325
32.9066667,56.3620513 32.7948718,56.3326496 C32.682735,56.3032479
32.6576068,56.2461538 32.7935043,56.2136752 C32.9295726,56.1810256
33.1948718,56.1466667 33.5300855,56.1153846 C33.8649573,56.0842735
34.2483761,56.0593162 34.34,56.06 C34.4393162,56.0608547 34.4646154,56.1179487
34.3606838,56.1774359 C34.2952137,56.2150427 34.0150427,56.3088889
34.1211966,57.4519658 C34.214359,58.4574359 34.46,58.5473504
34.582906,58.5717949 C34.6841026,58.5924786 34.6700855,58.6533333
34.5822222,58.671453 C34.494359,58.6895726 34.2015385,58.7464957
33.8271795,58.7811966" id="Fill-33" fill="#FFFFFF"></path>
+ <path d="M48.8338462,52.1552137 C48.5507692,52.402735
48.2974359,52.594359 48.2331624,52.6410256 C48.1447863,52.7051282
48.1131624,52.6538462 48.1533333,52.5794872 C48.1933333,52.5049573
48.277094,52.1950427 47.6582906,51.4871795 C46.8830769,50.6006838
46.6709402,50.7340171 46.562906,50.7755556 C46.4550427,50.8174359
46.4008547,50.7859829 46.4923077,50.6798291 C46.5834188,50.5736752
46.7781197,50.3904274 47.031453,50.1688889 C47.2846154,49.9471795
47.5806838,49.7023932 47.6552137,49.6495726 C47.7364103,49.5919658
47.7905983,49.6235897 47.7410256,49.7326496 C47.7099145,49.8011966
47.5377778,50.0415385 48.2933333,50.905812 C48.9581197,51.665641
49.2097436,51.5947009 49.3239316,51.542906 C49.4177778,51.5
49.4420513,51.5577778 49.3815385,51.6237607 C49.3210256,51.6899145
49.1169231,51.9076923 48.8338462,52.1552137" id="Fill-34" fill="#FFFFFF"></path>
+ <path d="M45.7926496,6.25230769 C46.1023932,6.46512821
46.3507692,6.66324786 46.4121368,6.71367521 C46.4960684,6.78358974
46.454188,6.82683761 46.3723077,6.80649573 C46.2900855,6.78615385
45.9690598,6.7817094 45.4367521,7.5565812 C44.7700855,8.52735043
44.951453,8.70017094 45.0186325,8.79435897 C45.0859829,8.88837607
45.0688889,8.94871795 44.9432479,8.88649573 C44.8179487,8.82444444
44.5921368,8.68136752 44.3148718,8.49076923 C44.0374359,8.30017094
43.7266667,8.07401709 43.657094,8.01504274 C43.5810256,7.95076923
43.5982906,7.89059829 43.7160684,7.91145299 C43.7902564,7.92461538
44.065812,8.03162393 44.7158974,7.08547009 C45.2876923,6.25299145
45.1562393,6.02683761 45.0777778,5.92923077 C45.0129915,5.84871795
45.062735,5.81111111 45.1418803,5.85333333 C45.2210256,5.89555556
45.4823932,6.0391453 45.7926496,6.25230769" id="Fill-35" fill="#FFFFFF"></path>
+ <path d="M39.1697436,3.07897436 C39.5251282,3.20188034
39.8174359,3.32700855 39.8894017,3.35948718 C39.9892308,3.4042735
39.9603419,3.45726496 39.8758974,3.45931624 C39.7912821,3.46153846
39.4805128,3.5425641 39.1731624,4.43111111 C38.7882051,5.54393162
39.0088889,5.66239316 39.0988034,5.73521368 C39.1888889,5.80820513
39.1882051,5.87094017 39.0507692,5.84410256 C38.9133333,5.81760684
38.6574359,5.73948718 38.3396581,5.62957265 C38.0217094,5.51948718
37.6618803,5.38393162 37.5793162,5.34547009 C37.4888889,5.30376068
37.4894017,5.24119658 37.608547,5.23008547 C37.6835897,5.22307692
37.9777778,5.25299145 38.3529915,4.16820513 C38.6832479,3.21401709
38.4967521,3.03059829 38.3948718,2.95760684 C38.3111111,2.89709402
38.3490598,2.84735043 38.4367521,2.86717949 C38.5239316,2.88700855
38.814188,2.95606838 39.1697436,3.07897436" id="Fill-36" fill="#FFFFFF"></path>
+ <path d="M10.1623932,11.7184615 C9.53230769,11.0750427
9.73076923,10.1463248 10.2186325,9.66854701 C10.5863248,9.30837607
10.7582906,9.42393162 10.9564103,9.22991453 C11.154359,9.03623932
11.1625641,8.82495726 11.1594872,8.70564103 C11.1569231,8.60393162
11.1801709,8.56769231 11.2437607,8.6782906 C11.2938462,8.76564103
11.5030769,9.14290598 11.545812,9.23435897 C11.5870085,9.32222222
11.5815385,9.33811966 11.4781197,9.35606838 C11.3820513,9.37316239
10.8994872,9.47264957 10.5459829,9.81897436 C10.3480342,10.0128205
10.3846154,10.5311111 10.8832479,11.0401709 C11.4441026,11.6128205
11.9121368,11.708547 12.1735043,11.4523077 C12.4352137,11.1962393
12.5931624,10.805812 12.337094,10.5442735 C12.1916239,10.3957265
12.0299145,10.457094 11.9311111,10.554188 C11.8319658,10.6511111
11.8020513,10.8466667 11.8574359,10.9032479 C11.9266667,10.9740171
11.9018803,10.9982906 11.7935043,10.9936752 C11.7023932,10.9897436
11.6011966,10.9880342 11.4001709,10.7830769 C11.1926496,10.5709402
11.2210256,10.182735 11.4473504,9.96119658 C11.7018803,9.71196581
12.1719658,9.59777778 12.5388034,9.97264957 C12.9059829,10.3473504
13.1020513,11.0001709 12.3950427,11.6924786 C11.5678632,12.502735
10.7924786,12.3618803 10.1623932,11.7184615" id="Fill-37" fill="#FFFFFF"></path>
+ <path d="M40.6442735,4.8608547 C41.0642735,4.0642735
42.0095726,3.97008547 42.6135043,4.28871795 C43.0687179,4.52888889
43.0109402,4.72803419 43.2560684,4.85726496 C43.5010256,4.98666667
43.7047863,4.93025641 43.8176068,4.89076923 C43.9136752,4.85726496
43.9553846,4.86837607 43.8692308,4.96273504 C43.8013675,5.03692308
43.5059829,5.35162393 43.4319658,5.42017094 C43.3606838,5.48615385
43.3441026,5.48564103 43.2953846,5.39282051 C43.2499145,5.30649573
43.0076923,4.8774359 42.5700855,4.64632479 C42.3251282,4.51709402
41.8425641,4.71008547 41.5100855,5.34017094 C41.1360684,6.04923077
41.1876923,6.52393162 41.5112821,6.69487179 C41.8352137,6.86581197
42.2552137,6.89709402 42.4259829,6.57333333 C42.522906,6.38940171
42.4152137,6.25435897 42.2926496,6.18974359 C42.1700855,6.12512821
41.9748718,6.15606838 41.9379487,6.22615385 C41.8916239,6.31367521
41.8610256,6.29760684 41.8321368,6.19282051 C41.8082051,6.10495726
41.7788034,6.00786325 41.9128205,5.75418803 C42.051453,5.49162393
42.4297436,5.40034188 42.7097436,5.54803419 C43.0247863,5.71435897
43.2769231,6.12717949 43.0321368,6.59111111 C42.7873504,7.05487179
42.2254701,7.44102564 41.3502564,6.9791453 C40.3261538,6.43863248
40.2237607,5.65726496 40.6442735,4.8608547" id="Fill-38" fill="#FFFFFF"></path>
+ <path d="M51.3695726,11.0025641 C51.6126496,11.2765812
51.7437607,11.4247863 51.7955556,11.4979487 C51.8471795,11.5711111
51.8295726,11.5880342 51.7452991,11.5755556 C51.522906,11.5411966
51.0545299,11.7512821 50.5290598,12.2174359 C49.9883761,12.6965812
49.9577778,12.7367521 49.9210256,12.7695726 C49.8837607,12.8025641
49.8747009,12.8369231 49.9107692,12.8777778 C49.9500855,12.9220513
50.1307692,13.125812 50.2750427,13.2887179 C50.4194872,13.451453
50.705641,13.4757265 50.8955556,13.3470085 C51.0854701,13.2182906
51.1235897,13.0524786 51.0849573,12.9940171 C51.0466667,12.9357265
51.0622222,12.908547 51.1311111,12.9266667 C51.2001709,12.9447863
51.3591453,12.9825641 51.4806838,13.1194872 C51.6251282,13.2823932
51.8425641,13.6846154 51.4798291,14.0061538 C51.117094,14.3280342
50.6724786,14.2591453 50.2859829,13.8082051 C49.8994872,13.357265
49.5252991,12.9350427 49.374188,12.7647863 C49.2234188,12.5945299
49.0958974,12.4415385 49.0121368,12.371453 C48.9088889,12.2844444
48.9300855,12.2261538 49.0331624,12.2605128 C49.1129915,12.2868376
49.2605128,12.3232479 49.9822222,11.6305983 C50.7041026,10.9379487
50.8842735,10.7384615 50.8319658,10.5601709 C50.8082051,10.4789744
50.8386325,10.4483761 50.9052991,10.508547 C50.9716239,10.568547
51.1268376,10.7287179 51.3695726,11.0025641" id="Fill-39" fill="#FFFFFF"></path>
+ <path d="M48.3194872,8.18923077 C48.5979487,8.42700855
48.748547,8.55538462 48.8097436,8.6208547 C48.8711111,8.68632479
48.8560684,8.70547009 48.7707692,8.70461538 C48.545812,8.70136752
48.1111111,8.97435897 47.6550427,9.50871795 C47.1861538,10.0582906
47.1615385,10.1023932 47.1294017,10.14 C47.097265,10.1776068
47.0929915,10.2129915 47.1345299,10.2483761 C47.1796581,10.2868376
47.3866667,10.4637607 47.5521368,10.6049573 C47.7177778,10.7463248
48.0044444,10.7307692 48.1747009,10.5769231 C48.3449573,10.422906
48.3598291,10.2533333 48.3135043,10.2008547 C48.2671795,10.1483761
48.2791453,10.1194872 48.3497436,10.1276923 C48.4208547,10.1362393
48.5834188,10.151453 48.7225641,10.2702564 C48.8882051,10.4117949
49.1594872,10.7798291 48.8447863,11.1487179 C48.5297436,11.5176068
48.08,11.5109402 47.6348718,11.1179487 C47.1895726,10.7247863
46.7605128,10.3586325 46.5875214,10.2109402 C46.414188,10.0632479
46.2671795,9.92940171 46.1745299,9.87145299 C46.0601709,9.79965812
46.0728205,9.7391453 46.1794872,9.75880342 C46.2622222,9.77367521
46.4136752,9.78940171 47.0324786,9.0034188 C47.6511111,8.2174359
47.8020513,7.99504274 47.7254701,7.82547009 C47.6909402,7.74837607
47.7167521,7.71384615 47.7907692,7.7642735 C47.8651282,7.81452991
48.0410256,7.95145299 48.3194872,8.18923077" id="Fill-40" fill="#FFFFFF"></path>
+ <path d="M7.30700855,47.5329915 C7.06854701,47.1805128
6.94495726,46.9711111 6.90324786,46.8919658 C6.86136752,46.8126496
6.89982906,46.7986325 6.95760684,46.8312821 C7.01555556,46.8637607
7.24119658,46.9499145 7.45623932,46.6849573 C7.67128205,46.42
8.16803419,45.7420513 8.32068376,45.4904274 C8.36700855,45.414359
8.34051282,45.3875214 8.26102564,45.3933333 C8.18153846,45.3994872
7.3382906,45.5220513 6.81282051,45.734188 C6.51931624,45.8526496
6.47196581,46.042735 6.47794872,46.1223932 C6.48393162,46.2017094
6.4565812,46.214359 6.40940171,46.1623932 C6.3625641,46.1105983
6.18529915,45.8839316 6.00222222,45.6136752 C5.8191453,45.3430769
5.66068376,45.0562393 5.61897436,44.9767521 C5.57709402,44.8974359
5.60153846,44.8451282 5.68974359,44.9047863 C5.77811966,44.9647863
6.17435897,45.1266667 7.46136752,45.0682051 C8.74837607,45.0097436
8.92410256,45.0223932 9.03931624,45.0160684 C9.15435897,45.0097436
9.14393162,45.0646154 9.11145299,45.1225641 C9.07880342,45.1805128
8.16034188,46.9135043 8.03094017,47.2162393 C7.90119658,47.5191453
7.77247863,47.9288889 7.78957265,48.0249573 C7.80666667,48.1208547
7.77384615,48.1430769 7.7157265,48.0748718 C7.65760684,48.0064957
7.54564103,47.8852991 7.30700855,47.5329915" id="Fill-41" fill="#FFFFFF"></path>
+ <path d="M55.0923077,44.7015385 C54.86,45.0582906
54.7153846,45.2531624 54.6584615,45.3223932 C54.6015385,45.3917949
54.5738462,45.3617094 54.5813675,45.2958974 C54.5887179,45.2297436
54.5808547,44.9882051 54.2529915,44.8929915 C53.9252991,44.7977778
53.1078632,44.6030769 52.8165812,44.56 C52.728547,44.5470085
52.7140171,44.5817094 52.7502564,44.6526496 C52.7868376,44.7235897
53.2268376,45.4531624 53.6266667,45.8552137 C53.8494017,46.0794872
54.0432479,46.0497436 54.114188,46.0131624 C54.1851282,45.9765812
54.2073504,45.997094 54.1777778,46.0603419 C54.1482051,46.1239316
54.0082051,46.3753846 53.8297436,46.6490598 C53.6517949,46.9225641
53.4487179,47.18 53.3917949,47.2494017 C53.3348718,47.3186325
53.277094,47.3165812 53.2981197,47.2117949 C53.3188034,47.1075214
53.314188,46.6791453 52.7610256,45.5158974 C52.2078632,44.3524786
52.1511111,44.1854701 52.1006838,44.0818803 C52.0500855,43.9781197
52.1049573,43.9664957 52.1707692,43.9738462 C52.2367521,43.9815385
54.1902564,44.1553846 54.5198291,44.1574359 C54.8490598,44.1591453
55.2769231,44.1191453 55.3586325,44.0659829 C55.4405128,44.0129915
55.4735043,44.0345299 55.4333333,44.1145299 C55.3929915,44.1947009
55.3246154,44.3449573 55.0923077,44.7015385" id="Fill-42" fill="#FFFFFF"></path>
+ <path d="M53.6039316,13.6177778 C53.8393162,13.9721368
53.9610256,14.1823932 54.0020513,14.2620513 C54.042906,14.3417094
54.0046154,14.3553846 53.9470085,14.3223932 C53.8895726,14.2892308
53.6644444,14.2011966 53.4471795,14.4641026 C53.2299145,14.7271795
52.7273504,15.4008547 52.5723077,15.6511111 C52.5254701,15.7268376
52.551453,15.7540171 52.6311111,15.7487179 C52.7107692,15.7432479
53.5548718,15.6282051 54.0822222,15.4205128 C54.3767521,15.3049573
54.425812,15.1150427 54.4206838,15.0355556 C54.4153846,14.9558974
54.442735,14.9437607 54.4894017,14.9958974 C54.5358974,15.0480342
54.7109402,15.2762393 54.8916239,15.5482051 C55.0724786,15.8201709
55.2283761,16.1088889 55.2694017,16.188547 C55.3105983,16.2680342
55.285641,16.3201709 55.1979487,16.2596581 C55.1102564,16.1991453
54.7153846,16.0338462 53.4276923,16.0808547 C52.1405128,16.1280342
51.9647863,16.1140171 51.8494017,16.1191453 C51.734359,16.1244444
51.7452991,16.0697436 51.7784615,16.0119658 C51.811453,15.954359
52.7449573,14.2295726 52.877094,13.9278632 C53.0094017,13.6261538
53.1418803,13.2174359 53.125812,13.1215385 C53.1094017,13.0252991
53.1423932,13.0034188 53.2,13.0721368 C53.2574359,13.1408547
53.3683761,13.2630769 53.6039316,13.6177778" id="Fill-43" fill="#FFFFFF"></path>
+ <path d="M57.1721368,40.1473504 C57.0381197,40.4668376
56.9220513,40.7184615 56.877094,40.7747009 C56.8319658,40.8311111
56.822735,40.8271795 56.7565812,40.8316239 C56.6905983,40.8362393
55.805812,40.8731624 55.7394872,40.8776068 C55.6623932,40.882906
55.6635897,40.9047863 55.7049573,40.9596581 C55.737094,41.0023932
56.3193162,41.7213675 56.362735,41.7717949 C56.4059829,41.8220513
56.4128205,41.857265 56.3875214,41.942906 C56.3678632,42.0099145
56.2336752,42.3615385 56.1723077,42.5076923 C56.1111111,42.6536752
55.9259829,43.0697436 55.8902564,43.1297436 C55.854359,43.1897436
55.8218803,43.202906 55.8083761,43.1329915 C55.7948718,43.062735
55.8010256,42.8562393 54.7557265,42.4825641 C53.7105983,42.1088889
53.6112821,42.2176068 53.5052991,42.291453 C53.3994872,42.3649573
53.3887179,42.3391453 53.4011966,42.2584615 C53.4135043,42.1776068
53.5022222,41.914359 53.6478632,41.5676923 C53.7929915,41.2208547
53.9129915,40.96 53.9605128,40.8724786 C54.0076923,40.7851282
54.0478632,40.8529915 54.0531624,40.9326496 C54.0649573,41.1095726
54.5105983,41.4034188 55.0673504,41.6367521 C55.6241026,41.8699145
55.7948718,41.9495726 55.8794872,41.977265 C55.9362393,41.9955556
55.977094,41.9752137 55.9232479,41.8988034 C55.8694017,41.8225641
55.0576068,40.7868376 54.9711111,40.662906 C54.934359,40.6099145
54.9687179,40.5278632 55.0302564,40.5213675 C55.1451282,40.5094017
56.4516239,40.3818803 56.54,40.3758974 C56.6282051,40.3700855
56.6381197,40.3206838 56.5598291,40.2769231 C56.4815385,40.2335043
56.1935043,40.1020513 55.7641026,39.9222222 C55.1071795,39.6468376
54.6806838,39.6022222 54.5516239,39.7304274 C54.4760684,39.8059829
54.4155556,39.7863248 54.4447863,39.6911111 C54.4738462,39.5960684
54.5940171,39.2709402 54.7087179,38.997094 C54.8235897,38.7232479
54.9442735,38.4735043 54.9917949,38.385812 C55.0389744,38.2984615
55.08,38.3157265 55.0905983,38.4059829 C55.0986325,38.4767521
55.0070085,38.6820513 56.0179487,39.1377778 C56.8025641,39.4917949
57.1535043,39.602906 57.3006838,39.4822222 C57.3762393,39.4205128
57.4105983,39.437265 57.3919658,39.5203419 C57.3788034,39.5793162
57.3059829,39.8278632 57.1721368,40.1473504" id="Fill-44" fill="#FFFFFF"></path>
+ <path d="M58.5938462,34.7001709 C58.5179487,35.0382906
58.4475214,35.3063248 58.4129915,35.3695726 C58.3786325,35.4328205
58.3688889,35.4307692 58.3046154,35.4466667 C58.24,35.4625641
57.3753846,35.6538462 57.3111111,35.6697436 C57.2357265,35.6883761
57.2411966,35.7099145 57.291453,35.7567521 C57.3307692,35.7929915
58.0295726,36.3991453 58.0810256,36.4411966 C58.1324786,36.4830769
58.1452991,36.5164103 58.1353846,36.605641 C58.1276923,36.6745299
58.0569231,37.0444444 58.0222222,37.1989744 C57.9876923,37.3533333
57.8782906,37.7953846 57.8533333,37.8608547 C57.828547,37.9261538
57.7989744,37.9449573 57.7733333,37.8782906 C57.7478632,37.8117949
57.7177778,37.6070085 56.6230769,37.4222222 C55.5288889,37.237094
55.4502564,37.3615385 55.3586325,37.4524786 C55.2671795,37.5435897
55.2523077,37.52 55.2504274,37.4382906 C55.2483761,37.3567521
55.2897436,37.0820513 55.3721368,36.7150427 C55.4545299,36.3480342
55.5273504,36.0704274 55.5586325,35.9758974 C55.5899145,35.8815385
55.6411966,35.9417094 55.6603419,36.0191453 C55.702906,36.1909402
56.1929915,36.4025641 56.7818803,36.5347009 C57.3711111,36.6670085
57.5529915,36.7155556 57.6413675,36.7278632 C57.7003419,36.7360684
57.7369231,36.7087179 57.6704274,36.6432479 C57.6041026,36.5774359
56.6235897,35.6998291 56.5169231,35.5928205 C56.471453,35.5470085
56.4909402,35.46 56.5504274,35.4430769 C56.6613675,35.4111111
57.9254701,35.057094 58.0112821,35.0358974 C58.097265,35.0147009
58.0982906,34.9642735 58.0138462,34.9350427 C57.9290598,34.905812
57.6225641,34.8268376 57.1683761,34.7247863 C56.4729915,34.568547
56.0452991,34.5993162 55.9408547,34.7482051 C55.8798291,34.8355556
55.8167521,34.8268376 55.8287179,34.7280342 C55.8408547,34.6294017
55.9022222,34.2882051 55.9673504,33.9986325 C56.0324786,33.7088889
56.1075214,33.4417094 56.1389744,33.3473504 C56.1702564,33.2529915
56.2136752,33.2625641 56.2396581,33.3497436 C56.2603419,33.4179487
56.205812,33.6362393 57.2806838,33.9082051 C58.1153846,34.1194872
58.4801709,34.1673504 58.6039316,34.022906 C58.6675214,33.9490598
58.7046154,33.9593162 58.7005128,34.0444444 C58.6976068,34.1047863
58.6699145,34.3622222 58.5938462,34.7001709" id="Fill-45" fill="#FFFFFF"></path>
+ <path d="M55.9929915,17.6087179 C56.1276923,17.9278632
56.2261538,18.1870085 56.2348718,18.2584615 C56.2435897,18.3300855
56.2347009,18.3340171 56.191453,18.3844444 C56.1483761,18.4348718
55.5558974,19.0931624 55.5128205,19.1435897 C55.4623932,19.2022222
55.4793162,19.2165812 55.5475214,19.2254701 C55.6003419,19.2324786
56.5215385,19.3193162 56.5878632,19.3234188 C56.6540171,19.3278632
56.6839316,19.3475214 56.7275214,19.425641 C56.7615385,19.4861538
56.9189744,19.8282051 56.9805128,19.974188 C57.0420513,20.12
57.2099145,20.5434188 57.2278632,20.6111111 C57.245812,20.6786325
57.2324786,20.7111111 57.1729915,20.6717949 C57.1131624,20.6324786
56.9697436,20.4835897 55.9716239,20.9692308 C54.9738462,21.4548718
54.9820513,21.6018803 54.9606838,21.7288889 C54.9391453,21.8562393
54.9131624,21.845812 54.8641026,21.7805128 C54.8150427,21.7152137
54.6890598,21.4675214 54.5430769,21.1210256 C54.3967521,20.7747009
54.294188,20.5063248 54.2647863,20.411453 C54.2353846,20.3164103
54.3119658,20.3353846 54.3728205,20.3873504 C54.5073504,20.5022222
55.0290598,20.3895726 55.5852991,20.1548718 C56.1415385,19.9201709
56.3179487,19.8538462 56.3967521,19.8124786 C56.4492308,19.7847863
56.4634188,19.7411966 56.3712821,19.7264957 C56.2789744,19.7117949
54.9711111,19.5675214 54.8220513,19.5425641 C54.7582906,19.5316239
54.7237607,19.4497436 54.7622222,19.4010256 C54.8336752,19.3107692
55.6567521,18.2878632 55.714188,18.2206838 C55.7716239,18.1533333
55.7432479,18.1116239 55.6574359,18.137094 C55.571453,18.1625641
55.2760684,18.2765812 54.8473504,18.4574359 C54.1909402,18.7345299
53.8606838,19.0082051 53.8622222,19.1900855 C53.8632479,19.2967521
53.8068376,19.3263248 53.7593162,19.2389744 C53.7116239,19.1516239
53.5632479,18.8382906 53.4478632,18.5647863 C53.3324786,18.2912821
53.2382906,18.0302564 53.2090598,17.9350427 C53.1796581,17.8401709
53.2206838,17.822735 53.2924786,17.8784615 C53.3488889,17.9220513
53.4312821,18.1312821 54.4641026,17.7275214 C55.2661538,17.414359
55.5909402,17.2413675 55.6075214,17.0517949 C55.6160684,16.9548718
55.6523077,16.9415385 55.6986325,17.0131624 C55.731453,17.0639316
55.8584615,17.2895726 55.9929915,17.6087179" id="Fill-46" fill="#FFFFFF"></path>
+ <path d="M4.04820513,24.0883761 C4.12683761,23.7919658
4.35452991,23.6678632 4.5842735,23.7290598 C4.81367521,23.7900855
4.96358974,24.0347009 4.9,24.2738462 C4.82376068,24.5608547
4.60854701,24.6776068 4.38837607,24.6189744 C4.16854701,24.5606838
3.96717949,24.3948718 4.04820513,24.0883761" id="Fill-47" fill="#FFFFFF"></path>
+ <path d="M14.4646154,54.2661538 C14.2529915,54.102906
14.2066667,53.8548718 14.3635897,53.6511111 C14.5206838,53.4471795
14.7801709,53.4347009 14.9839316,53.5919658 C15.1878632,53.7488889
15.2080342,54.014359 15.0752137,54.1868376 C14.9423932,54.3591453
14.6760684,54.4288889 14.4646154,54.2661538" id="Fill-48" fill="#FFFFFF"></path>
+ <path d="M15.5317949,52.8646154 C15.2888889,52.6777778
15.2625641,52.4196581 15.4073504,52.2316239 C15.5523077,52.0434188
15.8360684,51.9996581 16.0319658,52.1507692 C16.2671795,52.3316239
16.2916239,52.5753846 16.1528205,52.7558974 C16.0138462,52.9360684
15.7830769,53.0579487 15.5317949,52.8646154" id="Fill-49" fill="#FFFFFF"></path>
+ <path d="M26.211453,56.98 C25.9090598,56.9297436
25.7642735,56.7145299 25.8034188,56.4801709 C25.842906,56.245812
26.0723077,56.0735043 26.3164103,56.1147009 C26.6092308,56.1637607
26.745641,56.3673504 26.7080342,56.5917949 C26.6702564,56.8160684
26.5241026,57.0321368 26.211453,56.98" id="Fill-50" fill="#FFFFFF"></path>
+ <path d="M56.2815385,23.6070085 C56.3594872,23.9034188
56.2223932,24.1237607 55.9926496,24.1839316 C55.762906,24.2439316
55.5117949,24.1051282 55.4492308,23.865812 C55.3738462,23.5784615
55.5037607,23.3707692 55.7239316,23.3129915 C55.9441026,23.2553846
56.2010256,23.3003419 56.2815385,23.6070085" id="Fill-51" fill="#FFFFFF"></path>
+ <path d="M46.6177778,45.7105983 C46.3618803,45.9863248
45.8890598,46.4984615 45.4165812,46.8333333 C45.5738462,45.9666667
46.0661538,45.2182906 46.2239316,45.0015385 C45.1998291,45.6319658
44.4117949,46.7347009 43.9786325,47.2863248 C43.9196581,47.4439316
43.8015385,47.4242735 43.8605128,47.2271795 C44.1362393,46.3801709
44.7996581,45.2849573 45.2784615,44.8933333 C45.5271795,44.6904274
45.3721368,44.6582906 45.1603419,44.8047863 C43.8801709,45.6823932
43.0728205,46.6165812 42.5015385,47.6112821 C42.4350427,47.725641
42.3071795,47.7270085 42.3736752,47.5521368 C42.7675214,46.5083761
43.3781197,45.5825641 44.165812,44.7358974 C44.2704274,44.6237607
44.1989744,44.5731624 44.077265,44.6471795 C43.3287179,45.1001709
41.9205128,46.6068376 41.497265,47.4242735 C41.5463248,46.7545299
41.9008547,45.8388034 42.7675214,44.834359 C41.6350427,45.5335043
40.8374359,46.6264957 40.482906,47.3846154 C40.4632479,46.8825641
40.7882051,46.1241026 41.3001709,45.2576068 C40.4729915,45.8880342
39.8034188,47.1386325 39.6063248,47.3846154 C39.4784615,47.1287179
39.9215385,46.0063248 40.285812,45.5235897 C40.4374359,45.322906
40.2822222,45.3735043 40.1382906,45.4842735 C39.3208547,46.1145299
38.7793162,47.0006838 38.6217094,47.3452991 C38.5528205,47.0203419
38.7495726,46.4198291 38.8186325,46.222735 C38.3064957,46.5181197
37.8634188,46.9119658 37.705812,47.1876923 C37.7747009,46.8529915
38.0111111,46.2423932 38.542906,45.8092308 C39.077094,45.3735043
40.3747009,44.8637607 40.9063248,44.6668376 C41.4381197,44.4697436
42.1471795,44.2728205 42.5213675,44.2728205 C42.8955556,44.2728205
43.3287179,44.2138462 43.7817094,44.2138462 C44.2347009,44.2138462
44.825641,44.2138462 45.1998291,44.2926496 C45.5738462,44.3716239
46.105812,44.3516239 46.48,44.4897436 C46.854188,44.6275214
47.3070085,44.6078632 47.5434188,44.6668376 C47.2480342,45.0411966
46.8738462,45.4350427 46.6177778,45.7105983 L46.6177778,45.7105983 Z
M42.1765812,49.8859829 C42.1668376,50.0630769 42.0782906,49.8958974
42.0782906,49.8958974 C42.0782906,49.8958974 41.6350427,48.8815385
40.9852991,48.5270085 C41.2805128,49.3738462 41.1820513,50.1124786
41.1524786,50.2798291 C40.8374359,49.2852991 39.8919658,48.3005128
39.4687179,48.3102564 C39.6851282,48.7241026 40.0497436,49.7282051
39.9411966,50.2405128 C39.4094017,49.2064957 38.9958974,48.6847863
38.4442735,48.3890598 C38.3670085,48.3473504 38.2082051,48.3102564
38.3064957,48.4480342 C38.4049573,48.5861538 38.9073504,49.5117949
38.8777778,50.3784615 C38.8729915,50.537094 38.7989744,50.5358974
38.74,50.4177778 C38.6806838,50.2994872 37.9618803,48.9111111
37.4991453,48.6847863 C37.6271795,49.2950427 37.6958974,49.8268376
37.6468376,50.0435897 C37.4598291,49.6299145 37.0362393,48.9406838
36.6817094,48.7044444 C36.8588034,49.2261538 36.8,49.531453
36.7309402,49.7482051 C36.4357265,49.2852991 36.2287179,48.9111111
36.051453,48.7929915 C36.0415385,48.9700855 36.0218803,49.157265
35.962906,49.2753846 C35.9039316,49.3935043 35.7264957,48.6355556
35.5494017,48.3499145 C35.7854701,48.2808547 35.9432479,48.2316239
36.4357265,48.0938462 C36.9280342,47.9558974 37.7550427,47.7784615
38.0307692,47.7588034 C38.3064957,47.7391453 38.8777778,47.7391453
39.3700855,47.7391453 C39.8625641,47.7391453 40.6895726,47.8377778
40.8670085,47.8967521 C41.0441026,47.9558974 41.6350427,48.0938462
41.7926496,48.1923077 C41.9500855,48.2909402 42.3046154,48.4581197
42.4326496,48.5664957 C42.5606838,48.6747009 42.8659829,49.157265
42.8955556,49.4524786 C42.4917949,49.0389744 42.1668376,48.9307692
41.9993162,48.8519658 C42.1471795,49.2360684 42.1864957,49.7088889
42.1765812,49.8859829 L42.1765812,49.8859829 Z M36.888547,52.2099145
C36.8393162,51.8948718 36.9969231,51.3533333 37.0263248,51.3039316
C37.0558974,51.2547009 37.0263248,51.185812 36.9280342,51.2646154
C36.8295726,51.3435897 36.1107692,51.9735043 35.7562393,52.4758974
C35.8054701,52.0328205 36.14,50.9297436 36.2189744,50.7919658
C36.2976068,50.6540171 36.1993162,50.6837607 36.1006838,50.7820513
C36.0022222,50.8805128 35.1752137,51.9145299 34.7220513,52.7811966
C34.7417094,52.0131624 35.1948718,50.742735 35.3719658,50.3981197
C34.3282051,51.1367521 33.8654701,52.3870085 33.6979487,52.7218803
C33.6191453,51.8948718 34.485641,50.1420513 34.5646154,50.0630769
C34.6434188,49.9846154 34.5880342,49.9191453 34.485641,50.0239316
C33.5405128,50.9890598 33.097265,51.8357265 32.7919658,52.682735
C32.7328205,52.2492308 33.2276923,50.5839316 33.5208547,50.0535043
C33.6782906,49.7678632 33.4716239,49.9153846 33.4025641,49.9846154
C33.2523077,50.1347009 32.5261538,50.9497436 32.1025641,51.9145299
C32.191453,50.742735 32.7526496,49.7282051 32.9495726,49.4524786
C32.3094017,49.8760684 31.5119658,50.8608547 31.2755556,51.3435897
C31.2362393,50.6933333 31.7976068,49.3935043 32.0535043,49.2064957
C31.0588034,49.6396581 30.545641,50.4495726 30.4777778,50.6244444
C30.4287179,50.7526496 30.3695726,50.7326496 30.3695726,50.6147009
C30.3695726,50.4965812 30.6452991,49.4823932 30.8422222,49.2164103
C30.2022222,49.5018803 29.8673504,50.0435897 29.8082051,50.1813675
C29.7492308,50.3191453 29.6801709,50.3191453 29.6801709,50.1617094
C29.6801709,50.0042735 29.6211966,49.5018803 30.0545299,49.0389744
C30.2538462,48.8261538 29.965812,48.98 29.8082051,49.0389744
C29.6507692,49.0982906 29.237094,49.354359 28.9712821,49.7184615
C28.7841026,49.9758974 28.8875214,49.3011966 29.0304274,49.157265
C29.0794872,49.1080342 28.6264957,49.1080342 28.025812,49.3639316
C28.6264957,48.7140171 29.6211966,48.5861538 30.5664957,48.5861538
C31.5119658,48.5861538 32.9299145,48.6647863 33.5208547,48.8618803
C34.111453,49.0586325 34.6630769,49.1179487 34.8796581,49.2557265
C35.0962393,49.3935043 35.4705983,49.6102564 35.7068376,49.7282051
C35.9432479,49.8466667 36.9870085,50.457094 37.3022222,50.6540171
C37.617265,50.8509402 37.991453,51.2252991 37.991453,51.2252991
C37.991453,51.2252991 37.1152137,52.0820513 36.888547,52.2099145
L36.888547,52.2099145 Z M29.6998291,53.411453 C29.7097436,53.0569231
29.7492308,52.9290598 29.9558974,52.5251282 C29.6309402,52.6333333
29.1189744,53.2242735 28.951453,53.3916239 C28.951453,52.8697436
29.2666667,52.111453 29.4044444,51.9145299 C29.0006838,52.1705983
28.1242735,53.1061538 28.0160684,53.2933333 C28.1046154,52.5940171
28.4887179,51.757094 28.8335043,51.4222222 C28.9589744,51.3003419
28.9071795,51.2437607 28.7644444,51.3336752 C28.1441026,51.7275214
27.2282051,52.9189744 27.1494017,53.0668376 C27.0707692,53.214359
27.0324786,53.1073504 27.0410256,52.9880342 C27.0952137,52.2678632
27.6222222,51.2646154 28.0752137,50.6933333 C27.5335043,50.9497436
26.1647863,52.5940171 26.0466667,52.7712821 C25.9480342,52.0721368
26.8047863,50.6540171 27.1692308,50.2702564 C26.6078632,50.3683761
25.18,52.1017094 25.0323077,52.397094 C25.0323077,51.8063248
25.465641,50.5752137 26.4206838,49.8466667 C25.8398291,49.9649573
24.4020513,51.382906 23.8702564,52.2295726 C24.1066667,50.7919658
25.3276923,49.5905983 25.3866667,49.5512821 C25.445812,49.5117949
25.411453,49.46 25.3276923,49.5018803 C24.4415385,49.9452991
23.2497436,51.185812 22.9938462,51.6882051 C23.2203419,50.2010256
24.254188,49.4035897 24.5299145,49.1179487 C23.9490598,49.2753846
22.2357265,50.6540171 21.8121368,51.3632479 C21.9894017,50.3880342
22.8461538,49.4724786 23.4271795,49.0389744 C22.2059829,49.3935043
20.9063248,50.8116239 20.7979487,50.9593162 C20.6895726,51.1071795
20.6010256,51.1464957 20.7288889,50.9001709 C20.8569231,50.6540171
21.4476923,49.5610256 22.3931624,48.9011966 C21.4280342,49.2064957
19.9511111,50.5162393 19.8721368,50.6147009 C19.7933333,50.7129915
19.6752137,50.7723077 19.7540171,50.6147009 C19.8328205,50.457094
19.9707692,49.7678632 21.2704274,48.9897436 C20.482735,49.2164103
18.9760684,50.1912821 18.6806838,50.3784615 C18.9466667,49.7777778
19.3107692,49.4724786 19.8524786,49.0294017 C19.1928205,49.1376068
18.3557265,49.7184615 18.0700855,49.8663248 C17.7846154,50.0138462
17.8830769,49.9252991 18.0011966,49.8071795 C18.1193162,49.6892308
18.5723077,49.2654701 19.0449573,48.9603419 C18.3459829,49.0786325
17.4989744,49.4823932 17.154188,49.4524786 C17.5777778,49.1475214
18.7102564,48.6451282 19.4389744,48.5073504 C20.6611966,48.2760684
22.0189744,48.074188 23.1217094,48.2512821 C24.2247863,48.4283761
25.3670085,48.7437607 25.9579487,48.98 C26.5488889,49.2164103
27.7502564,49.9252991 28.0652991,50.1223932 C28.3803419,50.3191453
29.6015385,51.4222222 29.8969231,51.8948718 C30.1923077,52.3673504
30.4483761,52.8796581 30.4483761,52.8796581 C30.4483761,52.8796581
29.8280342,53.302906 29.6998291,53.411453 L29.6998291,53.411453 Z
M16.8982906,44.9818803 C16.5044444,45.2379487 15.9331624,46.7545299
15.9923077,47.6210256 C15.7364103,47.0894017 15.7560684,45.474359
15.874188,45.0015385 C15.5788034,45.3757265 15.1849573,46.3998291
15.0470085,47.0497436 C14.948547,46.3998291 14.9682051,45.6121368
15.0076923,45.1396581 C14.7909402,45.297094 14.3774359,46.1637607
14.3182906,46.5576068 C14.1805128,46.1441026 14.1213675,45.6319658
14.2001709,45.2182906 C14.022906,45.3757265 13.9244444,45.5531624
13.825812,45.8880342 C13.5895726,45.474359 13.5502564,45.0015385
13.5502564,45.0015385 C13.5502564,45.0015385 14.6726496,44.7061538
15.322735,44.7061538 C15.9726496,44.7061538 16.8393162,44.6078632
17.2726496,44.6275214 C17.705812,44.6471795 18.4345299,44.745812
18.7102564,44.7061538 C18.985812,44.6668376 19.5177778,44.6471795
19.7736752,44.7061538 C20.0297436,44.7654701 21.211453,45.0215385
21.3690598,45.0805128 C21.5264957,45.1396581 22.1765812,45.3167521
22.1765812,45.3167521 C22.1765812,45.3167521 21.7037607,45.7502564
21.4871795,45.9470085 C21.4083761,45.7699145 21.3887179,45.6516239
21.3887179,45.474359 C21.1917949,45.6121368 20.7584615,46.3801709
20.7191453,46.6362393 C20.5813675,46.2818803 20.6010256,45.7105983
20.6206838,45.3953846 C20.3646154,45.7302564 19.9116239,46.9711111
19.7540171,47.7784615 C19.6160684,46.9119658 19.6950427,45.6909402
19.734359,45.3167521 C19.1632479,45.8880342 18.8480342,47.5225641
18.6709402,48.074188 C18.4740171,47.0497436 18.7692308,45.474359
18.8283761,45.2576068 C18.8875214,45.0411966 18.8148718,45.0642735
18.6709402,45.2379487 C18.4271795,45.5323077 17.902735,46.9317949
17.7846154,48.1331624 C17.6270085,47.4635897 17.8042735,45.3953846
17.9223932,44.9818803 C17.2726496,45.8880342 16.8589744,47.6013675
16.8194872,47.9362393 C16.6620513,47.6406838 16.7605128,45.3167521
16.8982906,44.9818803 L16.8982906,44.9818803 Z M23.4567521,45.6712821
C23.5945299,45.6319658 23.7323077,45.5136752 23.8702564,45.494188
C24.0082051,45.474359 24.3035897,45.2379487 24.9338462,45.1001709
C25.5641026,44.9622222 25.8003419,44.8835897 26.1352137,44.8047863
C26.4699145,44.725812 27.3760684,44.5683761 27.6319658,44.6275214
C27.8880342,44.6864957 28.6757265,44.725812 29.1880342,44.922906
C29.6998291,45.1196581 30.2907692,45.3560684 30.5468376,45.6319658
C30.802735,45.9076923 31.3345299,46.5379487 31.5316239,47.0697436
C31.728547,47.6013675 31.7875214,47.6013675 31.9846154,48.2119658
C31.2952137,47.325641 30.7634188,46.2818803 29.6606838,45.8288889
C29.9755556,46.2818803 30.2119658,46.5379487 30.4287179,47.5225641
C29.325812,45.8880342 28.1242735,45.3757265 27.9471795,45.3167521
C27.7699145,45.2576068 27.7699145,45.2576068 27.9076923,45.3953846
C28.0454701,45.5335043 29.0894017,46.6755556 29.3059829,47.7
C28.222906,46.1834188 27.1593162,45.5924786 26.9032479,45.5136752
C26.6471795,45.4350427 26.6864957,45.474359 26.8244444,45.5924786
C26.9623932,45.7105983 28.0454701,46.7940171 28.4198291,47.7784615
C27.9864957,47.3846154 26.8047863,45.9666667 25.9184615,45.8092308
C26.6078632,46.5576068 27.0644444,47.1116239 27.297265,47.877094
C27.377094,48.1391453 27.2577778,48.074188 27.1789744,47.9558974
C27.0362393,47.7417094 26.1155556,46.5379487 25.2882051,46.1241026
C25.1073504,46.0333333 24.9338462,46.045641 25.1111111,46.1637607
C25.2882051,46.2818803 26.2533333,47.5620513 26.4107692,48.1331624
C26.4601709,48.3140171 26.3911111,48.3102564 26.2928205,48.2119658
C26.194188,48.1135043 25.1147009,46.5564103 23.9883761,46.2818803
C24.8550427,47.1090598 25.1750427,47.7588034 25.3473504,48.0345299
C25.445812,48.1923077 25.445812,48.2909402 25.2292308,48.0938462
C25.1147009,47.9904274 23.8507692,46.8529915 23.2006838,46.577265
C22.9876923,46.4873504 22.9051282,46.5379487 23.1415385,46.7152137
C23.3779487,46.8924786 23.7717949,47.3059829 24.0475214,47.877094
C23.4764103,47.5225641 22.7673504,47.1483761 22.3340171,46.9711111
C22.137094,46.9119658 21.8023932,46.8529915 22.1174359,47.0697436
C22.4326496,47.2863248 22.688547,47.6406838 22.8854701,47.9755556
C22.314359,47.7784615 21.8417094,47.5225641 21.5659829,47.4635897
C21.2900855,47.4046154 20.7388034,47.5817094 20.7388034,47.5817094
C20.7388034,47.5817094 21.8220513,46.577265 22.3340171,46.2818803
C22.8461538,45.9863248 23.3188034,45.7105983 23.4567521,45.6712821
L23.4567521,45.6712821 Z M33.934359,44.6471795 C34.3478632,44.5880342
35.0962393,44.6275214 35.4116239,44.6864957 C35.7264957,44.745812
37.3415385,45.1196581 37.794359,45.6319658 C37.5384615,45.9076923
37.3218803,46.4788034 37.2234188,46.7740171 C37.1531624,46.9822222
37.0128205,45.5003419 36.8492308,45.494188 C36.6904274,45.4878632
36.7309402,46.7152137 36.514359,47.0304274 C36.3112821,46.2904274
36.0022222,45.2576068 35.7264957,45.0608547 C35.8447863,45.848547
36.0415385,46.8924786 35.7068376,47.5225641 C35.5297436,46.3801709
35.1158974,45.3757265 34.8010256,45.1001709 C34.9977778,46.2620513
34.7613675,47.4439316 34.6039316,47.6406838 C34.5449573,46.0847863
34.0328205,45.1986325 33.9147009,45.0608547 C33.7965812,44.922906
33.7376068,44.9622222 33.7765812,45.1196581 C33.8162393,45.277265
34.111453,46.9119658 33.7176068,47.7391453 C33.6191453,46.222735
33.1859829,45.3560684 33.0480342,45.2576068 C32.9102564,45.1593162
32.9102564,45.2379487 32.9299145,45.3167521 C32.9495726,45.3953846
33.1663248,46.8333333 32.8312821,47.325641 C32.6345299,46.2030769
32.2405128,45.494188 32.082906,45.3560684 C32.1618803,45.9076923
32.1422222,46.3998291 32.0632479,46.7740171 C31.7678632,46.0847863
31.5711111,45.6319658 31.3345299,45.2576068 C31.9451282,45.1196581
32.6148718,44.9425641 32.6148718,44.9425641 C32.6148718,44.9425641
33.5208547,44.7061538 33.934359,44.6471795 Z M48.882735,43.9774359
C48.5478632,43.9577778 47.6811966,43.8396581 47.3070085,43.7413675
C46.9328205,43.642735 45.9087179,43.5639316 45.4755556,43.5049573
C45.0420513,43.445641 44.6678632,43.3475214 44.1757265,43.2882051
C43.6830769,43.2292308 42.7181197,43.3671795 42.3635897,43.445641
C42.0090598,43.5246154 41.0834188,43.7017094 40.2760684,43.9774359
C39.4687179,44.2531624 38.4049573,44.9032479 38.4049573,44.9032479
C38.4049573,44.9032479 37.4005128,44.2926496 36.3960684,43.9774359
C35.8076923,43.7928205 34.8993162,43.8003419 34.3282051,43.7806838
C33.7569231,43.7610256 33.0283761,43.997094 32.4374359,44.1352137
C31.8468376,44.2728205 30.7634188,44.5487179 30.7634188,44.5487179
C30.7634188,44.5487179 30.3892308,44.3319658 30.1135043,44.194188
C29.8377778,44.0562393 29.1287179,43.9577778 28.8136752,43.9184615
C28.4984615,43.8791453 27.9076923,43.8003419 27.3169231,43.8396581
C26.7259829,43.8791453 25.2292308,44.2336752 24.5989744,44.3516239
C23.9687179,44.4697436 23.2598291,44.7851282 23.2598291,44.7851282
C23.2598291,44.7851282 23.062735,44.6275214 22.7082051,44.5094017
C22.3538462,44.3909402 21.762906,44.2728205 21.3295726,44.194188
C20.8964103,44.1152137 19.5177778,43.9184615 18.8087179,43.8396581
C18.0996581,43.7610256 15.302906,43.9577778 14.397094,43.997094
C13.4911111,44.0365812 11.2459829,44.3516239 11.2459829,44.3516239
C11.2459829,44.3516239 13.471453,46.9907692 14.1805128,47.6603419
C14.8894017,48.3302564 15.7560684,48.9603419 16.1104274,49.3147009
C16.4649573,49.6692308 18.7888889,51.0282051 19.5177778,51.3239316
C20.2463248,51.6193162 22.3340171,52.5841026 23.791453,52.9979487
C25.2488889,53.411453 27.6319658,53.8052991 28.8529915,53.8642735
C30.074188,53.9234188 32.1618803,53.8446154 33.1663248,53.7068376
C34.1707692,53.5688889 35.7264957,53.2736752 36.7702564,52.9779487
C37.8140171,52.682735 39.2323077,52.0917949 40.8078632,51.3632479
C42.3832479,50.634359 43.4666667,49.8268376 44.5104274,49.0786325
C45.554188,48.3302564 46.5782906,47.2863248 46.8935043,46.9711111
C47.208547,46.6558974 48.2524786,45.4547009 48.4494017,45.2182906
C48.6464957,44.9818803 49.434188,43.9774359 49.434188,43.9774359
C49.434188,43.9774359 49.2174359,43.997094 48.882735,43.9774359
L48.882735,43.9774359 Z" id="Fill-52" fill="#BB922C"></path>
+ <path d="M13.6059829,19.94 L13.6044444,19.6789744
C13.6020513,19.3921368 13.5988034,18.9993162 13.6059829,18.7230769
C13.6160684,18.3268376 13.6355556,17.8905983 13.6444444,17.8112821
C13.668547,17.5935043 13.5755556,17.4716239 13.4933333,17.4076923
C13.4709402,17.3900855 13.4338462,17.3637607 13.3825641,17.3268376
C13.2550427,17.2352137 12.9560684,17.0205128 12.8938462,16.9365812
C12.8348718,16.8582906 12.7704274,16.5935043 12.7784615,16.4642735
C12.7822222,16.4042735 12.8538462,16.3136752 12.9005128,16.2717949
L12.8764103,16.2894017 C12.9413675,16.2504274 13.0112821,16.1565812
12.9947009,16.0239316 C12.991453,15.9779487 13.0023932,15.6847863
13.0102564,15.4707692 C13.0270085,15.0237607 13.0290598,14.9252991
13.0232479,14.8847863 C13.0088889,14.7839316 12.9552137,14.7088889
12.8760684,14.6791453 C12.8304274,14.6618803 12.7386325,14.6459829
12.6379487,14.7323077 C12.6124786,14.7533333 12.5276923,14.8405128
12.2252991,15.1562393 C12.2252991,15.1562393 12.0731624,15.3147009
12.08,15.3080342 L12.0965812,15.2948718 C12.0832479,15.3039316
12.0721368,15.3135043 12.0605128,15.3263248 C12.0605128,15.3263248
11.9511111,15.4454701 11.9406838,15.457094 L11.9704274,15.4852991
C11.8974359,15.5940171 11.7917949,15.7451282 11.7254701,15.8329915
L11.4252991,16.2217094 C11.0591453,16.6923077 10.5574359,17.3367521
10.3088889,17.7360684 C10.097094,18.0760684 9.92136752,18.4664957
9.80495726,18.7247863 C9.75350427,18.8389744 9.69521368,18.968547
9.67538462,18.9965812 C9.65299145,19.0275214 9.62888889,19.0528205
9.6034188,19.0796581 C9.55008547,19.1360684 9.48957265,19.1996581
9.44051282,19.3140171 C9.41418803,19.3758974 9.29418803,19.5757265
9.19777778,19.7364103 C9.07145299,19.9468376 8.99880342,20.0687179
8.97623932,20.1252991 C8.9634188,20.157094 8.93179487,20.2432479
8.88769231,20.3625641 C8.79675214,20.6087179 8.64461538,21.0206838
8.58529915,21.1523077 C8.52358974,21.2882051 8.18222222,22.1052991
8.04068376,22.4591453 C7.99675214,22.5692308 7.94700855,22.7553846
7.89897436,22.9355556 C7.8625641,23.0719658 7.81264957,23.2589744
7.79025641,23.3032479 C7.75094017,23.3820513 7.65726496,23.7560684
7.38923077,24.9044444 L7.2757265,25.3851282 C7.23230769,25.5586325
7.1434188,26.0562393 7.06478632,26.4955556 C7.01692308,26.7630769
6.97196581,27.0155556 6.94923077,27.1247863 C6.88700855,27.4259829
6.75794872,28.6702564 6.72940171,29.1271795 C6.71059829,29.4297436
6.71521368,29.9996581 6.7191453,30.4576068 C6.72119658,30.7150427
6.72307692,30.937265 6.71948718,31.0213675 C6.70905983,31.2716239
6.76854701,32.4261538 6.80905983,32.7613675 C6.84871795,33.0873504
7.03675214,34.4234188 7.11589744,34.8586325 C7.19726496,35.3066667
7.66136752,37.1206838 7.82290598,37.5461538 L8.04991453,38.1646154
C8.2642735,38.7581197 8.50735043,39.4309402 8.7808547,39.9917949
C8.87076923,40.1740171 8.92717949,40.331453 8.97709402,40.4705983
C9.01948718,40.5878632 9.0557265,40.6894017 9.10205128,40.7757265
C9.29760684,41.1422222 9.47589744,41.4365812 9.60632479,41.6512821
C9.68735043,41.7849573 9.75145299,41.8909402 9.79076923,41.9659829
C9.80376068,41.9909402 9.81880342,42.022906 9.83452991,42.0567521
C9.88683761,42.1692308 9.95213675,42.3087179 10.0533333,42.4290598
C10.1196581,42.5076923 10.1984615,42.5670085 10.2617094,42.6148718
C10.2878632,42.6345299 10.3237607,42.6615385 10.3331624,42.6724786
C10.3331624,42.6723077 10.331453,42.6704274 10.3282051,42.6651282
C10.3839316,42.7560684 10.4396581,42.8169231 10.4765812,42.857265
C10.4868376,42.868547 10.4998291,42.882906 10.5035897,42.8880342
C10.5035897,42.8880342 10.5011966,42.8849573 10.4984615,42.8789744
C10.5275214,42.937265 10.5815385,42.9781197 10.6468376,42.9911111
C10.7230769,43.0063248 10.8087179,42.9832479 10.8702564,42.9300855
C10.8832479,42.9186325 10.9625641,42.8420513 11.2052991,42.6083761
C11.5960684,42.2319658 12.3234188,41.5312821 12.3738462,41.4875214
C12.4637607,41.4153846 12.5444444,41.2652991 12.5090598,41.1063248
C12.4969231,41.0452991 12.5958974,40.7917949 12.5958974,40.7917949
L12.6071795,40.748547 C12.6654701,40.5275214 12.6521368,39.4523077
12.6294017,39.2866667 C12.6126496,39.1682051 12.6316239,38.6661538
12.648547,38.2232479 C12.6695726,37.6752137 12.6911111,37.1087179
12.6699145,36.8540171 C12.631453,36.3933333 12.6213675,33.4731624
12.6213675,33.0962393 C12.6213675,32.8694017 12.6408547,31.8495726
12.6524786,31.2403419 C12.6586325,30.9147009 12.6618803,30.7437607
12.6618803,30.7215385 C12.6618803,30.5907692 12.6095726,30.4834188
12.497265,30.3835897 L12.3470085,30.2536752 C12.1535043,30.0871795
11.7947009,29.7784615 11.6793162,29.6637607 C11.6784615,29.6526496
11.6880342,29.6068376 11.7557265,29.5391453 L12.6909402,28.6116239
C12.6909402,28.6116239 12.9670085,28.3377778 12.974188,28.3307692
C13.0218803,28.2832479 13.1018803,28.2037607 13.1105983,28.0760684
C13.1273504,27.8695726 13.1063248,27.4852991 13.0974359,27.3211966
C13.0957265,27.2919658 13.0940171,27.2618803 13.0938462,27.2565812
C13.0938462,27.1181197 12.9960684,27.0446154 12.9605128,27.0179487
L12.9447863,27.0061538 C12.7008547,26.8259829 12.5335043,26.6823932
12.4360684,26.5938462 C12.2911111,26.4613675 12.134188,26.2965812
11.9702564,26.1061538 C11.9473504,26.0495726 11.9471795,25.8767521
11.9700855,25.8270085 C12.0461538,25.7317949 12.2280342,25.6003419
12.2917949,25.5615385 C12.3615385,25.5153846 12.4182906,25.3916239
12.4182906,25.285812 L12.417094,25.2003419 C12.414359,24.9919658
12.4073504,24.4382906 12.414359,24.2996581 C12.4247863,24.0588034
12.4140171,22.4492308 12.4042735,22.2745299 L12.3976068,22.171453
C12.3890598,22.0483761 12.3642735,21.6835897 12.3897436,21.5868376
C12.4521368,21.5218803 12.7001709,21.3637607 12.8791453,21.3324786
C13.0933333,21.2953846 13.3350427,21.2386325 13.4030769,21.2218803
C13.6039316,21.171453 13.625641,21.0247863 13.625641,20.9641026
C13.625641,20.9389744 13.6235897,20.8478632 13.6198291,20.6888889
C13.6140171,20.4335043 13.6059829,20.0841026 13.6059829,19.94" id="Fill-53"
fill="#D1262B"></path>
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14867] Merge 14848:14866 from trunk,
Sigurd Nes <=