Bladeren bron

Merge pull request #458 from causefx/cero-dev

Cero dev
causefx 9 jaren geleden
bovenliggende
commit
0d4382a148
9 gewijzigde bestanden met toevoegingen van 44 en 11 verwijderingen
  1. 19 2
      functions.php
  2. 1 1
      lang/de.ini
  3. 1 1
      lang/en.ini
  4. 1 1
      lang/es.ini
  5. 1 1
      lang/fr.ini
  6. 1 1
      lang/it.ini
  7. 1 1
      lang/nl.ini
  8. 1 1
      lang/pl.ini
  9. 18 2
      settings.php

+ 19 - 2
functions.php

@@ -318,6 +318,7 @@ if (function_exists('curl_version')) :
 		// As post request
 		curl_setopt($curlReq, CURLOPT_CUSTOMREQUEST, "POST"); 
 		curl_setopt($curlReq, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($curlReq, CURLOPT_CAINFO, getCert());
 		// Format Data
 		switch (isset($headers['Content-Type'])?$headers['Content-Type']:'') {
 			case 'application/json': 
@@ -354,6 +355,7 @@ if (function_exists('curl_version')) :
 		// As post request
 		curl_setopt($curlReq, CURLOPT_CUSTOMREQUEST, "GET"); 
 		curl_setopt($curlReq, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($curlReq, CURLOPT_CAINFO, getCert());
   		curl_setopt($curlReq, CURLOPT_CONNECTTIMEOUT, 5);
 		// Format Headers
 		$cHeaders = array();
@@ -379,6 +381,7 @@ if (function_exists('curl_version')) :
 		curl_setopt($curlReq, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 		curl_setopt($curlReq, CURLOPT_RETURNTRANSFER, true);
   		curl_setopt($curlReq, CURLOPT_CONNECTTIMEOUT, 5);
+		curl_setopt($curlReq, CURLOPT_CAINFO, getCert());
 		// Format Headers
 		$cHeaders = array();
 		foreach ($headers as $k => $v) {
@@ -3153,8 +3156,8 @@ function searchPlex($query){
 				$link = PLEXURL."/web/index.html#!/server/$server/details?key=/library/metadata/".$results['ratingkey'];
 			}
 			
-            $items .= '<tr>
-            <th scope="row"><a class="openTab" openTab="'.$openTab.'" href="'.$link.'"><img src="'.$image_url.'"></th></a>
+            $items .= '<tr style="cursor: pointer;" class="openTab" openTab="'.$openTab.'" href="'.$link.'">
+            <th scope="row"><img src="'.$image_url.'"></th>
             <td class="col-xs-2 nzbtable nzbtable-row"'.$style.'>'.$results['title'].'</td>
             <td class="col-xs-3 nzbtable nzbtable-row"'.$style.'>'.$results['genre'].'</td>
             <td class="col-xs-1 nzbtable nzbtable-row"'.$style.'>'.$results['year'].'</td>
@@ -3462,5 +3465,19 @@ function plexJoin($username, $email, $password){
 	
 }
 
+function getCert(){
+	$url = "http://curl.haxx.se/ca/cacert.pem";
+	$file = getcwd()."/config/cacert.pem";
+	$directory = getcwd()."/config/";
+	@mkdir($directory, 0770, true);
+	if(!file_exists($file)){
+    	file_put_contents( $file, fopen($url, 'r'));
+		writeLog("success", "CERT PEM: pem file created");
+	}elseif (file_exists($file) && time() - 2592000 > filemtime($file)) {
+		writeLog("success", "CERT PEM: downloaded new pem file");
+	}
+	return $file;
+}
+
 // Always run this
 dependCheck();

+ 1 - 1
lang/de.ini

@@ -274,7 +274,7 @@ HAVE_ACCOUNT = "Do You Have A PLEX Account Already?"
 USERNAME_EMAIL = "Username or E-Mail"
 INVITE_SUCCESS = "You have now been invited, please check your email to accept"
 INVITE_ERROR = "Invite Code not valid, contact admin"
-CREATE_PLEX = Create PLEX Account"
+CREATE_PLEX = "Create PLEX Account"
 JOIN = "Join"
 SIGN_UP = "Sign-up"
 JOIN_SUCCESS = "You have successfully signed up for PLEX, please click join now"

+ 1 - 1
lang/en.ini

@@ -274,7 +274,7 @@ HAVE_ACCOUNT = "Do You Have A PLEX Account Already?"
 USERNAME_EMAIL = "Username or E-Mail"
 INVITE_SUCCESS = "You have now been invited, please check your email to accept"
 INVITE_ERROR = "Invite Code not valid, contact admin"
-CREATE_PLEX = Create PLEX Account"
+CREATE_PLEX = "Create PLEX Account"
 JOIN = "Join"
 SIGN_UP = "Sign-up"
 JOIN_SUCCESS = "You have successfully signed up for PLEX, please click join now"

+ 1 - 1
lang/es.ini

@@ -274,7 +274,7 @@ HAVE_ACCOUNT = "Do You Have A PLEX Account Already?"
 USERNAME_EMAIL = "Username or E-Mail"
 INVITE_SUCCESS = "You have now been invited, please check your email to accept"
 INVITE_ERROR = "Invite Code not valid, contact admin"
-CREATE_PLEX = Create PLEX Account"
+CREATE_PLEX = "Create PLEX Account"
 JOIN = "Join"
 SIGN_UP = "Sign-up"
 JOIN_SUCCESS = "You have successfully signed up for PLEX, please click join now"

+ 1 - 1
lang/fr.ini

@@ -274,7 +274,7 @@ HAVE_ACCOUNT = "Do You Have A PLEX Account Already?"
 USERNAME_EMAIL = "Username or E-Mail"
 INVITE_SUCCESS = "You have now been invited, please check your email to accept"
 INVITE_ERROR = "Invite Code not valid, contact admin"
-CREATE_PLEX = Create PLEX Account"
+CREATE_PLEX = "Create PLEX Account"
 JOIN = "Join"
 SIGN_UP = "Sign-up"
 JOIN_SUCCESS = "You have successfully signed up for PLEX, please click join now"

+ 1 - 1
lang/it.ini

@@ -274,7 +274,7 @@ HAVE_ACCOUNT = "Do You Have A PLEX Account Already?"
 USERNAME_EMAIL = "Username or E-Mail"
 INVITE_SUCCESS = "You have now been invited, please check your email to accept"
 INVITE_ERROR = "Invite Code not valid, contact admin"
-CREATE_PLEX = Create PLEX Account"
+CREATE_PLEX = "Create PLEX Account"
 JOIN = "Join"
 SIGN_UP = "Sign-up"
 JOIN_SUCCESS = "You have successfully signed up for PLEX, please click join now"

+ 1 - 1
lang/nl.ini

@@ -274,7 +274,7 @@ HAVE_ACCOUNT = "Do You Have A PLEX Account Already?"
 USERNAME_EMAIL = "Username or E-Mail"
 INVITE_SUCCESS = "You have now been invited, please check your email to accept"
 INVITE_ERROR = "Invite Code not valid, contact admin"
-CREATE_PLEX = Create PLEX Account"
+CREATE_PLEX = "Create PLEX Account"
 JOIN = "Join"
 SIGN_UP = "Sign-up"
 JOIN_SUCCESS = "You have successfully signed up for PLEX, please click join now"

+ 1 - 1
lang/pl.ini

@@ -274,7 +274,7 @@ HAVE_ACCOUNT = "Do You Have A PLEX Account Already?"
 USERNAME_EMAIL = "Username or E-Mail"
 INVITE_SUCCESS = "You have now been invited, please check your email to accept"
 INVITE_ERROR = "Invite Code not valid, contact admin"
-CREATE_PLEX = Create PLEX Account"
+CREATE_PLEX = "Create PLEX Account"
 JOIN = "Join"
 SIGN_UP = "Sign-up"
 JOIN_SUCCESS = "You have successfully signed up for PLEX, please click join now"

+ 18 - 2
settings.php

@@ -1529,7 +1529,7 @@ echo buildSettings(
                                         </div>
                                     </div>
                                     <div class="row">
-                                        <div class="col-sm-6 col-lg-6">
+                                        <div class="col-sm-4 col-lg-4">
                                             <div class="content-box ultra-widget blue-bg" style="cursor: pointer;" onclick="window.open('https://paypal.me/causefx', '_blank')">
                                                 <div class="w-content big-box">
                                                     <div class="w-progress">
@@ -1546,7 +1546,7 @@ echo buildSettings(
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="col-sm-6 col-lg-6">
+                                        <div class="col-sm-4 col-lg-4">
                                             <div class="content-box ultra-widget green-bg" style="cursor: pointer;" onclick="window.open('https://cash.me/$causefx', '_blank')">
                                                 <div class="w-content big-box">
                                                     <div class="w-progress">
@@ -1562,6 +1562,22 @@ echo buildSettings(
                                                     </span>
                                                 </div>
                                             </div>
+                                        </div>
+										 <div class="col-sm-4 col-lg-4">
+                                            <div class="content-box ultra-widget red-bg">
+                                                <div class="w-content big-box">
+                                                    <div class="w-progress">
+                                                        <span class="w-amount">BitCoin</span>
+                                                        <small class="text-uppercase">1NDy1Su6izmwkcFZaZuMWDYrFFUNv3FQCN</small>
+                                                    </div>
+                                                    <span class="w-refresh w-p-icon">
+                                                        <span class="fa-stack fa-lg">
+                                                            <i class="fa fa-square fa-stack-2x"></i>
+                                                            <i class="fa fa-btc red fa-stack-1x fa-inverse"></i>
+                                                        </span>
+                                                    </span>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>