diff --git a/backend/controllers/BrandsController.php b/backend/controllers/BrandsController.php
index 4af9da2..a48d6a2 100755
--- a/backend/controllers/BrandsController.php
+++ b/backend/controllers/BrandsController.php
@@ -28,11 +28,11 @@ class BrandsController extends Controller
                 'class' => AccessControl::className(),
                 'rules' => [
                     [
-                        'actions' => ['login', 'error', 'download-photo','delete-image' ],
+                        'actions' => ['login', 'error', 'download-photo', 'delete-image'],
                         'allow' => true,
                     ],
                     [
-                        'actions' => ['logout', 'index','create','update','view','delete',],
+                        'actions' => ['logout', 'index', 'create', 'update', 'view', 'delete',],
                         'allow' => true,
                         'roles' => ['@'],
                     ],
@@ -82,8 +82,13 @@ class BrandsController extends Controller
     public function actionCreate()
     {
         $model = new Brands();
-
-        return $this->saveIMG( $model, 'create' );
+        if ($model->load(Yii::$app->request->post())) {
+            return $this->saveModelWithImg($model);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
 
     }
 
@@ -96,8 +101,20 @@ class BrandsController extends Controller
     public function actionUpdate($id)
     {
         $model = $this->findModel($id);
-
-        return $this->saveIMG( $model, 'update' );
+        if ($model->load(Yii::$app->request->post())) {
+
+            if ($model->delete_img) {
+                // удаляем изображение (как из базы так и с сервера), сохраняем модель
+                return $this->saveModelWithDeleteImg($model);
+            } else {
+                // сохраняем модель с сохранением изображения (как в базу так и на сервер)
+                return $this->saveModelWithImg($model);
+            }
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
 
     }
 
@@ -136,24 +153,42 @@ class BrandsController extends Controller
      * сохраняет картинку и валидирует модель
      * выбрасывает исключение в случае ошибки
      */
-    protected function saveIMG( $model, $action ){
-        if( $model->load(Yii::$app->request->post()) ) {
-            $model->file = UploadedFile::getInstance($model, 'file');
-            $model->IMG = $model->file->name;
-            // первый проход - валидируем, сохраняем файл,
-            if ( $model->validate() ) {
-                // сохраним файл
-                $model->file->saveAs( Yii::getAlias('@storage') . '/files/brands/' . $model->IMG );
-                if ( $model->save() ) {
-                    return $this->redirect(['index']);
-                }
+    protected function saveModelWithImg($model)
+    {
+        $model->file = UploadedFile::getInstance($model, 'file');
+        $model->IMG = $model->file->name;
+        // первый проход - валидируем, сохраняем файл,
+        if ($model->validate()) {
+            // сохраним файл
+            $model->file->saveAs(Yii::getAlias('@storage') . '/files/brands/' . $model->IMG);
+            if ($model->save()) {
+                return $this->redirect(['index']);
+            }
+        }
+        $model->throwStringErrorException();
+
+    }
+
+    /**
+     * @param $model
+     * @return \yii\web\Response
+     * сохраняет модель с удалением картинки
+     * выбрасывает исключение в случае ошибки
+     */
+    protected function saveModelWithDeleteImg($model)
+    {
+        if ($model->validate()) {
+            $img_path = Yii::getAlias('@storage') . '/files/brands/' . $model->IMG;
+            // удалим файл
+            if(file_exists( $img_path ))
+                unlink( $img_path );
+
+            $model->IMG = '';
+            if ($model->save()) {
+                return $this->redirect(['index']);
             }
-            $model->throwStringErrorException();
-        } else {
-            return $this->render($action, [
-                'model' => $model,
-            ]);
         }
+        $model->throwStringErrorException();
 
     }
 }
diff --git a/backend/controllers/CrossingUploadController.php b/backend/controllers/CrossingUploadController.php
index 68cfdad..107d0ac 100755
--- a/backend/controllers/CrossingUploadController.php
+++ b/backend/controllers/CrossingUploadController.php
@@ -100,7 +100,6 @@ class CrossingUploadController extends BaseController
         $model = DynamicFormHelper::CreateDynamicModel($arr_attributes);
         $crosses_model = new DetailsCrosses();
         $arr_keys = array_keys($this->getBasicColumns());
-
         //добавим правила валидации (колонки должны быть те что в модели)
         foreach ($arr_attributes as $key => $value) {
             $model->addRule($key, 'in', ['range' => $arr_keys]);
diff --git a/backend/controllers/ParserController.php b/backend/controllers/ParserController.php
index 242b64f..4ea6de8 100755
--- a/backend/controllers/ParserController.php
+++ b/backend/controllers/ParserController.php
@@ -224,13 +224,13 @@ class ParserController extends BaseController
                 $id = Yii::$app->request->post()['id'];
                 try {
                     $files_model->delete($id);
-                    if (file_exists( Yii::getAlias('@temp_upload') . '/' . $id . '.csv'  )) {
-                        unlink(Yii::getAlias('@temp_upload') . '/' . $id . '.csv' );
+                    $arr_supported_extension = Parser::supportedExtension();
+                    // получим список файлов которые ожидают к загрузке
+                    foreach ($arr_supported_extension as $ext) {
+                        if (file_exists(Yii::getAlias('@temp_upload') . '/' . $id . ".{$ext}")) {
+                            unlink(Yii::getAlias('@temp_upload') . '/' . $id . ".{$ext}");
+                        }
                     }
-                    if (file_exists( Yii::getAlias('@temp_upload') . '/' . $id . '.xlsx'  )) {
-                        unlink(Yii::getAlias('@temp_upload') . '/' . $id . '.xlsx' );
-                    }
-
                     // сообщим скрипту что все ОК
                     echo 1;
                 } catch (ErrorException  $e) {
diff --git a/backend/models/UploadFileCrossingForm.php b/backend/models/UploadFileCrossingForm.php
index 91bc7af..37ee930 100755
--- a/backend/models/UploadFileCrossingForm.php
+++ b/backend/models/UploadFileCrossingForm.php
@@ -27,7 +27,7 @@ class UploadFileCrossingForm extends Model
     {
         return [
             ['file', 'required', 'message' => 'Не выбран файл!' ],
-            [['file'], 'file', 'extensions' => 'csv', 'checkExtensionByMimeType'=>false ],
+            [['file'], 'file', 'extensions' => ['csv'], 'checkExtensionByMimeType'=>false ],
             [['delete_prefix1', 'delete_prefix2'], 'boolean' ],
 
         ];
diff --git a/backend/models/UploadFileParsingForm.php b/backend/models/UploadFileParsingForm.php
index 3ebdcaa..f9dc936 100755
--- a/backend/models/UploadFileParsingForm.php
+++ b/backend/models/UploadFileParsingForm.php
@@ -48,7 +48,7 @@ class UploadFileParsingForm extends Model
         return [
             ['importer_id', 'required', 'message' => 'Не указан поставщик!' ],
             ['file', 'required', 'message' => 'Не выбран файл!' ],
-            [['file'], 'file', 'extensions' => ['csv', 'xlsx'], 'checkExtensionByMimeType'=>false ],
+            [['file'], 'file', 'extensions' => ['csv', 'xlsx','txt','xls'], 'checkExtensionByMimeType'=>false ],
             ['importer_id', 'integer','max' => 999999, 'min' => 0 ],
             [['action','delete_prefix', 'delete_price', 'success'], 'boolean', 'except' => 'auto' ], // только для ручной загрузки
             ['delimiter', 'string', 'max' => 1],
diff --git a/backend/views/brands/_form.php b/backend/views/brands/_form.php
index 3807320..e17b523 100755
--- a/backend/views/brands/_form.php
+++ b/backend/views/brands/_form.php
@@ -25,9 +25,33 @@ use yii\widgets\ActiveForm;
             ]
         )
     ]); ?>
+
     <?= $form->field($model, 'if_oem')->checkbox() ?>
+
+<div class="container-fluid">
+    <fieldset>
+        <legend>Изображение</legend>
+    <div class="col-md-4">
     <?= $form->field($model, 'file')->fileInput()->label(false)->hint('имя файла должно иметь только латинские символы и цифры',['tag'=>'span'])?>
+    </div>
+
+    <div class="col-md-4">
+        <div>
+            <?php
+            if(!$model->isNewRecord && $model->IMG)
+                echo $form->field($model, 'delete_img')->checkbox();
+            ?>
+        </div>
 
+            <?php
+            if(!$model->isNewRecord && $model->IMG)
+                echo "Имя файла - $model->IMG";
+            ?>
+
+        </div>
+        <fieldset>
+
+</div>
 
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Редактировать', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
diff --git a/backend/views/brands/create.php b/backend/views/brands/create.php
index 2bf8d50..2561909 100755
--- a/backend/views/brands/create.php
+++ b/backend/views/brands/create.php
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\Brands */
 
-$this->title = 'Добавить Brands';
+$this->title = 'Добавить бренд';
 $this->params['breadcrumbs'][] = ['label' => 'Brands', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
diff --git a/backend/views/brands/index.php b/backend/views/brands/index.php
index e0b638f..b3db5f6 100755
--- a/backend/views/brands/index.php
+++ b/backend/views/brands/index.php
@@ -18,7 +18,7 @@ $img1 = '/storage/checkbox1.gif';
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
 
     <p>
-        <?= Html::a('Создать', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
 
     <?= GridView::widget([
diff --git a/backend/views/margins/_form.php b/backend/views/margins/_form.php
index 96833e4..25352b0 100755
--- a/backend/views/margins/_form.php
+++ b/backend/views/margins/_form.php
@@ -17,7 +17,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'koef')->textInput() ?>
 
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Обновить', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>
diff --git a/common/components/parsers/CsvParser.php b/common/components/parsers/CsvParser.php
index 1ab1d95..1724fcf 100644
--- a/common/components/parsers/CsvParser.php
+++ b/common/components/parsers/CsvParser.php
@@ -17,7 +17,7 @@ class CsvParser extends TableParser
 
 
     /**
-     * метод устанвливает нужные настройки объекта SplFileObject, для работы с csv
+     * метод устанавливает настройки конвертера
      */
     public function setup()
     {
diff --git a/common/components/parsers/ExcelReader/example.php b/common/components/parsers/ExcelReader/example.php
new file mode 100644
index 0000000..fa95080
--- /dev/null
+++ b/common/components/parsers/ExcelReader/example.php
@@ -0,0 +1,70 @@
+<?php
+// Test CVS
+
+require_once 'Excel/reader.php';
+
+
+// ExcelFile($filename, $encoding);
+$data = new Spreadsheet_Excel_Reader();
+
+
+// Set output Encoding.
+$data->setOutputEncoding('CP1251');
+
+/***
+* if you want you can change 'iconv' to mb_convert_encoding:
+* $data->setUTFEncoder('mb');
+*
+**/
+
+/***
+* By default rows & cols indeces start with 1
+* For change initial index use:
+* $data->setRowColOffset(0);
+*
+**/
+
+
+
+/***
+*  Some function for formatting output.
+* $data->setDefaultFormat('%.2f');
+* setDefaultFormat - set format for columns with unknown formatting
+*
+* $data->setColumnFormat(4, '%.3f');
+* setColumnFormat - set format for column (apply only to number fields)
+*
+**/
+
+$data->read('jxlrwtest.xls');
+
+/*
+
+
+ $data->sheets[0]['numRows'] - count rows
+ $data->sheets[0]['numCols'] - count columns
+ $data->sheets[0]['cells'][$i][$j] - data from $i-row $j-column
+
+ $data->sheets[0]['cellsInfo'][$i][$j] - extended info about cell
+    
+    $data->sheets[0]['cellsInfo'][$i][$j]['type'] = "date" | "number" | "unknown"
+        if 'type' == "unknown" - use 'raw' value, because  cell contain value with format '0.00';
+    $data->sheets[0]['cellsInfo'][$i][$j]['raw'] = value if cell without format 
+    $data->sheets[0]['cellsInfo'][$i][$j]['colspan'] 
+    $data->sheets[0]['cellsInfo'][$i][$j]['rowspan'] 
+*/
+
+error_reporting(E_ALL ^ E_NOTICE);
+
+for ($i = 1; $i <= $data->sheets[0]['numRows']; $i++) {
+	for ($j = 1; $j <= $data->sheets[0]['numCols']; $j++) {
+		echo "\"".$data->sheets[0]['cells'][$i][$j]."\",";
+	}
+	echo "\n";
+
+}
+
+
+//print_r($data);
+//print_r($data->formatRecords);
+?>
diff --git a/common/components/parsers/ExcelReader/example2.php b/common/components/parsers/ExcelReader/example2.php
new file mode 100644
index 0000000..ab9394c
--- /dev/null
+++ b/common/components/parsers/ExcelReader/example2.php
@@ -0,0 +1,206 @@
+<?
+$allow_url_override = 1; // Set to 0 to not allow changed VIA POST or GET
+if(!$allow_url_override || !isset($file_to_include))
+{
+	$file_to_include = "jxlrwtest.xls";
+}
+if(!$allow_url_override || !isset($max_rows))
+{
+	$max_rows = 0; //USE 0 for no max
+}
+if(!$allow_url_override || !isset($max_cols))
+{
+	$max_cols = 5; //USE 0 for no max
+}
+if(!$allow_url_override || !isset($debug))
+{
+	$debug = 0;  //1 for on 0 for off
+}
+if(!$allow_url_override || !isset($force_nobr))
+{
+	$force_nobr = 1;  //Force the info in cells not to wrap unless stated explicitly (newline)
+}
+
+require_once 'Excel/reader.php';
+$data = new Spreadsheet_Excel_Reader();
+$data->setOutputEncoding('CPa25a');
+$data->read($file_to_include);
+error_reporting(E_ALL ^ E_NOTICE);
+echo "
+<STYLE>
+.table_data
+{
+	border-style:ridge;
+	border-width:1;
+}
+.tab_base
+{
+	background:#C5D0DD;
+	font-weight:bold;
+	border-style:ridge;
+	border-width:1;
+	cursor:pointer;
+}
+.table_sub_heading
+{
+	background:#CCCCCC;
+	font-weight:bold;
+	border-style:ridge;
+	border-width:1;
+}
+.table_body
+{
+	background:#F0F0F0;
+	font-wieght:normal;
+	font-size:12;
+	font-family:sans-serif;
+	border-style:ridge;
+	border-width:1;
+	border-spacing: 0px;
+	border-collapse: collapse;
+}
+.tab_loaded
+{
+	background:#222222;
+	color:white;
+	font-weight:bold;
+	border-style:groove;
+	border-width:1;
+	cursor:pointer;
+}
+</STYLE>
+";
+function make_alpha_from_numbers($number)
+{
+	$numeric = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+	if($number<strlen($numeric))
+	{
+		return $numeric[$number];
+	}
+	else
+	{
+		$dev_by = floor($number/strlen($numeric));
+		return "" . make_alpha_from_numbers($dev_by-1) . make_alpha_from_numbers($number-($dev_by*strlen($numeric)));
+	}
+}
+echo "<SCRIPT LANGUAGE='JAVASCRIPT'>
+var sheet_HTML = Array();\n";
+for($sheet=0;$sheet<count($data->sheets);$sheet++)
+{
+	$table_output[$sheet] .= "<TABLE CLASS='table_body'>
+	<TR>
+		<TD>&nbsp;</TD>";
+	for($i=0;$i<$data->sheets[$sheet]['numCols']&&($i<=$max_cols||$max_cols==0);$i++)
+	{
+		$table_output[$sheet] .= "<TD CLASS='table_sub_heading' ALIGN=CENTER>" . make_alpha_from_numbers($i) . "</TD>";
+	}
+	for($row=1;$row<=$data->sheets[$sheet]['numRows']&&($row<=$max_rows||$max_rows==0);$row++)
+	{
+		$table_output[$sheet] .= "<TR><TD CLASS='table_sub_heading'>" . $row . "</TD>";
+		for($col=1;$col<=$data->sheets[$sheet]['numCols']&&($col<=$max_cols||$max_cols==0);$col++)
+		{
+			if($data->sheets[$sheet]['cellsInfo'][$row][$col]['colspan'] >=1 && $data->sheets[$sheet]['cellsInfo'][$row][$col]['rowspan'] >=1)
+			{
+				$this_cell_colspan = " COLSPAN=" . $data->sheets[$sheet]['cellsInfo'][$row][$col]['colspan'];
+				$this_cell_rowspan = " ROWSPAN=" . $data->sheets[$sheet]['cellsInfo'][$row][$col]['rowspan'];
+				for($i=1;$i<$data->sheets[$sheet]['cellsInfo'][$row][$col]['colspan'];$i++)
+				{
+					$data->sheets[$sheet]['cellsInfo'][$row][$col+$i]['dontprint']=1;
+				}
+				for($i=1;$i<$data->sheets[$sheet]['cellsInfo'][$row][$col]['rowspan'];$i++)
+				{
+					for($j=0;$j<$data->sheets[$sheet]['cellsInfo'][$row][$col]['colspan'];$j++)
+					{
+						$data->sheets[$sheet]['cellsInfo'][$row+$i][$col+$j]['dontprint']=1;
+					}
+				}
+			}
+			else if($data->sheets[$sheet]['cellsInfo'][$row][$col]['colspan'] >=1)
+			{
+				$this_cell_colspan = " COLSPAN=" . $data->sheets[$sheet]['cellsInfo'][$row][$col]['colspan'];
+				$this_cell_rowspan = "";
+				for($i=1;$i<$data->sheets[$sheet]['cellsInfo'][$row][$col]['colspan'];$i++)
+				{
+					$data->sheets[$sheet]['cellsInfo'][$row][$col+$i]['dontprint']=1;
+				}
+			}
+			else if($data->sheets[$sheet]['cellsInfo'][$row][$col]['rowspan'] >=1)
+			{
+				$this_cell_colspan = "";
+				$this_cell_rowspan = " ROWSPAN=" . $data->sheets[$sheet]['cellsInfo'][$row][$col]['rowspan'];
+				for($i=1;$i<$data->sheets[$sheet]['cellsInfo'][$row][$col]['rowspan'];$i++)
+				{
+					$data->sheets[$sheet]['cellsInfo'][$row+$i][$col]['dontprint']=1;
+				}
+			}
+			else
+			{
+				$this_cell_colspan = "";
+				$this_cell_rowspan = "";
+			}
+			if(!($data->sheets[$sheet]['cellsInfo'][$row][$col]['dontprint']))
+			{
+				$table_output[$sheet] .= "<TD CLASS='table_data' $this_cell_colspan $this_cell_rowspan>&nbsp;";
+				if($force_nobr)
+				{
+					$table_output[$sheet] .= "<NOBR>";
+				}
+				$table_output[$sheet] .= nl2br(htmlentities($data->sheets[$sheet]['cells'][$row][$col]));
+				if($force_nobr)
+				{
+					$table_output[$sheet] .= "</NOBR>";
+				}
+				$table_output[$sheet] .= "</TD>";
+			}
+		}
+		$table_output[$sheet] .= "</TR>";
+	}
+	$table_output[$sheet] .= "</TABLE>";
+	$table_output[$sheet] = str_replace("\n","",$table_output[$sheet]);
+	$table_output[$sheet] = str_replace("\r","",$table_output[$sheet]);
+	$table_output[$sheet] = str_replace("\t"," ",$table_output[$sheet]);
+	if($debug)
+	{
+		$debug_output = print_r($data->sheets[$sheet],true);
+		$debug_output = str_replace("\n","\\n",$debug_output);
+		$debug_output = str_replace("\r","\\r",$debug_output);
+		$table_output[$sheet] .= "<PRE>$debug_output</PRE>";
+	}
+	echo "sheet_HTML[$sheet] = \"$table_output[$sheet]\";\n";
+}
+echo "
+function change_tabs(sheet)
+{
+	//alert('sheet_tab_' + sheet);
+	for(i=0;i<" , count($data->sheets) , ";i++)
+	{
+		document.getElementById('sheet_tab_' + i).className = 'tab_base';
+	}
+	document.getElementById('table_loader_div').innerHTML=sheet_HTML[sheet];
+	document.getElementById('sheet_tab_' + sheet).className = 'tab_loaded';
+
+}
+</SCRIPT>";
+echo "
+<TABLE CLASS='table_body' NAME='tab_table'>
+<TR>";
+for($sheet=0;$sheet<count($data->sheets);$sheet++)
+{
+	echo "<TD CLASS='tab_base' ID='sheet_tab_$sheet' ALIGN=CENTER
+		ONMOUSEDOWN=\"change_tabs($sheet);\">", $data->boundsheets[$sheet]['name'] , "</TD>";
+}
+
+echo 
+"<TR>";
+echo "</TABLE>
+<DIV ID=table_loader_div></DIV>
+<SCRIPT LANGUAGE='JavaScript'>
+change_tabs(0);
+</SCRIPT>";
+//echo "<IFRAME NAME=table_loader_iframe SRC='about:blank' WIDTH=100 HEIGHT=100></IFRAME>";
+/*
+echo "<PRE>";
+print_r($data);
+echo "</PRE>";
+*/
+?>
\ No newline at end of file
diff --git a/common/components/parsers/ExcelReader/oleread.inc b/common/components/parsers/ExcelReader/oleread.inc
new file mode 100644
index 0000000..0ac868a
--- /dev/null
+++ b/common/components/parsers/ExcelReader/oleread.inc
@@ -0,0 +1,271 @@
+<?php
+define('NUM_BIG_BLOCK_DEPOT_BLOCKS_POS', 0x2c);
+define('SMALL_BLOCK_DEPOT_BLOCK_POS', 0x3c);
+define('ROOT_START_BLOCK_POS', 0x30);
+define('BIG_BLOCK_SIZE', 0x200);
+define('SMALL_BLOCK_SIZE', 0x40);
+define('EXTENSION_BLOCK_POS', 0x44);
+define('NUM_EXTENSION_BLOCK_POS', 0x48);
+define('PROPERTY_STORAGE_BLOCK_SIZE', 0x80);
+define('BIG_BLOCK_DEPOT_BLOCKS_POS', 0x4c);
+define('SMALL_BLOCK_THRESHOLD', 0x1000);
+// property storage offsets
+define('SIZE_OF_NAME_POS', 0x40);
+define('TYPE_POS', 0x42);
+define('START_BLOCK_POS', 0x74);
+define('SIZE_POS', 0x78);
+define('IDENTIFIER_OLE', pack("CCCCCCCC",0xd0,0xcf,0x11,0xe0,0xa1,0xb1,0x1a,0xe1));
+
+//echo 'ROOT_START_BLOCK_POS = '.ROOT_START_BLOCK_POS."\n";
+
+//echo bin2hex($data[ROOT_START_BLOCK_POS])."\n";
+//echo "a=";
+//echo $data[ROOT_START_BLOCK_POS];
+//function log
+
+function GetInt4d($data, $pos)
+{
+	$value = ord($data[$pos]) | (ord($data[$pos+1])	<< 8) | (ord($data[$pos+2]) << 16) | (ord($data[$pos+3]) << 24);
+	if ($value>=4294967294)
+	{
+		$value=-2;
+	}
+	return $value;
+}
+
+
+class OLERead {
+    var $data = '';
+    
+    
+    function OLERead(){
+        
+        
+    }
+    
+    function read($sFileName){
+        
+    	// check if file exist and is readable (Darko Miljanovic)
+    	if(!is_readable($sFileName)) {
+    		$this->error = 1;
+    		return false;
+    	}
+    	
+    	$this->data = @file_get_contents($sFileName);
+    	if (!$this->data) { 
+    		$this->error = 1; 
+    		return false; 
+   		}
+   		//echo IDENTIFIER_OLE;
+   		//echo 'start';
+   		if (substr($this->data, 0, 8) != IDENTIFIER_OLE) {
+    		$this->error = 1; 
+    		return false; 
+   		}
+        $this->numBigBlockDepotBlocks = GetInt4d($this->data, NUM_BIG_BLOCK_DEPOT_BLOCKS_POS);
+        $this->sbdStartBlock = GetInt4d($this->data, SMALL_BLOCK_DEPOT_BLOCK_POS);
+        $this->rootStartBlock = GetInt4d($this->data, ROOT_START_BLOCK_POS);
+        $this->extensionBlock = GetInt4d($this->data, EXTENSION_BLOCK_POS);
+        $this->numExtensionBlocks = GetInt4d($this->data, NUM_EXTENSION_BLOCK_POS);
+        
+	/*
+        echo $this->numBigBlockDepotBlocks." ";
+        echo $this->sbdStartBlock." ";
+        echo $this->rootStartBlock." ";
+        echo $this->extensionBlock." ";
+        echo $this->numExtensionBlocks." ";
+        */
+        //echo "sbdStartBlock = $this->sbdStartBlock\n";
+        $bigBlockDepotBlocks = array();
+        $pos = BIG_BLOCK_DEPOT_BLOCKS_POS;
+       // echo "pos = $pos";
+	$bbdBlocks = $this->numBigBlockDepotBlocks;
+        
+            if ($this->numExtensionBlocks != 0) {
+                $bbdBlocks = (BIG_BLOCK_SIZE - BIG_BLOCK_DEPOT_BLOCKS_POS)/4; 
+            }
+        
+        for ($i = 0; $i < $bbdBlocks; $i++) {
+              $bigBlockDepotBlocks[$i] = GetInt4d($this->data, $pos);
+              $pos += 4;
+        }
+        
+        
+        for ($j = 0; $j < $this->numExtensionBlocks; $j++) {
+            $pos = ($this->extensionBlock + 1) * BIG_BLOCK_SIZE;
+            $blocksToRead = min($this->numBigBlockDepotBlocks - $bbdBlocks, BIG_BLOCK_SIZE / 4 - 1);
+
+            for ($i = $bbdBlocks; $i < $bbdBlocks + $blocksToRead; $i++) {
+                $bigBlockDepotBlocks[$i] = GetInt4d($this->data, $pos);
+                $pos += 4;
+            }   
+
+            $bbdBlocks += $blocksToRead;
+            if ($bbdBlocks < $this->numBigBlockDepotBlocks) {
+                $this->extensionBlock = GetInt4d($this->data, $pos);
+            }
+        }
+
+       // var_dump($bigBlockDepotBlocks);
+        
+        // readBigBlockDepot
+        $pos = 0;
+        $index = 0;
+        $this->bigBlockChain = array();
+        
+        for ($i = 0; $i < $this->numBigBlockDepotBlocks; $i++) {
+            $pos = ($bigBlockDepotBlocks[$i] + 1) * BIG_BLOCK_SIZE;
+            //echo "pos = $pos";	
+            for ($j = 0 ; $j < BIG_BLOCK_SIZE / 4; $j++) {
+                $this->bigBlockChain[$index] = GetInt4d($this->data, $pos);
+                $pos += 4 ;
+                $index++;
+            }
+        }
+
+	//var_dump($this->bigBlockChain);
+        //echo '=====2';
+        // readSmallBlockDepot();
+        $pos = 0;
+	    $index = 0;
+	    $sbdBlock = $this->sbdStartBlock;
+	    $this->smallBlockChain = array();
+	
+	    while ($sbdBlock != -2) {
+	
+	      $pos = ($sbdBlock + 1) * BIG_BLOCK_SIZE;
+	
+	      for ($j = 0; $j < BIG_BLOCK_SIZE / 4; $j++) {
+	        $this->smallBlockChain[$index] = GetInt4d($this->data, $pos);
+	        $pos += 4;
+	        $index++;
+	      }
+	
+	      $sbdBlock = $this->bigBlockChain[$sbdBlock];
+	    }
+
+        
+        // readData(rootStartBlock)
+        $block = $this->rootStartBlock;
+        $pos = 0;
+        $this->entry = $this->__readData($block);
+        
+        /*
+        while ($block != -2)  {
+            $pos = ($block + 1) * BIG_BLOCK_SIZE;
+            $this->entry = $this->entry.substr($this->data, $pos, BIG_BLOCK_SIZE);
+            $block = $this->bigBlockChain[$block];
+        }
+        */
+        //echo '==='.$this->entry."===";
+        $this->__readPropertySets();
+
+    }
+    
+     function __readData($bl) {
+        $block = $bl;
+        $pos = 0;
+        $data = '';
+        
+        while ($block != -2)  {
+            $pos = ($block + 1) * BIG_BLOCK_SIZE;
+            $data = $data.substr($this->data, $pos, BIG_BLOCK_SIZE);
+            //echo "pos = $pos data=$data\n";	
+	    $block = $this->bigBlockChain[$block];
+        }
+		return $data;
+     }
+        
+    function __readPropertySets(){
+        $offset = 0;
+        //var_dump($this->entry);
+        while ($offset < strlen($this->entry)) {
+              $d = substr($this->entry, $offset, PROPERTY_STORAGE_BLOCK_SIZE);
+            
+              $nameSize = ord($d[SIZE_OF_NAME_POS]) | (ord($d[SIZE_OF_NAME_POS+1]) << 8);
+              
+              $type = ord($d[TYPE_POS]);
+              //$maxBlock = strlen($d) / BIG_BLOCK_SIZE - 1;
+        
+              $startBlock = GetInt4d($d, START_BLOCK_POS);
+              $size = GetInt4d($d, SIZE_POS);
+        
+            $name = '';
+            for ($i = 0; $i < $nameSize ; $i++) {
+              $name .= $d[$i];
+            }
+            
+            $name = str_replace("\x00", "", $name);
+            
+            $this->props[] = array (
+                'name' => $name, 
+                'type' => $type,
+                'startBlock' => $startBlock,
+                'size' => $size);
+
+            if (($name == "Workbook") || ($name == "Book")) {
+                $this->wrkbook = count($this->props) - 1;
+            }
+
+            if ($name == "Root Entry") {
+                $this->rootentry = count($this->props) - 1;
+            }
+            
+            //echo "name ==$name=\n";
+
+            
+            $offset += PROPERTY_STORAGE_BLOCK_SIZE;
+        }   
+        
+    }
+    
+    
+    function getWorkBook(){
+    	if ($this->props[$this->wrkbook]['size'] < SMALL_BLOCK_THRESHOLD){
+//    	  getSmallBlockStream(PropertyStorage ps)
+
+			$rootdata = $this->__readData($this->props[$this->rootentry]['startBlock']);
+	        
+			$streamData = '';
+	        $block = $this->props[$this->wrkbook]['startBlock'];
+	        //$count = 0;
+	        $pos = 0;
+		    while ($block != -2) {
+      	          $pos = $block * SMALL_BLOCK_SIZE;
+		          $streamData .= substr($rootdata, $pos, SMALL_BLOCK_SIZE);
+
+			      $block = $this->smallBlockChain[$block];
+		    }
+			
+		    return $streamData;
+    		
+
+    	}else{
+    	
+	        $numBlocks = $this->props[$this->wrkbook]['size'] / BIG_BLOCK_SIZE;
+	        if ($this->props[$this->wrkbook]['size'] % BIG_BLOCK_SIZE != 0) {
+	            $numBlocks++;
+	        }
+	        
+	        if ($numBlocks == 0) return '';
+	        
+	        //echo "numBlocks = $numBlocks\n";
+	    //byte[] streamData = new byte[numBlocks * BIG_BLOCK_SIZE];
+	        //print_r($this->wrkbook);
+	        $streamData = '';
+	        $block = $this->props[$this->wrkbook]['startBlock'];
+	        //$count = 0;
+	        $pos = 0;
+	        //echo "block = $block";
+	        while ($block != -2) {
+	          $pos = ($block + 1) * BIG_BLOCK_SIZE;
+	          $streamData .= substr($this->data, $pos, BIG_BLOCK_SIZE);
+	          $block = $this->bigBlockChain[$block];
+	        }   
+	        //echo 'stream'.$streamData;
+	        return $streamData;
+    	}
+    }
+    
+}
+?>
\ No newline at end of file
diff --git a/common/components/parsers/ExcelReader/reader.php b/common/components/parsers/ExcelReader/reader.php
new file mode 100644
index 0000000..f61fb58
--- /dev/null
+++ b/common/components/parsers/ExcelReader/reader.php
@@ -0,0 +1,1085 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+* A class for reading Microsoft Excel Spreadsheets.
+*
+* Originally developed by Vadim Tkachenko under the name PHPExcelReader.
+* (http://sourceforge.net/projects/phpexcelreader)
+* Based on the Java version by Andy Khan (http://www.andykhan.com).  Now
+* maintained by David Sanders.  Reads only Biff 7 and Biff 8 formats.
+*
+* PHP versions 4 and 5
+*
+* LICENSE: This source file is subject to version 3.0 of the PHP license
+* that is available through the world-wide-web at the following URI:
+* http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+* the PHP License and are unable to obtain it through the web, please
+* send a note to license@php.net so we can mail you a copy immediately.
+*
+* @category   Spreadsheet
+* @package    Spreadsheet_Excel_Reader
+* @author     Vadim Tkachenko <vt@apachephp.com>
+* @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+* @version    CVS: $Id: reader.php 19 2007-03-13 12:42:41Z shangxiao $
+* @link       http://pear.php.net/package/Spreadsheet_Excel_Reader
+* @see        OLE, Spreadsheet_Excel_Writer
+*/
+
+
+//require_once 'PEAR.php';
+//require_once 'Spreadsheet/Excel/Reader/OLERead.php';
+require_once 'oleread.inc';
+//require_once 'OLE.php';
+
+define('SPREADSHEET_EXCEL_READER_BIFF8',             0x600);
+define('SPREADSHEET_EXCEL_READER_BIFF7',             0x500);
+define('SPREADSHEET_EXCEL_READER_WORKBOOKGLOBALS',   0x5);
+define('SPREADSHEET_EXCEL_READER_WORKSHEET',         0x10);
+
+define('SPREADSHEET_EXCEL_READER_TYPE_BOF',          0x809);
+define('SPREADSHEET_EXCEL_READER_TYPE_EOF',          0x0a);
+define('SPREADSHEET_EXCEL_READER_TYPE_BOUNDSHEET',   0x85);
+define('SPREADSHEET_EXCEL_READER_TYPE_DIMENSION',    0x200);
+define('SPREADSHEET_EXCEL_READER_TYPE_ROW',          0x208);
+define('SPREADSHEET_EXCEL_READER_TYPE_DBCELL',       0xd7);
+define('SPREADSHEET_EXCEL_READER_TYPE_FILEPASS',     0x2f);
+define('SPREADSHEET_EXCEL_READER_TYPE_NOTE',         0x1c);
+define('SPREADSHEET_EXCEL_READER_TYPE_TXO',          0x1b6);
+define('SPREADSHEET_EXCEL_READER_TYPE_RK',           0x7e);
+define('SPREADSHEET_EXCEL_READER_TYPE_RK2',          0x27e);
+define('SPREADSHEET_EXCEL_READER_TYPE_MULRK',        0xbd);
+define('SPREADSHEET_EXCEL_READER_TYPE_MULBLANK',     0xbe);
+define('SPREADSHEET_EXCEL_READER_TYPE_INDEX',        0x20b);
+define('SPREADSHEET_EXCEL_READER_TYPE_SST',          0xfc);
+define('SPREADSHEET_EXCEL_READER_TYPE_EXTSST',       0xff);
+define('SPREADSHEET_EXCEL_READER_TYPE_CONTINUE',     0x3c);
+define('SPREADSHEET_EXCEL_READER_TYPE_LABEL',        0x204);
+define('SPREADSHEET_EXCEL_READER_TYPE_LABELSST',     0xfd);
+define('SPREADSHEET_EXCEL_READER_TYPE_NUMBER',       0x203);
+define('SPREADSHEET_EXCEL_READER_TYPE_NAME',         0x18);
+define('SPREADSHEET_EXCEL_READER_TYPE_ARRAY',        0x221);
+define('SPREADSHEET_EXCEL_READER_TYPE_STRING',       0x207);
+define('SPREADSHEET_EXCEL_READER_TYPE_FORMULA',      0x406);
+define('SPREADSHEET_EXCEL_READER_TYPE_FORMULA2',     0x6);
+define('SPREADSHEET_EXCEL_READER_TYPE_FORMAT',       0x41e);
+define('SPREADSHEET_EXCEL_READER_TYPE_XF',           0xe0);
+define('SPREADSHEET_EXCEL_READER_TYPE_BOOLERR',      0x205);
+define('SPREADSHEET_EXCEL_READER_TYPE_UNKNOWN',      0xffff);
+define('SPREADSHEET_EXCEL_READER_TYPE_NINETEENFOUR', 0x22);
+define('SPREADSHEET_EXCEL_READER_TYPE_MERGEDCELLS',  0xE5);
+
+define('SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS' ,    25569);
+define('SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS1904', 24107);
+define('SPREADSHEET_EXCEL_READER_MSINADAY',          86400);
+//define('SPREADSHEET_EXCEL_READER_MSINADAY', 24 * 60 * 60);
+
+//define('SPREADSHEET_EXCEL_READER_DEF_NUM_FORMAT', "%.2f");
+define('SPREADSHEET_EXCEL_READER_DEF_NUM_FORMAT',    "%s");
+
+
+/*
+* Place includes, constant defines and $_GLOBAL settings here.
+* Make sure they have appropriate docblocks to avoid phpDocumentor
+* construing they are documented by the page-level docblock.
+*/
+
+/**
+* A class for reading Microsoft Excel Spreadsheets.
+*
+* Originally developed by Vadim Tkachenko under the name PHPExcelReader.
+* (http://sourceforge.net/projects/phpexcelreader)
+* Based on the Java version by Andy Khan (http://www.andykhan.com).  Now
+* maintained by David Sanders.  Reads only Biff 7 and Biff 8 formats.
+*
+* @category   Spreadsheet
+* @package    Spreadsheet_Excel_Reader
+* @author     Vadim Tkachenko <vt@phpapache.com>
+* @copyright  1997-2005 The PHP Group
+* @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+* @version    Release: @package_version@
+* @link       http://pear.php.net/package/PackageName
+* @see        OLE, Spreadsheet_Excel_Writer
+*/
+class Spreadsheet_Excel_Reader
+{
+    /**
+     * Array of worksheets found
+     *
+     * @var array
+     * @access public
+     */
+    var $boundsheets = array();
+
+    /**
+     * Array of format records found
+     * 
+     * @var array
+     * @access public
+     */
+    var $formatRecords = array();
+
+    /**
+     * todo
+     *
+     * @var array
+     * @access public
+     */
+    var $sst = array();
+
+    /**
+     * Array of worksheets
+     *
+     * The data is stored in 'cells' and the meta-data is stored in an array
+     * called 'cellsInfo'
+     *
+     * Example:
+     *
+     * $sheets  -->  'cells'  -->  row --> column --> Interpreted value
+     *          -->  'cellsInfo' --> row --> column --> 'type' - Can be 'date', 'number', or 'unknown'
+     *                                            --> 'raw' - The raw data that Excel stores for that data cell
+     *
+     * @var array
+     * @access public
+     */
+    var $sheets = array();
+
+    /**
+     * The data returned by OLE
+     *
+     * @var string
+     * @access public
+     */
+    var $data;
+
+    /**
+     * OLE object for reading the file
+     *
+     * @var OLE object
+     * @access private
+     */
+    var $_ole;
+
+    /**
+     * Default encoding
+     *
+     * @var string
+     * @access private
+     */
+    var $_defaultEncoding;
+
+    /**
+     * Default number format
+     *
+     * @var integer
+     * @access private
+     */
+    var $_defaultFormat = SPREADSHEET_EXCEL_READER_DEF_NUM_FORMAT;
+
+    /**
+     * todo
+     * List of formats to use for each column
+     *
+     * @var array
+     * @access private
+     */
+    var $_columnsFormat = array();
+
+    /**
+     * todo
+     *
+     * @var integer
+     * @access private
+     */
+    var $_rowoffset = 1;
+
+    /**
+     * todo
+     *
+     * @var integer
+     * @access private
+     */
+    var $_coloffset = 1;
+
+    /**
+     * List of default date formats used by Excel
+     *
+     * @var array
+     * @access public
+     */
+    var $dateFormats = array (
+        0xe => "d/m/Y",
+        0xf => "d-M-Y",
+        0x10 => "d-M",
+        0x11 => "M-Y",
+        0x12 => "h:i a",
+        0x13 => "h:i:s a",
+        0x14 => "H:i",
+        0x15 => "H:i:s",
+        0x16 => "d/m/Y H:i",
+        0x2d => "i:s",
+        0x2e => "H:i:s",
+        0x2f => "i:s.S");
+
+    /**
+     * Default number formats used by Excel
+     *
+     * @var array
+     * @access public
+     */
+    var $numberFormats = array(
+        0x1 => "%1.0f",     // "0"
+        0x2 => "%1.2f",     // "0.00",
+        0x3 => "%1.0f",     //"#,##0",
+        0x4 => "%1.2f",     //"#,##0.00",
+        0x5 => "%1.0f",     /*"$#,##0;($#,##0)",*/
+        0x6 => '$%1.0f',    /*"$#,##0;($#,##0)",*/
+        0x7 => '$%1.2f',    //"$#,##0.00;($#,##0.00)",
+        0x8 => '$%1.2f',    //"$#,##0.00;($#,##0.00)",
+        0x9 => '%1.0f%%',   // "0%"
+        0xa => '%1.2f%%',   // "0.00%"
+        0xb => '%1.2f',     // 0.00E00",
+        0x25 => '%1.0f',    // "#,##0;(#,##0)",
+        0x26 => '%1.0f',    //"#,##0;(#,##0)",
+        0x27 => '%1.2f',    //"#,##0.00;(#,##0.00)",
+        0x28 => '%1.2f',    //"#,##0.00;(#,##0.00)",
+        0x29 => '%1.0f',    //"#,##0;(#,##0)",
+        0x2a => '$%1.0f',   //"$#,##0;($#,##0)",
+        0x2b => '%1.2f',    //"#,##0.00;(#,##0.00)",
+        0x2c => '$%1.2f',   //"$#,##0.00;($#,##0.00)",
+        0x30 => '%1.0f');   //"##0.0E0";
+
+    // }}}
+    // {{{ Spreadsheet_Excel_Reader()
+
+    /**
+     * Constructor
+     *
+     * Some basic initialisation
+     */ 
+    function Spreadsheet_Excel_Reader()
+    {
+        $this->_ole =& new OLERead();
+        $this->setUTFEncoder('iconv');
+    }
+
+    // }}}
+    // {{{ setOutputEncoding()
+
+    /**
+     * Set the encoding method
+     *
+     * @param string Encoding to use
+     * @access public
+     */
+    function setOutputEncoding($encoding)
+    {
+        $this->_defaultEncoding = $encoding;
+    }
+
+    // }}}
+    // {{{ setUTFEncoder()
+
+    /**
+     *  $encoder = 'iconv' or 'mb'
+     *  set iconv if you would like use 'iconv' for encode UTF-16LE to your encoding
+     *  set mb if you would like use 'mb_convert_encoding' for encode UTF-16LE to your encoding
+     *
+     * @access public
+     * @param string Encoding type to use.  Either 'iconv' or 'mb'
+     */
+    function setUTFEncoder($encoder = 'iconv')
+    {
+        $this->_encoderFunction = '';
+
+        if ($encoder == 'iconv') {
+            $this->_encoderFunction = function_exists('iconv') ? 'iconv' : '';
+        } elseif ($encoder == 'mb') {
+            $this->_encoderFunction = function_exists('mb_convert_encoding') ?
+                                      'mb_convert_encoding' :
+                                      '';
+        }
+    }
+
+    // }}}
+    // {{{ setRowColOffset()
+
+    /**
+     * todo
+     *
+     * @access public
+     * @param offset
+     */
+    function setRowColOffset($iOffset)
+    {
+        $this->_rowoffset = $iOffset;
+        $this->_coloffset = $iOffset;
+    }
+
+    // }}}
+    // {{{ setDefaultFormat()
+
+    /**
+     * Set the default number format
+     *
+     * @access public
+     * @param Default format
+     */
+    function setDefaultFormat($sFormat)
+    {
+        $this->_defaultFormat = $sFormat;
+    }
+
+    // }}}
+    // {{{ setColumnFormat()
+
+    /**
+     * Force a column to use a certain format
+     *
+     * @access public
+     * @param integer Column number
+     * @param string Format
+     */
+    function setColumnFormat($column, $sFormat)
+    {
+        $this->_columnsFormat[$column] = $sFormat;
+    }
+
+
+    // }}}
+    // {{{ read()
+
+    /**
+     * Read the spreadsheet file using OLE, then parse
+     *
+     * @access public
+     * @param filename
+     * @todo return a valid value
+     */
+    function read($sFileName)
+    {
+    /*
+        require_once 'OLE.php';
+        $ole = new OLE();
+        $ole->read($sFileName);
+
+        foreach ($ole->_list as $i => $pps) {
+            if (($pps->Name == 'Workbook' || $pps->Name == 'Book') &&
+                $pps->Size >= SMALL_BLOCK_THRESHOLD) {
+
+                $this->data = $ole->getData($i, 0, $ole->getDataLength($i));
+            } elseif ($pps->Name == 'Root Entry') {
+                $this->data = $ole->getData($i, 0, $ole->getDataLength($i));
+            }
+            //var_dump(strlen($ole->getData($i, 0, $ole->getDataLength($i))), $pps->Name, md5($this->data), $ole->getDataLength($i));
+        }
+//exit;
+        $this->_parse();
+
+        return sizeof($this->sheets) > 0;
+    */
+
+        $res = $this->_ole->read($sFileName);
+
+        // oops, something goes wrong (Darko Miljanovic)
+        if($res === false) {
+            // check error code
+            if($this->_ole->error == 1) {
+            // bad file
+                die('The filename ' . $sFileName . ' is not readable');
+            }
+            // check other error codes here (eg bad fileformat, etc...)
+        }
+
+        $this->data = $this->_ole->getWorkBook();
+
+
+        /*
+        $res = $this->_ole->read($sFileName);
+
+        if ($this->isError($res)) {
+//        var_dump($res);
+            return $this->raiseError($res);
+        }
+
+        $total = $this->_ole->ppsTotal();
+        for ($i = 0; $i < $total; $i++) {
+            if ($this->_ole->isFile($i)) {
+                $type = unpack("v", $this->_ole->getData($i, 0, 2));
+                if ($type[''] == 0x0809)  { // check if it's a BIFF stream
+                    $this->_index = $i;
+                    $this->data = $this->_ole->getData($i, 0, $this->_ole->getDataLength($i));
+                    break;
+                }
+            }
+        }
+
+        if ($this->_index === null) {
+            return $this->raiseError("$file doesn't seem to be an Excel file");
+        }
+
+        */
+
+    //echo "data =".$this->data;
+        //$this->readRecords();
+        $this->_parse();
+    }
+
+
+    // }}}
+    // {{{ _parse()
+
+    /**
+     * Parse a workbook
+     *
+     * @access private
+     * @return bool
+     */
+    function _parse()
+    {
+        $pos = 0;
+
+        $code = ord($this->data[$pos]) | ord($this->data[$pos+1])<<8;
+        $length = ord($this->data[$pos+2]) | ord($this->data[$pos+3])<<8;
+
+        $version = ord($this->data[$pos + 4]) | ord($this->data[$pos + 5])<<8;
+        $substreamType = ord($this->data[$pos + 6]) | ord($this->data[$pos + 7])<<8;
+        //echo "Start parse code=".base_convert($code,10,16)." version=".base_convert($version,10,16)." substreamType=".base_convert($substreamType,10,16).""."\n";
+
+        if (($version != SPREADSHEET_EXCEL_READER_BIFF8) &&
+            ($version != SPREADSHEET_EXCEL_READER_BIFF7)) {
+            return false;
+        }
+
+        if ($substreamType != SPREADSHEET_EXCEL_READER_WORKBOOKGLOBALS){
+            return false;
+        }
+
+        //print_r($rec);
+        $pos += $length + 4;
+
+        $code = ord($this->data[$pos]) | ord($this->data[$pos+1])<<8;
+        $length = ord($this->data[$pos+2]) | ord($this->data[$pos+3])<<8;
+
+        while ($code != SPREADSHEET_EXCEL_READER_TYPE_EOF) {
+            switch ($code) {
+                case SPREADSHEET_EXCEL_READER_TYPE_SST:
+                    //echo "Type_SST\n";
+                     $spos = $pos + 4;
+                     $limitpos = $spos + $length;
+                     $uniqueStrings = $this->_GetInt4d($this->data, $spos+4);
+                                                $spos += 8;
+                                       for ($i = 0; $i < $uniqueStrings; $i++) {
+        // Read in the number of characters
+                                                if ($spos == $limitpos) {
+                                                $opcode = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8;
+                                                $conlength = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8;
+                                                        if ($opcode != 0x3c) {
+                                                                return -1;
+                                                        }
+                                                $spos += 4;
+                                                $limitpos = $spos + $conlength;
+                                                }
+                                                $numChars = ord($this->data[$spos]) | (ord($this->data[$spos+1]) << 8);
+                                                //echo "i = $i pos = $pos numChars = $numChars ";
+                                                $spos += 2;
+                                                $optionFlags = ord($this->data[$spos]);
+                                                $spos++;
+                                        $asciiEncoding = (($optionFlags & 0x01) == 0) ;
+                                                $extendedString = ( ($optionFlags & 0x04) != 0);
+
+                                                // See if string contains formatting information
+                                                $richString = ( ($optionFlags & 0x08) != 0);
+
+                                                if ($richString) {
+                                        // Read in the crun
+                                                        $formattingRuns = ord($this->data[$spos]) | (ord($this->data[$spos+1]) << 8);
+                                                        $spos += 2;
+                                                }
+
+                                                if ($extendedString) {
+                                                  // Read in cchExtRst
+                                                  $extendedRunLength = $this->_GetInt4d($this->data, $spos);
+                                                  $spos += 4;
+                                                }
+
+                                                $len = ($asciiEncoding)? $numChars : $numChars*2;
+                                                if ($spos + $len < $limitpos) {
+                                                                $retstr = substr($this->data, $spos, $len);
+                                                                $spos += $len;
+                                                }else{
+                                                        // found countinue
+                                                        $retstr = substr($this->data, $spos, $limitpos - $spos);
+                                                        $bytesRead = $limitpos - $spos;
+                                                        $charsLeft = $numChars - (($asciiEncoding) ? $bytesRead : ($bytesRead / 2));
+                                                        $spos = $limitpos;
+
+                                                         while ($charsLeft > 0){
+                                                                $opcode = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8;
+                                                                $conlength = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8;
+                                                                        if ($opcode != 0x3c) {
+                                                                                return -1;
+                                                                        }
+                                                                $spos += 4;
+                                                                $limitpos = $spos + $conlength;
+                                                                $option = ord($this->data[$spos]);
+                                                                $spos += 1;
+                                                                  if ($asciiEncoding && ($option == 0)) {
+                                                                                $len = min($charsLeft, $limitpos - $spos); // min($charsLeft, $conlength);
+                                                                    $retstr .= substr($this->data, $spos, $len);
+                                                                    $charsLeft -= $len;
+                                                                    $asciiEncoding = true;
+                                                                  }elseif (!$asciiEncoding && ($option != 0)){
+                                                                                $len = min($charsLeft * 2, $limitpos - $spos); // min($charsLeft, $conlength);
+                                                                    $retstr .= substr($this->data, $spos, $len);
+                                                                    $charsLeft -= $len/2;
+                                                                    $asciiEncoding = false;
+                                                                  }elseif (!$asciiEncoding && ($option == 0)) {
+                                                                // Bummer - the string starts off as Unicode, but after the
+                                                                // continuation it is in straightforward ASCII encoding
+                                                                                $len = min($charsLeft, $limitpos - $spos); // min($charsLeft, $conlength);
+                                                                        for ($j = 0; $j < $len; $j++) {
+                                                                 $retstr .= $this->data[$spos + $j].chr(0);
+                                                                }
+                                                            $charsLeft -= $len;
+                                                                $asciiEncoding = false;
+                                                                  }else{
+                                                            $newstr = '';
+                                                                    for ($j = 0; $j < strlen($retstr); $j++) {
+                                                                      $newstr = $retstr[$j].chr(0);
+                                                                    }
+                                                                    $retstr = $newstr;
+                                                                                $len = min($charsLeft * 2, $limitpos - $spos); // min($charsLeft, $conlength);
+                                                                    $retstr .= substr($this->data, $spos, $len);
+                                                                    $charsLeft -= $len/2;
+                                                                    $asciiEncoding = false;
+                                                                        //echo "Izavrat\n";
+                                                                  }
+                                                          $spos += $len;
+
+                                                         }
+                                                }
+                                                $retstr = ($asciiEncoding) ? $retstr : $this->_encodeUTF16($retstr);
+//                                              echo "Str $i = $retstr\n";
+                                        if ($richString){
+                                                  $spos += 4 * $formattingRuns;
+                                                }
+
+                                                // For extended strings, skip over the extended string data
+                                                if ($extendedString) {
+                                                  $spos += $extendedRunLength;
+                                                }
+                                                        //if ($retstr == 'Derby'){
+                                                        //      echo "bb\n";
+                                                        //}
+                                                $this->sst[]=$retstr;
+                                       }
+                    /*$continueRecords = array();
+                    while ($this->getNextCode() == Type_CONTINUE) {
+                        $continueRecords[] = &$this->nextRecord();
+                    }
+                    //echo " 1 Type_SST\n";
+                    $this->shareStrings = new SSTRecord($r, $continueRecords);
+                    //print_r($this->shareStrings->strings);
+                     */
+                     // echo 'SST read: '.($time_end-$time_start)."\n";
+                    break;
+
+                case SPREADSHEET_EXCEL_READER_TYPE_FILEPASS:
+                    return false;
+                    break;
+                case SPREADSHEET_EXCEL_READER_TYPE_NAME:
+                    //echo "Type_NAME\n";
+                    break;
+                case SPREADSHEET_EXCEL_READER_TYPE_FORMAT:
+                        $indexCode = ord($this->data[$pos+4]) | ord($this->data[$pos+5]) << 8;
+
+                        if ($version == SPREADSHEET_EXCEL_READER_BIFF8) {
+                            $numchars = ord($this->data[$pos+6]) | ord($this->data[$pos+7]) << 8;
+                            if (ord($this->data[$pos+8]) == 0){
+                                $formatString = substr($this->data, $pos+9, $numchars);
+                            } else {
+                                $formatString = substr($this->data, $pos+9, $numchars*2);
+                            }
+                        } else {
+                            $numchars = ord($this->data[$pos+6]);
+                            $formatString = substr($this->data, $pos+7, $numchars*2);
+                        }
+
+                    $this->formatRecords[$indexCode] = $formatString;
+                   // echo "Type.FORMAT\n";
+                    break;
+                case SPREADSHEET_EXCEL_READER_TYPE_XF:
+                        //global $dateFormats, $numberFormats;
+                        $indexCode = ord($this->data[$pos+6]) | ord($this->data[$pos+7]) << 8;
+                        //echo "\nType.XF ".count($this->formatRecords['xfrecords'])." $indexCode ";
+                        if (array_key_exists($indexCode, $this->dateFormats)) {
+                            //echo "isdate ".$dateFormats[$indexCode];
+                            $this->formatRecords['xfrecords'][] = array(
+                                    'type' => 'date',
+                                    'format' => $this->dateFormats[$indexCode]
+                                    );
+                        }elseif (array_key_exists($indexCode, $this->numberFormats)) {
+                        //echo "isnumber ".$this->numberFormats[$indexCode];
+                            $this->formatRecords['xfrecords'][] = array(
+                                    'type' => 'number',
+                                    'format' => $this->numberFormats[$indexCode]
+                                    );
+                        }else{
+                            $isdate = FALSE;
+                            if ($indexCode > 0){
+                                if (isset($this->formatRecords[$indexCode]))
+                                    $formatstr = $this->formatRecords[$indexCode];
+                                //echo '.other.';
+                                //echo "\ndate-time=$formatstr=\n";
+                                if ($formatstr)
+                                if (preg_match("/[^hmsday\/\-:\s]/i", $formatstr) == 0) { // found day and time format
+                                    $isdate = TRUE;
+                                    $formatstr = str_replace('mm', 'i', $formatstr);
+                                    $formatstr = str_replace('h', 'H', $formatstr);
+                                    //echo "\ndate-time $formatstr \n";
+                                }
+                            }
+
+                            if ($isdate){
+                                $this->formatRecords['xfrecords'][] = array(
+                                        'type' => 'date',
+                                        'format' => $formatstr,
+                                        );
+                            }else{
+                                $this->formatRecords['xfrecords'][] = array(
+                                        'type' => 'other',
+                                        'format' => '',
+                                        'code' => $indexCode
+                                        );
+                            }
+                        }
+                        //echo "\n";
+                    break;
+                case SPREADSHEET_EXCEL_READER_TYPE_NINETEENFOUR:
+                    //echo "Type.NINETEENFOUR\n";
+                    $this->nineteenFour = (ord($this->data[$pos+4]) == 1);
+                    break;
+                case SPREADSHEET_EXCEL_READER_TYPE_BOUNDSHEET:
+                    //echo "Type.BOUNDSHEET\n";
+                        $rec_offset = $this->_GetInt4d($this->data, $pos+4);
+                        $rec_typeFlag = ord($this->data[$pos+8]);
+                        $rec_visibilityFlag = ord($this->data[$pos+9]);
+                        $rec_length = ord($this->data[$pos+10]);
+
+                        if ($version == SPREADSHEET_EXCEL_READER_BIFF8){
+                            $chartype =  ord($this->data[$pos+11]);
+                            if ($chartype == 0){
+                                $rec_name    = substr($this->data, $pos+12, $rec_length);
+                            } else {
+                                $rec_name    = $this->_encodeUTF16(substr($this->data, $pos+12, $rec_length*2));
+                            }
+                        }elseif ($version == SPREADSHEET_EXCEL_READER_BIFF7){
+                                $rec_name    = substr($this->data, $pos+11, $rec_length);
+                        }
+                    $this->boundsheets[] = array('name'=>$rec_name,
+                                                 'offset'=>$rec_offset);
+
+                    break;
+
+            }
+
+            //echo "Code = ".base_convert($r['code'],10,16)."\n";
+            $pos += $length + 4;
+            $code = ord($this->data[$pos]) | ord($this->data[$pos+1])<<8;
+            $length = ord($this->data[$pos+2]) | ord($this->data[$pos+3])<<8;
+
+            //$r = &$this->nextRecord();
+            //echo "1 Code = ".base_convert($r['code'],10,16)."\n";
+        }
+
+        foreach ($this->boundsheets as $key=>$val){
+            $this->sn = $key;
+            $this->_parsesheet($val['offset']);
+        }
+        return true;
+
+    }
+
+    /**
+     * Parse a worksheet
+     *
+     * @access private
+     * @param todo
+     * @todo fix return codes
+     */
+    function _parsesheet($spos)
+    {
+        $cont = true;
+        // read BOF
+        $code = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8;
+        $length = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8;
+
+        $version = ord($this->data[$spos + 4]) | ord($this->data[$spos + 5])<<8;
+        $substreamType = ord($this->data[$spos + 6]) | ord($this->data[$spos + 7])<<8;
+
+        if (($version != SPREADSHEET_EXCEL_READER_BIFF8) && ($version != SPREADSHEET_EXCEL_READER_BIFF7)) {
+            return -1;
+        }
+
+        if ($substreamType != SPREADSHEET_EXCEL_READER_WORKSHEET){
+            return -2;
+        }
+        //echo "Start parse code=".base_convert($code,10,16)." version=".base_convert($version,10,16)." substreamType=".base_convert($substreamType,10,16).""."\n";
+        $spos += $length + 4;
+        //var_dump($this->formatRecords);
+    //echo "code $code $length";
+        while($cont) {
+            //echo "mem= ".memory_get_usage()."\n";
+//            $r = &$this->file->nextRecord();
+            $lowcode = ord($this->data[$spos]);
+            if ($lowcode == SPREADSHEET_EXCEL_READER_TYPE_EOF) break;
+            $code = $lowcode | ord($this->data[$spos+1])<<8;
+            $length = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8;
+            $spos += 4;
+            $this->sheets[$this->sn]['maxrow'] = $this->_rowoffset - 1;
+            $this->sheets[$this->sn]['maxcol'] = $this->_coloffset - 1;
+            //echo "Code=".base_convert($code,10,16)." $code\n";
+            unset($this->rectype);
+            $this->multiplier = 1; // need for format with %
+            switch ($code) {
+                case SPREADSHEET_EXCEL_READER_TYPE_DIMENSION:
+                    //echo 'Type_DIMENSION ';
+                    if (!isset($this->numRows)) {
+                        if (($length == 10) ||  ($version == SPREADSHEET_EXCEL_READER_BIFF7)){
+                            $this->sheets[$this->sn]['numRows'] = ord($this->data[$spos+2]) | ord($this->data[$spos+3]) << 8;
+                            $this->sheets[$this->sn]['numCols'] = ord($this->data[$spos+6]) | ord($this->data[$spos+7]) << 8;
+                        } else {
+                            $this->sheets[$this->sn]['numRows'] = ord($this->data[$spos+4]) | ord($this->data[$spos+5]) << 8;
+                            $this->sheets[$this->sn]['numCols'] = ord($this->data[$spos+10]) | ord($this->data[$spos+11]) << 8;
+                        }
+                    }
+                    //echo 'numRows '.$this->numRows.' '.$this->numCols."\n";
+                    break;
+                case SPREADSHEET_EXCEL_READER_TYPE_MERGEDCELLS:
+                    $cellRanges = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8;
+                    for ($i = 0; $i < $cellRanges; $i++) {
+                        $fr =  ord($this->data[$spos + 8*$i + 2]) | ord($this->data[$spos + 8*$i + 3])<<8;
+                        $lr =  ord($this->data[$spos + 8*$i + 4]) | ord($this->data[$spos + 8*$i + 5])<<8;
+                        $fc =  ord($this->data[$spos + 8*$i + 6]) | ord($this->data[$spos + 8*$i + 7])<<8;
+                        $lc =  ord($this->data[$spos + 8*$i + 8]) | ord($this->data[$spos + 8*$i + 9])<<8;
+                        //$this->sheets[$this->sn]['mergedCells'][] = array($fr + 1, $fc + 1, $lr + 1, $lc + 1);
+                        if ($lr - $fr > 0) {
+                            $this->sheets[$this->sn]['cellsInfo'][$fr+1][$fc+1]['rowspan'] = $lr - $fr + 1;
+                        }
+                        if ($lc - $fc > 0) {
+                            $this->sheets[$this->sn]['cellsInfo'][$fr+1][$fc+1]['colspan'] = $lc - $fc + 1;
+                        }
+                    }
+                    //echo "Merged Cells $cellRanges $lr $fr $lc $fc\n";
+                    break;
+                case SPREADSHEET_EXCEL_READER_TYPE_RK:
+                case SPREADSHEET_EXCEL_READER_TYPE_RK2:
+                    //echo 'SPREADSHEET_EXCEL_READER_TYPE_RK'."\n";
+                    $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8;
+                    $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8;
+                    $rknum = $this->_GetInt4d($this->data, $spos + 6);
+                    $numValue = $this->_GetIEEE754($rknum);
+                    //echo $numValue." ";
+                    if ($this->isDate($spos)) {
+                        list($string, $raw) = $this->createDate($numValue);
+                    }else{
+                        $raw = $numValue;
+                        if (isset($this->_columnsFormat[$column + 1])){
+                                $this->curformat = $this->_columnsFormat[$column + 1];
+                        }
+                        $string = sprintf($this->curformat, $numValue * $this->multiplier);
+                        //$this->addcell(RKRecord($r));
+                    }
+                    $this->addcell($row, $column, $string, $raw);
+                    //echo "Type_RK $row $column $string $raw {$this->curformat}\n";
+                    break;
+                case SPREADSHEET_EXCEL_READER_TYPE_LABELSST:
+                        $row        = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8;
+                        $column     = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8;
+                        $xfindex    = ord($this->data[$spos+4]) | ord($this->data[$spos+5])<<8;
+                        $index  = $this->_GetInt4d($this->data, $spos + 6);
+            //var_dump($this->sst);
+                        $this->addcell($row, $column, $this->sst[$index]);
+                        //echo "LabelSST $row $column $string\n";
+                    break;
+                case SPREADSHEET_EXCEL_READER_TYPE_MULRK:
+                    $row        = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8;
+                    $colFirst   = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8;
+                    $colLast    = ord($this->data[$spos + $length - 2]) | ord($this->data[$spos + $length - 1])<<8;
+                    $columns    = $colLast - $colFirst + 1;
+                    $tmppos = $spos+4;
+                    for ($i = 0; $i < $columns; $i++) {
+                        $numValue = $this->_GetIEEE754($this->_GetInt4d($this->data, $tmppos + 2));
+                        if ($this->isDate($tmppos-4)) {
+                            list($string, $raw) = $this->createDate($numValue);
+                        }else{
+                            $raw = $numValue;
+                            if (isset($this->_columnsFormat[$colFirst + $i + 1])){
+                                        $this->curformat = $this->_columnsFormat[$colFirst + $i + 1];
+                                }
+                            $string = sprintf($this->curformat, $numValue * $this->multiplier);
+                        }
+                      //$rec['rknumbers'][$i]['xfindex'] = ord($rec['data'][$pos]) | ord($rec['data'][$pos+1]) << 8;
+                      $tmppos += 6;
+                      $this->addcell($row, $colFirst + $i, $string, $raw);
+                      //echo "MULRK $row ".($colFirst + $i)." $string\n";
+                    }
+                     //MulRKRecord($r);
+                    // Get the individual cell records from the multiple record
+                     //$num = ;
+
+                    break;
+                case SPREADSHEET_EXCEL_READER_TYPE_NUMBER:
+                    $row    = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8;
+                    $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8;
+                    $tmp = unpack("ddouble", substr($this->data, $spos + 6, 8)); // It machine machine dependent
+                    if ($this->isDate($spos)) {
+                        list($string, $raw) = $this->createDate($tmp['double']);
+                     //   $this->addcell(DateRecord($r, 1));
+                    }else{
+                        //$raw = $tmp[''];
+                        if (isset($this->_columnsFormat[$column + 1])){
+                                $this->curformat = $this->_columnsFormat[$column + 1];
+                        }
+                        $raw = $this->createNumber($spos);
+                        $string = sprintf($this->curformat, $raw * $this->multiplier);
+
+                     //   $this->addcell(NumberRecord($r));
+                    }
+                    $this->addcell($row, $column, $string, $raw);
+                    //echo "Number $row $column $string\n";
+                    break;
+                case SPREADSHEET_EXCEL_READER_TYPE_FORMULA:
+                case SPREADSHEET_EXCEL_READER_TYPE_FORMULA2:
+                    $row    = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8;
+                    $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8;
+                    if ((ord($this->data[$spos+6])==0) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) {
+                        //String formula. Result follows in a STRING record
+                        //echo "FORMULA $row $column Formula with a string<br>\n";
+                    } elseif ((ord($this->data[$spos+6])==1) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) {
+                        //Boolean formula. Result is in +2; 0=false,1=true
+                    } elseif ((ord($this->data[$spos+6])==2) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) {
+                        //Error formula. Error code is in +2;
+                    } elseif ((ord($this->data[$spos+6])==3) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) {
+                        //Formula result is a null string.
+                    } else {
+                        // result is a number, so first 14 bytes are just like a _NUMBER record
+                        $tmp = unpack("ddouble", substr($this->data, $spos + 6, 8)); // It machine machine dependent
+                        if ($this->isDate($spos)) {
+                            list($string, $raw) = $this->createDate($tmp['double']);
+                         //   $this->addcell(DateRecord($r, 1));
+                        }else{
+                            //$raw = $tmp[''];
+                            if (isset($this->_columnsFormat[$column + 1])){
+                                    $this->curformat = $this->_columnsFormat[$column + 1];
+                            }
+                            $raw = $this->createNumber($spos);
+                            $string = sprintf($this->curformat, $raw * $this->multiplier);
+
+                         //   $this->addcell(NumberRecord($r));
+                        }
+                        $this->addcell($row, $column, $string, $raw);
+                        //echo "Number $row $column $string\n";
+                    }
+                    break;
+                case SPREADSHEET_EXCEL_READER_TYPE_BOOLERR:
+                    $row    = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8;
+                    $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8;
+                    $string = ord($this->data[$spos+6]);
+                    $this->addcell($row, $column, $string);
+                    //echo 'Type_BOOLERR '."\n";
+                    break;
+                case SPREADSHEET_EXCEL_READER_TYPE_ROW:
+                case SPREADSHEET_EXCEL_READER_TYPE_DBCELL:
+                case SPREADSHEET_EXCEL_READER_TYPE_MULBLANK:
+                    break;
+                case SPREADSHEET_EXCEL_READER_TYPE_LABEL:
+                    $row    = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8;
+                    $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8;
+                    $this->addcell($row, $column, substr($this->data, $spos + 8, ord($this->data[$spos + 6]) | ord($this->data[$spos + 7])<<8));
+
+                   // $this->addcell(LabelRecord($r));
+                    break;
+
+                case SPREADSHEET_EXCEL_READER_TYPE_EOF:
+                    $cont = false;
+                    break;
+                default:
+                    //echo ' unknown :'.base_convert($r['code'],10,16)."\n";
+                    break;
+
+            }
+            $spos += $length;
+        }
+
+        if (!isset($this->sheets[$this->sn]['numRows']))
+             $this->sheets[$this->sn]['numRows'] = $this->sheets[$this->sn]['maxrow'];
+        if (!isset($this->sheets[$this->sn]['numCols']))
+             $this->sheets[$this->sn]['numCols'] = $this->sheets[$this->sn]['maxcol'];
+
+    }
+
+    /**
+     * Check whether the current record read is a date
+     *
+     * @param todo
+     * @return boolean True if date, false otherwise
+     */
+    function isDate($spos)
+    {
+        //$xfindex = GetInt2d(, 4);
+        $xfindex = ord($this->data[$spos+4]) | ord($this->data[$spos+5]) << 8;
+        //echo 'check is date '.$xfindex.' '.$this->formatRecords['xfrecords'][$xfindex]['type']."\n";
+        //var_dump($this->formatRecords['xfrecords'][$xfindex]);
+        if ($this->formatRecords['xfrecords'][$xfindex]['type'] == 'date') {
+            $this->curformat = $this->formatRecords['xfrecords'][$xfindex]['format'];
+            $this->rectype = 'date';
+            return true;
+        } else {
+            if ($this->formatRecords['xfrecords'][$xfindex]['type'] == 'number') {
+                $this->curformat = $this->formatRecords['xfrecords'][$xfindex]['format'];
+                $this->rectype = 'number';
+                if (($xfindex == 0x9) || ($xfindex == 0xa)){
+                    $this->multiplier = 100;
+                }
+            }else{
+                $this->curformat = $this->_defaultFormat;
+                $this->rectype = 'unknown';
+            }
+            return false;
+        }
+    }
+
+    //}}}
+    //{{{ createDate()
+
+    /**
+     * Convert the raw Excel date into a human readable format
+     *
+     * Dates in Excel are stored as number of seconds from an epoch.  On 
+     * Windows, the epoch is 30/12/1899 and on Mac it's 01/01/1904
+     *
+     * @access private
+     * @param integer The raw Excel value to convert
+     * @return array First element is the converted date, the second element is number a unix timestamp
+     */ 
+    function createDate($numValue)
+    {
+        if ($numValue > 1) {
+            $utcDays = $numValue - ($this->nineteenFour ? SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS1904 : SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS);
+            $utcValue = round(($utcDays+1) * SPREADSHEET_EXCEL_READER_MSINADAY);
+            $string = date ($this->curformat, $utcValue);
+            $raw = $utcValue;
+        } else {
+            $raw = $numValue;
+            $hours = floor($numValue * 24);
+            $mins = floor($numValue * 24 * 60) - $hours * 60;
+            $secs = floor($numValue * SPREADSHEET_EXCEL_READER_MSINADAY) - $hours * 60 * 60 - $mins * 60;
+            $string = date ($this->curformat, mktime($hours, $mins, $secs));
+        }
+
+        return array($string, $raw);
+    }
+
+    function createNumber($spos)
+    {
+        $rknumhigh = $this->_GetInt4d($this->data, $spos + 10);
+        $rknumlow = $this->_GetInt4d($this->data, $spos + 6);
+        //for ($i=0; $i<8; $i++) { echo ord($this->data[$i+$spos+6]) . " "; } echo "<br>";
+        $sign = ($rknumhigh & 0x80000000) >> 31;
+        $exp =  ($rknumhigh & 0x7ff00000) >> 20;
+        $mantissa = (0x100000 | ($rknumhigh & 0x000fffff));
+        $mantissalow1 = ($rknumlow & 0x80000000) >> 31;
+        $mantissalow2 = ($rknumlow & 0x7fffffff);
+        $value = $mantissa / pow( 2 , (20- ($exp - 1023)));
+        if ($mantissalow1 != 0) $value += 1 / pow (2 , (21 - ($exp - 1023)));
+        $value += $mantissalow2 / pow (2 , (52 - ($exp - 1023)));
+        //echo "Sign = $sign, Exp = $exp, mantissahighx = $mantissa, mantissalow1 = $mantissalow1, mantissalow2 = $mantissalow2<br>\n";
+        if ($sign) {$value = -1 * $value;}
+        return  $value;
+    }
+
+    function addcell($row, $col, $string, $raw = '')
+    {
+        //echo "ADD cel $row-$col $string\n";
+        $this->sheets[$this->sn]['maxrow'] = max($this->sheets[$this->sn]['maxrow'], $row + $this->_rowoffset);
+        $this->sheets[$this->sn]['maxcol'] = max($this->sheets[$this->sn]['maxcol'], $col + $this->_coloffset);
+        $this->sheets[$this->sn]['cells'][$row + $this->_rowoffset][$col + $this->_coloffset] = $string;
+        if ($raw)
+            $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['raw'] = $raw;
+        if (isset($this->rectype))
+            $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['type'] = $this->rectype;
+
+    }
+
+
+    function _GetIEEE754($rknum)
+    {
+        if (($rknum & 0x02) != 0) {
+                $value = $rknum >> 2;
+        } else {
+//mmp
+// first comment out the previously existing 7 lines of code here
+//                $tmp = unpack("d", pack("VV", 0, ($rknum & 0xfffffffc)));
+//                //$value = $tmp[''];
+//                if (array_key_exists(1, $tmp)) {
+//                    $value = $tmp[1];
+//                } else {
+//                    $value = $tmp[''];
+//                }
+// I got my info on IEEE754 encoding from
+// http://research.microsoft.com/~hollasch/cgindex/coding/ieeefloat.html
+// The RK format calls for using only the most significant 30 bits of the
+// 64 bit floating point value. The other 34 bits are assumed to be 0
+// So, we use the upper 30 bits of $rknum as follows...
+         $sign = ($rknum & 0x80000000) >> 31;
+        $exp = ($rknum & 0x7ff00000) >> 20;
+        $mantissa = (0x100000 | ($rknum & 0x000ffffc));
+        $value = $mantissa / pow( 2 , (20- ($exp - 1023)));
+        if ($sign) {$value = -1 * $value;}
+//end of changes by mmp
+
+        }
+
+        if (($rknum & 0x01) != 0) {
+            $value /= 100;
+        }
+        return $value;
+    }
+
+    function _encodeUTF16($string)
+    {
+        $result = $string;
+        if ($this->_defaultEncoding){
+            switch ($this->_encoderFunction){
+                case 'iconv' :     $result = iconv('UTF-16LE', $this->_defaultEncoding, $string);
+                                break;
+                case 'mb_convert_encoding' :     $result = mb_convert_encoding($string, $this->_defaultEncoding, 'UTF-16LE' );
+                                break;
+            }
+        }
+        return $result;
+    }
+
+    function _GetInt4d($data, $pos)
+    {
+        $value = ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | (ord($data[$pos+3]) << 24);
+        if ($value>=4294967294)
+        {
+            $value=-2;
+        }
+        return $value;
+    }
+
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
+?>
diff --git a/common/components/parsers/Parser.php b/common/components/parsers/Parser.php
index fd31215..0c42ca3 100644
--- a/common/components/parsers/Parser.php
+++ b/common/components/parsers/Parser.php
@@ -94,7 +94,7 @@ abstract class Parser
 
     public final static function supportedExtension()
     {
-        return ['csv','xml','xlsx'];
+        return ['csv','xml','xlsx','txt','xls'];
     }
 
     protected function cleanUp(  )
diff --git a/common/components/parsers/TableParser.php b/common/components/parsers/TableParser.php
index 420eeaf..7e85ad5 100644
--- a/common/components/parsers/TableParser.php
+++ b/common/components/parsers/TableParser.php
@@ -71,8 +71,8 @@ abstract class TableParser extends Parser
 
             if ($this->isEmptyRow()) {
                 //счетчик пустых строк
-                //CustomVarDamp::dump($this->current_row_number);
                 $empty_lines++;
+                $this->current_row_number++;
                 continue;
             }
 
@@ -101,7 +101,6 @@ abstract class TableParser extends Parser
             $empty_lines = 0;
 
         }
-
     }
 
     /**
diff --git a/common/components/parsers/XlsParser.php b/common/components/parsers/XlsParser.php
new file mode 100644
index 0000000..b30085e
--- /dev/null
+++ b/common/components/parsers/XlsParser.php
@@ -0,0 +1,107 @@
+<?php
+/**
+
+ */
+namespace common\components\parsers;
+
+/**
+ * Class XlsParser
+ * @package yii\multiparser
+ * @todo - перевести на анг. яз.
+ */
+
+
+class XlsParser extends TableParser
+{
+    // экземпляр класса Spreadsheet_Excel_Reader - для чтения листов Excel
+  protected $reader;
+   // строка кодировки
+  protected $encoding = 'CP1251';
+
+    /**
+     * @var int - номер листа с которого будет происходить чтение
+     */
+    public $active_sheet = 0;
+
+    /**
+     * метод устанавливает настройки конвертера и ридера
+     */
+    public function setup()
+    {
+        parent::setup();
+        $this->setupReader();
+    }
+
+
+    /**
+     * устанавливает ридер и его параметры
+     */
+    protected function setupReader()
+    {
+        require_once 'ExcelReader/reader.php';
+        $this->reader = new \Spreadsheet_Excel_Reader();
+        $this->reader->setOutputEncoding( $this->encoding );
+        $this->reader->read( $this->file_path );
+
+    }
+
+    public function read()
+    {
+        parent::read();
+
+        $this->cleanUp();
+
+        return $this->result;
+    }
+
+
+    protected function readRow(  )
+    {
+        $this->row = [];
+        $current_sheet = $this->reader->sheets[ $this->active_sheet ];
+
+        for ( $j = 1; $j <= $current_sheet['numCols']; $j++ ) {
+            if ( isset( $current_sheet['cells'][ $this->current_row_number ][$j]) )
+                $this->row[] = $current_sheet['cells'][ $this->current_row_number ][$j];
+        }
+    }
+
+    protected  function isEmptyRow(){
+
+        $is_empty = false;
+
+        if ( !$this->row ) {
+            return true;
+        }
+        if (  count( $this->row ) < $this->min_column_quantity ) {
+            return true;
+        }
+
+        $j = 0;
+        for ($i = 1; $i <= count( $this->row ); $i++) {
+
+            if ( !isset( $this->row[ $i - 1 ] ) ) {
+                continue;
+            }
+
+            if ( $this->isEmptyColumn( $this->row[$i - 1] ) ) {
+                $j++;
+            }
+
+            if ( $j >= $this->min_column_quantity ) {
+                $is_empty = true;
+                break;
+            }
+        }
+
+        return $is_empty;
+    }
+
+    protected  function isEmptyColumn( $val ){
+        return $val == '';
+    }
+
+    protected  function setResult(  ){
+        $this->result[] = $this->row;
+    }
+}
\ No newline at end of file
diff --git a/common/components/parsers/XlsxParser.php b/common/components/parsers/XlsxParser.php
index da11671..f54ceee 100644
--- a/common/components/parsers/XlsxParser.php
+++ b/common/components/parsers/XlsxParser.php
@@ -208,7 +208,7 @@ class XlsxParser extends TableParser
 
         $is_empty = false;
 
-        if (!count($this->row) || !$this->current_node->valid()) {
+        if (!count($this->row)) {
             return true;
         }
 
@@ -230,7 +230,7 @@ class XlsxParser extends TableParser
 
     protected function isEmptyColumn($val)
     {
-        return $val == '';
+        return $val == '' || $val === null;
     }
 
     protected function setResult()
diff --git a/common/components/parsers/config.php b/common/components/parsers/config.php
index 3c24344..4f76711 100755
--- a/common/components/parsers/config.php
+++ b/common/components/parsers/config.php
@@ -1,110 +1,186 @@
 <?php
- return [
-     'csv' =>
-         ['web' =>
-             ['class' => 'common\components\parsers\CustomCsvParser',
-                 'auto_detect_first_line' => true,
-                 'converter_conf' => [
-                     'class' => 'common\components\parsers\CustomConverter',
-                                        'configuration' => ["encode"   => 'DESCR'],
-                 ]
-             ],
-          'console' =>
-             ['class' => 'common\components\parsers\CustomCsvParser',
-                 'auto_detect_first_line' => true,
-                 'converter_conf' => [
-                     'class' => ' common\components\parsers\CustomConverter',
-                     'configuration' => ["encode"   => 'DESCR',
-                                        "string"   => 'DESCR',
-                                         "float"   => 'PRICE',
-                                         "brand"   => 'BRAND',
-                                        "integer"   => ['BOX','ADD_BOX'],
-                                        "multiply"   => [],
-                                        "article"   => [],
-                                        "details"   => []
+return [
+    'csv' =>
+        ['web' =>
+            ['class' => 'common\components\parsers\CustomCsvParser',
+                'auto_detect_first_line' => true,
+                'converter_conf' => [
+                    'class' => 'common\components\parsers\CustomConverter',
+                    'configuration' => ["encode" => 'DESCR'],
+                ]
+            ],
+            'console' =>
+                ['class' => 'common\components\parsers\CustomCsvParser',
+                    'auto_detect_first_line' => true,
+                    'converter_conf' => [
+                        'class' => ' common\components\parsers\CustomConverter',
+                        'configuration' => ["encode" => 'DESCR',
+                            "string" => 'DESCR',
+                            "float" => 'PRICE',
+                            "brand" => 'BRAND',
+                            "integer" => ['BOX', 'ADD_BOX'],
+                            "multiply" => [],
+                            "article" => [],
+                            "details" => []
 
-                     ]
-             ],],
+                        ]
+                    ],],
 
-             'basic_column' => [
-                 Null  => 'Пусто',
-                 "BRAND"  => 'Бренд',
-                 "ARTICLE"=> 'Артикул',
-                 "PRICE"  => 'Цена',
-                 "DESCR"  => 'Наименование',
-                 "BOX"    => 'Колво',
-                 "ADD_BOX"=> 'В пути',
-                 "GROUP"  => 'Группа RG'
-             ],
+            'basic_column' => [
+                Null => 'Пусто',
+                "BRAND" => 'Бренд',
+                "ARTICLE" => 'Артикул',
+                "PRICE" => 'Цена',
+                "DESCR" => 'Наименование',
+                "BOX" => 'Колво',
+                "ADD_BOX" => 'В пути',
+                "GROUP" => 'Группа RG'
+            ],
 
-             'crosses' =>  ['class' => 'common\components\parsers\CustomCsvParser',
-                 'auto_detect_first_line' => true,
-                 'min_column_quantity' => 4,
-                 'converter_conf' => [
-                     'class' => ' common\components\parsers\CustomConverter',
-                     'hasKey' => 1,
-                     'configuration' => [
-                         "brand"   => ['BRAND', 'CROSS_BRAND'],
-                     ]
-                 ],
-                 'basic_column' => [
-                     Null  => 'Пусто',
-                     "ARTICLE"=> 'Артикул',
-                     "CROSS_ARTICLE"  => 'Кросс артикул',
-                     "BRAND"  => 'Бренд',
-                     "CROSS_BRAND"    => 'Кросс бренд'
-                 ],
-             ],
-             ],
-      'xml' =>
-         ['console' =>
-             ['class' => 'common\components\parsers\XmlParser',
-                 'node' => 'Товар',
-                 'has_header_row' => true,
-                 'keys' => [
-                    "BRAND"  => 'Производитель',
-                     "ARTICLE"=> 'Код',
-                     "PRICE"  => 'Розница',
-                     "DESCR"  => 'Наименование',
-                     "BOX"    => 'Колво',
-                     "ADD_BOX"=> 'Ожидаемое',
-                     "GROUP"  => 'Группа'
-                 ],
-                 'converter_conf' => [
-                     'class' => 'common\components\parsers\CustomConverter',
-                     'configuration' => ["details"   => []
-                         ],],
-                 ],
-         ],
-     'xlsx' =>
-         ['web' =>
-             ['class' => 'common\components\parsers\XlsxParser',
-                 'path_for_extract_files' => \Yii::getAlias('@temp_upload') . '/xlsx/',
-                 //'auto_detect_first_line' => true,
-                 //'has_header_row' => true,
-                 'active_sheet' => 1,
-                 'converter_conf' => [
-                     'class' => 'common\components\parsers\CustomConverter',
-                     'configuration' => ["string"   => []],
-             ]
-             ],
-             'console' =>
-                 ['class' => 'common\components\parsers\XlsxParser',
-                     'path_for_extract_files' => \Yii::getAlias('@temp_upload') . '/xlsx/',
-                     'auto_detect_first_line' => true,
-                     'active_sheet' => 1,
-                     'converter_conf' => [
-                         'class' => ' common\components\parsers\CustomConverter',
-                         'configuration' => ["encode"   => 'DESCR',
-                             "string"   => 'DESCR',
-                             "float"   => 'PRICE',
-                             "brand"   => 'BRAND',
-                             "integer"   => ['BOX','ADD_BOX'],
-                             "multiply"   => [],
-                             "article"   => [],
-                             "details"   => []
-                         ]
-                     ],],
- ]
- ];
+            'crosses' => ['class' => 'common\components\parsers\CustomCsvParser',
+                'auto_detect_first_line' => true,
+                'min_column_quantity' => 4,
+                'converter_conf' => [
+                    'class' => ' common\components\parsers\CustomConverter',
+                    'hasKey' => 1,
+                    'configuration' => [
+                        "brand" => ['BRAND', 'CROSS_BRAND'],
+                    ]
+                ],
+                'basic_column' => [
+                    Null => 'Пусто',
+                    "ARTICLE" => 'Артикул',
+                    "CROSS_ARTICLE" => 'Кросс артикул',
+                    "BRAND" => 'Бренд',
+                    "CROSS_BRAND" => 'Кросс бренд'
+                ],
+            ],
+        ],
+    'xml' =>
+        ['console' =>
+            ['class' => 'common\components\parsers\XmlParser',
+                'node' => 'Товар',
+                'has_header_row' => true,
+                'keys' => [
+                    "BRAND" => 'Производитель',
+                    "ARTICLE" => 'Код',
+                    "PRICE" => 'Розница',
+                    "DESCR" => 'Наименование',
+                    "BOX" => 'Колво',
+                    "ADD_BOX" => 'Ожидаемое',
+                    "GROUP" => 'Группа'
+                ],
+                'converter_conf' => [
+                    'class' => 'common\components\parsers\CustomConverter',
+                    'configuration' => ["details" => []
+                    ],],
+            ],
+        ],
+    'xlsx' =>
+        ['web' =>
+            ['class' => 'common\components\parsers\XlsxParser',
+                'path_for_extract_files' => \Yii::getAlias('@temp_upload') . '/xlsx/',
+                //'auto_detect_first_line' => true,
+                //'has_header_row' => true,
+                'active_sheet' => 1,
+                'converter_conf' => [
+                    'class' => 'common\components\parsers\CustomConverter',
+                    'configuration' => ["string" => []],
+                ]
+            ],
+            'console' =>
+                ['class' => 'common\components\parsers\XlsxParser',
+                    'path_for_extract_files' => \Yii::getAlias('@temp_upload') . '/xlsx/',
+                    'auto_detect_first_line' => true,
+                    'active_sheet' => 1,
+                    'min_column_quantity' => 3,
+                    'converter_conf' => [
+                        'class' => ' common\components\parsers\CustomConverter',
+                        'configuration' => ["encode" => 'DESCR',
+                            "string" => 'DESCR',
+                            "float" => 'PRICE',
+                            "brand" => 'BRAND',
+                            "integer" => ['BOX', 'ADD_BOX'],
+                            "multiply" => [],
+                            "article" => [],
+                            "details" => []
+                        ]
+                    ],],
+        ],
+    'txt' =>
+        [ 'web' =>
+            ['class' => 'common\components\parsers\CustomCsvParser',
+                'auto_detect_first_line' => true,
+                'delimiter' => "\t",
+                'converter_conf' => [
+                    'class' => 'common\components\parsers\CustomConverter',
+                    'configuration' => ["encode" => 'DESCR'],
+                ]
+            ],
+            'console' =>
+            ['class' => 'common\components\parsers\CustomCsvParser',
+                'auto_detect_first_line' => true,
+                'delimiter' => "\t",
+                'converter_conf' => [
+                    'class' => ' common\components\parsers\CustomConverter',
+                    'configuration' => ["encode" => 'DESCR',
+                        "string" => 'DESCR',
+                        "float" => 'PRICE',
+                        "brand" => 'BRAND',
+                        "integer" => ['BOX', 'ADD_BOX'],
+                        "multiply" => [],
+                        "article" => [],
+                        "details" => []
+                    ]
+                ],
+            ],
+            'basic_column' => [
+                Null => 'Пусто',
+                "BRAND" => 'Бренд',
+                "ARTICLE" => 'Артикул',
+                "PRICE" => 'Цена',
+                "DESCR" => 'Наименование',
+                "BOX" => 'Колво',
+                "ADD_BOX" => 'В пути',
+                "GROUP" => 'Группа RG'
+            ],
+        ],
+    'xls' =>
+        ['web' =>
+            ['class' => 'common\components\parsers\XlsParser',
+                'auto_detect_first_line' => true,
+                'converter_conf' => [
+                    'class' => 'common\components\parsers\CustomConverter',
+                    'configuration' => ["encode" => 'DESCR'],
+                ]
+            ],
+            'console' =>
+                ['class' => 'common\components\parsers\XlsParser',
+                    'auto_detect_first_line' => true,
+                    'converter_conf' => [
+                        'class' => ' common\components\parsers\CustomConverter',
+                        'configuration' => ["encode" => 'DESCR',
+                            "string" => 'DESCR',
+                            "float" => 'PRICE',
+                            "brand" => 'BRAND',
+                            "integer" => ['BOX', 'ADD_BOX'],
+                            "multiply" => [],
+                            "article" => [],
+                            "details" => []
+
+                        ]
+                    ],],
+
+            'basic_column' => [
+                Null => 'Пусто',
+                "BRAND" => 'Бренд',
+                "ARTICLE" => 'Артикул',
+                "PRICE" => 'Цена',
+                "DESCR" => 'Наименование',
+                "BOX" => 'Колво',
+                "ADD_BOX" => 'В пути',
+                "GROUP" => 'Группа RG'
+            ],
+        ],
+];
 
diff --git a/common/models/Brands.php b/common/models/Brands.php
index 5eab7c9..cf80f77 100755
--- a/common/models/Brands.php
+++ b/common/models/Brands.php
@@ -22,6 +22,8 @@ class Brands extends BaseActiveRecord
 {
     // для валидации выбранного пользователем файла
     public $file;
+    // флаг, нужно ли удалять изображение
+    public $delete_img;
     /**
      * @inheritdoc
      */
@@ -36,15 +38,17 @@ class Brands extends BaseActiveRecord
     public function rules()
     {
         return [
-            [['BRAND', 'CONTENT'], 'required'],
+            [['BRAND'], 'required'],
             [['if_tecdoc', 'if_oem', 'if_checked'], 'integer'],
             [['CONTENT'], 'string'],
             [['timestamp'], 'safe'],
+            [['delete_img'], 'safe'],
             [['BRAND'], 'string', 'max' => 100],
             [['tecdoc_logo'], 'string', 'max' => 50],
             ['IMG', 'string', 'max' => 255],
-            ['IMG', 'match', 'pattern' => '/[a-zA-Z0-9]+\.[a-zA-Z]+/', 'message' => 'имя файла изображения должно иметь только латинские символы и цифры'],
-            [['file'], 'image' ]
+            ['IMG', 'match', 'pattern' => '/[a-zA-Z0-9]+\.[a-zA-Z]+/', 'message' => 'Имя файла изображения должно иметь только латинские символы и цифры'],
+          //  [['file'], 'image' ]
+            [['file'], 'file', 'extensions' => ['jpg','png','bmp'], 'checkExtensionByMimeType'=>false ]
         ];
     }
 
@@ -54,15 +58,16 @@ class Brands extends BaseActiveRecord
     public function attributeLabels()
     {
         return [
-            'ID' => 'Номер',
-            'BRAND' => 'Название',
+            'ID' => 'НОМЕР',
+            'BRAND' => 'БРЕНД',
             'if_tecdoc' => 'ТЕКДОК?',
             'tecdoc_logo' => 'Tecdoc Logo',
-            'if_oem' => 'Оргигинал',
+            'if_oem' => 'Оригинал',
             'if_checked' => 'If Checked',
             'CONTENT' => 'Описание',
             'IMG' => 'Изображение',
             'timestamp' => 'Timestamp',
+            'delete_img' => 'Удалить',
         ];
     }
 }
diff --git a/common/models/BrandsSearch.php b/common/models/BrandsSearch.php
index 2b84872..816f0fe 100755
--- a/common/models/BrandsSearch.php
+++ b/common/models/BrandsSearch.php
@@ -60,6 +60,7 @@ class BrandsSearch extends Brands
             'BRAND' => $this->BRAND,
         ]);
 
+        $query->orderBy('ID');
 
         return $dataProvider;
     }
diff --git a/console/controllers/ParserController.php b/console/controllers/ParserController.php
index 69491d8..8dbe5de 100755
--- a/console/controllers/ParserController.php
+++ b/console/controllers/ParserController.php
@@ -73,8 +73,6 @@ class ParserController extends Controller
         $new_destination = \Yii::getAlias('@mail_upload') . '/';
 
         $this->registerAndReplaceFiles($files, $new_destination);
-
-
     }
 
     protected function parseFilesByExtension( $ext, $path_arr )
@@ -282,6 +280,10 @@ class ParserController extends Controller
             $importer_id = ImportersFiles::findOne(['id' => $file_name])->importer_id;
             $current_importer = Importers::findOne(['id' => $importer_id]);
             $keys = $current_importer->keys;
+            // если меньше 5 ключей, то чего-то нехватает - обнуляем
+            if ( count( $keys ) < 5 ) {
+                $keys = NULL;
+            }
             $mult_array = $current_importer->multiply;
 
             // получим настройки ценообразования и передадим их отдельно в конвертер
diff --git a/frontend/tmp/sess_8b64oe9oegmov606tt0bcakvo4 b/frontend/tmp/sess_8b64oe9oegmov606tt0bcakvo4
new file mode 100644
index 0000000..0c7bad9
--- /dev/null
+++ b/frontend/tmp/sess_8b64oe9oegmov606tt0bcakvo4
@@ -0,0 +1 @@
+__flash|a:0:{}__captcha/site/captcha|s:6:"vzuijp";__captcha/site/captchacount|i:1;
\ No newline at end of file
--
libgit2 0.21.4