From c0ae07803d7b58fd52d3f33d08f76b9a56e2e5ac Mon Sep 17 00:00:00 2001 From: isaack <drericlaufer@gmx.de> Date: Wed, 14 Aug 2019 16:03:25 +0200 Subject: [PATCH] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Bug in der Refübersicht behoben - Bug in der Anmeledung behoben - Werbemittel --- CHANGELOG | 9 +++++ images/werbemittel/index.html | 1 + install/mysql.txt | 1 - lib/class/anmelden.class.php | 2 +- lib/class/ref.class.php | 71 ++++++++++++++++++--------------- lib/class/verdienen.class.php | 8 ++-- lib/class/werbemittel.class.php | 52 ++++++++++++++++++++++++ page/intern/mediadaten.php | 6 +-- page/werbemittel.php | 37 +++++++++++++++++ 9 files changed, 146 insertions(+), 41 deletions(-) create mode 100644 images/werbemittel/index.html create mode 100644 lib/class/werbemittel.class.php create mode 100644 page/werbemittel.php diff --git a/CHANGELOG b/CHANGELOG index 492da00..3cc8cbb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,13 @@ # Was alles passiert +## [0.1.5] + +##geupdatet +- Bug in der Refübersicht behoben +- Bug in der Anmeledung behoben +##gelöscht + +##hinzugefügt +- Werbemittel ## [0.1.4] diff --git a/images/werbemittel/index.html b/images/werbemittel/index.html new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/images/werbemittel/index.html @@ -0,0 +1 @@ + diff --git a/install/mysql.txt b/install/mysql.txt index 3573296..f50f6db 100644 --- a/install/mysql.txt +++ b/install/mysql.txt @@ -526,7 +526,6 @@ CREATE TABLE `vms_seitenkonfig` ( `id` int(11) NOT NULL, `wartung` int(1) NOT NULL DEFAULT '0', `domain` text NOT NULL, - `start_seite` text NOT NULL, `seitenname` text NOT NULL, `waehrung` text NOT NULL, `betreibermail` text NOT NULL, diff --git a/lib/class/anmelden.class.php b/lib/class/anmelden.class.php index c733194..8c9abb4 100644 --- a/lib/class/anmelden.class.php +++ b/lib/class/anmelden.class.php @@ -8,7 +8,7 @@ class ANMELDEN{ private $db; private $error = 0; private $meldung; - private $post = array; + private $post = array(); private $config; private $session; diff --git a/lib/class/ref.class.php b/lib/class/ref.class.php index 2ce442c..c5f046c 100644 --- a/lib/class/ref.class.php +++ b/lib/class/ref.class.php @@ -17,7 +17,9 @@ class ref{ $this->konto = $k_buchung; $explode = explode(";",$this->config->RefVerg); for($i = 1; $i <= $this->config->RefEbenen; $i++){ - $this->verg[$i] = $explode[$i-1]; + if(!empty($explode[$i-1])){ + $this->verg[$i] = $explode[$i-1]; + } } } @@ -90,41 +92,46 @@ class ref{ } public function RefListe($uid){ - $aus = '<ul class="list-group">'; - foreach($this->db->get_results("SELECT * FROM ". PREFIX . WERBER ." WHERE werber = '$uid' ") AS $res){ - $user = userinfo($res->uid); - $refs = $this->RefAnzahl($res->uid); - $aus .= '<li class="list-group-item">'; - $aus .= '<div class="row"> - <div class="col"> '.$user->nickname.'('.$res->uid.')</div> - <div class="col"> - <form method="post" action=""> - <input type="hidden" name="uid" value="'. $res->uid .'"> - <div class="input-group"> - <input type="text" class="form-control" name="refback" value="'. $res->refback.'"> - <div class="input-group-append"> - <span class="input-group-text">%</span> - <input type="submit" name="run[refback_save]" value="Save" class="btn btn-success btn-sm"> + $query = "SELECT * FROM ". PREFIX . WERBER ." WHERE werber = '$uid' "; + if($this->db->num_rows($query) > 0){ + $aus = '<ul class="list-group">'; + foreach($this->db->get_results($query) AS $res){ + $user = userinfo($res->uid); + $refs = $this->RefAnzahl($res->uid); + $aus .= '<li class="list-group-item">'; + $aus .= '<div class="row"> + <div class="col"> '.$user->nickname.'('.$res->uid.')</div> + <div class="col"> + <form method="post" action=""> + <input type="hidden" name="uid" value="'. $res->uid .'"> + <div class="input-group"> + <input type="text" class="form-control" name="refback" value="'. $res->refback.'"> + <div class="input-group-append"> + <span class="input-group-text">%</span> + <input type="submit" name="run[refback_save]" value="Save" class="btn btn-success btn-sm"> + </div> </div> - </div> - </form> - </div> - <div class="col">Umsatz: '. number_format($res->umsatz,2,',','.') .' '. $this->config->waehrung .'</div> - <div class="col">Refs: '. $refs .'</div> - </div>'; - - if($refs != 0){ - $aus .= ' - <div class="collapse" id="refs_'. $res->uid .'"> - <div class="card card-body"> - '. $this->RefRefListe($res->uid,1) .' + </form> + </div> + <div class="col">Umsatz: '. number_format($res->umsatz,2,',','.') .' '. $this->config->waehrung .'</div> + <div class="col">Refs: '. $refs .'</div> + </div>'; + + if($refs != 0){ + $aus .= ' + <div class="collapse" id="refs_'. $res->uid .'"> + <div class="card card-body"> + '. $this->RefRefListe($res->uid,1) .' + </div> </div> - </div> - '; + '; + } + $aus .= '</li>'; } - $aus .= '</li>'; + $aus .= '</ul>'; + }else{ + $aus = '<div class=" alert alert-info">Du hast noch keinen User geworben.</div>'; } - $aus .= '</ul>'; return $aus; } diff --git a/lib/class/verdienen.class.php b/lib/class/verdienen.class.php index 2086b5b..6c5bcd0 100644 --- a/lib/class/verdienen.class.php +++ b/lib/class/verdienen.class.php @@ -58,7 +58,7 @@ class Verdienen{ AND t2.tan = t1.tan WHERE - t1.bis <= ". time() ." + t1.bis > ". time() ." ",true); $aus = " <table class=\"table\"> @@ -137,11 +137,11 @@ class Verdienen{ } private function AnzahlBanner(){ - if(isset($this->get['banner'])){ - if($this->get['banner']*5 > $this->maxBanner){ + if(isset($this->get['anzahl'])){ + if($this->get['anzahl']*5 > $this->maxBanner){ return 5; }else{ - return $this->get['banner']*5; + return $this->get['anzahl']*5; } }else{ return rand(1,$this->maxBanner); diff --git a/lib/class/werbemittel.class.php b/lib/class/werbemittel.class.php new file mode 100644 index 0000000..eb4cf99 --- /dev/null +++ b/lib/class/werbemittel.class.php @@ -0,0 +1,52 @@ +<?php + +class werbemittel{ + private $session = array(); + private $gconfig; + + public function __construct(){ + global $_SESSION,$grundconfig; + $this->session = $_SESSION; + $this->gconfig = $grundconfig; + } + + public function Ansicht(){ + $aus = ''; + $aus .= $this->Werbelink(); + $aus .= '<hr>'; + $aus .= $this->Banner(); + return $aus; + } + + private function Banner(){ + $url = $this->gconfig->domain.'/?content=/betteln&ref='.$this->session['uid'].''; + $aus = '<div class="card"><div class="card-header text-center">Werbebanner</div><div class="card-body text-center">'; + $open = opendir('./images/werbemittel/'); + while ($banner = readdir($open)){ + if ($banner != '..' && $banner != '.' && $banner != 'Thumbs.db'){ + $size = getimagesize('images/werbemittel/'.$banner); + $groesse = filesize('images/werbemittel/'.$banner.'')/1024; + $aus .= ' + <b>'.$size[0].'x'.$size[1].' (~ '.round($groesse).' KB)</b><br> + <img src="images/werbemittel/'.$banner.'" alt="'.$this->gconfig->seitenname.'"><br> + <code><a href="'.$url.'" target="_blank"><img src="'.$this->gconfig->domain.'/images/werbemittel/'.$banner.'" alt="'.$this->gconfig->seitenname.'" border="0"></a></code><br><br>'; + } + } + closedir($open); + + $aus .= '</div></div>'; + return $aus; + } + + private function Werbelink(){ + return ' + <div class="card"> + <div class="card-header text-center">Deine Werbelinks</div> + <div class="card-body"> + Dein Reflink: <a href="'.$this->gconfig->domain.'/?ref='.$this->session['uid'].'" target="_blank">'.$this->gconfig->domain.'/?ref='.$this->session['uid'].'</a><br> + Dein Bettellink: <a href="'.$this->gconfig->domain.'/?content=/betteln&ref='.$this->session['uid'].'" target="_blank">'.$this->gconfig->domain.'/?content=/betteln&ref='.$this->session['uid'].'</a> + </div> + </div> + '; + } +} diff --git a/page/intern/mediadaten.php b/page/intern/mediadaten.php index aceb6f2..1613dbd 100644 --- a/page/intern/mediadaten.php +++ b/page/intern/mediadaten.php @@ -97,15 +97,15 @@ head("Mediadaten - Werbung");?> <table width="100%" border="0" cellpadding="1" cellspacing="1"> <tr class="tabellenbody_0"> <td width="50%">Forcedklick Kampagnen</td> -<td width="50%"><?php echo @number_format($fc_gebucht,0,",",".");?> Kampagnen</td> +<td width="50%"><?php echo @number_format($fc['gebucht'],0,",",".");?> Kampagnen</td> </tr> <tr class="tabellenbody_1"> <td width="50%">Forcedklick Restklicks</td> -<td width="50%"><?php echo @number_format($fc_menge,0,",",".");?> Klicks</td> +<td width="50%"><?php echo @number_format($fc['menge'],0,",",".");?> Klicks</td> </tr> <tr class="tabellenbody_0"> <td width="50%">Forcedklicks Gesamtwert</td> -<td width="50%"><?php echo @number_format($fc_wert,2,",",".");?> <?php echo $grundconfig->waehrung;?></td> +<td width="50%"><?php echo @number_format($fc['wert'],2,",",".");?> <?php echo $grundconfig->waehrung;?></td> </tr> </table> <?php foot();?> diff --git a/page/werbemittel.php b/page/werbemittel.php new file mode 100644 index 0000000..b145d3a --- /dev/null +++ b/page/werbemittel.php @@ -0,0 +1,37 @@ +<?php + +$Class = Classloader('werbemittel'); +echo $Class->Ansicht(); + +/* +if ($_SESSION['uid'] >= 0) { + head("Dein Werbelinks"); + echo '<table> + <tr><td align="right"><b>Dein Reflink:</b></td><td align="left"> <a href="'.$domain.'/?ref='.$_SESSION['uid'].'" target="_blank">'.$domain.'/?ref='.$_SESSION['uid'].'</a></td></tr> + <tr><td align="right"><b>Reflink und Bettellink:</b></td><td align="left"> <a href="'.$domain.'/?content=/betteln&ref='.$_SESSION['uid'].'" target="_blank">'.$domain.'/?content=/betteln&ref='.$_SESSION['uid'].'</a></td></tr> + </table>'; + foot(); + $url = $domain.'/?content=/betteln&ref='.$_SESSION['uid'].''; +}else{ + $url = $domain; +} + +head("".$seitenname." - Werbemittel"); + echo '<div align="center">'; + + $open = opendir('./images/banner/'); + while ($banner = readdir($open)){ + if ($banner != '..' && $banner != '.' && $banner != 'Thumbs.db'){ + $size = getimagesize('images/banner/'.$banner); + $groesse = filesize('images/banner/'.$banner.'')/1024; + echo ' + <b>'.$size[0].'x'.$size[1].' (~ '.round($groesse).' KB)</b><br> + <img src="images/banner/'.$banner.'" alt="'.$seitenname.'"><br> + <textarea style="width:468px; height:50px;"><a href="'.$url.'" target="_blank"><img src="'.$domain.'/images/banner/'.$banner.'" alt="'.$seitenname.'" border="0"></a></textarea><br><br>'; + } + } + closedir($open); + + echo '</div>'; +foot(); +*/ -- GitLab