Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.6/administrator/components/com_installer/admin.installer.php

-revision 319, Thu Feb 23 11:30:16 2006 UTC
+revision 320, Fri Feb 24 16:46:13 2006 UTC
 Line 106
          // Check if file uploads are enabled
          if (!(bool)ini_get('file_uploads')) {
-                 HTML_installer::showInstallMessage(T_('The installer can\'t continue before file uploads are enabled. Please use the install from directory method.'),
+                 $message = new mosError (T_('The installer can\'t continue before file uploads are enabled. Please use the install from directory method.'), _MOS_ERROR_FATAL);
-                         T_('Installer - Error'), returnTo( $option, $element, $client ) );
+                 HTML_installer::showInstallMessage($message, T_('Installer - Error'), returnTo( $option, $element, $client ));
                  exit();
          }
          // Check that the zlib is available
          if(!extension_loaded('zlib')) {
-                 HTML_installer::showInstallMessage(T_('The installer can\'t continue before zlib is installed'),
+                 $message = new mosError (T_('The installer can\'t continue before zlib is installed'), _MOS_ERROR_FATAL);
-                         T_('Installer - Error'), returnTo( $option, $element, $client ) );
+                 HTML_installer::showInstallMessage($message, T_('Installer - Error'), returnTo( $option, $element, $client ));
                  exit();
          }
          $userfile = mosGetParam( $_FILES, 'userfile', null );
          if (!$userfile) {
-                 HTML_installer::showInstallMessage( T_('No file selected'), T_('Upload new module - error'),
+                 $message = new mosError (T_('No file selected'), _MOS_ERROR_FATAL);
-                         returnTo( $option, $element, $client ));
+                 HTML_installer::showInstallMessage($message, T_('Upload new module - error'), returnTo($option, $element, $client));
                  exit();
          }
          $userfile_name = $userfile['name'];
-         $msg = '';
+         if (uploadFile( $userfile['tmp_name'], $userfile['name'], $message )) {
-         if (uploadFile( $userfile['tmp_name'], $userfile['name'], $msg )) {
                  $installer =& new $installerClass();
                  if (!$installer->extractArchive( $userfile['name'] )) {
                          $installer->cleanUpInstall();
-Line 142
+Line 140
                  HTML_installer::showInstallMessage( $installer->getErrors(), T_('Upload ').$element.' - '.($ret ? T_('Success') : T_('Failed')),
                          returnTo( $option, $element, $client ) );
          }
-         else HTML_installer::showInstallMessage( $msg, sprintf(T_('Upload %s -  Upload Error'), $element),
+         else HTML_installer::showInstallMessage( $message, sprintf(T_('Upload %s -  Upload Error'), $element),
                          returnTo( $option, $element, $client ) );
  }
-Line 172
+Line 170
  function installFromUrl( $installerClass, $option, $element, $client ) {
          // Check that the zlib is available
          if(!extension_loaded('zlib')) {
-                 HTML_installer::showInstallMessage( T_('The installer can\'t continue before zlib is installed'),
+                 $message = new mosError (T_('The installer can\'t continue before zlib is installed'), _MOS_ERROR_FATAL);
-                         'Installer - Error', returnTo( $option, $element, $client ) );
+                 HTML_installer::showInstallMessage($message, 'Installer - Error', returnTo( $option, $element, $client ));
                  exit();
          }
          $userurl = mosGetParam( $_REQUEST, 'userurl', '' );
          if (!$userurl) {
-                 HTML_installer::showInstallMessage(T_('Please select an HTTP URL'),
+                 $message = new mosError (T_('Please select an HTTP URL'), _MOS_ERROR_FATAL);
-                         T_('Installer - Error'), returnTo( $option, $element, $client ) );
+                 HTML_installer::showInstallMessage($message, T_('Installer - Error'), returnTo($option, $element, $client));
          }
          $url_data = parse_url($userurl);
          if (isset($url_data['path'])) $userfilename = basename($url_data['path']);
          else $userfilename = '';
-         if (!$userfilename) HTML_installer::showInstallMessage(T_('The URL did not define a file name'),
+         if (!$userfilename) {
-                         T_('Installer - Error'), returnTo( $option, $element, $client ) );
+                 $message = new mosError (T_('The URL did not define a file name'), _MOS_ERROR_FATAL);
-         $msg = '';
+                 HTML_installer::showInstallMessage($message, T_('Installer - Error'), returnTo($option, $element, $client));
-         if (uploadUrl($userurl, $userfilename, $msg )) {
+         }
+         if (uploadUrl($userurl, $userfilename, $message )) {
                  $installer = new $installerClass();
                  if (!$installer->extractArchive($userfilename)) {
                          $installer->cleanUpInstall();
-Line 199
+Line 198
                  HTML_installer::showInstallMessage( $installer->getErrors(), T_('Upload ').$element.' - '.($ret ? T_('Success') : T_('Failed')),
                          returnTo( $option, $element, $client ) );
          } else {
-                 HTML_installer::showInstallMessage( $msg, T_('Upload ').$element.' - '.T_('Error'),
+                 HTML_installer::showInstallMessage( $message, T_('Upload ').$element.' - '.T_('Error'),
                          returnTo( $option, $element, $client ) );
          }
  }
-Line 208
+Line 207
  * @param string The name of the file to put in the temp directory
  * @param string The message to return
  */
- function uploadFile( $filename, $userfile_name, &$msg ) {
+ function uploadFile( $filename, $userfile_name, &$error ) {
          global $mosConfig_absolute_path;
          $baseDir = mosPathName( $mosConfig_absolute_path . '/media' );
-Line 229
+Line 228
          } else {
              $msg = T_('Upload failed as <code>/media</code> directory does not exist.');
          }
+         $error = new mosError ($msg, _MOS_ERROR_FATAL);
          return false;
  }
  /**
 Line 236
  * @param string The name of the file to put in the temp directory
  * @param string The message to return
  */
- function uploadUrl( $userurl, $userfilename, &$msg ) {
+ function uploadUrl( $userurl, $userfilename, &$error ) {
          global $mosConfig_absolute_path;
          $baseDir = mosPathName( $mosConfig_absolute_path . '/media' );
          if (file_exists( $baseDir )) {
 Line 259
                  else $msg = T_('Upload failed as <code>/media</code> directory is not writable.');
          }
          else $msg = T_('Upload failed as <code>/media</code> directory does not exist.');
+         $error = new mosError ($msg, _MOS_ERROR_FATAL);
          return false;
  }
-Line 273
+Line 274
                  $sql = "SELECT * FROM #__components WHERE id=$cid";
                  $database->setQuery($sql);
                  if (!$database->loadObject( $row )) {
-                         HTML_installer::showInstallMessage($database->stderr(true),T_('Uninstall -  error'),
+                         $message = new mosError ($database->stderr(true), _MOS_ERROR_FATAL);
-                                 "index2.php?option=$option&element=component");
+                         HTML_installer::showInstallMessage($message, T_('Uninstall -  error'), "index2.php?option=$option&element=component");
                          exit();
                  }
                  if ($row->iscore) {
-                         HTML_installer::showInstallMessage(sprintf(T_('Component %s is a core component, and can not be uninstalled.<br />You need to unpublish it if you don\'t want to use it'), $row->name), 'Uninstall -  error',
+                         $message = new mosError (sprintf(T_('Component %s is a core component, and can not be uninstalled.<br />You need to unpublish it if you don\'t want to use it'), $row->name), _MOS_ERROR_FATAL);
-                                 "index2.php?option=$option&element=component");
+                         HTML_installer::showInstallMessage($message, 'Uninstall -  error', "index2.php?option=$option&element=component");
                          exit();
                  }
                  // Try to find the XML file
-Line 305
+Line 306
                          $sql = "DELETE FROM #__components WHERE `option`='$com_name'";
                          $database->setQuery($sql);
                          $database->query();
-                         HTML_installer::showInstallMessage( T_('Uninstaller could not find XML file, but cleaned database'), T_('Uninstall ').T_('component - ').T_('Success'),
+                         $message = new mosError (T_('Uninstaller could not find XML file, but cleaned database'), _MOS_ERROR_WARN);
-                                 returnTo( $option, 'component', $client ) );
+                         HTML_installer::showInstallMessage($message, T_('Uninstall ').T_('component - ').T_('Success'), returnTo($option, 'component', $client));
                  }
                  exit();
          }
-Line 324
+Line 325
                  $database->setQuery( $query );
                  $database->loadObject( $row );
                  if ($row->iscore) {
-                         HTML_installer::showInstallMessage(sprintf(T_('%s is a core module, and can not be uninstalled.<br />You need to unpublish it if you don\'t want to use it'), $row->title), 'Uninstall -  error', returnTo( $option, 'module', $row->client_id ? '' : 'admin' ) );
+                         $message = new mosError (sprintf(T_('%s is a core module, and can not be uninstalled.<br />You need to unpublish it if you don\'t want to use it'), $row->title), _MOS_ERROR_FATAL);
+                         HTML_installer::showInstallMessage($message, 'Uninstall -  error', returnTo( $option, 'module', $row->client_id ? '' : 'admin' ) );
                          exit();
                  }
                  $query = "DELETE FROM #__modules_menu WHERE moduleid=$id";
-Line 356
+Line 358
                  $database->setQuery( "SELECT name, folder, element, iscore FROM #__mambots WHERE id = $id" );
                  $database->loadObject( $row );
                  if ($database->getErrorNum()) {
-                         HTML_installer::showInstallMessage( $database->stderr(), T_('Uninstall -  error'),
+                         $message = new mosError ($database->stderr(), _MOS_ERROR_FATAL);
+                         HTML_installer::showInstallMessage($message, T_('Uninstall -  error'),
                          returnTo( $option, 'mambot', $client ) );
                          exit();
                  }
                  if ($row == null) {
-                         HTML_installer::showInstallMessage( T_('Invalid object id'), T_('Uninstall -  error'),
+                         $message = new mosError (T_('Invalid object id'), _MOS_ERROR_FATAL);
-                         returnTo( $option, 'mambot', $client ) );
+                         HTML_installer::showInstallMessage($message, T_('Uninstall -  error'), returnTo($option, 'mambot', $client));
                          exit();
                  }
                  if (trim( $row->folder ) == '') {
-                         HTML_installer::showInstallMessage( T_('Folder field empty, cannot remove files'), T_('Uninstall -  error'),
+                         $message = new mosError (T_('Folder field empty, cannot remove files'), _MOS_ERROR_FATAL);
-                         returnTo( $option, 'mambot', $client ) );
+                         HTML_installer::showInstallMessage($message, T_('Uninstall -  error'), returnTo($option, 'mambot', $client));
                          exit();
                  }
                  $xmlfile = $mosConfig_absolute_path.'/mambots/'.$row->folder.'/'.$row->element.'.xml';
-Line 379
+Line 382
                  else {
                          $database->setQuery("DELETE FROM #__mambots WHERE id = $id");
                          $ret = $database->query();
-                         $showerrors = T_('Uninstaller did its best with no XML file present');
+                         $showerrors = new mosError (T_('Uninstaller did its best with no XML file present'), _MOS_ERROR_WARN);
                  }
                  HTML_installer::showInstallMessage( $showerrors, T_('Uninstall mambot - ').($ret ? T_('Success') : T_('Error')),
                          returnTo( $option, 'mambot', $client ) );
-Line 411
+Line 414
                          $tdir = new mosDirectory($path);
                          $tdir->deleteAll();
                  }
-                 HTML_installer::showInstallMessage( T_('Uninstall template - ').T_('Success'),
+                 $message = new mosError (T_('Uninstall template - '), _MOS_ERROR_INFORM);
-                         returnTo( $option, 'template', $client ) );
+                 HTML_installer::showInstallMessage($message, T_('Success'), returnTo($option, 'template', $client));
              exit ();
          }
-Line 434
+Line 437
                          HTML_installer::showInstallMessage( $parser->errors->getErrors(), T_('Uninstall language - ').($ret ? T_('Success') : T_('Error')),
                                  returnTo( $option, 'language', $client ) );
                  }
-                 else HTML_installer::showInstallMessage( T_('Language id empty, cannot remove files'), T_('Uninstall -  error'), "index2.php?option=com_languages");
+                 else {
+                         $message = new mosError (T_('Language id empty, cannot remove files'), _MOS_ERROR_FATAL);
+                         HTML_installer::showInstallMessage($message, T_('Uninstall -  error'), "index2.php?option=com_languages");
+                 }
                  exit();
          }

 Legend:



Removed from v.319
 


changed lines


 
Added in v.320
 Legend:



Removed from v.319
 


changed lines


 
Added in v.320
-Removed from v.319
+Added in v.320

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

Diff of /mambo/branches/4.6/administrator/components/com_installer/admin.installer.php