Changeset 722711

Timestamp:

06/04/2013 06:34:43 PM (13 years ago)

Author:

macbrink

Message:

fix issue when non-80 port is used

Location:

eazyest-gallery

Files:

• branches/0.1/eazyest-gallery.php (modified) (1 diff)
• trunk/eazyest-gallery.php (modified) (2 diffs)

eazyest-gallery/branches/0.1/eazyest-gallery.php

@@ -393 +393 @@
     $this->root = str_replace( '\\', '/', trailingslashit( $this->get_absolute_path( ABSPATH . $gallery_folder ) ) );
     
-    $http = empty( $_SERVER['HTTPS'] ) || 'off' == $_SERVER['HTTPS'] ? 'http://' : 'https://';
-    $this->address = trailingslashit( $this->_resolve_href( trailingslashit( $http . $_SERVER['HTTP_HOST'] ), substr( $this->root, strlen( $this->home_dir() ) ) ) );
+    $http = empty( $_SERVER['HTTPS'] ) || 'off' == $_SERVER['HTTPS'] ? 'http://' : 'https://';  
+    $port = ( $_SERVER["SERVER_PORT"] == '80' ) ? '' : ( ':' . $_SERVER['SERVER_PORT'] );
+    
+    $this->address = trailingslashit( $this->_resolve_href( trailingslashit( $http . $_SERVER['HTTP_HOST'] . $port ), substr( $this->root, strlen( $this->home_dir() ) ) ) );
     }
     

eazyest-gallery/trunk/eazyest-gallery.php

@@ -24 +24 @@
  * 
  * @uses TableDnD plug-in for JQuery,
- * @copyright (c) Denis Howlett
+ * @copyright (c) Denis Howlett396
  * 
  * @uses JQuery File Tree, 
@@ -393 +393 @@
     $this->root = str_replace( '\\', '/', trailingslashit( $this->get_absolute_path( ABSPATH . $gallery_folder ) ) );
     
-    $http = empty( $_SERVER['HTTPS'] ) || 'off' == $_SERVER['HTTPS'] ? 'http://' : 'https://';
-    $this->address = trailingslashit( $this->_resolve_href( trailingslashit( $http . $_SERVER['HTTP_HOST'] ), substr( $this->root, strlen( $this->home_dir() ) ) ) );
+    $http = empty( $_SERVER['HTTPS'] ) || 'off' == $_SERVER['HTTPS'] ? 'http://' : 'https://';      
+    $port = ( $_SERVER["SERVER_PORT"] == '80' ) ? '' : ( ':' . $_SERVER['SERVER_PORT'] );
+    
+    $this->address = trailingslashit( $this->_resolve_href( trailingslashit( $http . $_SERVER['HTTP_HOST'] . $port ), substr( $this->root, strlen( $this->home_dir() ) ) ) );
     }