Changeset 2483 for trunk/filemanager
- Timestamp:
- 04/12/10 11:35:46 (14 years ago)
- Location:
- trunk/filemanager
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/filemanager/inc/class.uiconfig.inc.php
r2026 r2483 32 32 ( 33 33 'currentapp' => 'filemanager', 34 'noheader' => False,35 'nonavbar' => False,34 //'noheader' => False, 35 //'nonavbar' => False, 36 36 'nofooter' => False, 37 37 'noappheader' => False, … … 39 39 ); 40 40 41 41 //$GLOBALS['phpgw']->common->phpgw_header(); 42 42 include('load_lang.php'); 43 echo "<script src=' ".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/connector.js'></script>";44 echo "<script src=' ".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/common_functions.js'></script>";45 echo "<script src=' ".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/config.js'></script>";43 echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/connector.js' )}'></script>"; 44 echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/common_functions.js' )}'></script>"; 45 echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/config.js' )}'></script>"; 46 46 $t = $GLOBALS['phpgw']->template; 47 47 $t->set_file(array('config_list' => 'config_folders.tpl')); … … 64 64 ( 65 65 'currentapp' => 'filemanager', 66 'noheader' => False,67 'nonavbar' => False,66 //'noheader' => False, 67 //'nonavbar' => False, 68 68 'nofooter' => False, 69 69 'noappheader' => False, … … 71 71 ); 72 72 73 $GLOBALS['phpgw']->common->phpgw_header();73 // $GLOBALS['phpgw']->common->phpgw_header(); 74 74 include('load_lang.php'); 75 echo "<script src=' ".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/connector.js'></script>";76 echo "<script src=' ".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/common_functions.js'></script>";77 echo "<script src=' ".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/config.js'></script>";75 echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/connector.js' )}'></script>"; 76 echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/common_functions.js' )}'></script>"; 77 echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/config.js' )}'></script>"; 78 78 $t = $GLOBALS['phpgw']->template; 79 79 $t->set_file(array('config_list' => 'config_owner.tpl')); … … 227 227 ( 228 228 'currentapp' => 'filemanager', 229 'noheader' => False,230 'nonavbar' => False,229 //'noheader' => False, 230 //'nonavbar' => False, 231 231 'nofooter' => False, 232 232 'noappheader' => False, … … 234 234 ); 235 235 236 $GLOBALS['phpgw']->common->phpgw_header();236 //$GLOBALS['phpgw']->common->phpgw_header(); 237 237 include('load_lang.php'); 238 echo "<script src=' ".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/connector.js'></script>";239 echo "<script src=' ".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/common_functions.js'></script>";240 echo "<script src=' ".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/config.js'></script>";238 echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/connector.js' )}'></script>"; 239 echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/common_functions.js' )}'></script>"; 240 echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/config.js' )}'></script>"; 241 241 $t = $GLOBALS['phpgw']->template; 242 242 $t->set_file(array('config_list' => 'config_quota.tpl')); -
trunk/filemanager/inc/class.uifilemanager.inc.php
r2016 r2483 104 104 105 105 // here local vars are created from the HTTP vars 106 @reset($GLOBALS['HTTP_POST_VARS']);107 while(list($name,) = @each($GLOBALS['HTTP_POST_VARS']))108 { 109 $this->$name = $ GLOBALS['HTTP_POST_VARS'][$name];110 } 111 112 @reset($GLOBALS['HTTP_GET_VARS']);113 while(list($name,) = @each($GLOBALS['HTTP_GET_VARS']))114 { 115 $$name = $ GLOBALS['HTTP_GET_VARS'][$name];116 $this ->$name = $GLOBALS['HTTP_GET_VARS'][$name];106 reset( $_POST ); 107 while(list($name,) = each( $_POST ) ) 108 { 109 $this->$name = $_POST[ $name ]; 110 } 111 112 reset( $_GET ); 113 while(list($name,) = each( $_GET ) ) 114 { 115 $$name = $_GET[ $name ]; 116 $this -> $name = $_GET[ $name ]; 117 117 118 118 } … … 238 238 ( 239 239 'currentapp' => 'filemanager', 240 'noheader' => False,241 'nonavbar' => False,240 //'noheader' => False, 241 //'nonavbar' => False, 242 242 'nofooter' => False, 243 243 'noappheader' => False, … … 245 245 ); 246 246 247 $GLOBALS['phpgw']->common->phpgw_header();247 //$GLOBALS['phpgw']->common->phpgw_header(); 248 248 $this->t->set_file(array('models' => 'fileModels.tpl')); 249 249 $this->t->set_block('models','header','header'); … … 283 283 ( 284 284 'currentapp' => 'filemanager', 285 'noheader' => False,286 'nonavbar' => False,285 //'noheader' => False, 286 //'nonavbar' => False, 287 287 'nofooter' => False, 288 288 'noappheader' => False, … … 290 290 ); 291 291 292 $GLOBALS['phpgw']->common->phpgw_header();292 //$GLOBALS['phpgw']->common->phpgw_header(); 293 293 294 294 $filename = lang('new')."_".lang($this->model).rand(0,1000).".html"; … … 316 316 ( 317 317 'currentapp' => 'filemanager', 318 'noheader' => False,319 'nonavbar' => False,318 //'noheader' => False, 319 //'nonavbar' => False, 320 320 'nofooter' => False, 321 321 'noappheader' => False, … … 323 323 ); 324 324 325 $GLOBALS['phpgw']->common->phpgw_header();326 327 echo "<script src=' ".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/global.js'></script>";328 echo "<script src=' ".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/main.js'></script>";329 echo "<script src=' ".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/common_functions.js'></script>";330 echo "<script src=' ".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/connector.js'></script>";331 echo "<script src=' ".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/draw_api.js'></script>";332 echo "<script src=' ".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/drag_area.js'></script>";333 echo "<script src=' ".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/handler.js'></script>";334 echo "<script src=' ./phpgwapi/js/dftree/dftree.js'></script>";325 //$GLOBALS['phpgw']->common->phpgw_header(); 326 327 echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/global.js' )}'></script>"; 328 echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/main.js' )}'></script>"; 329 echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/common_functions.js' )}'></script>"; 330 echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/connector.js' )}'></script>"; 331 echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/draw_api.js' )}'></script>"; 332 echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/drag_area.js' )}'></script>"; 333 echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/handler.js' )}'></script>"; 334 echo "<script src='{$GLOBALS['phpgw'] -> link( '/phpgwapi/js/dftree/dftree.js' )}'></script>"; 335 335 336 336 include('load_lang.php'); … … 793 793 ( 794 794 'currentapp' => 'filemanager', 795 'noheader' => True,796 'nonavbar' => True,795 //'noheader' => True, 796 //'nonavbar' => True, 797 797 'nofooter' => True, 798 798 'noappheader' => True 799 799 ); 800 $GLOBALS['phpgw']->common->phpgw_header();800 //$GLOBALS['phpgw']->common->phpgw_header(); 801 801 802 802 $this->t->set_file(array('upload' => 'upload.tpl')); … … 915 915 916 916 917 $vars[refresh_script] = "<script src=' filemanager/js/refresh.js'></script>";917 $vars[refresh_script] = "<script src='{$GLOBALS[ 'phpgw' ] -> link( '/filemanager/js/refresh.js' )}'></script>"; 918 918 919 919 $vars[preview_content]=''; -
trunk/filemanager/index.php
r2362 r2483 20 20 $phpgw_flags = Array( 21 21 'currentapp' => 'filemanager', 22 'noheader' => True,23 'nonavbar' => True,22 //'noheader' => True, 23 //'nonavbar' => True, 24 24 'noappheader' => True, 25 25 'noappfooter' => True, … … 33 33 $_SESSION['phpgw_info']['user']['preferences']['filemanager'] = $preferences['filemanager']; 34 34 35 Header('Location: '.$GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.index'));35 $GLOBALS[ 'phpgw' ] -> redirect( $GLOBALS[ 'phpgw' ] -> link('/index.php','menuaction=filemanager.uifilemanager.index' ) ); 36 36 $GLOBALS['phpgw']->common->phpgw_exit(); 37 37 ?> -
trunk/filemanager/js/connector.js
r2019 r2483 157 157 method = 'GET'; 158 158 Ajax.open(method, requestURL, true); 159 Ajax.setRequestHeader( 'BackgroundRequest', Date.parse( new Date ) ); 159 160 Ajax.send(null); 160 161 }
Note: See TracChangeset
for help on using the changeset viewer.