From 43de9af71f7f4ca5731b94a06d688ae8412ba427 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Fri, 6 Jul 2018 11:14:41 +0200 Subject: 2018/Feb/28 -i állapot hozzáadva, mint a módosítások kiindulási állapota --- .../policy/private/naplo/hirnok/cronFutar-pre.php | 32 +++++++++++++ .../www/policy/private/naplo/hirnok/cronFutar.php | 45 ++++++++++++++++++ .../www/policy/private/naplo/hirnok/hirnok-pre.php | 53 ++++++++++++++++++++++ .../www/policy/private/naplo/hirnok/hirnok.php | 6 +++ .../naplo/hirnok/hirnokFeliratkozas-pre.php | 47 +++++++++++++++++++ .../private/naplo/hirnok/hirnokFeliratkozas.php | 7 +++ 6 files changed, 190 insertions(+) create mode 100644 mayor-orig/www/policy/private/naplo/hirnok/cronFutar-pre.php create mode 100644 mayor-orig/www/policy/private/naplo/hirnok/cronFutar.php create mode 100644 mayor-orig/www/policy/private/naplo/hirnok/hirnok-pre.php create mode 100644 mayor-orig/www/policy/private/naplo/hirnok/hirnok.php create mode 100644 mayor-orig/www/policy/private/naplo/hirnok/hirnokFeliratkozas-pre.php create mode 100644 mayor-orig/www/policy/private/naplo/hirnok/hirnokFeliratkozas.php (limited to 'mayor-orig/www/policy/private/naplo/hirnok') diff --git a/mayor-orig/www/policy/private/naplo/hirnok/cronFutar-pre.php b/mayor-orig/www/policy/private/naplo/hirnok/cronFutar-pre.php new file mode 100644 index 00000000..5691de0f --- /dev/null +++ b/mayor-orig/www/policy/private/naplo/hirnok/cronFutar-pre.php @@ -0,0 +1,32 @@ +'cron','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v)); + + for ($i=0; $i$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. + // Javítható: hirnokWrapper() függvény sokszoros használatával + $ADAT['hirnokFolyam'] = hirnokWrapper(array('tolDt'=>$tolDt, + 'diakId'=>$USER['diak'], + 'tanarId'=>$USER['tanar'], + 'tolDtByUser'=>$TOLDTBYUSER + )); + + +?> \ No newline at end of file diff --git a/mayor-orig/www/policy/private/naplo/hirnok/cronFutar.php b/mayor-orig/www/policy/private/naplo/hirnok/cronFutar.php new file mode 100644 index 00000000..605e8eaa --- /dev/null +++ b/mayor-orig/www/policy/private/naplo/hirnok/cronFutar.php @@ -0,0 +1,45 @@ +array($D))); + if ($body !='') { + echo "Email cím: ".$_toEmail."\n"; + $mail = new PHPMailer(); + $mail->CharSet = 'UTF-8'; + $mail->SetFrom(__SUPPORT_EMAIL_ADDRESS, ''._SITE.''); + $mail->AddReplyTo(__SUPPORT_EMAIL_ADDRESS,'MaYoR Support'); + $mail->AddAddress($_toEmail, $cn); + $mail->Subject = "[MaYoR] Értesítés – ".$cn; + $mail->MsgHTML(emailHead(array( + 'skin/classic/module-naplo/css/hirnok/hirnok.css', + 'skin/classic/module-naplo/css/hirnok/cronFutar.css' + )).$body.emailFoot()); + if(!$mail->Send()) { + echo "PHP Mailer Error: " . $mail->ErrorInfo . "\n"; + } else { + $q = "UPDATE hirnokFeliratkozas SET utolsoEmailDt ='%s' WHERE naploId=%u AND naploTipus='%s' AND userAccount='%s' AND policy='%s'"; + $v = array($_toUser['setDt'],$_data['id'],$_data['tipus'],$_toUser['userAccount'],$_toUser['policy']); + db_query($q,array('modul'=>'naplo_intezmeny','fv'=>'cron','values'=>$v,'result'=>'update')); + echo "Email elküldve: ".$_toEmail." - ".$cn." - ".date('Y-m-d H:i:s')."\n"; + } + + } else { + // echo "Nincs mit küldeni.\n"; + } + } + + } +?> \ No newline at end of file diff --git a/mayor-orig/www/policy/private/naplo/hirnok/hirnok-pre.php b/mayor-orig/www/policy/private/naplo/hirnok/hirnok-pre.php new file mode 100644 index 00000000..adc18ddc --- /dev/null +++ b/mayor-orig/www/policy/private/naplo/hirnok/hirnok-pre.php @@ -0,0 +1,53 @@ +strtotime($_SESSION['lastLogin'])) $rDt = $_SESSION['lastLogin']; + else $rDt = getTanitasiNapVissza(2); + $tolDt = readVariable($_POST['tolDt'],'date', + readVariable($_GET['tolDt'], 'date', + $rDt + ) + ); + if (strtotime($tolDt)>strtotime(date('Y-m-d H:i:s'))) $tolDt = date('Y-m-d',strtotime('-10 day')); + + $osztalyId = readVariable($_POST['osztalyId'], 'id'); + if (__NAPLOADMIN === true) { // csak adminnak engedjük kiválasztani - lásd még include + $diakId = readVariable($_POST['diakId'], 'id', readVariable($_GET['diakId'], 'id')); + $tanarId = readVariable($_POST['tanarId'], 'id', readVariable($_GET['tanarId'], 'id')); + $feliratkozott = getHirnokFeliratkozasok(); + if ($diakId==0 && count($feliratkozott['diak'])>0) $diakId = $feliratkozott['diak']; + if ($tanarId==0 && count($feliratkozott['tanar'])>0) $tanarId = $feliratkozott['tanar']; + if ($tanarId==0 && defined('__USERTANARID')) $tanarId = __USERTANARID; + } else { + if (__DIAK===true) { // diák nézet + $diakId = __USERDIAKID; + } elseif (__TANAR ===true) { // tanár nézet + $tanarId = __USERTANARID; + } + } + + $ADAT['hirnokFolyam'] = hirnokWrapper(array('tolDt'=>$tolDt,'diakId'=>$diakId,'tanarId'=>$tanarId)); + $ADAT['tolDt'] = $tolDt; + $ADAT['igDt'] = $igDt = date('Y-m-d'); + + if (__NAPLOADMIN===true) { + $TOOL['vissza'] = array('tipus'=>'vissza','paramName'=>'','icon'=>'bullhorn'); + $TOOL['tanarSelect'] = array('tipus'=>'cella','paramName'=>'tanarId', 'post'=>array('tolDt', 'igDt')); + $TOOL['osztalySelect'] = array('tipus'=>'cella','paramName' => 'osztalyId', 'post'=>array('tolDt', 'igDt')); + $TOOL['diakSelect'] = array('tipus'=>'cella','paramName'=>'diakId', 'post'=>array('osztalyId','tolDt', 'igDt', 'osztalyId')); + if ($diakId>0)$TOOL['diakLapozo'] = array('tipus'=>'sor','paramName'=>'diakId', 'post'=>array('osztalyId','tolDt', 'igDt', 'osztalyId')); + } + $TOOL['datumTolIgSelect'] = array( + 'tipus' => 'sor', 'title' => '', + 'post'=>array('tolDt','tanarId','osztalyId','tankorId','mkId','diakId','telephely'), + 'tolParamName' => 'tolDt', 'igParamName' => 'igDt', 'hanyNaponta' => 1, + 'override' => true, + 'tolDt' => $_TANEV['kezdesDt'], + 'igDt' => $igDt, + ); + + getToolParameters(); + +?> \ No newline at end of file diff --git a/mayor-orig/www/policy/private/naplo/hirnok/hirnok.php b/mayor-orig/www/policy/private/naplo/hirnok/hirnok.php new file mode 100644 index 00000000..ce3b7f72 --- /dev/null +++ b/mayor-orig/www/policy/private/naplo/hirnok/hirnok.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/mayor-orig/www/policy/private/naplo/hirnok/hirnokFeliratkozas-pre.php b/mayor-orig/www/policy/private/naplo/hirnok/hirnokFeliratkozas-pre.php new file mode 100644 index 00000000..d8fb3d33 --- /dev/null +++ b/mayor-orig/www/policy/private/naplo/hirnok/hirnokFeliratkozas-pre.php @@ -0,0 +1,47 @@ +strtotime(date('Y-m-d'))) $tolDt = date('Y-m-d',strtotime('-10 day')); + + $osztalyId = readVariable($_POST['osztalyId'], 'id'); + if (__NAPLOADMIN === true) { // csak adminnak engedjük kiválasztani - lásd még include + if ($action=='hirnokFeliratkozas') { + $S['naploId'] = readVariable($_POST['naploId'],'numeric'); + $S['naploTipus'] = readVariable($_POST['naploTipus'],'string',null,array('tanar','diak')); + $S['email'] = readVariable($_POST['email'],'email'); + $S['hirnokFeliratkozasId'] = readVariable($_POST['hirnokFeliratkozasId'],'numeric'); + if ($S['hirnokFeliratkozasId']>0) delHirnokFeliratkozas($S); + elseif ($S['email']!='') addHirnokFeliratkozas($S); + } + $ADAT['hirnokFeliratkozas'] = $feliratkozott = getHirnokFeliratkozasok(true); +// if ($diakId==0 && count($feliratkozott['diak'])>0) $diakId = $feliratkozott['diak']; +// if ($tanarId==0 && count($feliratkozott['tanar'])>0) $tanarId = $feliratkozott['tanar']; +// if ($tanarId==0 && defined('__USERTANARID')) $tanarId = __USERTANARID; + } else { + if (__DIAK===true) { // diák nézet + szülő? + $diakId = $naploId = __USERDIAKID; + $naploTipus = 'diak'; // szulo??? + } elseif (__TANAR ===true) { // tanár nézet + $tanarId = $naploId = __USERTANARID; + $naploTipus = 'tanar'; + } + if ($action=='hirnokFeliratkozas') { + $S['email'] = readVariable($_POST['email'],'email'); + $S['naploId'] = $naploId; + $S['naploTipus'] = $naploTipus; + + $S['hirnokFeliratkozasId'] = readVariable($_POST['hirnokFeliratkozasId'],'numeric'); + if ($S['hirnokFeliratkozasId']>0) delHirnokFeliratkozas($S); + elseif ($S['email']!='') addHirnokFeliratkozas($S); + } + $ADAT['email'] = ''; // lekérdezhetnénk az objektum e-mail címét később + $ADAT['hirnokFeliratkozas'] = $feliratkozott = getHirnokFeliratkozasok(true); + + } + +?> \ No newline at end of file diff --git a/mayor-orig/www/policy/private/naplo/hirnok/hirnokFeliratkozas.php b/mayor-orig/www/policy/private/naplo/hirnok/hirnokFeliratkozas.php new file mode 100644 index 00000000..a5c9056b --- /dev/null +++ b/mayor-orig/www/policy/private/naplo/hirnok/hirnokFeliratkozas.php @@ -0,0 +1,7 @@ + \ No newline at end of file -- cgit v1.2.3