Changeset 10385 for extensions/Mail_supervisor/mail_super.inc.php

Timestamp:

Apr 15, 2011, 4:09:41 PM (13 years ago)

Author:

cljosse

Message:

[extensions] mail_supervisor fix bug format_email

File:

• extensions/Mail_supervisor/mail_super.inc.php (modified) (3 diffs)

extensions/Mail_supervisor/mail_super.inc.php

@@ -20 +20 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
-if (!defined('MAIL_SUPERV_PATH'))
-define('MAIL_SUPERV_PATH', PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
-if (!defined('ROOT_URL'))
-define(  'ROOT_URL',  get_root_url().'/' );
-$MAIL_SUPERV_PATH_ABS=str_replace('\\','/',dirname(__FILE__) );
-if (!defined('MAIL_SUPERV_PATH_ABS'))
-define('MAIL_SUPERV_PATH_ABS',   $MAIL_SUPERV_PATH_ABS."/");
 
 class mail_supervisor {
@@ -46 +39 @@
  */
  static public function init() {
-  global  $template,$version,$path_js,$icon_path;
-
- $theme="default";
-
+  global  $template,$version,$icon_path;    
+  $action_spam = pwg_get_session_var('action_spam') ;
+  $theme="default";
+  $themeconf=$template->get_template_vars('themeconf');
+  $theme=$themeconf['id'];
+  if (file_exists ( 'admin/themes/clear/icon/help.png')) $icon_path = 'themes/default/icon/help.png';
+  else  $icon_path =  "admin/template/goto/theme/clear/icon/help.png";
   if (PHPWG_VERSION < 2.2 ) {
     $file =MAIL_SUPERV_PATH_ABS.'admin/header_2_1.tpl' ;
-    if (PHPWG_VERSION < 2.0 ) $path_js =  "template-common/lib/";
-    else $path_js=  'themes/default/js/' ;
-    $themeconf=$template->get_template_vars('themeconf');
-    $theme=$themeconf['id'];
-   
+  
   } else {
-     $themeconf=$template->get_template_vars('themeconf');
-    $theme=$themeconf['id'];
-    $file =MAIL_SUPERV_PATH_ABS.'admin/header_2_2.tpl' ;
-    $path_js=  'themes/default/js/' ;
+    $file = MAIL_SUPERV_PATH_ABS.'admin/header_2_2.tpl' ;
+    
   }
   if(isset($_GET['action_spam']) and $_GET['action_spam']=="no"){
-    $action_spam = pwg_get_session_var('action_spam') ;
     pwg_set_session_var('action_spam', "false");
     unset ($_SESSION['pwg_'.'action_spam']);
   }
- 
-
+  $action_spam=pwg_get_session_var('action_spam');
   $template->set_filenames(array('mail_superv_init'=> $file ));
-  if (file_exists ( 'admin/themes/clear/icon/help.png')) $icon_path = 'themes/default/icon/help.png';
-  else  $icon_path =  "admin/template/goto/theme/clear/icon/help.png";
-  $template->assign( 
-      array('theme' => $theme,'version' => $version,
-      'PHPWG_VERSION' =>     PHPWG_VERSION ,
-      'MAIL_SUPERV_PATH' =>  MAIL_SUPERV_PATH ,
-      'path_js' => $path_js,
-      'MAIL_SUPERV_PATH_ABS' => MAIL_SUPERV_PATH_ABS,
-      'action_spam' => pwg_get_session_var('action_spam')
-      )
-  );
+  $MAIL_SUPERV_PATH=str_replace(PHPWG_ROOT_PATH,"",MAIL_SUPERV_PATH) ;
+  $profile=array('theme' => $theme,
+            'PHPWG_VERSION' => PHPWG_VERSION ,
+            'MAIL_SUPERV_PATH' => $MAIL_SUPERV_PATH  ,             
+            'MAIL_SUPERV_PATH_ABS' => MAIL_SUPERV_PATH_ABS           
+          );
+
+  $template->assign( $profile );
+  $template->append('footer_elements', '<input id="action_spam" name="action_spam" type="hidden" value="'.$action_spam.'" />');
   $template->parse( 'mail_superv_init', false);
-
   return ;//
 }// function init
@@ -190 +175 @@
     ob_start();
     echo '<pre>';
+    if(count($variables)>1){
     foreach($variables as $key => $line){
       echo  $key . " =>  " . $line ; 
       echo "<br />";
     }       
+    }else{
+        echo "<i>".$variables."</i><br />";
+    }
+
     $m= ob_get_contents();
     ob_end_clean();