Skip to content

Commit

Permalink
Transform 2025
Browse files Browse the repository at this point in the history
  • Loading branch information
Joseph Topotushko committed Aug 23, 2017
1 parent 5ced592 commit 01380c9
Show file tree
Hide file tree
Showing 10 changed files with 166 additions and 144 deletions.
2 changes: 1 addition & 1 deletion classes/budget.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ public function getScenarioSelect($params = Array()){
}
?>
</select>
<?
<?php
$res = ob_get_clean();
return($res);
}
Expand Down
14 changes: 7 additions & 7 deletions common/auth.php
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
<?php
if(!$noCompression)
ini_set("zlib.output_compression","1");
//ini_set("zlib.output_compression","1");
header("Content-Type: text/html; charset=UTF-8");
header("Expires: 0");
header("Cache-Control: must-revalidate, post-check=0, pre-check=0");




ob_start();

require ("../common/common.php");
require ("config.php");
include('../common/izintra/izintra.class.php');
require ("common.php");

$js_path = "";
Expand Down Expand Up @@ -59,8 +57,6 @@
require ("../common/inc_setup.php");
//require ("../common/inc_russtuff.php");

readUserData($arrUsrData);

if ($strLocal){
require_once ("../common/language/ru.php");
} else {
Expand All @@ -71,6 +67,9 @@
define ('UPLOAD_DIR',$arrSetup['stpUploadPath']);
ini_set("SMTP",$arrSetup['stpSMTPAddress']);

$Intra = new Izintra($oSQL, Array());
$Intra->readUserData();

//===============Fill the profit array=========================
$sql = "SELECT * FROM vw_profit";
$rs = $oSQL->q($sql);
Expand All @@ -85,7 +84,8 @@
$arrCompanyConfig[$rw['comID']] = $rw;
}

$company = isset($_COOKIE['company'])?$_COOKIE['company']:'000000001';
$company = isset($_GET['company'])?$_GET['company']:(isset($_COOKIE['company'])?$_COOKIE['company']:'000000001');
SetCookie('company',$company);

//require ("lang_en.php");
$budget_scenario = $arrSetup['stpScenarioID'];
Expand Down
4 changes: 2 additions & 2 deletions common/common.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
$arrJS[] = '../common/jquery/jquery-1.7.1.min.js';
$arrJS[] = '../common/jquery/jquery-2.1.1.min.js';
$arrJS[] = '../common/jquery/jquery-ui-1.12.0.custom/jquery-ui.min.js';
//$arrJS[] = 'js/ef_common.js';
$arrCSS[] = "../common/izintra/style.css";
Expand Down Expand Up @@ -574,4 +574,4 @@ function rstrpos ($haystack, $needle, $offset=0){

return $size - $pos;
}
?>
?>
36 changes: 11 additions & 25 deletions frm_toc.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,22 @@
// $('div.menu').css({width:'250px'}).accordion();
$.sidebarMenu($('.sidebar-menu'));

if(false){
simpleTreeCollection = $('ul.simpleTree').simpleTree({
autoclose: true,
drag: false,
afterClick:function(node){
//alert("text-"+$('span:first',node).text());
},
afterDblClick:function(node){
//alert("text-"+$('span:first',node).text());
},
afterMove:function(destination, source, pos){
//alert("destination-"+$('span:first',destination).text()+" source-"+$('span:first',source).text()+" pos-"+pos);
},
afterAjax:function()
{
//alert('Loaded');
},
animate:true
,docToFolderConvert:true
});
}
$('span.fa-bars').click(function(){
$('#sidebar').toggle('slide');
});

});
</script>
<?php
$strHead = ob_get_clean();
if(!($_GET['entID']||$_GET['pagID'])) require ('includes/inc-frame_top.php');
// if(!($_GET['entID']||$_GET['pagID'])) require ('includes/inc-frame_top.php');
?>

if (!$_GET['entID']) require ("includes/inc_toc.php");
// if (!$_GET['pagID']) require ("includes/inc_entity.php");
<?php
if (!$_GET['entID']) require ("../common/izintra/inc_toc.php");
//if (!$_GET['pagID']) require ("includes/inc_entity.php");
?>

if(!($_GET['entID']||$_GET['pagID'])) require ('includes/inc-frame_bottom.php');
<?php
// if(!($_GET['entID']||$_GET['pagID'])) require ('includes/inc-frame_bottom.php');
?>
15 changes: 3 additions & 12 deletions includes/inc-frame_bottom.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
</div><!--frameContent-->
</div><!--#body-->
<div id="error_log">
<?php
echo "<pre>";
print_r($arrErrorLog);
echo "</pre>";
?>
</div>
<div id="debug_info"><?php echo $strDebugInfo; ?></div>
</body>
</html>
<?php
include ('../common/izintra/inc-frame_bottom.php');
?>
90 changes: 31 additions & 59 deletions includes/inc-frame_top.php
Original file line number Diff line number Diff line change
@@ -1,65 +1,37 @@
<!DOCTYPE html>
<?php
//echo $strDocType."\r\n";
if (isset($_COOKIE["UserMessage"])) {
$strUserMessage = $_COOKIE["UserMessage"];
SetCookie("UserMessage", "");
}
ob_start();
?>
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<meta name="platform" content="IZ_Intra v3.01 Date UI"/>
<meta name="author" content="Igor Zhuravlev" />
<title><?php echo $arrUsrData["pagTitle$strLocal"].($strPageSubtitle?" | ".$strPageSubtitle:""); ?></title>
<script type="text/javascript">
var arrUsrData = <?php echo json_encode($arrUsrData);?>;
var strLocal = '<?php echo $strLocal; ?>';
</script>
<!--Scripts loaded by LoadJS-->
<?php
loadJS();
?>
<!--Styles loaded by LoadCSS-->
<?php
loadCSS();
?>
<!--Frame-specific HEAD tags-->
<?php
echo "\t".$strHead."\r\n";
?>
<!--End of frame-specific HEAD tags-->
<div id='topbar-company-select'>
<select id='company-select' name='company'>
<?php
$sql = "SELECT * FROM common_db.tbl_company";
$rs = $oSQL->q($sql);
while ($rw = $oSQL->f($rs)){
?>
<option value="<?php echo $rw['comID'];?>" <?php if ($rw['comID']==$company) echo 'selected';?>><?php echo $rw["comTitle$strLocal"];?></option>
<?php
}
?>
</select>
</div>
<div id='topbar-search'>
<form method="GET" id="customer-search" action='rep_sales_kpi_new.php'>
<input name='cntID' placeholder='Customer...'/>
<span id="customerSearchButton" class='fa fa-lg fa-search'></span>
</form>

</div>
<script>
$(document).ready(function(){
MsgShow();
$(document).ready(function(){
$('#customerSearchButton').click(function(){
$('#customer-search').submit();
});
$('#company-select').change(function(){
location.search = 'company='+$(this).val();
});
});
</script>
<img src='/common/images/spinner-orange.gif' style='display:none;'/>
</head>
<body>
<div id="body">
<div style="display:none;" id="sysmsg"<?php echo (preg_match("/ERROR/", $strUserMessage) ? " class='error'" : "") ;?>><?php echo $strUserMessage ; ?></div>
<?php
if (!$flagNoMenu && is_array($arrActions)) {
?>
<div id="menubar" class="menubar">
<div id="loader"><img alt="Connecting..." src="/common/images/ajax-loader-orange.gif" /></div>
<ul class="menu-h">
<?php
for ($i=0;$i<count($arrActions);$i++) {
$strClass = 'sprite '.$arrActions[$i]['class'];
$isJS = preg_match("/javascript\:(.+)$/", $arrActions[$i]['action'], $arrJSAction);
if (!$isJS){
echo "\t<li><a class='{$strClass}' href=\"".$arrActions[$i]['action']."\">".$arrActions[$i]['title']."</a></li>\r\n";
} else {
echo "\t<li><a class='{$strClass}' href=\"".$arrActions[$i]['action']."\" onclick=\"".$arrJSAction[1]."; return false;\">".$arrActions[$i]['title']."</a></li>\r\n";
}
}
?>
</ul>
</div>
<div id='vspacer'>&nbsp;</div>
<?php
}
if ($_DEBUG) {
echo "<h1>Debug information</h1><h2>\$_SERVER:</h2>\r\n<pre>";print_r($_SERVER);echo "</pre>\r\n";
} ?>
<div id="frameContent" class="content"><!--End of frame top template(includes/inc_frame-top.php)-->
$Intra->projectTopbar = ob_get_clean();
include('../common/izintra/inc-frame_top.php');
?>
3 changes: 0 additions & 3 deletions includes/inc_report_settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,4 @@
if ($denominator!=1) {
$arrUsrData["pagTitle$strLocal"] .= ' x'.$denominator;
}



?>
4 changes: 2 additions & 2 deletions includes/inc_toc.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
WHERE
(RLU.rluUserID='$usrID' OR ROL.rolFlagDefault=1)
AND PG1.pagFlagShowInMenu=1
AND PG1.pagParentID<>1
##AND PG1.pagParentID<>1
GROUP BY
PG1.pagID
, PG1.pagParentID
Expand All @@ -39,7 +39,7 @@


<ul role="nav" class="sidebar-menu" id="toc">
<li class='sidebar-header'>Menu</li>
<li class='sidebar-header'><?php echo $title;?></li>
<?php
$strOutput .= "";
$rw_old["iLevelInside"] = 3;
Expand Down
Loading

0 comments on commit 01380c9

Please sign in to comment.