Merge branch 'dev-3.0' into 'dev-3.0'

-index.php: added jquery to make progressbar work in /verdienen/forcedbanner See merge request !35

Merge branch 'dev-3.0' into 'dev-3.0'
-index.php: added jquery to make progressbar work in /verdienen/forcedbanner See merge request !35
4501ed25 · Joel Kuder · 85b8d912 · 5ad4ab5d · 4501ed25 · 4501ed25
Commit 4501ed25 authored 5 years ago by Joel Kuder
--- a/adminforce/content/usersystem/doppelaccis.php
+++ b/adminforce/content/usersystem/doppelaccis.php
@@ -73,7 +73,7 @@ if ($sql2->rowCount() == 0) {

 <?php
 if (isset($_GET['md5'])) {
-    $md5 = db_query("SELECT k.uid,u.nickname FROM
+    $md5 = sql::$db->prepare("SELECT k.uid,u.nickname FROM
                        `" . _VMS_ . "_kontodaten` AS k
                        LEFT JOIN `" . _VMS_ . "_userdaten` AS u ON u.uid=k.uid
 WHERE k.passwort=:md5");

--- a/adminforce/frametest.php
+++ b/adminforce/frametest.php
@@ -7,9 +7,9 @@ if ($_GET['testen'] == 'true') {
    if ($_GET['frame'] == 'true') {
        echo 'Dies ist der Testframe';
    } else {
-        require_once ('../lib/config.inc.php');
-        require_once ('../lib/functions.lib.php');
-        db_connect();
+        require_once ('../lib/extras.init.php');
+
+
        if (!isset($_GET['art'])) $_GET['art'] = "";
        if (!isset($forced['tan'])) $forced['tan'] = "";
        if (!isset($forced['ziel'])) $forced['ziel'] = "";
@@ -39,7 +39,7 @@ if ($_GET['testen'] == 'true') {
 </frameset><noframes></noframes><noframes>Bei dir sind keine Frames aktiviert!</noframes>
 </body>
 </html>';
-        db_close();
+
    }
 } else {
    echo 'Javascript Test! Bitte warte einen Moment!

--- a/index.php
+++ b/index.php
@@ -22,6 +22,9 @@ if ($_GET['content'] == '/betteln') require_once ('lib/texte/alt_bettelseitenpop
        <meta name="Description" content="Verdien was Du willst">
        <meta name="Robots" content="INDEX,FOLLOW">
        <link rel="stylesheet" href="css/main.css" type="text/css">
+        <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+        <script src="https://code.jquery.com/jquery-3.4.1.js"></script>
+        <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
    </head>
    <body>
        <div id="wrapper">