- made simple template almost feature complete by implementing view modes and more

- other general fixes to things a bit all over the place

git-svn-id: file:///Users/jimeh/Desktop/dlist/trunk@12 a5845835-ea0f-0410-a762-dd0bfe9bfde8

exec/core.exc.php

@@ -12,7 +12,7 @@
 Name: core
 Priority: 40
 Author: Jim Myhrberg
-Include: output.exc.php
+Include: output.exc.php, language.exc.php
 */
 //_SCRIPT;
 
@@ -34,18 +34,14 @@ $_SERVER['SERVER_SIGNATURE'] = $serverinfo[1].'Port '.$_SERVER['SERVER_PORT'].$s
 //>Section> define_constants:30
 define('DIR_URL', $dir_url);
 define('DIR_PATH', $dir_path);
-define('QUERY_STRING', $query_string);
-
 define('DLIST_URL', $config->dlist_url);
-define('TEMPLATE', $config->template);
-define('TPL_PATH', 'templates/'.TEMPLATE.'/');
-define('TPL_URL', DLIST_URL.TPL_PATH);
 
 
 //>Section> dynamic_vars
 $do_readdir = true;
 $do_render = true;
 $do_sort_items = true;
+$do_sort_by = $config->default_sort;
 $do_sort_reverse = false;
 
 
@@ -54,19 +50,20 @@ $do_sort_reverse = false;
 //==========================
 
 
-//>Section> readdir
+//>Section> do_readdir
 if ( $do_readdir ) {
 	//>Section> readdir.start
 	$dlist = new dirList();
 	//>Section> readdir.options
-	if ( empty($do_sort_items) ) {
-		$dlist->sort_items = false;
-	} elseif (!empty($do_sort_reverse)) $dlist->reverse = true;
+	if ( $do_sort_items ) {
+		$dlist->sort_by = $do_sort_by;
+		if ( $do_sort_reverse ) $dlist->reverse = true;
+	} else $dlist->sort_items = false;
 	if ($config->show_hidden) $dlist->show_hidden = true;
 	if ( !$config->smartdate ) $dlist->use_smartdate = false;
 	//>Section> readdir.read
 	$dlist->read(DIR_PATH);
-	//>Section> readdir.end
+	//>Section> do_readdir.end
 }
 
 //==========================
@@ -74,8 +71,6 @@ if ( $do_readdir ) {
 //==========================
 
 
-//>Section> echo
-//print_r($dlist->list);
 
 
 //_END;

exec/language.exc.php

@@ -22,7 +22,6 @@ Author: Jim Myhrberg
 
 //>Section> init:10
 if ( empty($config->language) ) $config->language = 'english';
-
 if ( is_readable('languages/'.$config->language.'.lang.php') ) {
 	include('languages/'.$config->language.'.lang.php');
 } elseif ( is_readable('languages/'.$config->default_lang.'.lang.php') ) {
@@ -31,7 +30,22 @@ if ( is_readable('languages/'.$config->language.'.lang.php') ) {
 	die("ERROR: Can't open language file.");
 }
 
+
+//>Section> create_object:10
 $lang = new lang();
+
+
+//>Section> warning:10
+if ( $lang->_version < $config->req_lang_ver ) {
+	echo 'WARNING: '.ucfirst($config->language).' language file is out of date and not fully compatible with this version of dList.';
+}
+
+
+//>Section> timer_string:10
+if ( stristr($lang->timer_string, '%s') != false ) $timer->pattern = $lang->timer_string;
+
+
+//>Section> setlocale:10
 setlocale(LC_ALL, array_merge($lang->_locale, $config->default_locale));
 
 

exec/output.exc.php

@@ -15,11 +15,68 @@ Author: Jim Myhrberg
 */
 //_SCRIPT;
 
+//==========================
+//>STAGE> functions
+//==========================
+
+
+//>Section> sort_class.start
+class Sort {
+	
+	//>Section> get_url
+	function get_url ($sortby) {
+		global $config;
+		$return = array();
+		$current_sort = ( empty($_REQUEST['sort']) ) ? $config->default_sort : $_REQUEST['sort'] ;
+		
+		if ( $sortby == $current_sort ) {
+			if ($sortby != $config->default_sort) $return[] = 'sort='.$sortby;
+			if ( empty($_REQUEST['order']) || $_REQUEST['order'] != 'desc' ) {
+				$return[] = 'order=desc';
+			}
+		} else {
+			if ($sortby != $config->default_sort) {
+				$return[] = 'sort='.$sortby;
+			}
+		}
+		
+		if ( empty($return) ) {
+			return DIR_URL;
+		} else {
+			$return = implode('&', $return);
+			return '?'.$return;
+		}
+	}
+	
+	//Section sort_class.end	
+}
+	
+
 //==========================
 //>STAGE> init
 //==========================
 
 
+//>After> core.define_constants:30
+define('TEMPLATE', $config->template);
+define('TPL_PATH', 'templates/'.TEMPLATE.'/');
+define('TPL_URL', DLIST_URL.TPL_PATH);
+define('SERVER_INFO', strip_tags($_SERVER['SERVER_SIGNATURE']));
+
+//>After> core.dynamic_vars
+if ( !empty($_REQUEST['order']) && $_REQUEST['order'] == 'desc' ) $do_sort_reverse = true;
+if ( !empty($_REQUEST['sort']) ) $do_sort_by = $_REQUEST['sort'];
+$is_root = ( DIR_URL != '' && DIR_URL != '/' ) ? false : true;
+
+
+//==========================
+//>STAGE> main
+//==========================
+
+
+
+
+
 //==========================
 //>STAGE> render
 //==========================