[zi-cvs] packages/com.zzoss.zic application_install.php,1.1,1.2 packages_process.php,1.7,1.8 packages_reset.php,1.3,1.4 plugins_process.php,1.6,1.7
Sandro Zic <[email protected]> Thu, 18 Mar 2004 11:10:27 +0000
| Newsgroups | gmane.comp.php.zzoss.installer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/zzossinstaller/packages/com.zzoss.zic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32519/com.zzoss.zic
Modified Files:
application_install.php packages_process.php
packages_reset.php plugins_process.php
Log Message:
quick install of dev apps
Index: packages_reset.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_reset.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** packages_reset.php 18 Mar 2004 09:41:39 -0000 1.3
--- packages_reset.php 18 Mar 2004 11:10:25 -0000 1.4
***************
*** 33,36 ****
--- 33,38 ----
$remove_installed_pkgs = true;
+ $remove_plugins = true;
+ $buffer_output = false;
// check if this script is part of installation procedure
***************
*** 39,43 ****
--- 41,52 ----
exit;
} elseif($zi_registry->isProcedure($pkg_type.'s_register')){
+ if($pkg_type == 'plugin'){
+ // When resetting plugins, we need to install them to the plugin
+ // runtime environment and register them as plugins,
+ // otherwise the build won't work
+ $zi_registry->setProcedure('plugins_fileroles');
+ }
$remove_installed_pkgs = false;
+ $buffer_output = true;
}
***************
*** 66,69 ****
--- 75,82 ----
}
+ if($buffer_output){
+ ob_start();
+ }
+
include 'themes/'.$GLOBALS['ZI']['theme'].'/header'.$widget_type.'.php';
?>
***************
*** 109,112 ****
--- 122,126 ----
System::mkDir($dir_plugins_re);
}
+
$zi_registry->unsetPlugins();
}
***************
*** 180,182 ****
--- 194,202 ----
}
include 'themes/'.$GLOBALS['ZI']['theme'].'/footer'.$widget_type.'.php';
+
+ if($buffer_output){
+ ob_end_clean();
+ header('Location: '.$zi_buttons['next']);
+ exit;
+ }
?>
Index: application_install.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_install.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** application_install.php 18 Mar 2004 09:41:39 -0000 1.1
--- application_install.php 18 Mar 2004 11:10:25 -0000 1.2
***************
*** 124,132 ****
<h1>Install Application</h1>
<h2><a href="info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&distribution=<?php echo $_REQUEST['distribution']; ?>&application=<?php echo $_REQUEST['application']; ?>" onclick="javascript:window.open('info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&distribution=<?php echo $_REQUEST['distribution']; ?>&application=<?php echo $_REQUEST['application']; ?>', 'ApplicationInformation', 'width=500,height=500,resizable=1,status=0,scrollbars=1,toolbar=0,location=0,directories=0,menubar=0,dependent=0');void(0);javascript:return(false);" target="_blank" title="<?php echo $application["summary"].' '.$application['release']['version']; ?>"><?php echo $application["summary"].' '.$application['release']['version']; ?></a></h2>
<?php
if(isset($_REQUEST['msg'])){
$app_settings = $zi_registry->getApplicationSettings();
?>
! <div class="warning"><?php echo $_REQUEST['msg']; ?></div>
<p><a href="<?php echo $app_settings['application_url']; ?>" target="_blank" title="<?php echo $application['summary'].'-'.$application['release']['version']; ?>"><img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/window_new.png" border="0" alt="View Application" title="View Application" align="absmiddle"> View Application</a><br/>
Take a look at the installed application.</p>
--- 124,164 ----
<h1>Install Application</h1>
<h2><a href="info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&distribution=<?php echo $_REQUEST['distribution']; ?>&application=<?php echo $_REQUEST['application']; ?>" onclick="javascript:window.open('info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&distribution=<?php echo $_REQUEST['distribution']; ?>&application=<?php echo $_REQUEST['application']; ?>', 'ApplicationInformation', 'width=500,height=500,resizable=1,status=0,scrollbars=1,toolbar=0,location=0,directories=0,menubar=0,dependent=0');void(0);javascript:return(false);" target="_blank" title="<?php echo $application["summary"].' '.$application['release']['version']; ?>"><?php echo $application["summary"].' '.$application['release']['version']; ?></a></h2>
+
<?php
if(isset($_REQUEST['msg'])){
+ $procedures = $zi_registry->getProcedures();
+ $procedures_txt = array(
+ 'settings' => 'Configured installation paths',
+ 'profile' => 'Configured installation profile (full, minimum, custom)',
+ 'plugins_manager' => 'Showed plugins manager',
+ 'plugins_confirm' => 'Confirmed plugins installation actions',
+ 'plugins_register' => 'Refreshed plugins from sources',
+ 'plugins_deps' => 'Checked plugins dependencies',
+ 'plugins_fileroles' => 'Processed file roles of plugins',
+ 'plugins_build' => 'Built plugins; displayed configuration options if available',
+ 'packages_manager' => 'Showed packages manager',
+ 'packages_confirm' => 'Confirmed packages installation actions',
+ 'packages_register' => 'Refreshed packages from sources',
+ 'packages_deps' => 'Checked packages dependencies',
+ 'packages_fileroles' => 'Processed file roles of packages',
+ 'packages_build' => 'Built packages; displayed configuration options if available'
+ );
+ $procedures_order = array(
+ 'settings', 'profile', 'plugins_manager', 'plugins_confirm', 'plugins_register',
+ 'plugins_deps', 'plugins_fileroles', 'plugins_build', 'packages_manager', 'packages_confirm',
+ 'packages_register', 'packages_deps', 'packages_fileroles', 'packages_build'
+ );
+ ?>
+ <div class="warning">
+ <?
+ foreach($procedures_order as $procedure){
+ if(isset($procedures[$procedure])){
+ echo $procedures_txt[$procedure].'<br/>';
+ }
+ }
+
$app_settings = $zi_registry->getApplicationSettings();
?>
! </div>
<p><a href="<?php echo $app_settings['application_url']; ?>" target="_blank" title="<?php echo $application['summary'].'-'.$application['release']['version']; ?>"><img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/window_new.png" border="0" alt="View Application" title="View Application" align="absmiddle"> View Application</a><br/>
Take a look at the installed application.</p>
Index: packages_process.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_process.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** packages_process.php 18 Mar 2004 09:41:39 -0000 1.7
--- packages_process.php 18 Mar 2004 11:10:25 -0000 1.8
***************
*** 121,124 ****
--- 121,125 ----
fputs($fp,$plugin->getLog());
fclose($fp);
+ /*echo $plugin->getLog();die();*/
}
Index: plugins_process.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/plugins_process.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** plugins_process.php 18 Mar 2004 09:41:39 -0000 1.6
--- plugins_process.php 18 Mar 2004 11:10:25 -0000 1.7
***************
*** 264,267 ****
--- 264,269 ----
// if nothing is there to configure post a message
if(!isset($_REQUEST['package']) && !strlen($plugin->getOutput())) {
+ /*echo $plugin->getLog();
+ die('here');*/
// maybe some plugin just want to exec ...
zi_process();
-------------------------------------------------------
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