From 9d4fa2963b1059fed54aaeae583bf02a30c42239 Mon Sep 17 00:00:00 2001 From: jhunkeler Date: Mon, 4 Jan 2010 04:54:14 +0000 Subject: Fixed SVN maybe. git-svn-id: http://svn.3rd-infantry-division.org/testing/branches/Bayonet CMS v2@448 c5b2fb0a-d05d-0410-98c8-828840a80ff6 --- includes/classes.php | 131 +++++++++++++++++++++++++++++++++++++++++++++++++ includes/debug.php | 17 +++++-- includes/functions.php | 13 +++-- includes/sql.class.php | 14 ++++-- 4 files changed, 165 insertions(+), 10 deletions(-) create mode 100644 includes/classes.php (limited to 'includes') diff --git a/includes/classes.php b/includes/classes.php new file mode 100644 index 0000000..33794c2 --- /dev/null +++ b/includes/classes.php @@ -0,0 +1,131 @@ +request = $_POST; + echo "
\n"; + } + + public function __destruct() + { + echo "
\n"; + } + + function getKeyStates($keys) + { + $good = array(); + $bad = array(); + + if(!is_array($keys)) + return array(); + + foreach($keys as $key => $value) + { + if(!empty($value)) + $good[$key] = $value; + else + $bad[$key] = $value; + } + + $data = array( + 'set' => $good, + 'unset' => $bad + ); + + return $data; + } + + function verify($submit_key) + { + return $this->verifySubmit($submit_key); + } + + function verifySubmit($submit_key) + { + return isset($this->request[$submit_key]) ? true : false; + } + + function button($extern_name, $value, $text = "Button") + { + echo "\n"; + } + + function submitButton($extern_name, $value = "Submit") + { + echo "\n"; + } + + function reset($value = "Reset") + { + echo "\n"; + } + + function textField($extern_name, $value = NULL, $isPassword = false) + { + $type = 'text'; + if($isPassword) $type = 'password'; + + $value = filter_var($value, FILTER_SANITIZE_STRING); + echo "\n"; + } + + function radioButton($extern_name, $value, $isChecked = false) + { + if($isChecked) + { + echo "\n"; + } + else + { + echo "\n"; + } + } + + function checkBox($extern_name, $value, $isChecked = false) + { + if($isChecked) + { + echo "\n"; + } + else + { + echo "\n"; + } + } + + function dropDown($extern_name, $values = array('None'), $select = NULL) + { + $selectIterator = 1; + + echo "\n"; + } + + function textArea($extern_name, $rows = 10, $cols = 30, $value = NULL) + { + $value = filter_var($value, FILTER_SANITIZE_STRING); + echo "\n"; + } +} + +?> \ No newline at end of file diff --git a/includes/debug.php b/includes/debug.php index 87ebe70..29f4195 100644 --- a/includes/debug.php +++ b/includes/debug.php @@ -50,8 +50,8 @@ function decho($message, $force = false) $message = $message; } - if(count($log_message_queue) >= 100) - array_pop($log_message_queue); + //if(count($log_message_queue) >= 100) + // array_pop($log_message_queue); array_push($log_message_queue, $message); @@ -67,10 +67,15 @@ function queuePrint($obj, $force = false) if($config['debug']['enabled'] == false || $config['debug']['show_messages'] == false) return; } - + if(is_array($obj)) { $array_dump = print_r($obj,true); + if(empty($obj)) + { + echo "Array was empty
\n"; + return; + } echo "
" . $array_dump . "

\n"; //WriteLog($array_dump,BAYONET_LOG_INFO); } @@ -90,6 +95,10 @@ function queuePrint($obj, $force = false) echo $obj . "
\n"; //WriteLog($message,BAYONET_LOG_INFO); } + else + { + echo "queuePrint: Invalid type of " . gettype($obj) . "
\n"; + } } function logQueueFlush($force = false) @@ -117,6 +126,7 @@ function logQueueFlush($force = false) return false; } + echo "" . count($log_message_queue) . " messages received.

\n"; foreach($log_message_queue as $message) { if($message != $log_message_queue[$messageCount - 1]) @@ -156,6 +166,7 @@ function logQueueFlush($force = false) ++$messageCount; } + echo ""; CloseContent(); error_reporting(1); diff --git a/includes/functions.php b/includes/functions.php index 46b92f3..30997c6 100644 --- a/includes/functions.php +++ b/includes/functions.php @@ -25,6 +25,9 @@ * @param mixed $str * @return */ + +include_once 'classes.php'; + function bbcode_format ($str) { $str = htmlentities($str); @@ -363,6 +366,10 @@ static $error_stack_messages = array(); //global stack of errors accumulated thr function push_error_stack($message) { global $error_stack_messages; + + if(count($error_stack_messages) >= 100) + array_pop($error_stack_messages); + array_push($error_stack_messages, $message); } @@ -586,15 +593,15 @@ function UnderConstruction($message = NULL, $flag = BAYONET_SITE) * @return */ -define('BLOCK_LEFT',false); -define('BLOCK_RIGHT',true); +define('BLOCK_LEFT', 0); +define('BLOCK_RIGHT', 1); function GetBlocks($position = BLOCK_LEFT) { global $config; global $db; - $result = $db->Query("SELECT * FROM `bayonet_blocks` WHERE `position` = '$position' AND `active` = 1 ORDER BY weight"); + $result = $db->Query("SELECT block_id, active, weight, position, dir_name, title FROM `bayonet_blocks` WHERE `position` = $position AND `active` = 1 ORDER BY weight"); $blocks = $db->Fetch($result); foreach($blocks as $block) diff --git a/includes/sql.class.php b/includes/sql.class.php index 2bdb996..bbc0bbb 100644 --- a/includes/sql.class.php +++ b/includes/sql.class.php @@ -88,20 +88,26 @@ class Bayonet_SQL return is_array($result) ? $result : array(); } - public function FetchObject($p_result, $class) + public function FetchObject($p_result, $class, $no_array = false) { global $db_fetches; ++$db_fetches; decho("Fetching object result"); - while ($row = mysqli_fetch_object($p_result, $class)) { - (object)$result[] = $row; + while ($row = mysqli_fetch_object($p_result, $class)) + { + if($no_array == true) + (object)$result = $row; + else + (object)$result[] = $row; } $this->Free($p_result); - return is_object($result) ? $result : (object)array(); + // TODO: Test for objects inside of $result array + if($no_array == true) { return is_object($result) ? $result : (object)$nothing; } + return is_array($result) ? $result : (object)array(); } public function FetchAssoc($result) -- cgit