Merge branch 'master' of github.com:justinwalsh/daux.io

README.md

@@ -188,6 +188,13 @@ Set custom files and entire folders to ignore within your `/docs` folder. For fi
 	}
 ```
 
+###Disabling clean URLs
+By default, Daux.io will create clean url's that do not include index.php. On servers running Apache, uploading the included .htaccess file should be enough for them to work properly. On servers that are not running Apache or that do not allow custom .htaccess files, you may need to disable clean_urls:
+
+	{
+		"clean_urls": false
+	}
+
 ## Running Remotely
 
 Copy the files from the repo to a web server that can run PHP 5.3 or greater.

docs/00_Getting_Started.md

@@ -188,6 +188,13 @@ Set custom files and entire folders to ignore within your `/docs` folder. For fi
 	}
 ```
 
+###Disabling clean URLs
+By default, Daux.io will create clean url's that do not include index.php. On servers running Apache, uploading the included .htaccess file should be enough for them to work properly. On servers that are not running Apache or that do not allow custom .htaccess files, you may need to disable clean_urls:
+
+	{
+		"clean_urls": false
+	}
+
 ## Running Remotely
 
 Copy the files from the repo to a web server that can run PHP 5.3 or greater.

libs/functions.php

@@ -39,6 +39,7 @@ function get_options() {
 		'twitter' => array(),
 		'links' => array(),
 		'colors' => false,
+		'clean_urls' => true,
 		'google_analytics' => false,
 		'piwik_analytics' => false,
         'ignore' => array()
@@ -228,8 +229,9 @@ function get_ignored() {
 	return $all_ignored;
 }
 
-function get_tree($path = '.', $clean_path = '', $title = ''){
-	$tree = array();
+function get_tree($path = '.', $clean_path = '', $title = '', $first = true){
+    $options = get_options();
+    $tree = array();
     $ignore = get_ignored();
     $dh = @opendir($path);
     $index = 0;
@@ -252,9 +254,26 @@ function get_tree($path = '.', $clean_path = '', $title = ''){
 
      	// Check that this file or folder is not to be ignored
         if(!in_array($file, $ignore)) {
-        	$full_path = "$path/$file";
-        	$clean_sort = clean_sort($file);
-        	$url = $clean_path . '/' . $clean_sort;
+            $full_path = "$path/$file";
+            $clean_sort = clean_sort($file);
+
+            // If clean_urls is set to false and this is the first branch of the tree, append index.php to the clean_path.
+            if($options['clean_urls'] == false)
+            {
+                if($first)
+                {
+                    $url = $clean_path . '/index.php/' . $clean_sort;
+                }
+                else
+                {
+                    $url = $clean_path . '/' . $clean_sort;
+                }
+            }
+            else
+            {
+            	$url = $clean_path . '/' . $clean_sort;
+            }
+
         	$clean_name = clean_name($clean_sort);
 
         	// Title
@@ -273,7 +292,7 @@ function get_tree($path = '.', $clean_path = '', $title = ''){
             		'path' => $full_path,
             		'clean' => $clean_sort,
             		'url' => $url,
-            		'tree'=> get_tree($full_path, $url, $full_title)
+            		'tree'=> get_tree($full_path, $url, $full_title, false)
             	);
             } else {
             	// File