azhurb

#!/bin/bash

# Use login and password from the configuration file. (api_auth_login and api_auth_password in server/custom.ini)
API_URL=http://login:password@localhost/stalker_portal/api/monitoring_links/

#type channel for scaning; first argument from console or or manualy edit; posible value - "itv" or "radio"
MONITORING_TYPE="$1"

if [ "$MONITORING_TYPE" == '' ] ; then
    MONITORING_TYPE='itv'

azhurb

Index: admin/resources/views/ApplicationCatalog_tos.twig
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- admin/resources/views/ApplicationCatalog_tos.twig	(revision df0e87a5249add9b1e78f66d4b628e767cbfd02e)
+++ admin/resources/views/ApplicationCatalog_tos.twig	(revision d72588c6b810a10eda156008adda91e6a828ff48)
@@ -14,7 +14,7 @@
             </div>
             <div class="col-xs-12 col-sm-12">

azhurb

server {
    listen 80;
    server_name localhost;

    location /tslink/ {

        rewrite ^/tslink/(.+)/archive/(\d+)/(.+) /stalker_portal/server/api/chk_tmp_timeshift_link.php?key=$1&file=$3 break;

        proxy_set_header Host 127.0.0.1;
        proxy_set_header X-Real-IP $remote_addr;

azhurb

<?php
// http://dev.maxmind.com/geoip/legacy/codes/iso3166
/* @var $country */
/* @var $model  */
/* @var $mac  */
/* @var $serial_number string */
/* @var $version */
/* @var $device_id */
/* @var $signature */
/* @var $rnd */

azhurb

Index: server/lib/vod.class.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- server/lib/vod.class.php	(date 1459783782000)
+++ server/lib/vod.class.php	(revision )
@@ -1032,6 +1032,24 @@
             $replace_str = $tmp_arr[1].str_pad($series, 2, '0',  STR_PAD_LEFT );
             $url = str_replace($search_str, $replace_str, $url);

azhurb

Index: server/lib/oauth/authaccesshandler.class.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- server/lib/oauth/authaccesshandler.class.php	(revision c9ff739911a4ad294cc9b2211123e85a97af3e8b)
+++ server/lib/oauth/authaccesshandler.class.php	(revision )
@@ -116,23 +116,31 @@
 
     public function generateUniqueToken(\User $user){

azhurb

#!upstart
description "node.js based server"
author      "Alexey Zhurbitsky <[email protected]>"

#start on net-device-up
start on (started networking)
stop on starting shutdown

respawn
respawn limit 10 10

azhurb

Index: c/tv.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- c/tv.js	(revision 161e355d70b9f533ceb65c0eb7ddcc8f1af8e62b)
+++ c/tv.js	(revision )
@@ -1911,39 +1911,10 @@
             module.tv.genres = genres;
             module.tv.genre  = genres[0];

azhurb

Index: server/lib/stb.class.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- server/lib/stb.class.php	(revision 7c6db5d3d7d2910c23015418fb96c239aa1b9b09)
+++ server/lib/stb.class.php	(revision )
@@ -683,7 +683,13 @@
 
         $auto_update_setting = ImageAutoUpdate::getSettingByStbType($this->params['stb_type']);

azhurb

Index: c/xpcom.common.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- c/xpcom.common.js	(revision 5bc524d090bd28bc9691e70aea088abfabf3f015)
+++ c/xpcom.common.js	(revision )
@@ -1201,6 +1201,28 @@
                         stb.RDir('setenv timezone_conf '+this.user['default_timezone']);
                     }