From c13777d7e34da4b381bab98c7ac6bba7a3331b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D1=91=D0=B4=D0=BE=D1=80=20=D0=9F=D0=BE=D0=B4=D0=BB?=
 =?UTF-8?q?=D0=B5=D1=81=D0=BD=D0=BE=D0=B2?= <phedor@corp.edu.yar.ru>
Date: Mon, 18 Jul 2016 16:23:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D1=87?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=20loadConfig,=20=D0=B0=20=D0=BD=D0=B5?=
 =?UTF-8?q?=20=D0=BA=D0=B0=D0=BA=20=D0=B3=D0=BB=D0=BE=D0=B1=D0=B0=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/config.php          |  3 +--
 core/data/areas.php      |  2 +-
 core/data/city-short.php | 14 ++++++++++++++
 core/data/city.php       | 16 +---------------
 core/data/mime.php       |  2 +-
 core/data/okato.php      |  2 +-
 core/data/regions.php    |  3 +--
 core/data/states.php     |  5 +----
 8 files changed, 21 insertions(+), 26 deletions(-)
 create mode 100644 core/data/city-short.php

diff --git a/core/config.php b/core/config.php
index 93f1a62..a88e625 100644
--- a/core/config.php
+++ b/core/config.php
@@ -1,8 +1,7 @@
 <?php
 
 function loadConfig($filename) {
-    if (file_exists($filename)) {
-        include($filename);
+    if (@include($filename)) {    
         return $settings;
     } 
     throw new Exception("config $filename not found");
diff --git a/core/data/areas.php b/core/data/areas.php
index 0bb54c4..a864edf 100644
--- a/core/data/areas.php
+++ b/core/data/areas.php
@@ -1,6 +1,6 @@
 <?php
 
-$Areas = array
+$settings = array
 (
    0 => '', 
    1 => 'Город Ярославль',
diff --git a/core/data/city-short.php b/core/data/city-short.php
new file mode 100644
index 0000000..bea4476
--- /dev/null
+++ b/core/data/city-short.php
@@ -0,0 +1,14 @@
+<?php
+
+$settings = array(
+    0 => '',
+    1 => 'г.',
+    2 => 'с.',
+    3 => 'п.',
+    4 => 'д.',
+    5 => 'пгт.',
+    6 => 'р.п.',
+    7 => 'ст.',
+    8 => 'а.'
+);
+
diff --git a/core/data/city.php b/core/data/city.php
index 360fadc..5fb0bef 100644
--- a/core/data/city.php
+++ b/core/data/city.php
@@ -1,8 +1,7 @@
 <?php
 
-global $TypeCity, $TypeCityShort;
 // Массив типов поселений
-$TypeCity = array(
+$settings = array(
 //    0 => '',
     1 => 'город',
     2 => 'село',
@@ -13,16 +12,3 @@ $TypeCity = array(
     7 => 'станица',
     8 => 'аул'
 );
-
-$TypeCityShort = array(
-    0 => '',
-    1 => 'г.',
-    2 => 'с.',
-    3 => 'п.',
-    4 => 'д.',
-    5 => 'пгт.',
-    6 => 'р.п.',
-    7 => 'ст.',
-    8 => 'а.'
-);
-
diff --git a/core/data/mime.php b/core/data/mime.php
index ade015f..be65117 100644
--- a/core/data/mime.php
+++ b/core/data/mime.php
@@ -3,7 +3,7 @@
  * http://www.w3schools.com/media/media_mimeref.asp
  */
 
-$_mime_type = array (
+$settings = array (
     "" => "application/octet-stream",
     "323" => "text/h323",
     "acx" => "application/internet-property-stream",
diff --git a/core/data/okato.php b/core/data/okato.php
index 7736c35..a066e66 100644
--- a/core/data/okato.php
+++ b/core/data/okato.php
@@ -2,7 +2,7 @@
 // В ОКАТО приняты следующие сокращения:
 // http://www.consultant.ru/online/base/?req=doc;base=LAW;n=62484
 
-$_okato = array (
+$settings = array (
     "р-н" => "район",
     "г"   => "город",
     "пгт" => "поселок городского типа",
diff --git a/core/data/regions.php b/core/data/regions.php
index 8bbea97..e2fb520 100644
--- a/core/data/regions.php
+++ b/core/data/regions.php
@@ -1,7 +1,6 @@
 <?php
 
-global $Regions;
-$Regions = array (
+$settings = array (
   0 => '',
   2 => 'Алтайский край',
   3 => 'Амурская область',
diff --git a/core/data/states.php b/core/data/states.php
index da33572..346cae4 100644
--- a/core/data/states.php
+++ b/core/data/states.php
@@ -1,6 +1,6 @@
 <?php
 
-$_states = array (
+$settings = array (
    0 => array('title' => ''),
    1 => array( 
           'title'   => 'Центральный федеральный округ',
@@ -30,6 +30,3 @@ $_states = array (
           'title'   => 'Приволжский федеральный округ',
           'short'   => 'ПФО',
           'regions' => array(23, 39, 43, 45, 46, 51, 56, 57, 60, 65, 66, 77, 78, 85)));
-
-$States = &$_states;
-