[Phpgroupware-cvs] folders/inc class.uifolders.inc.php,1.7

[fipsfuchs]

Update of folders/inc

Modified Files:
     Branch: MAIN
            class.uifolders.inc.php lines: +7 -15

Log Message:
version changed
https bug fixed

====================================================
Index: folders/inc/class.uifolders.inc.php
diff -u folders/inc/class.uifolders.inc.php:1.6 
folders/inc/class.uifolders.inc.php:1.7
--- folders/inc/class.uifolders.inc.php:1.6     Fri Nov 19 09:30:26 2004
+++ folders/inc/class.uifolders.inc.php Tue Feb 15 10:43:32 2005
@@ -71,7 +71,7 @@
                 */
                function showFolders()
                {
-                       $this->t->set_root(PHPGW_SERVER_ROOT . 
'/folders/templates/default/'); // hardcoded path :-(
+                       $this->t->set_root(PHPGW_SERVER_ROOT . 
'/folders/templates/base/'); // hardcoded path :-(
                        $this->t->set_file(array('folders_t' => 'folders.tpl'));

                        $this->bofolders = CreateObject('folders.bofolders');
@@ -88,14 +88,14 @@
                 *
                 * @return string parsed HTML iframe
                 */
-               function get_iframe ()
+               function get_iframe($iframe_linkdata=array())
                {
-                       $this->t->set_root(PHPGW_SERVER_ROOT . 
'/folders/templates/default/');
+                       $this->t->set_root(PHPGW_SERVER_ROOT . 
'/folders/templates/base/');
                        $this->t->set_file(array('helpers_t' => 'helpers.tpl'));
                        $this->t->set_block('helpers_t','iframe');

                        $parameters = 
'menuaction=folders.uifolders.showfolders';
-                       while(list($param_name, $param_value) = 
each($iframe_linkdata))
+                       foreach($iframe_linkdata as $param_name => $param_value)
                        {
                                $parameters .= '&'.$param_name.'='.$param_value;
                        }
@@ -128,19 +128,11 @@
                 */
                function get_switchlink()
                {
-                       /* workaround: IE doesn't set the PHP referer variable 
*/
-                       if ($GLOBALS['SSL_VERSION_LIBRARY'])
-                       {
-                               $httpMode = 'https://';
-                       }
-                       else
-                       {
-                               $httpMode = 'http://';
-                       }
+                       $httpMode = $_SERVER['HTTPS'] ? 'https://' : 'http://';
                        $GLOBALS['phpgw']->session->appsession('link', 
'folders', $httpMode.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
                        /* end of workaround */

-                       $this->t->set_root(PHPGW_SERVER_ROOT . 
'/folders/templates/default/'); // hardcoded path :-(
+                       $this->t->set_root(PHPGW_SERVER_ROOT . 
'/folders/templates/base/'); // hardcoded path :-(
                        $this->t->set_file(array('helpers_t' => 'helpers.tpl'));
                        $this->t->set_block('helpers_t','link');