Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.6/installation/install4.php

-revision 1219, Sat Jul 28 02:12:48 2007 UTC
+revision 1359, Tue Oct 23 08:50:31 2007 UTC
 Line 25
  $DBpassword = mosGetParam( $_POST, 'DBpassword', '' );
  $DBname         = mosGetParam( $_POST, 'DBname', '' );
  $DBPrefix       = mosGetParam( $_POST, 'DBPrefix', '' );
- $sitename       = mosGetParam( $_POST, 'sitename', '' );
+ $DBcreated      = intval( mosGetParam( $_POST, 'DBcreated', 0 ) );
+ $sitename       = stripslashes( mosGetParam( $_POST, 'sitename', '' ) );
  $adminEmail = mosGetParam( $_POST, 'adminEmail', '');
  $siteUrl        = mosGetParam( $_POST, 'siteUrl', '' );
- $absolutePath = mosGetParam( $_POST, 'absolutePath', '' );
+ $absolutePath = stripslashes( mosGetParam( $_POST, 'absolutePath', '' ) );
  $adminPassword = mosGetParam( $_POST, 'adminPassword', '');
  $filePerms = '';
-Line 56
+Line 57
                  (mosGetParam($_POST,'dirPermsWorldRead',0) * 4 +
                   mosGetParam($_POST,'dirPermsWorldWrite',0) * 2 +
                   mosGetParam($_POST,'dirPermsWorldSearch',0));
+ ?>
+ <?php echo "<?xml version=\"1.0\" encoding=\"".$charset."\"?".">";
+ ?>
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <html xmlns="http://www.w3.org/1999/xhtml" dir="<?php echo $text_direction;?>">
+ <head>
+ <title><?php echo T_('Mambo - Web Installer') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset ?>" />
+ <link rel="shortcut icon" href="../images/favicon.ico" />
+ <link rel="stylesheet" href="install<?php if($text_direction=='rtl') echo '_'.$text_direction ?>.css" type="text/css" />
+ </head>
+ <body>
+ <?php
  if ((trim($adminEmail== "")) || (preg_match("/[\w\.\-]+@\w+[\w\.\-]*?\.\w{1,4}/", $adminEmail )==false)) {
          echo "<form name=\"stepBack\" method=\"post\" action=\"install3.php\">
                  <input type=\"hidden\" name=\"DBhostname\" value=\"$DBhostname\" />
-Line 64
+Line 77
                  <input type=\"hidden\" name=\"DBpassword\" value=\"$DBpassword\" />
                  <input type=\"hidden\" name=\"DBname\" value=\"$DBname\" />
                  <input type=\"hidden\" name=\"DBPrefix\" value=\"$DBPrefix\" />
-                 <input type=\"hidden\" name=\"DBcreated\" value=\"1\" />
+                 <input type=\"hidden\" name=\"DBcreated\" value=\"$DBcreated\">
                  <input type=\"hidden\" name=\"sitename\" value=\"$sitename\" />
                  <input type=\"hidden\" name=\"adminEmail\" value=\"$adminEmail\" />
                  <input type=\"hidden\" name=\"siteUrl\" value=\"$siteUrl\" />
-Line 72
+Line 85
                  <input type=\"hidden\" name=\"filePerms\" value=\"$filePerms\" />
                  <input type=\"hidden\" name=\"dirPerms\" value=\"$dirPerms\" />
                  </form>";
-         echo "<script>alert('".T_('You must provide a valid admin email address.')."'); document.stepBack.submit(); </script>";
+         $error_msg = T_('You must provide a valid admin email address');
+         echo "<script>alert('".$error_msg."'); document.stepBack.submit(); </script></body></html>";
          return;
  }
-Line 97
+Line 111
                  <input type=\"hidden\" name=\"filePerms\" value=\"$filePerms\" />
                  <input type=\"hidden\" name=\"dirPerms\" value=\"$dirPerms\" />
                  </form>";
+         $error_msg = T_('The database details provided are incorrect and/or empty');
-         echo "<script>alert('".T_('The database details provided are incorrect and/or empty')."'); document.stepBack.submit(); </script>";
+         echo "<script>alert('".$error_msg."'); document.stepBack.submit(); </script></body></html>";
          return;
  }
  if ($sitename) {
-         if (!get_magic_quotes_gpc()) {
-                 $configArray['sitename'] = addslashes($sitename);
-         } else {
                  $configArray['sitename'] = $sitename;
-         }
  } else {
          ?>
                  <form name=\"stepBack\" method=\"post\" action=\"install3.php\">
-Line 124
+Line 134
                  <input type=\"hidden\" name=\"filePerms\" value=\"$filePerms\" />
                  <input type=\"hidden\" name=\"dirPerms\" value=\"$dirPerms\" />
                  </form>
-                 <script type="text/javascript">alert('".T_('The sitename has not been provided'); document.stepBack2.submit();</script>
                  <?php
+         $error_msg = T_('The sitename has not been provided');
+         echo "<script>alert('".$error_msg."'); document.stepBack.submit(); </script></body></html>";
          return;
  }
  if (file_exists( '../configuration.php' )) {
-Line 145
+Line 155
          $configArray['absolutePath']=$absolutePath;
          $configArray['filePerms']=$filePerms;
          $configArray['dirPerms']=$dirPerms;
+         $configArray['sitename'] = addslashes($configArray['sitename']);
          $config = "<?php\n";
          $config .= "\$mosConfig_offline = '0';\n";
-Line 213
+Line 224
          $config .= "\$mosConfig_dirperms = '".$configArray['dirPerms']."';\n";
          $config .= "\$mosConfig_helpurl = 'http://docs.mambo-foundation.org';\n";
          $config .= "\$mosConfig_mbf_content = '0';\n";
+         $config .= "\$mosConfig_doctype = 'xhtml-trans';\n";
          $config .= "setlocale (LC_TIME, \$mosConfig_locale);\n";
          $config .= "?>";
-Line 303
+Line 315
            <input type="hidden" name="filePerms" value="$filePerms" />
            <input type="hidden" name="dirPerms" value="$dirPerms" />
          </form>
-         <script>alert('<?php echo T_('The site url has not been provided') ?>'); document.stepBack3.submit();</script>
  <?php
- }
+         $error_msg = T_('The site url has not been provided');
- echo "<?xml version=\"1.0\" encoding=\"".$charset."\"?".">";
+         echo "<script>alert('".$error_msg."'); document.stepBack.submit(); </script></body></html>";
- ?>
+         return;
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ } ?>
- <html xmlns="http://www.w3.org/1999/xhtml" dir="<?php echo $text_direction;?>">
- <head>
- <title><?php echo T_('Mambo - Web Installer') ?></title>
- <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset ?>" />
- <link rel="shortcut icon" href="../images/favicon.ico" />
- <link rel="stylesheet" href="install<?php if($text_direction=='rtl') echo '_'.$text_direction ?>.css" type="text/css" />
- </head>
- <body>
  <div id="wrapper">
          <div id="header">
                  <div id="mambo"><img src="header_install.png" alt="<?php echo T_('Mambo Installation') ?>" /></div>
-Line 392
+Line 395
      <tbody>
        <tr>
          <td>
-         <div style="text-align: left;">The form below is optional. The information is intended to provide you with more information and to help us make Mambo better. We treat all data as confidential; it will not be shared with any third parties.<br /><br />
+         <div style="text-align: left;"><?php echo T_('The form below is optional. The information is intended to provide you with more information and to help us make Mambo better. We treat all data as confidential; it will not be shared with any third parties.') ?><br /><br />
          </div>
          <table class="bodytext" border="0" cellpadding="3" cellspacing="0" width="100%">
            <tbody>
              <tr>
-               <td colspan="4" bgcolor="#e0e0ff"><b>Your details:</b></td>
+               <td colspan="4" bgcolor="#e0e0ff"><b><?php echo T_('Your details:') ?></b></td>
              </tr>
              <tr>
                <td>&nbsp;</td>
-               <td><b>Your name:</b></td>
+               <td><b><?php echo T_('Your name:') ?></b></td>
                <td align="right">&nbsp;</td>
                <td><input maxlength="100" name="name" size="28" /></td>
              </tr>
              <tr>
                <td>&nbsp;</td>
-               <td><b>Your email address:</b></td>
+               <td><b><?php echo T_('Your email address:') ?></b></td>
                <td align="right">&nbsp;</td>
                <td><input maxlength="100" name="email" size="28" /></td>
              </tr>
              <tr>
                <td>&nbsp;</td>
-               <td><b>Your organization:</b></td>
+               <td><b><?php echo T_('Your organization:') ?></b></td>
                <td align="right">&nbsp;</td>
                <td><input maxlength="100" name="company" size="28" /></td>
              </tr>
              <tr>
                <td>&nbsp;</td>
-               <td><b>Intended use:</b></td>
+               <td><b><?php echo T_('Intended use:') ?></b></td>
                <td align="right">&nbsp;</td>
                <td>
                <select name="category">
-               <option value="" selected="on">Select a category</option>
+               <option value="" selected="on"><?php echo T_('Select a category') ?></option>
-               <option value="personal">Personal</option>
+               <option value="personal"><?php echo T_('Personal') ?></option>
-               <option value="company">Company</option>
+               <option value="company"><?php echo T_('Company') ?></option>
-               <option value="government">Government</option>
+               <option value="government"><?php echo T_('Government') ?></option>
-               <option value="nonprofit">Non-profit</option>
+               <option value="nonprofit"><?php echo T_('Non-profit') ?></option>
-               <option value="university">University</option>
+               <option value="university"><?php echo T_('University') ?></option>
-               <option value="school">School</option>
+               <option value="school"><?php echo T_('School') ?></option>
                </select>
                </td>
              </tr>
              <tr>
                <td></td>
-               <td><b>Subscribe to Mambo Security Announcement Mailing List?</b></td>
+               <td><b><?php echo T_('Subscribe to Mambo Security Announcement Mailing List?') ?></b></td>
                <td></td>
-               <td><a href="http://mambo-foundation.org/mailman/listinfo/security-notification_mambo-foundation.org" target="_blank">Click Here</a><br />
+               <td><a href="http://mambo-foundation.org/mailman/listinfo/security-notification_mambo-foundation.org" target="_blank"><?php echo T_('Click Here') ?></a><br />
                </td>
              </tr>
              <tr>
                <td></td>
-               <td><span style="font-weight: bold;">Are you interested in joining Team Mambo?</span></td>
+               <td><span style="font-weight: bold;"><?php echo T_('Are you interested in joining Team Mambo?') ?></span></td>
                <td></td>
-               <td><input name="teammambo" value="teammambo" type="checkbox" /></td>
+               <td><a href="http://members.mambo-foundation.org/" target="_blank"><?php echo T_('Click Here') ?></a></td>
              </tr>
              <tr>
                <td>&nbsp;</td>
-               <td valign="top"><b>Additional comments / feedback:</b></td>
+               <td valign="top"><b><?php echo T_('Additional comments / feedback:') ?></b></td>
                <td valign="top">&nbsp;</td>
                <td valign="top"><textarea name="comments" cols="35" rows="3"></textarea>
                </td>
              </tr>
              <tr>
                <td></td>
-               <td style="text-align: center;">Help support Mambo:</td>
+               <td style="text-align: center;"><?php echo T_('Help support Mambo:') ?></td>
                <td></td>
-               <td>We appreciate your feedback!</td>
+               <td><?php echo T_('We appreciate your feedback!') ?></td>
              </tr>
              <tr>
                <td></td>
-Line 485
+Line 488
  </div>
  </body>
  </html>

 Legend:



Removed from v.1219
 


changed lines


 
Added in v.1359
 Legend:



Removed from v.1219
 


changed lines


 
Added in v.1359
-Removed from v.1219
+Added in v.1359

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

Diff of /mambo/branches/4.6/installation/install4.php