diff options
Diffstat (limited to 'mayor-orig/mayor-naplo/www/policy')
5 files changed, 16 insertions, 5 deletions
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/hibabejelento/admin.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/hibabejelento/admin.php index f34d5eed..8296185e 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/hibabejelento/admin.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/hibabejelento/admin.php @@ -2,9 +2,9 @@ if (_RIGHTS_OK !== true) die(); - global $Kerelmek,$telephelyId,$TELEPHELY; + global $Kerelmek,$telephelyId,$TELEPHELY, $kerelemId; - if ($skin=='classic') putHibabejelento($telephelyId); + if ($skin=='classic' && !($kerelemId>0)) putHibabejelento($telephelyId); if (is_array($Kerelmek) && count($Kerelmek)>0) { if ($_GET['view']==2){ diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/hirnok/cronFutar-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/hirnok/cronFutar-pre.php index 5691de0f..c183ba30 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/hirnok/cronFutar-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/hirnok/cronFutar-pre.php @@ -15,9 +15,15 @@ for ($i=0; $i<count($r); $i++) { $d = $r[$i]; + if (defined('_DEVEL') && _DEVEL===true) $d['email'] = 'konczy+test@gmail.com'; // over $TOLDTBYUSER[$d['naploTipus']][$d['naploId']] = ($d['utolsoEmailDt']=='') ? $_TANEV['kezdesDt'] : $d['utolsoEmailDt']; // setDt if (!in_array($d['naploId'],$USER[$d['naploTipus']])) $USER[$d['naploTipus']][] = $d['naploId']; - $ADAT['feliratkozas'][$d['naploTipus']][$d['naploId']][] = array('userAccount'=>$d['userAccount'], 'policy'=>$d['policy'], 'email'=>$d['email'], 'setDt'=> $refDt); + $ADAT['feliratkozas'][$d['naploTipus']][$d['naploId']][] = array( + 'userAccount'=>$d['userAccount'], + 'policy'=>$d['policy'], + 'email'=>$d['email'], + 'setDt'=> $refDt + ); } // Megszorítás: egy naplóbeli entitás utolsoEmailDt-je együtt kell, hogy mozogjon ebben a feldolgozási rendszerben. diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php index a7022d00..6421687a 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php @@ -224,6 +224,7 @@ $ADAT['dt'] = $dt; // show this... ha a skin ajax $ADAT['csengetesiRend'] = getCsengetesiRend(); + $ADAT['utolsoorak'] = getUtolsoorak(); $ADAT['telephelyId'] = $telephelyId; $ADAT['napiMinOra'] = getMinOra(); $ADAT['napiMaxOra'] = getMaxOra(); diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas-pre.php index 8f44cd8c..e1f28bc7 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas-pre.php @@ -27,6 +27,7 @@ $ADAT['cimzett'] = readVariable($_POST['cimzett'],'string'); $ADAT['diakokkal'] = readVariable($_POST['diakokkal'],'bool'); // ez mindig true $ADAT['txt'] = readVariable($_POST['txt'],'string'); + $ADAT['tanev'] = readVariable($_POST['tanev'],'numeric',__TANEV); list($_cimzettTipus,$_cimzettId) = explode('|',$ADAT['cimzett']); $ADAT['cimzettTipus'] = readVariable($_cimzettTipus,'strictstring',null); @@ -77,13 +78,15 @@ 'txt'=> $ADAT['txt'] ); if (postUzenet($P) === true) { - /* Ha sikered */ + /* Ha sikeres */ unset($_POST); header('Location: '.location('index.php?page=naplo&sub=uzeno&f=uzeno')); } else { $_SESSION['alert'][] = 'page::uzenorogziteshiba'; } + } else { + $_SESSION['alert'][] = 'page::uzenorogziteshiba'; } ?> diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas.php index 18ccddef..6d899712 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas.php @@ -1,5 +1,6 @@ <?php global $ADAT; - putUzenoPostazo($ADAT); + if ($skin=='ajax') putUzenoPostazo($ADAT); + if (__HABEL_GYURI_DEBUG===true) dump($ADAT); ?> |