<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[GlotPress][871] trunk: Generate the .htaccess file when possible.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://glotpress.trac.wordpress.org/changeset/871">871</a></dd>
<dt>Author</dt> <dd>markoheijnen</dd>
<dt>Date</dt> <dd>2014-04-12 11:31:26 +0000 (Sat, 12 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Generate the .htaccess file when possible.
Props Secretmapper for the initial patch.
See <a href="http://glotpress.trac.wordpress.org/ticket/280">#280</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesinstallupgradephp">trunk/gp-includes/install-upgrade.php</a></li>
<li><a href="#trunkgptemplatesinstallphp">trunk/gp-templates/install.php</a></li>
<li><a href="#trunkinstallphp">trunk/install.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesinstallupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/install-upgrade.php (870 => 871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/install-upgrade.php 2014-04-12 11:06:26 UTC (rev 870)
+++ trunk/gp-includes/install-upgrade.php 2014-04-12 11:31:26 UTC (rev 871)
</span><span class="lines">@@ -39,9 +39,64 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function gp_upgrade() {
</span><del>- return gp_upgrade_db();
</del><ins>+ return gp_upgrade_db();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Sets the rewrite rules
+ *
+ * @return bool Returns true on success and false on failure
+ */
+function gp_set_htaccess() {
+ // The server doesn't support mod rewrite
+ if ( ! apache_mod_loaded( 'mod_rewrite', true ) ) {
+ //return false;
+ }
+
+ if ( file_exists( '.htaccess' ) && ! is_writeable( '.htaccess' ) ) {
+ return false;
+ }
+
+ // check if the .htaccess is in place or try to write it
+ $htaccess_file = @fopen( '.htaccess', 'c+' );
+
+ //error opening htaccess, inform user!
+ if ( false === $htaccess_file ) {
+ return false;
+ }
+
+ //'# BEGIN GlotPress' not found, write the access rules
+ if ( false === strpos( stream_get_contents( $htaccess_file ), '# BEGIN GlotPress' ) ) {
+ fwrite( $htaccess_file, gp_mod_rewrite_rules() );
+ }
+
+ fclose( $htaccess_file );
+
+ return true;
+}
+
+/**
+ * Return the rewrite rules
+ *
+ * @return string Rewrite rules
+ */
+function gp_mod_rewrite_rules() {
+ $path = gp_add_slash( gp_url_path() );
+
+ return '
+# BEGIN GlotPress
+ <IfModule mod_rewrite.c>;
+ RewriteEngine On
+ RewriteBase ' . $path . '
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteCond %{REQUEST_FILENAME} !-d
+ RewriteRule . ' . $path . 'index.php [L]
+ </IfModule>
+# END GlotPress';
+}
+
+
+
</ins><span class="cx"> function gp_upgrade_data( $db_version ) {
</span><span class="cx"> global $gpdb;
</span><span class="cx"> if ( $db_version < 190 ) {
</span><span class="lines">@@ -50,9 +105,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function gp_install() {
</span><del>- global $gpdb;
</del><ins>+ global $gpdb;
</ins><span class="cx">
</span><del>- $errors = gp_upgrade_db();
</del><ins>+ $errors = gp_upgrade_db();
</ins><span class="cx">
</span><span class="cx"> if ( $errors ) return $errors;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkgptemplatesinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/install.php (870 => 871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/install.php 2014-04-12 11:06:26 UTC (rev 870)
+++ trunk/gp-templates/install.php 2014-04-12 11:31:26 UTC (rev 871)
</span><span class="lines">@@ -22,19 +22,11 @@
</span><span class="cx"> // TODO: deny access to scripts folder
</span><span class="cx"> if ( $show_htaccess_instructions ): ?>
</span><span class="cx"> <p>
</span><del>- <?php _e('Please add this to your <code>.htaccess</code> file:'); ?>
- <pre>
- # BEGIN GlotPress
- <IfModule mod_rewrite.c>
- RewriteEngine On
- RewriteBase <?php echo $path . "\n"; ?>
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule . <?php echo $path; ?>index.php [L]
- </IfModule>
- # END GlotPress
- </pre>
- <?php _e('<strong>The default username is <code>admin</code>, whose password is simply <code>a</code>.</strong>'); ?>
</del><ins>+ <?php _e( 'If your <code>.htaccess</code> file were writable, we could do this automatically, but it isn’t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file.' ); ?>
+
+ <pre><?php echo esc_html( gp_mod_rewrite_rules() ); ?></pre>
+
+ <?php _e( '<strong>The default username is <code>admin</code>, whose password is simply <code>a</code>.</strong>' ); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/install.php (870 => 871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/install.php 2014-04-12 11:06:26 UTC (rev 870)
+++ trunk/install.php 2014-04-12 11:31:26 UTC (rev 871)
</span><span class="lines">@@ -9,31 +9,29 @@
</span><span class="cx"> require_once( GP_PATH . GP_INC . 'install-upgrade.php' );
</span><span class="cx"> require_once( GP_PATH . GP_INC . 'schema.php' );
</span><span class="cx">
</span><del>-$show_htaccess_instructions = true;
</del><ins>+$show_htaccess_instructions = false;
</ins><span class="cx"> $action = 'upgrade';
</span><span class="cx">
</span><del>-if ( gp_get_option( 'gp_db_version' ) <= gp_get_option_from_db( 'gp_db_version' ) && !isset( $_GET['force'] ) ) {
</del><ins>+if ( gp_get_option( 'gp_db_version' ) <= gp_get_option_from_db( 'gp_db_version' ) && ! isset( $_GET['force'] ) ) {
</ins><span class="cx"> $success_message = __( 'You already have the latest version, no need to upgrade!' );
</span><span class="cx"> $errors = array();
</span><del>- $show_htaccess_instructions = false;
</del><span class="cx"> }
</span><span class="cx"> else {
</span><del>- if ( gp_is_installed() ) {
- $success_message = __( 'GlotPress was successully upgraded!' );
- $errors = gp_upgrade();
- }
- else {
- $success_message = __( 'GlotPress was successully installed!' );
- $errors = gp_install();
- $action = 'install';
</del><ins>+ if ( gp_is_installed() ) {
+ $success_message = __( 'GlotPress was successully upgraded!' );
+ $errors = gp_upgrade();
+ }
+ else {
+ $success_message = __( 'GlotPress was successully installed!' );
+ $errors = gp_install();
+ $action = 'install';
</ins><span class="cx">
</span><del>- if ( !$errors ) {
</del><ins>+ if ( ! $errors ) {
</ins><span class="cx"> gp_create_initial_contents();
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ $show_htaccess_instructions = ! gp_set_htaccess() && empty( $errors );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-// TODO: check if the .htaccess is in place or try to write it
-$show_htaccess_instructions = $show_htaccess_instructions && empty( $errors );
-$path = gp_add_slash( gp_url_path() );
</del><span class="cx"> gp_tmpl_load( 'install', get_defined_vars() );
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>