From abd8cfdf391410090842081422f711779978f473 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Sun, 27 Oct 2019 02:17:37 +0100 Subject: Rev: 4554 --- mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- .../www/include/modules/portal/share/hirek.php | 3 +-- .../parent/portal/portal/portal_demo.classic.php | 4 ++-- .../www/policy/private/portal/hirek/egyhir-pre.php | 2 ++ .../www/skin/classic/module-portal/css/portal.css | 6 ++--- .../classic/module-portal/html/portal/hir.phtml | 27 ++++++++++++++++++++-- .../classic/module-portal/html/share/hirek.phtml | 24 ++++++++++++------- 7 files changed, 50 insertions(+), 18 deletions(-) (limited to 'mayor-orig/mayor-portal') diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 1031aed8..d0fabd4c 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4538 +4554 diff --git a/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php b/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php index 5aa3bdc9..e4791c3a 100644 --- a/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php +++ b/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php @@ -41,8 +41,7 @@ $WHERE = "WHERE ".implode(' AND ',$W); } else $WHERE = ''; - //hack - if ($SET['all']===true) $WHERE=''; + if ($SET['all']===true) $WHERE=' WHERE `owner`="'._USERACCOUNT.'" '; $q = "SELECT * FROM hirek $WHERE ORDER BY kdt DESC,vdt DESC".$L; $HIREK['szovegek'] = db_query($q, array('modul'=>'portal','result'=>'indexed')); return $HIREK; diff --git a/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal_demo.classic.php b/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal_demo.classic.php index c48052fd..8e8949fc 100644 --- a/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal_demo.classic.php +++ b/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal_demo.classic.php @@ -31,10 +31,10 @@ echo ''; echo ''; - echo ''; + echo ''; $_refStamp = mktime(date('H')+8,0,0,date('m'), date('d'), date('Y')); $dt = date('Y-m-d', $_refStamp); - putDoboz('Órarend '.str_replace('-','.',$dt).'.',ajaxUpdaterForm('orarend','index.php?page=naplo&sub=tanev&f=orarend',array('dt' => $dt),'post',true) + putDoboz('Órarend '.str_replace('-','.',$dt).'.',ajaxUpdaterForm('orarend','index.php?page=naplo&sub=orarend&f=orarend',array('dt' => $dt),'post',true) ,array('header-color'=>'#f06')); // putDoboz('Hangya',ajaxUpdaterForm('hangya','index.php?page=naplo&sub=hibabejelento&f=admin',array(),'post',true), diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php index f5931b9d..6addac83 100644 --- a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php +++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php @@ -6,6 +6,8 @@ if (_RIGHTS_OK !== true) die(); $hirId = readVariable($_POST['hirId'],'id',null); if ($hirId=='') $hirId = readVariable($_GET['hirId'],'id',null); $action = readVariable($_POST['action'],'strictstring',array(null,'save','')); + if ($hirId>0 && isOwner($hirId)===false) $_SESSION['alert'][] = 'page:not_owner'; + if ($action=='save' && (__HIREKADMIN || $hirId=='' || isOwner($hirId))) { global $LANGUAGES; if (__HIREKADMIN === true) { diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css index 8aeb0838..6012657c 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css @@ -1,7 +1,7 @@ div.hirCim { - font-style: italic; - font-size: 14px; + /* font-style: italic; */ + font-size: large; color: #000088; font-weight: bold; margin-top:1em; @@ -12,7 +12,7 @@ color: #000088; text-decoration: none; } - div.hirCim a:hover { color: #1E90FF } + div.hirCim a:hover { color: #1E90FF; text-decoration: underline; } table.portalMain { width: 100%; } diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/portal/hir.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/portal/hir.phtml index 30be4289..38140692 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/portal/hir.phtml +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/portal/hir.phtml @@ -1,11 +1,34 @@ '; + + if ($D['cim']!='') { + echo '
'; + if ($D['class']==6) { + echo ''; + } + echo '
'; + } echo '

'.$H['cim'].'

'; echo '

'.$H['txt'].'

'; - //echo '
'.$H['kdt'].'
'; + + echo '
'; + echo superdate($D['kdt']); + echo ' · '; + echo $D['owner']; + if ($D['csoport']!='') { + $CSOPORT = explode(',',$D['csoport']); + echo ' · '; + //echo ''; + for ($j=0; $j'.$CSOPORT[$j].''; + //echo ''; + } + + echo '
'; + echo ''; if (_OG_ENABLED===true) { echo '
',$D['txt']); echo '
'; - echo '
'; + if ($D['cim']!='') { + echo '
'; if ($D['class']==6) { echo ''; } echo ''.$D['cim'].''; + echo '
'; + echo '
'; + echo superdate($D['kdt']); + echo ' · '; + echo $D['owner']; + if ($D['csoport']!='') { + $CSOPORT = explode(',',$D['csoport']); + echo ' · '; + //echo ''; + for ($j=0; $j'.$CSOPORT[$j].''; + //echo ''; + } - echo '
'; + echo '
'; + } echo '
'; echo $a; if ($b!="") echo ' Tovább...'; @@ -33,12 +47,6 @@ echo ''; } - if ($D['csoport']!='') { - $CSOPORT = explode(',',$D['csoport']); - echo '
'; - for ($j=0; $j'.$CSOPORT[$j].''; - echo '
'; - } echo '
'.($ADAT['hirek']['szovegek'][0]['kdt']).'
'; echo '
'; echo '
'; -- cgit v1.2.3