diff --git a/adminforce/lib/class/rally.class.php b/adminforce/lib/class/rally.class.php index 4007e8476aa20bbdab741119187c677d5d30937f..6ccb898c09aeb20d2640ef64a58294904e9a367d 100644 --- a/adminforce/lib/class/rally.class.php +++ b/adminforce/lib/class/rally.class.php @@ -22,7 +22,7 @@ class rally{ <td>'. $res->name .'</td> <td> <input type="hidden" name="id" value="'. $res->id .'"> - <input type="submit" name="rallyDelete" class="btn btn-danger" value="Löschen" style="width:100px;"> + <input type="submit" name="run[rallyDelete]" class="btn btn-danger" value="Löschen" style="width:100px;"> </td> </tr> </form> @@ -62,8 +62,8 @@ class rally{ <td>'. $res->name .'</td> <td>'. $ausgabe .'</td> <td> - <input type="submit" name="OrtEdit" value="bearbeiten" class="btn btn-success"><br> - <input type="submit" name="OrtDelete" value="Löschen" class="btn btn-danger"> + <input type="submit" name="run[OrtEdit]" value="bearbeiten" class="btn btn-success"><br> + <input type="submit" name="run[OrtDelete]" value="Löschen" class="btn btn-danger"> </td> </form> </tr> diff --git a/crons/rallysystem.php b/crons/rallysystem.php index a1c48e926fde7ad24858b76bbf817f594a67a4f2..bddb08f85729c4092695b34726dc35a6d41f449e 100644 --- a/crons/rallysystem.php +++ b/crons/rallysystem.php @@ -1,31 +1,37 @@ <?php -$rallys = explode('|', $_GET['rallys']); -$konto = Classloader('kontobuchung'); -$bilanz = Classloder('bilanz'); +if(isset($_GET['rallys'])){ + $rallys = explode('|', $_GET['rallys']); + $konto = Classloader('kontobuchung'); + $bilanz = Classloader('bilanz'); -for ($i = 0; $i < count($rallys); $i++) { - echo $rallys[$i] . '-Auswertung beginnt--------------------------<br>'; - $rallyd = $datenbank->get_row("SELECT * FROM ". PREFIX . RALLY ." WHERE name='" . $rallys[$i] . "' LIMIT 1",true); - $platz = "SELECT * FROM vms_rallyuser WHERE rally = '" . $rallyd->id . "' AND ausgezahlt = '0' AND punkte >= '" . $rallyd->mindestpunktzhl . "' ORDER BY punkte DESC LIMIT " . $rallyd->gewinner_anzahl . ""; - $rp = 1; - foreach($datenbank->get_results($platz) AS $res){ - $platzP = 'p'.$rp; - $gewinn = $rallyd->gewinn_topf / 100 * $rallyd->$platzP; - echo $res->uid.' = '. $rp .' => '. $gewinn .' Gewinn<br>'; - $datenbank->update(PREFIX . RALLYU, array("auszahlungssumme" => $gewinn, "ausgezahlt" => time()), array("uid" => $res->uid, "ausgezahlt" => 0, "rally" =>$rallyd->id)); - $konto->set_var($res->uid,$gewinn,'+',$rallyd->name . ' (Platz ' . $rp . ')'); - $bilanz->bilanz (0,$gewinn,'Rally',$rallyd->name); - $rp++; + for ($i = 0; $i < count($rallys); $i++) { + echo $rallys[$i] . '-Auswertung beginnt--------------------------<br>'; + $rallyd = $datenbank->get_row("SELECT * FROM ". PREFIX . RALLY ." WHERE name='" . $rallys[$i] . "' LIMIT 1",true); + $platz = "SELECT * FROM vms_rallyuser WHERE rally = '" . $rallyd->id . "' AND ausgezahlt = '0' AND punkte >= '" . $rallyd->mindestpunktzhl . "' ORDER BY punkte DESC LIMIT " . $rallyd->gewinner_anzahl . ""; + $rp = 1; + foreach($datenbank->get_results($platz) AS $res){ + $platzP = 'p'.$rp; + $gewinn = $rallyd->gewinn_topf / 100 * $rallyd->$platzP; + echo $res->uid.' = '. $rp .' => '. $gewinn .' Gewinn<br>'; + $datenbank->update(PREFIX . RALLYU, array("auszahlungssumme" => $gewinn, "ausgezahlt" => time()), array("uid" => $res->uid, "ausgezahlt" => 0, "rally" =>$rallyd->id)); + $konto->set_var($res->uid,$gewinn,'+',$rallyd->name . ' (Platz ' . $rp . ')'); + $bilanz->bilanz (0,$gewinn,'Rally',$rallyd->name); + $rp++; + } + + $datenbank->update(PREFIX . RALLYU, array("ausgezahlt" => time()),array("rally" => $rallyd->id, "ausgezahlt" => 0)); + $datenbank->delete(PREFIX . RALLYU, array("rally" => $rallyd->id, "ausgezahlt" => 0)); + $datenbank->update(PREFIX . RALLY, array( + "ende_punkte_aktuell" => 0, + "gewinn_topf" => $rallyd->tagpotstart, + "start_time" => date("H:i",time()).":00.000000", + "start_date" => date("Y-m-d",time()) + ), array("name" => $rallyd->name)); } - - $datenbank->update(PREFIX . RALLYU, array("ausgezahlt" => time()),array("rally" => $rallyd->id, "ausgezahlt" => 0)); - $datenbank->delete(PREFIX . RALLYU, array("rally" => $rallyd->id, "ausgezahlt" => 0)); - $datenbank->update(PREFIX . RALLY, array( - "ende_punkte_aktuell" => 0, - "gewinn_topf" => $rallyd->tagpotstart, - "start_time" => date("H:i",time()).":00.000000", - "start_date" => date("Y-m-d",time()) - ), array("name" => $rallyd->name)); -} -echo '<br><br>Auswertung Durch<strong></strong><br>'; + echo '<br><br>Auswertung Durch<strong></strong><br>'; +}else{ + echo 'Es wurden keine Rallys ausgewählt.<br> + Bitte füge an den aktuellen Link folgendes an: &rallys=NameDerRally<br> + <br>'; +} diff --git a/lib/class/anmelden.class.php b/lib/class/anmelden.class.php index 0ab1f4740b761ea3a8cc76fe35dc2f3088792508..ba9a3efc7b71a1ce35b06e21aa14020d9a6bf744 100644 --- a/lib/class/anmelden.class.php +++ b/lib/class/anmelden.class.php @@ -90,7 +90,7 @@ class ANMELDEN{ function werber(){ $insert = array( "uid" => $this->uid, - "werber" => $this->werber_select($this->session['werber']), + "werber" => $this->session['werber'], "umsatz" => 0, "zuordnungszeit" => time() ); @@ -181,17 +181,6 @@ class ANMELDEN{ $this->meldung .= ANMLEDEN_NICKNAME_EXIST; } } - - function werber_select($werber){ - if($werber != ''){ - $ab = $this->db->exists(PREFIX . USER , 'uid' , array("uid" => $werber)); - if(!is_numeric($werber) OR $ab == false){ - $this->werber = 0; - } - }else{ - $this->werber = $werber; - } - } } ?> diff --git a/lib/class/bettel.class.php b/lib/class/bettel.class.php index 57147d74b64134249bfe09b9c62aeb83b3639558..679e30eab884f5bbdcabb49b041b8ffd31955543 100644 --- a/lib/class/bettel.class.php +++ b/lib/class/bettel.class.php @@ -65,7 +65,7 @@ class bettel{ private function BettelAuszahlung(){ $bettelsumme = rand($this->config->min_betteln * 100, $this->config->max_betteln * 100) / 100; $new_reload = time() + $this->config->reload_betteln; - //$this->db->insert(PREFIX . RELOAD, array("ip" => $this->ip,"uid" => $this->uid ,"tan" => 'bettelaufruf',"bis" => $new_reload) ); + $this->db->insert(PREFIX . RELOAD, array("ip" => $this->ip,"uid" => $this->uid ,"tan" => 'bettelaufruf',"bis" => $new_reload) ); $this->db->query("UPDATE ". PREFIX . KONTO ." SET angebettelt = angebettelt + 1, bv = bv + $bettelsumme, kontostand_a = kontostand_a + $bettelsumme WHERE uid = '$this->uid' "); $this->db->update(PREFIX . BETTELB, array("zeit" => time(),"betrag" => $bettelsumme,"refferer" => $this->refferer,"uid" => $this->uid)); $bilanz = Classloader('bilanz'); diff --git a/lib/class/verdienen.class.php b/lib/class/verdienen.class.php index f1753adb7d282c0731e1a1e14fb7cc16bde7d3b4..c34cac77a31ae3408ac8c0874119f2183b491eeb 100644 --- a/lib/class/verdienen.class.php +++ b/lib/class/verdienen.class.php @@ -65,9 +65,9 @@ class Verdienen{ <td align='center'>uebrig: ". number_format($fstats_gesamt->ganzahl - $fstats_gesamt->anzahlreload,0,',','.') ."</td> </tr> <tr> - <td align='center'>Ø Aufenthalt: ".number_format($fstats_gesamt->gaufenthalt - $fstats_uebrig->reloadaufendhalt / $fstats_gesamt->ganzahl,2,",",".")." Sekunden</td> + <td align='center'>Ø Aufenthalt: ".number_format(($fstats_gesamt->gaufenthalt - $fstats_uebrig->reloadaufendhalt) / $fstats_gesamt->ganzahl,2,",",".")." Sekunden</td> <td> </td> - <td align='center''>Ø Vergütung: ".number_format($fstats_gesamt->gverdienst - $fstats_uebrig->reloadverdienst / $fstats_gesamt->ganzahl,2,",",".")." ".$this->config->waehrung."</td> + <td align='center''>Ø Vergütung: ".number_format(($fstats_gesamt->gverdienst - $fstats_uebrig->reloadverdienst) / $fstats_gesamt->ganzahl,2,",",".")." ".$this->config->waehrung."</td> </tr> <tr> <td align='center''>Gesamtwert: ". number_format($fstats_gesamt->gverdienst,2,',','.') ." ".$this->config->waehrung."</td> @@ -112,14 +112,15 @@ class Verdienen{ $result = $this->Query(); foreach($result AS $res) { + $res->tan2 = str_replace("=","",$res->tan); $aus .= ' - <div class="card text-center" id="mail_'.$res->tan.'"> + <div class="card text-center" id="mail_'.$res->tan2.'"> <div class="card-header"> '. $res->betreff .' </div> <div class="card-body"> <p class="card-text">'. nl2br($res->text) .'</p> - <a href="pclick.php?tan=' . $res->tan . '&uid=' . $this->session['uid'] . '" target="_new" onclick="$( \'#mail_'.$res->tan.'\' ).hide( \'slow\' );" class="btn btn-success">Klick</a> + <a href="pclick.php?tan=' . $res->tan . '&uid=' . $this->session['uid'] . '" target="_blank" onclick="$( \'#mail_'.$res->tan2.'\' ).hide( \'slow\' );" class="btn btn-success">Klick</a> </div> <div class="card-footer text-muted"> Aufendhalt: '. $res->aufendhalt .' sek || Verdienst: '. number_format($res->verdienst,2,',','.') .' '. $this->config->waehrung .' || Reload: '. number_format($res->reload / 60,2,',','.') .' min | '. $this->Melden($res->tan) .' @@ -140,10 +141,11 @@ class Verdienen{ $result = $this->Query(); foreach($result AS $res) { + $res->tan2 = str_replace("=","",$res->tan); $aus .= ' - <div align="center" id="banner_' . $res->tan . '"> + <div align="center" id="banner_' . $res->tan2 . '"> <a href="top_forcedbanner.php?tan=' . $res->tan . '" target="_blank"> - <img src="' . $res->banner . '" border="0" height="60" width="468" alt="' . $res->tan . '" onClick="document.getElementById(\'banner_' . $res->tan . '\').style.display=\'none\';"> + <img src="' . $res->banner . '" border="0" height="60" width="468" alt="' . $res->tan2 . '" onClick="document.getElementById(\'banner_' . $res->tan2 . '\').style.display=\'none\';"> </a>' . '<br> Reload: ' . number_format($res->reload / 60,2,',','.') . ' Std. | Verdienst: ' . number_format($res->verdienst, 2, ',', '.') . ' | Aufenthalt: ' . $res->aufendhalt . ' Sekunden | '. $this->Melden($res->tan) .'<br><br> @@ -207,11 +209,12 @@ class Verdienen{ public function ReloadZahlung($Abfrage){ $aus = array(); $aus['wartezeit'] = 0; + if(!isset($Abfrage['force_error'])){ $Abfrage['force_error'] = true;} $bilanz = Classloader('bilanz'); $reload = $this->db->num_rows("SELECT * FROM ". PREFIX . RELOAD ." WHERE tan = '$this->tan' AND bis > '". time() ."' AND (uid = '". $this->session['uid'] ."' OR ip = '$this->ip' ) "); $forced = $this->db->get_row("SELECT * FROM ". PREFIX . WERBUNG ." WHERE tan = '$this->tan' ",true); - if(isset($this->get['force_error']) && $this->get['force_error'] != 'true'){ $ferror = '';}else{ $ferror = 'true';} - if ($this->get['auszahlen'] == 'true' && $reload == 0 && $ferror != 'rue' && $this->get['puk'] == md5($this->session['uid'] . $forced->aufendhalt . date("d.m.Y", time()) ) && time() >= $this->session['earlies_payout' . $this->get['tan']]) { + if(!isset($this->get['force_error']) || $this->get['force_error'] != 'true'){ $ferror = 'false';}else{ $ferror = 'true';} + if ($this->get['auszahlen'] == 'true' && $reload == 0 && $ferror != 'true' && $this->get['puk'] == md5($this->session['uid'] . $forced->aufendhalt . date("d.m.Y", time()) ) && time() >= $this->session['earlies_payout' . $this->get['tan']]) { $this->db->update(PREFIX . KONTO, array("klicks" => 'klicks + 1', "kv" => "kv + ".$forced->verdienst, "fc_klicks" => "fc_klicks + 1"),array("uid" => $this->session['uid']),1,false); $this->konto->set_var($this->session['uid'],$forced->verdienst,'+',$this->art.'verdienst'); refumsatz ($forced->verdienst, $this->session['uid']); @@ -226,6 +229,8 @@ class Verdienen{ $aus['headmsg'] = 'Wartezeit umgangen.'; } elseif ($this->get['auszahlen'] == 'true' && $Abfrage['force_error'] != 'true') { $aus['headmsg'] = 'Pin abgelaufen'; + } elseif ($reload != 0){ + $aus['headmsg'] = 'Banner noch im Reload'; } return $aus; } diff --git a/lib/functions.lib.php b/lib/functions.lib.php index d8a853412a6eaa63ebb825e2bed88e7f86295f2e..c0717aad65cf65f48193c25868bc380cf2975c50 100644 --- a/lib/functions.lib.php +++ b/lib/functions.lib.php @@ -76,13 +76,22 @@ function refumsatz ($summe, $uid) { */ function rallysystem ($uid,$was,$anzahl) { global $datenbank; - $rallyorte = $datenbank->get_row("SELECT welche_rallys FROM ". PREFIX . RALLYO ." WHERE id = '". $datenbank->escape($was) ."' LIMIT 1",true); - foreach($datenbank->get_results("SELECT * FROM `vms_rallydaten` WHERE `id` IN (". $rallyorte->welche_rallys .") AND `status` = 'aktive' AND ( start_time <= '". date("H:i", time()) ."' AND start_date >= '". date("Y-m-d",time()) ."') AND ((`ende_art` = 'zeit' AND `ende_time` >= '". date("H:i",time()) ."' AND ende_date >= '". date("Y-m-d",time()) ."' ) OR (`ende_art` = 'punkt' AND `ende_punkte` > `ende_punkte_aktuell`)) ") AS $res){ + foreach($datenbank->get_results(" + SELECT * FROM `vms_rallydaten` WHERE `id` IN (". $rallyorte->welche_rallys .") AND `status` = 'aktive' AND ( (UNIX_TIMESTAMP(start_time)+UNIX_TIMESTAMP(start_date))-UNIX_TIMESTAMP(curdate()) <= '". time() ."' ) + AND + ( + (ende_art = 'zeit' AND (UNIX_TIMESTAMP(ende_time)+UNIX_TIMESTAMP(ende_date))-UNIX_TIMESTAMP(curdate()) >= '". time() ."' ) + OR + (`ende_art` = 'punkt' AND `ende_punkte` > `ende_punkte_aktuell`) + + ) ") AS $res){ $gesperrt = explode(',',$res->sperruser); if (!in_array($uid, $gesperrt)) { $anzahl2 = $anzahl.$res->ende_punkte_anzahl; + eval("\$anzahl2 = $anzahl2;"); $steigerung = $anzahl.$res->gewinn_dyn_steigerung; + eval("\$steigerung = $steigerung;"); if ($res->gewinn_art == 'dynamisch') $datenbank->query("UPDATE ". PREFIX . RALLY ." SET gewinn_topf=gewinn_topf+'".$steigerung."' WHERE id = '".$res->id."' LIMIT 1"); if ($res->ende_art == 'punkt') $datenbank->query("UPDATE ". PREFIX . RALLY ." SET ende_punkte_aktuell = ende_punkte_aktuell + '".$anzahl2."' WHERE id = ".$res->id." LIMIT 1"); if($datenbank->num_rows("SELECT uid FROM ". PREFIX . RALLYU ." WHERE uid = '$uid' AND rally = '$res->id' ") == 1){ diff --git a/page/betteln.php b/page/betteln.php index ff8d96f2930d5ecae8e6fc5e5785ecb664eb7686..2778ad44804c0dc184747fd6061c974758b17884 100644 --- a/page/betteln.php +++ b/page/betteln.php @@ -18,5 +18,5 @@ foot(); head("Werbung dieser Seite"); $texte = Classloader('texte'); $aus = $texte->AWerbung('bettelwerbung'); - echo nl2br($aus->bettelwerbung); + echo nl2br($aus); foot();