[zi-cvs] packages/com.zzoss.zic application_done.php,1.13,1.14 index.php,1.2,1.3 info.php,1.5,1.6 info_changelog.php,1.7,1.8 packages_dependencies.php,1.9,1.10

Update of /cvsroot/zzossinstaller/packages/com.zzoss.zic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23152/com.zzoss.zic

Modified Files:
	application_done.php index.php info.php info_changelog.php 
	packages_dependencies.php 
Log Message:
optimise for setup and single app mode

Index: application_done.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_done.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** application_done.php	1 Apr 2004 18:59:05 -0000	1.13
--- application_done.php	4 Apr 2004 15:53:41 -0000	1.14
***************
*** 107,111 ****
      }
      if($GLOBALS['ZI']['mode'] != 'setup'){
!         $zi_buttons['next'] = "applications.php".zi_form_querystr();
      } else {
          $zi_buttons['ok'] = $app_settings['application_url'];
--- 107,111 ----
      }
      if($GLOBALS['ZI']['mode'] != 'setup'){
!         $zi_buttons['next'] = "index.php".zi_form_querystr();
      } else {
          $zi_buttons['ok'] = $app_settings['application_url'];

Index: packages_dependencies.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_dependencies.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** packages_dependencies.php	18 Mar 2004 09:41:39 -0000	1.9
--- packages_dependencies.php	4 Apr 2004 15:53:41 -0000	1.10
***************
*** 59,62 ****
--- 59,73 ----
      
      $packages = $zi_registry->getPackages();
+     // no packages?
+     if(!is_array($packages) || !count($packages)){
+         if($pkg_type == 'plugin'){
+             $_REQUEST['type'] = 'package';
+             header('Location: packages_reset.php'.zi_form_querystr());
+             exit;
+         } else {
+             PEAR::raiseError('No packages');
+         }
+     }
+     
      $packages_resolve = $zi_registry->getPackagesResolve();
      $packages_versions = $zi_registry->getPackagesVersions();

Index: info_changelog.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/info_changelog.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** info_changelog.php	9 Mar 2004 07:27:48 -0000	1.7
--- info_changelog.php	4 Apr 2004 15:53:41 -0000	1.8
***************
*** 34,38 ****
      $zi_buttons['back'] = 'info.php'.zi_form_querystr();
      
! 	include 'themes/'.$GLOBALS['ZI']['theme'].'/header_popup.php';
  ?>
  <h1>Information</h1>
--- 34,47 ----
      $zi_buttons['back'] = 'info.php'.zi_form_querystr();
      
!     $widget_type = '_popup';
!     
!     if(isset($_REQUEST['widget_type'])){
!         if($_REQUEST['widget_type'] == '_self'){
!             $widget_type = '';
!         } else {
!             $widget_type = '_popup';
!         }
!     }
! 	include 'themes/'.$GLOBALS['ZI']['theme'].'/header'.$widget_type.'.php';
  ?>
  <h1>Information</h1>
***************
*** 206,210 ****
      </div>
  <?php
! 
! 	include 'themes/'.$GLOBALS['ZI']['theme'].'/footer_popup.php';
  ?>
--- 215,218 ----
      </div>
  <?php
! 	include 'themes/'.$GLOBALS['ZI']['theme'].'/footer'.$widget_type.'.php';
  ?>

Index: info.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/info.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** info.php	5 Mar 2004 14:25:25 -0000	1.5
--- info.php	4 Apr 2004 15:53:41 -0000	1.6
***************
*** 28,32 ****
      include 'inc/info.php';
  	
! 	include 'themes/'.$GLOBALS['ZI']['theme'].'/header_popup.php';
  ?>
  <h1>Information</h1>
--- 28,41 ----
      include 'inc/info.php';
  	
!     $widget_type = '_popup';
!     
!     if(isset($_REQUEST['widget_type'])){
!         if($_REQUEST['widget_type'] == '_self'){
!             $widget_type = '';
!         } else {
!             $widget_type = '_popup';
!         }
!     }
! 	include 'themes/'.$GLOBALS['ZI']['theme'].'/header'.$widget_type.'.php';
  ?>
  <h1>Information</h1>
***************
*** 211,214 ****
      </div>
  <?php
! 	include 'themes/'.$GLOBALS['ZI']['theme'].'/footer_popup.php';
  ?>
--- 220,223 ----
      </div>
  <?php
! 	include 'themes/'.$GLOBALS['ZI']['theme'].'/footer'.$widget_type.'.php';
  ?>

Index: index.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	26 Mar 2004 08:10:33 -0000	1.2
--- index.php	4 Apr 2004 15:53:41 -0000	1.3
***************
*** 27,47 ****
      
      // Single Application Mode
!     if(strlen($GLOBALS['ZI']['application']) && strlen($GLOBALS['ZI']['distribution'])){
          $zi_registry->setDistribution($GLOBALS['ZI']['distribution']);
          $zi_registry->setApplication($GLOBALS['ZI']['application']);
          $application = $zi_registry->getApplication();
          
!         // Check if application is already installed
!         if(strlen($application['installed'])){
!             // redirect to reconfiguration.
!         } else {
!             $_REQUEST['id'] = $application['id'];
!             $_REQUEST['distribution'] = $GLOBALS['ZI']['distribution'];
!             $_REQUEST['application'] = $GLOBALS['ZI']['application'];
!             header('Location: application_settings.php'.zi_form_querystr().'&nav_parent=apps&nav_child=applications');
!             exit;
!         }
      }
      
      header('Location: applications.php?nav_parent=apps&nav_child=applications');
      exit;
--- 27,49 ----
      
      // Single Application Mode
!     if(
!         $GLOBALS['ZI']['mode'] == 'setup' || 
!         isset($GLOBALS['ZI']['application']) && strlen($GLOBALS['ZI']['application']) &&
!         isset($GLOBALS['ZI']['distribution']) && strlen($GLOBALS['ZI']['distribution'])){
!         
          $zi_registry->setDistribution($GLOBALS['ZI']['distribution']);
          $zi_registry->setApplication($GLOBALS['ZI']['application']);
+         
          $application = $zi_registry->getApplication();
+         $_REQUEST['distribution'] = $GLOBALS['ZI']['distribution'];
+         $_REQUEST['application'] = $GLOBALS['ZI']['application'];
+         $_REQUEST['type'] = 'application';
+         $_REQUEST['widget_type'] = '_self';
          
!         header('Location: info.php'.zi_form_querystr().'&nav_parent=app_info');
!         exit;
      }
      
+     // All other modes
      header('Location: applications.php?nav_parent=apps&nav_child=applications');
      exit;



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click