Fixed image.php initialization and remove unsed code

diff --git a/public_html/image.php b/public_html/image.php
index eaf01da..173bb52 100644 (file)
--- a/public_html/image.php
+++ b/public_html/image.php
@@ -21,7 +21,7 @@
 ******************************************************************************/
 
 require_once 'core.php';
-if(LSsession :: startLSsession()) {
+if(LSsession :: initialize()) {
   if (isset($_GET['i'])) {
     $img_path=LStemplate :: getImagePath($_GET['i']);
     if (is_file($img_path)) {

diff --git a/public_html/includes/class/class.LSsession.php b/public_html/includes/class/class.LSsession.php
index 4ad5c51..f798dc7 100644 (file)
--- a/public_html/includes/class/class.LSsession.php
+++ b/public_html/includes/class/class.LSsession.php
@@ -133,7 +133,7 @@ class LSsession {
   */  
   private static function startLStemplate() {
     if ( self :: loadLSclass('LStemplate') ) {
-      $res = LStemplate :: start(
+      return LStemplate :: start(
         array(
           'smarty_path'  => LSconfig :: get('Smarty'),
           'template_dir' => LS_TEMPLATES_DIR,
@@ -143,8 +143,6 @@ class LSsession {
           'debug_smarty' => (isset($_REQUEST['LStemplate_debug'])),
         )
       );
-      self :: addJSconfigParam('LS_IMAGES_DIR',LStemplate :: getDefaultImageDirPath());
-      return $res;
     }
     return False;
   }

diff --git a/public_html/includes/class/class.LStemplate.php b/public_html/includes/class/class.LStemplate.php
index 2935426..669cf93 100644 (file)
--- a/public_html/includes/class/class.LStemplate.php
+++ b/public_html/includes/class/class.LStemplate.php
@@ -117,7 +117,6 @@ class LStemplate {
       }
 
       self :: $_smarty -> assign('LS_CSS_DIR',LS_CSS_DIR);
-      self :: $_smarty -> assign('LS_IMAGES_DIR',self :: getDefaultImageDirPath());
 
       return True;
     }
@@ -149,19 +148,6 @@ class LStemplate {
   }
 
  /**
-  * Return the default path of images directory
-  *
-  * @retval string The path of the file
-  **/
-  public static function getDefaultImageDirPath() {
-    if (is_dir(self :: $config['image_dir'].'/'.LS_THEME)) {
-      return self :: $config['image_dir'].'/'.LS_THEME;
-    }
-    return self :: $config['image_dir'].'/default';
-  }
-
-
- /**
   * Return the path of the image file to use
   *
   * @param[in] string $image The image name (eg: mail)