Merge pull request #48 from DanielnetoDotCom/master

update unstable
WWBN · Apr 10, 2018 · 179c2b7 · 179c2b7
2 parents bd3d356 + aac3c26
commit 179c2b7
Show file tree

Hide file tree

Showing 11 changed files with 252 additions and 73 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,7 +28,6 @@
 /plugin/SubtitleSwitcher/
 /plugin/AWS_S3/
 /plugin/SignUpAgreement/
-/plugin/YPTWallet/plugins/YPTWalletPayPal/
 /plugin/PromoteVideos/
 /plugin/Livesearch/
 /plugin/AudioVisualizer/
diff --git a/plugin/Gallery/view/modeGallery.php b/plugin/Gallery/view/modeGallery.php
@@ -190,6 +190,7 @@ function afterExtraVideos($liveLi) {
                                     $countCols = 0;
                                     unset($_POST['sort']);
                                     $_POST['sort']['created'] = $_GET['dateAddedOrder'];
+                                    $_POST['current'] = $_GET['page'];
                                     $_POST['rowCount'] = $obj->DateAddedRowCount;
                                     $videos = Video::getAllVideos();
                                     createGallerySection($videos);

diff --git a/plugin/Live/stats.json.php b/plugin/Live/stats.json.php
@@ -54,9 +54,12 @@
 
         $users = false;
         if($liveUsersEnabled){
-            require_once $global['systemRootPath'] . 'plugin/LiveUsers/Objects/LiveOnlineUsers.php';
-            $liveUsers = new LiveOnlineUsers(0);
-            $users = $liveUsers->getUsersFromTransmitionKey($value->name);
+            $filename = $global['systemRootPath'] . 'plugin/LiveUsers/Objects/LiveOnlineUsers.php';
+            if(file_exists($filename)){
+                require_once $filename;
+                $liveUsers = new LiveOnlineUsers(0);
+                $users = $liveUsers->getUsersFromTransmitionKey($value->name);
+            }
         }
 
         $u = new User($row['users_id']);

diff --git a/plugin/YPTWallet/plugins/YPTWalletPayPal/YPTWalletPayPal.php b/plugin/YPTWallet/plugins/YPTWalletPayPal/YPTWalletPayPal.php
@@ -0,0 +1,39 @@
+<?php
+
+global $global;
+require_once $global['systemRootPath'] . 'plugin/YPTWallet/YPTWalletPlugin.php';
+
+class YPTWalletPayPal extends YPTWalletPlugin{
+
+    public function getAprovalLink() {
+        global $global;
+        $plugin = YouPHPTubePlugin::loadPluginIfEnabled("PayPalYPT");
+        $payment = $plugin->setUpPayment(
+                $this->getInvoiceNumber(), 
+                $this->getRedirectURL(), 
+                $this->getCancelURL(), 
+                $this->getValue(), 
+                $this->getCurrency());
+        if (!empty($payment)) {
+            return $payment->getApprovalLink();
+        }
+        return false;
+    }
+
+    public function getAprovalButton() {
+        global $global;
+        include $global['systemRootPath'].'plugin/YPTWallet/plugins/YPTWalletPayPal/confirmButton.php';
+    }
+
+    public function getEmptyDataObject() {
+        global $global;
+        $obj = new stdClass();
+        $obj->ClientID = "ASUkHFpWX0T8sr8EiGdLZ05m-RAb8l-hdRxoq-OXWmua2i7EUfqFkMZvSoGgH2LhK7zAqt29IiS2oRTn";
+        $obj->ClientSecret = "ECxtMBsLr0cFwSCgI0uaDiVzEUbVlV3r_o_qaU-SOsQqCEOKPq4uGlr1C0mhdDmEyO30mw7-PF0bOnfo";
+        $obj->RedirectURL = "{$global['webSiteRootURL']}plugin/YPTWallet/plugins/YPTWalletPayPal/redirect_url.php";
+        $obj->CancelURL = "{$global['webSiteRootURL']}plugin/YPTWallet/plugins/YPTWalletPayPal/cancel_url.php";
+        $obj->disableSandbox = false;
+        return $obj;
+    }
+
+}
diff --git a/plugin/YPTWallet/plugins/YPTWalletPayPal/cancel_url.php b/plugin/YPTWallet/plugins/YPTWalletPayPal/cancel_url.php
@@ -0,0 +1,7 @@
+<?php
+if (empty($global['systemRootPath'])) {
+    $global['systemRootPath'] = '../../../../';
+}
+require_once $global['systemRootPath'] . 'videos/configuration.php';
+
+header("Location: {$global['webSiteRootURL']}plugin/SupportAuthor/view/addFunds.php?status=cancel");
diff --git a/plugin/YPTWallet/plugins/YPTWalletPayPal/confirmButton.php b/plugin/YPTWallet/plugins/YPTWalletPayPal/confirmButton.php
@@ -0,0 +1,27 @@
+<button type="submit" class="btn btn-primary" id="YPTWalletPayPalButton"><?php echo __("Confirm"); ?> PayPal</button>
+<script>
+    $(document).ready(function () {
+        $('#YPTWalletPayPalButton').click(function (evt) {
+            evt.preventDefault();
+            modal.showPleaseWait();
+
+            $.ajax({
+                url: '<?php echo $global['webSiteRootURL']; ?>plugin/YPTWallet/plugins/YPTWalletPayPal/requestPayment.json.php',
+                data: {
+                    "value": $('#value').val()
+                },
+                type: 'post',
+                success: function (response) {
+                    if (!response.error) {
+                        document.location = response.approvalLink;
+                    } else {
+                        swal("<?php echo __("Sorry!"); ?>", "<?php echo __("Error!"); ?>", "error");
+                        modal.hidePleaseWait();
+                    }
+                }
+            });
+            return false;
+        });
+    });
+
+</script>
diff --git a/plugin/YPTWallet/plugins/YPTWalletPayPal/redirect_url.php b/plugin/YPTWallet/plugins/YPTWalletPayPal/redirect_url.php
@@ -0,0 +1,34 @@
+<?php
+
+header('Content-Type: application/json');
+
+if (empty($global['systemRootPath'])) {
+    $global['systemRootPath'] = '../../../../';
+}
+require_once $global['systemRootPath'] . 'videos/configuration.php';
+require_once $global['systemRootPath'] . 'objects/user.php';
+
+$plugin = YouPHPTubePlugin::loadPluginIfEnabled("YPTWallet");
+$paypal = YouPHPTubePlugin::loadPluginIfEnabled("PayPalYPT");
+$users_id = User::getId();
+
+$invoiceNumber = uniqid();
+$redirect_url = "{$global['webSiteRootURL']}plugin/SupportAuthor/redirect_url.php";
+$cancel_url = "{$global['webSiteRootURL']}plugin/SupportAuthor/cancel_url.php";
+
+$payment = $paypal->executePayment();
+//var_dump($amount);
+$obj= new stdClass();
+$obj->error = true;
+if (!empty($payment)) {
+    $amount = PayPalYPT::getAmountFromPayment($payment);
+    $plugin->addBalance($users_id, $amount->total, "Paypal payment", json_encode($payment));
+    $obj->error = false;
+    header("Location: {$global['webSiteRootURL']}plugin/YPTWallet/view/addFunds.php?status=success");
+}else{
+    header("Location: {$global['webSiteRootURL']}plugin/YPTWallet/view/addFunds.php?status=fail");
+}
+error_log(json_encode($obj));
+
+
+?>
diff --git a/plugin/YPTWallet/plugins/YPTWalletPayPal/requestPayment.json.php b/plugin/YPTWallet/plugins/YPTWalletPayPal/requestPayment.json.php
@@ -0,0 +1,32 @@
+<?php
+
+header('Content-Type: application/json');
+
+if (empty($global['systemRootPath'])) {
+    $global['systemRootPath'] = '../../../../';
+}
+require_once $global['systemRootPath'] . 'videos/configuration.php';
+require_once $global['systemRootPath'] . 'objects/user.php';
+
+$plugin = YouPHPTubePlugin::loadPluginIfEnabled("PayPalYPT");
+$pluginS = YouPHPTubePlugin::loadPluginIfEnabled("YPTWallet");
+$objS = $pluginS->getDataObject();
+$options = json_decode($objS->addFundsOptions);
+
+$obj= new stdClass();
+$obj->error = true;
+
+if(empty($_POST['value']) || !in_array($_POST['value'], $options)){ 
+    $obj->msg = "Invalid Value";
+    die(json_encode($obj));
+}
+
+$invoiceNumber = uniqid();
+
+$payment = $plugin->setUpPayment($invoiceNumber, $objS->RedirectURL, $objS->CancelURL, $_POST['value'], $objS->currency);
+
+if (!empty($payment)) {
+    $obj->error = false;
+    $obj->approvalLink = $payment->getApprovalLink();
+}
+die(json_encode($obj));