[zi-cvs] packages/com.zzoss.zic application_delete.php,1.1,1.2 application_done.php,1.4,1.5 application_settings.php,1.4,1.5 application_update.php,1.2,1.3 application_update_confirm.php,1.1,1.2 applications.php,1.6,1.7 authentication.php,1.2,1.3 dev_bundle.php,1.2,1.3 dev_bundle_instant.php,1.3,1.4 info.php,1.3,1.4 info_changelog.php,1.3,1.4 packages_sources.php,1.3,1.4 setup.php,1.7,1.8 setup_datadir.php,1.4,1.5
[email protected] Thu, 29 Jan 2004 06:09:19 -0800
| 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-serv16467/com.zzoss.zic
Modified Files:
application_delete.php application_done.php
application_settings.php application_update.php
application_update_confirm.php applications.php
authentication.php dev_bundle.php dev_bundle_instant.php
info.php info_changelog.php packages_sources.php setup.php
setup_datadir.php
Log Message:
E_ALL support
Index: application_delete.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_delete.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** application_delete.php 22 Dec 2003 17:19:58 -0000 1.1
--- application_delete.php 29 Jan 2004 14:09:16 -0000 1.2
***************
*** 36,53 ****
if($application = $zi_registry->getApplicationById($_REQUEST["id"])){
! if($_REQUEST['mode'] != 'dev'){
$application_settings = $zi_registry->getApplicationSettings($application['name'].'-'.$application['release']['version']);
! // First we simply delete the application root.
! System::rm(array('-rf', $application_settings["application_root"]));
!
! // remove other directories if they are outside of the application root
! if(is_array($application["release"]["packages"]["package"])) {
! foreach($application["release"]["packages"]["package"] as $package) {
! if(strlen($package["@"]["baseinstalldir"])) {
! $dir = $application_settings["application_root"];
! $dir .= $package["@"]["baseinstalldir"];
! if(is_dir($dir)) {
! System::rm(array('-rf',$dir));
}
}
--- 36,57 ----
if($application = $zi_registry->getApplicationById($_REQUEST["id"])){
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != 'dev'){
$application_settings = $zi_registry->getApplicationSettings($application['name'].'-'.$application['release']['version']);
! if(strlen($application_settings["application_root"])){
! // First we delete the application root.
! if(is_dir($application_settings["application_root"])){
! System::rm(array('-rf', $application_settings["application_root"]));
! }
!
! // remove other directories if they are outside of the application root
! if(is_array($application["release"]["packages"]["package"])) {
! foreach($application["release"]["packages"]["package"] as $package) {
! if(isset($package["@"]["baseinstalldir"])) {
! $dir = $application_settings["application_root"];
! $dir .= $package["@"]["baseinstalldir"];
! if(is_dir($dir)) {
! System::rm(array('-rf',$dir));
! }
}
}
***************
*** 82,86 ****
$content .= zi_info_td('Description', zi_info_text($info["description"]) );
! if($_REQUEST['type'] != 'distribution'){
$distribution = $zi_registry->getDistribution();
$content .= zi_info_td('Distribution', $distribution['summary'].' '.$distribution['release']['version']);
--- 86,90 ----
$content .= zi_info_td('Description', zi_info_text($info["description"]) );
! if(isset($_REQUEST['type']) && $_REQUEST['type'] != 'distribution'){
$distribution = $zi_registry->getDistribution();
$content .= zi_info_td('Distribution', $distribution['summary'].' '.$distribution['release']['version']);
***************
*** 90,97 ****
$content .= zi_info_td('Release Date', $info["release"]["date"] );
$content .= zi_info_td('State', zi_info_text($info["release"]["state"]) );
! $content .= zi_info_td('Homepage', zi_info_text($info['homepage']) );
$content .= zi_info_td('Licenses', zi_info_licenses($info["release"]["license"]) );
! $content .= zi_info_td('Copyrights', zi_info_copyrights($info["release"]["copyright"]['holder']) );
! $content .= zi_info_td('Maintainers', zi_info_maintainers($info["maintainers"]["maintainer"]) );
$content .= zi_info_td('Notes', zi_info_text($info["release"]["notes"]) );
echo zi_info_table($info["summary"].' '. $info["release"]["version"], $content);
--- 94,107 ----
$content .= zi_info_td('Release Date', $info["release"]["date"] );
$content .= zi_info_td('State', zi_info_text($info["release"]["state"]) );
! if(isset($info['homepage'])){
! $content .= zi_info_td('Homepage', zi_info_text($info['homepage']) );
! }
$content .= zi_info_td('Licenses', zi_info_licenses($info["release"]["license"]) );
! if(isset($info["release"]["copyright"]['holder'])){
! $content .= zi_info_td('Copyrights', zi_info_copyrights($info["release"]["copyright"]['holder']) );
! }
! if(isset($info["maintainers"]["maintainer"])){
! $content .= zi_info_td('Maintainers', zi_info_maintainers($info["maintainers"]["maintainer"]) );
! }
$content .= zi_info_td('Notes', zi_info_text($info["release"]["notes"]) );
echo zi_info_table($info["summary"].' '. $info["release"]["version"], $content);
Index: application_settings.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_settings.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** application_settings.php 21 Jan 2004 18:16:14 -0000 1.4
--- application_settings.php 29 Jan 2004 14:09:16 -0000 1.5
***************
*** 100,104 ****
$dev_mode = false;
! if($_REQUEST['mode'] == 'dev'){
$dev_mode = true;
}
--- 100,104 ----
$dev_mode = false;
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev'){
$dev_mode = true;
}
Index: application_update.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_update.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** application_update.php 21 Jan 2004 18:16:14 -0000 1.2
--- application_update.php 29 Jan 2004 14:09:16 -0000 1.3
***************
*** 64,67 ****
--- 64,69 ----
}
}
+ } else {
+ $_REQUEST['ZI_LOCATION_NEXT'] = $_SERVER['PHP_SELF'].zi_form_querystr().'&error='.rawurlencode('Nothing uploaded');
}
}
***************
*** 76,80 ****
<h1>Update Application</h1>
<?php
! if(strlen($_REQUEST['error'])){
?>
<div class="warning"><?php echo $_REQUEST['error']; ?></div>
--- 78,82 ----
<h1>Update Application</h1>
<?php
! if(isset($_REQUEST['error'])){
?>
<div class="warning"><?php echo $_REQUEST['error']; ?></div>
Index: application_update_confirm.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_update_confirm.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** application_update_confirm.php 22 Dec 2003 17:19:58 -0000 1.1
--- application_update_confirm.php 29 Jan 2004 14:09:16 -0000 1.2
***************
*** 66,70 ****
<div class="warning">
<?php
! if(strlen($_REQUEST['error'])){
?>
<?php echo $_REQUEST['error']; ?><br/><br/>
--- 66,70 ----
<div class="warning">
<?php
! if(isset($_REQUEST['error'])){
?>
<?php echo $_REQUEST['error']; ?><br/><br/>
Index: applications.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/applications.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** applications.php 21 Jan 2004 18:16:14 -0000 1.6
--- applications.php 29 Jan 2004 14:09:16 -0000 1.7
***************
*** 38,42 ****
$data_dir = $zi_registry->getDir();
$data_dir_dev = 'bundles'.DIRECTORY_SEPARATOR;
! if($_REQUEST['mode'] == 'dev'){
$data_dir_dev .= $dat_dir_dev.'dev'.DIRECTORY_SEPARATOR;
}
--- 38,42 ----
$data_dir = $zi_registry->getDir();
$data_dir_dev = 'bundles'.DIRECTORY_SEPARATOR;
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev'){
$data_dir_dev .= $dat_dir_dev.'dev'.DIRECTORY_SEPARATOR;
}
***************
*** 55,59 ****
$_REQUEST['application'] = $zi_registry->getApplicationNameById($_REQUEST['id']);
! if(!$_REQUEST['mode'] == 'dev'){
if(strlen($split[1])) {
if($split[1]=='I') {
--- 55,59 ----
$_REQUEST['application'] = $zi_registry->getApplicationNameById($_REQUEST['id']);
! if(isset($_REQUEST['mode']) && !$_REQUEST['mode'] == 'dev'){
if(strlen($split[1])) {
if($split[1]=='I') {
***************
*** 99,103 ****
require_once 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
! if($_REQUEST['mode'] == 'dev') {
?><h1>Develop Applications</h1><?php
} else {
--- 99,103 ----
require_once 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev') {
?><h1>Develop Applications</h1><?php
} else {
***************
*** 108,112 ****
Upload an application bundle to add it to the list of applications.--></p>
<?php
! if($_REQUEST['mode'] == 'dev') {
?>
<p>
--- 108,112 ----
Upload an application bundle to add it to the list of applications.--></p>
<?php
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev') {
?>
<p>
***************
*** 126,132 ****
}
- if(is_array($distributions) && count($distributions)){
! $hasApplication = false;
// iterate distributions and show their applications
--- 126,133 ----
}
! $hasApplications = false;
!
! if(is_array($distributions) && count($distributions)){
// iterate distributions and show their applications
***************
*** 145,149 ****
<tr>
<?php
! if($_REQUEST['mode'] == 'dev'){
?>
<th align="left">Action</th>
--- 146,150 ----
<tr>
<?php
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev'){
?>
<th align="left">Action</th>
***************
*** 198,202 ****
}
! if($application["installed"]=="") {
$application["installed"] = '-';
$options["update"] = ' disabled';
--- 199,212 ----
}
! $options["install"] = '';
! $options["update"] = '';
! $options["reconfigure"] = '';
! $options["remove"] = '';
! $options["install_prefix"] = '';
! $options["update_prefix"] = '';
! $options["reconfigure_prefix"] = '';
! $options["remove_prefix"] = '';
!
! if(!isset($application["installed"]) || !strlen($application["installed"])) {
$application["installed"] = '-';
$options["update"] = ' disabled';
***************
*** 209,215 ****
$options["blank"] = ' checked ';
}
! $modified = true;
} else {
! if($application["installed"]==$application["release"]["version"]) {
$modified = false;
/*$options["update"] = ' disabled';
--- 219,225 ----
$options["blank"] = ' checked ';
}
! $modified = false;
} else {
! if($application["installed"] == $application["release"]["version"]) {
$modified = false;
/*$options["update"] = ' disabled';
***************
*** 234,238 ****
echo '<tr>';
! if($_REQUEST['mode'] == 'dev'){
?>
<td<?php echo $highlight; ?>>
--- 244,248 ----
echo '<tr>';
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev'){
?>
<td<?php echo $highlight; ?>>
***************
*** 252,262 ****
}
?>
! <td<?php echo $highlight; ?>><a href="info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&id=<?php echo $application["id"]; ?>&distribution=<?php echo rawurlencode($distribution['name'].'-'.$distribution['release']['version']); ?>" onclick="javascript:window.open('info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&id=<?php echo $application["id"]; ?>&distribution=<?php echo rawurlencode($distribution['name'].'-'.$distribution['release']['version']); ?>', '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"]; ?>"><?php echo $application["summary"].$application["name_suffix"]; ?></a></td>
<!-- <td<?php echo $highlight; ?>><?php echo $distribution['summary']; ?></td> -->
<?php
echo '<td'.$highlight.'>'.$application["release"]["version"].'</td>';
! echo '<td'.$highlight.'>'.$application["installed"];
! if(!$modified){
$app_settings = $zi_registry->getApplicationSettings($application['name'].'-'.$application['release']['version']);
?> <a href="<?php echo $app_settings['application_url']; ?>" title="View Application" target="_blank"><img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/window_new.png" border="0" alt="View Application" title="View Application" align="absmiddle"></a><?php
--- 262,275 ----
}
?>
! <td<?php echo $highlight; ?>><a href="info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&id=<?php echo $application["id"]; ?>&distribution=<?php echo rawurlencode($distribution['name'].'-'.$distribution['release']['version']); ?>" onclick="javascript:window.open('info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&id=<?php echo $application["id"]; ?>&distribution=<?php echo rawurlencode($distribution['name'].'-'.$distribution['release']['version']); ?>', '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"]; ?>"><?php echo $application["summary"]; ?></a></td>
<!-- <td<?php echo $highlight; ?>><?php echo $distribution['summary']; ?></td> -->
<?php
echo '<td'.$highlight.'>'.$application["release"]["version"].'</td>';
! echo '<td'.$highlight.'>';
! if(isset($application["installed"])){
! echo $application["installed"];
! }
! if($modified){
$app_settings = $zi_registry->getApplicationSettings($application['name'].'-'.$application['release']['version']);
?> <a href="<?php echo $app_settings['application_url']; ?>" title="View Application" target="_blank"><img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/window_new.png" border="0" alt="View Application" title="View Application" align="absmiddle"></a><?php
***************
*** 280,284 ****
}
}
! $zi_buttons['next'] = "applications.php?mode=".$_REQUEST['mode'];
}
}
--- 293,297 ----
}
}
! $zi_buttons['next'] = "applications.php".zi_form_querystr();
}
}
***************
*** 295,299 ****
</p>
<?php
! $zi_buttons['next'] = "applications.php?mode=".$_REQUEST['mode'];
}
--- 308,312 ----
</p>
<?php
! $zi_buttons['next'] = "applications.php".zi_form_querystr();
}
Index: authentication.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/authentication.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** authentication.php 14 Jan 2004 15:41:27 -0000 1.2
--- authentication.php 29 Jan 2004 14:09:16 -0000 1.3
***************
*** 87,94 ****
<td align="right" valign="middle"><span class="label">Username:</span></td>
<td align="left" valign="middle"><?php
! if(strlen($zi_errors['username']) > 0){
echo $zi_errors['username'].'<br/>';
}
! ?><input type="text" name="ZI_VALUES[username]" size="20" style="width:160" value="<?php echo $_REQUEST['ZI_VALUES']['username']; ?>">
<input type="hidden" name="ZI_VALIDATIONS[username]" value="not empty"></td>
</tr>
--- 87,94 ----
<td align="right" valign="middle"><span class="label">Username:</span></td>
<td align="left" valign="middle"><?php
! if(isset($zi_errors['username']) > 0){
echo $zi_errors['username'].'<br/>';
}
! ?><input type="text" name="ZI_VALUES[username]" size="20" style="width:160" value="<?php if(isset($_REQUEST['ZI_VALUES']['username'])) echo $_REQUEST['ZI_VALUES']['username']; ?>">
<input type="hidden" name="ZI_VALIDATIONS[username]" value="not empty"></td>
</tr>
***************
*** 96,100 ****
<td align="right" valign="middle"><span class="label">Password:</span></td>
<td align="left" valign="middle"><?php
! if(strlen($zi_errors['password']) > 0){
echo $zi_errors['password'].'<br/>';
}
--- 96,100 ----
<td align="right" valign="middle"><span class="label">Password:</span></td>
<td align="left" valign="middle"><?php
! if(isset($zi_errors['password']) > 0){
echo $zi_errors['password'].'<br/>';
}
***************
*** 105,109 ****
<td align="right" valign="middle"><span class="label">Confirm password:</span></td>
<td align="left" valign="middle"><?php
! if(strlen($zi_errors['password_confirm']) > 0){
echo $zi_errors['password_confirm'].'<br/>';
}
--- 105,109 ----
<td align="right" valign="middle"><span class="label">Confirm password:</span></td>
<td align="left" valign="middle"><?php
! if(isset($zi_errors['password_confirm']) > 0){
echo $zi_errors['password_confirm'].'<br/>';
}
***************
*** 114,118 ****
<?php
! unset($zi_buttons['cancel']);
$zi_buttons['next'] = 'index.php';
include 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
--- 114,118 ----
<?php
! //unset($zi_buttons['cancel']);
$zi_buttons['next'] = 'index.php';
include 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
Index: dev_bundle.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/dev_bundle.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dev_bundle.php 21 Jan 2004 18:16:14 -0000 1.2
--- dev_bundle.php 29 Jan 2004 14:09:16 -0000 1.3
***************
*** 67,71 ****
*/
$tar = new Archive_Tar($instant_tgz);
! $tar->setErrorHandling(PEAR_ERROR_PRINT);
$tar->createModify($tar_list, $instant_name.'/installer/');
// WORKAROUND: Did not manage to have Archive_Tar add
--- 67,71 ----
*/
$tar = new Archive_Tar($instant_tgz);
! //$tar->setErrorHandling(PEAR_ERROR_PRINT);
$tar->createModify($tar_list, $instant_name.'/installer/');
// WORKAROUND: Did not manage to have Archive_Tar add
Index: dev_bundle_instant.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/dev_bundle_instant.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dev_bundle_instant.php 21 Jan 2004 18:16:14 -0000 1.3
--- dev_bundle_instant.php 29 Jan 2004 14:09:16 -0000 1.4
***************
*** 43,47 ****
// clean previous instant bundles
! System::rm(array('-rf', $instant_dir));
System::mkdir(array('-p', $instant_dir));
--- 43,49 ----
// clean previous instant bundles
! if(is_dir($instant_dir)){
! System::rm(array('-rf', $instant_dir));
! }
System::mkdir(array('-p', $instant_dir));
***************
*** 95,99 ****
*/
$tar = new Archive_Tar($instant_tgz);
! $tar->setErrorHandling(PEAR_ERROR_PRINT);
$tar->createModify($tar_list, $_REQUEST['ZI_VALUES']['instant_name'].'/installer/');
// WORKAROUND: Did not manage to have Archive_Tar add
--- 97,101 ----
*/
$tar = new Archive_Tar($instant_tgz);
! //$tar->setErrorHandling(PEAR_ERROR_PRINT);
$tar->createModify($tar_list, $_REQUEST['ZI_VALUES']['instant_name'].'/installer/');
// WORKAROUND: Did not manage to have Archive_Tar add
Index: info.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/info.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** info.php 28 Jan 2004 11:41:35 -0000 1.3
--- info.php 29 Jan 2004 14:09:16 -0000 1.4
***************
*** 151,155 ****
}
! if(is_array($info["changelog"])) {
$zi_buttons['next'] = 'info_changelog.php'.zi_form_querystr();
}
--- 151,155 ----
}
! if(isset($info["changelog"]) && is_array($info["changelog"])) {
$zi_buttons['next'] = 'info_changelog.php'.zi_form_querystr();
}
***************
*** 157,161 ****
$content = '';
// Show the installation paths if it is an installed application
! if($_REQUEST['type'] == 'application' && strlen($info['installed'])){
$settings = $zi_registry->getApplicationSettings();
$content .= zi_info_td('Install Root', $settings['application_root']);
--- 157,161 ----
$content = '';
// Show the installation paths if it is an installed application
! if($_REQUEST['type'] == 'application' && isset($info['installed'])){
$settings = $zi_registry->getApplicationSettings();
$content .= zi_info_td('Install Root', $settings['application_root']);
***************
*** 175,182 ****
$content .= zi_info_td('Release Date', $info["release"]["date"] );
$content .= zi_info_td('State', zi_info_text($info["release"]["state"]) );
! $content .= zi_info_td('Homepage', zi_info_text($info['homepage']) );
$content .= zi_info_td('Licenses', zi_info_licenses($info["release"]["license"]) );
! $content .= zi_info_td('Copyrights', zi_info_copyrights($info["release"]["copyright"]['holder']) );
! $content .= zi_info_td('Maintainers', zi_info_maintainers($info["maintainers"]["maintainer"]) );
$content .= zi_info_td('Notes', zi_info_text($info["release"]["notes"]) );
if($_REQUEST['type'] == 'package'){
--- 175,188 ----
$content .= zi_info_td('Release Date', $info["release"]["date"] );
$content .= zi_info_td('State', zi_info_text($info["release"]["state"]) );
! if(isset($info['homepage'])){
! $content .= zi_info_td('Homepage', zi_info_text($info['homepage']) );
! }
$content .= zi_info_td('Licenses', zi_info_licenses($info["release"]["license"]) );
! if(isset($info["release"]["copyright"]['holder'])){
! $content .= zi_info_td('Copyrights', zi_info_copyrights($info["release"]["copyright"]['holder']) );
! }
! if(isset($info["maintainers"]["maintainer"])){
! $content .= zi_info_td('Maintainers', zi_info_maintainers($info["maintainers"]["maintainer"]) );
! }
$content .= zi_info_td('Notes', zi_info_text($info["release"]["notes"]) );
if($_REQUEST['type'] == 'package'){
***************
*** 189,193 ****
<div class="contextlink">
<?php
! if(is_array($info["changelog"])) {
?>
[ <a href="info_changelog.php<?php echo zi_form_querystr(); ?>">Older Versions</a> ]
--- 195,199 ----
<div class="contextlink">
<?php
! if(isset($info["changelog"]) && is_array($info["changelog"])) {
?>
[ <a href="info_changelog.php<?php echo zi_form_querystr(); ?>">Older Versions</a> ]
Index: info_changelog.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/info_changelog.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** info_changelog.php 28 Jan 2004 11:41:35 -0000 1.3
--- info_changelog.php 29 Jan 2004 14:09:16 -0000 1.4
***************
*** 160,164 ****
<tr>
<th colspan="4"><?php
! if($_REQUEST['type'] == 'package'){
echo $info['name'].'-'.$info["release"][0]["version"].'<br/>'.$info["summary"];
} else {
--- 160,164 ----
<tr>
<th colspan="4"><?php
! if(isset($_REQUEST['type']) && $_REQUEST['type'] == 'package'){
echo $info['name'].'-'.$info["release"][0]["version"].'<br/>'.$info["summary"];
} else {
Index: packages_sources.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_sources.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** packages_sources.php 28 Jan 2004 11:41:35 -0000 1.3
--- packages_sources.php 29 Jan 2004 14:09:16 -0000 1.4
***************
*** 105,109 ****
} else {
$bundle_dir = $zi_registry->getApplicationPath().'bundle'.DIRECTORY_SEPARATOR;
! System::rm(array('-rf', $bundle_dir));
System::mkdir(array('-p', $bundle_dir));
}
--- 105,111 ----
} else {
$bundle_dir = $zi_registry->getApplicationPath().'bundle'.DIRECTORY_SEPARATOR;
! if(is_dir($bundle_dir)){
! System::rm(array('-rf', $bundle_dir));
! }
System::mkdir(array('-p', $bundle_dir));
}
Index: setup.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/setup.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** setup.php 28 Jan 2004 11:41:35 -0000 1.7
--- setup.php 29 Jan 2004 14:09:16 -0000 1.8
***************
*** 72,77 ****
}
! if(!$_SERVER['HTTPS'] == 'on'){
?>
<h2>Security</h2>
--- 72,82 ----
}
! if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on'){
?>
+ <h2>Encryption on</h2>
+ <p>You are using SSL encryption (HTTPS), which ensures that data sent from your browser to the installer cannot be read by others.</p>
+ <?php
+ } else {
+ ?>
<h2>Security</h2>
***************
*** 80,88 ****
<p>
<?php
- } else {
- ?>
- <h2>Encryption on</h2>
- <p>You are using SSL encryption (HTTPS), which ensures that data sent from your browser to the installer cannot be read by others.</p>
- <?php
}
?>
--- 85,88 ----
Index: setup_datadir.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/setup_datadir.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** setup_datadir.php 21 Jan 2004 10:53:54 -0000 1.4
--- setup_datadir.php 29 Jan 2004 14:09:16 -0000 1.5
***************
*** 32,35 ****
--- 32,39 ----
require_once 'inc/init.php';
+ if(!isset($_REQUEST['data_dir'])){
+ $_REQUEST['data_dir'] = '';
+ }
+
// Check if this is a fresh setup installation
// of the installer. If so, then we take over the
***************
*** 117,121 ****
</ul>
<?php
! if(strlen($_REQUEST['error'])){
echo '<p class="warning">'.rawurldecode($_REQUEST['error']).'</p>';
}
--- 121,125 ----
</ul>
<?php
! if(isset($_REQUEST['error'])){
echo '<p class="warning">'.rawurldecode($_REQUEST['error']).'</p>';
}
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn