Various bug fixes

renlok · Mar 24, 2017 · 0f9e5b1 · 0f9e5b1
1 parent 181a879
commit 0f9e5b1
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/admin/index.php b/admin/index.php
@@ -133,18 +133,21 @@
 }
 
 // version check
-switch ($system->SETTINGS['version_check']) {
-    case 'unstable':
-        $url = 'http://www.webidsupport.com/version_unstable.txt';
-        break;
-    default:
-        $url = 'http://www.webidsupport.com/version.txt';
-        break;
-}
-
-if (!($realversion = load_file_from_url($url))) {
-    $ERR = $MSG['error_file_access_disabled'];
-    $realversion = $MSG['unknown'];
+$realversion = '0.0';
+$update_available = false;
+if ($system->SETTINGS['version_check'] !== "") {
+    switch ($system->SETTINGS['version_check']) {
+        case 'unstable':
+            $url = 'http://raw.githubusercontent.com/renlok/WeBid/dev/install/thisversion.txt';
+            break;
+        default:
+          $url = 'http://raw.githubusercontent.com/renlok/WeBid/master/install/thisversion.txt';
+            break;
+    }
+    if (!($realversion = load_file_from_url($url))) {
+        $ERR = $MSG['error_file_access_disabled'];
+        $realversion = $MSG['unknown'];
+    }
 }
 
 $update_available = false;

diff --git a/includes/class_email_handler.php b/includes/class_email_handler.php
@@ -421,7 +421,7 @@ public function sendmail()
         if (is_array($this->to)) {
             for ($i = 0; $i < count($this->to); $i++) {
                 try {
-                    $mail->setFrom($this->from, $system->SETTINGS['adminmail']);
+                    $mail->setFrom($this->from, $system->SETTINGS['sitename']);
                     $mail->addAddress($this->to[$i]);
                     $mail->addReplyTo($this->from, $system->SETTINGS['adminmail']);
                     $mail->Subject = $this->subject;
@@ -440,7 +440,7 @@ public function sendmail()
             }
         } else {
             try {
-                $mail->setFrom($this->from, $system->SETTINGS['adminmail']);
+                $mail->setFrom($this->from, $system->SETTINGS['sitename']);
                 if (is_array($this->to)) {
                     for ($i = 0; $i < count($this->to); $i++) {
                         $mail->addAddress($this->to[$i]);

diff --git a/includes/functions_admin.php b/includes/functions_admin.php
@@ -108,7 +108,7 @@ function get_hash()
 
     function load_file_from_url($url)
     {
-        if (false !== ($str = file_get_contents($url))) {
+        if (false !== ($str = @file_get_contents($url))) {
             return $str;
         } elseif (($handle = @fopen($url, 'r')) !== false) {
             $str = fread($handle, 5);

diff --git a/install/sql/dump.inc.php b/install/sql/dump.inc.php
@@ -97,7 +97,7 @@
   `user` int(11) default NULL,
   `title` varchar(70),
   `subtitle` varchar(70),
-  `starts` datetime ,
+  `starts` datetime,
   `ends` datetime,
   `description` text,
   `pict_url` tinytext,

diff --git a/item.php b/item.php
@@ -96,6 +96,7 @@
 // get ending time
 $showendtime = false;
 $has_ended = false;
+$difference = null;
 if (strtotime($start) > time()) {
     $ending_time = '<span class="errfont">' . $MSG['668'] . '</span>';
 } elseif (strtotime($ends) - time() > 0) {
@@ -324,7 +325,7 @@
 }
 $min_bid = $system->print_money($minimum_bid);
 $high_bid = $system->print_money($high_bid);
-if (!$difference->invert) {
+if ($difference != null && !$difference->invert) {
     $next_bid = $system->print_money($next_bidp);
 } else {
     $next_bid = '--';
@@ -469,7 +470,7 @@
         'YOURBIDCLASS' => (isset($yourbidclass)) ? $yourbidclass : '',
 
         'B_HASENDED' => $has_ended,
-        'B_CANEDIT' => ($user->logged_in && $user->user_data['id'] == $auction_data['user'] && $num_bids == 0 && !$difference->invert),
+        'B_CANEDIT' => ($user->logged_in && $user->user_data['id'] == $auction_data['user'] && $num_bids == 0 && !($difference == null || $difference->invert)),
         'B_CANCONTACTSELLER' => (($system->SETTINGS['contactseller'] == 'always' || ($system->SETTINGS['contactseller'] == 'logged' && $user->logged_in)) && (!$user->logged_in || $user->user_data['id'] != $auction_data['user'])),
         'B_HASIMAGE' => (!empty($auction_data['pict_url'])),
         'B_NOTBNONLY' => ($auction_data['bn_only'] == 0),

diff --git a/themes/modern/sell.tpl b/themes/modern/sell.tpl
@@ -402,7 +402,7 @@ $(document).ready(function(){
 							<div class="duration col-md-4">
 	        					{L_022}: {DURATIONS}<br>
 				<!-- IF B_EDIT_ENDTIME -->
-								{L_or_custom_end_time}: <input type="text" name="a_ends" id="a_ends" value="{END_TIME}" size="20" maxlength="19">
+								{L_or_custom_end_time}: <input type="text" name="a_ends" id="a_ends" value="{END_TIME}" size="20" maxlength="19" class="form-control">
 								<script type="text/javascript">
 									new tcal ({'id': 'a_ends','controlname': 'a_ends', 'formname': 'sell'});
 									$('#a_ends').change(function () {