diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/classes.php | 131 | ||||
| -rw-r--r-- | includes/debug.php | 17 | ||||
| -rw-r--r-- | includes/functions.php | 13 | ||||
| -rw-r--r-- | includes/sql.class.php | 14 |
4 files changed, 165 insertions, 10 deletions
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 @@ +<?php
+
+define('PASSWORD', true);
+define('NO_PASSWORD', false);
+define('CHECKED', true);
+
+class BayonetForm
+{
+ static public $request;
+
+ public function __construct($action, $method)
+ {
+ $this->request = $_POST;
+ echo "<form action=\"$action\" method=\"$method\">\n";
+ }
+
+ public function __destruct()
+ {
+ echo "</form>\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 "<button name=\"{$extern_name}\" value=\"{$value}\">{$text}</button>\n";
+ }
+
+ function submitButton($extern_name, $value = "Submit")
+ {
+ echo "<input type=\"submit\" name=\"{$extern_name}\" value=\"{$value}\" />\n";
+ }
+
+ function reset($value = "Reset")
+ {
+ echo "<input type=\"reset\" value=\"{$value}\" />\n";
+ }
+
+ function textField($extern_name, $value = NULL, $isPassword = false)
+ {
+ $type = 'text';
+ if($isPassword) $type = 'password';
+
+ $value = filter_var($value, FILTER_SANITIZE_STRING);
+ echo "<input type=\"{$type}\" name=\"{$extern_name}\" value=\"$value\" />\n";
+ }
+
+ function radioButton($extern_name, $value, $isChecked = false)
+ {
+ if($isChecked)
+ {
+ echo "<input type=\"radio\" name=\"{$extern_name}\" value=\"$value\" checked=\"checked\"/>\n";
+ }
+ else
+ {
+ echo "<input type=\"radio\" name=\"{$extern_name}\" value=\"$value\" />\n";
+ }
+ }
+
+ function checkBox($extern_name, $value, $isChecked = false)
+ {
+ if($isChecked)
+ {
+ echo "<input type=\"checkbox\" name=\"{$extern_name}\" value=\"$value\" checked=\"checked\"/>\n";
+ }
+ else
+ {
+ echo "<input type=\"checkbox\" name=\"{$extern_name}\" value=\"$value\" />\n";
+ }
+ }
+
+ function dropDown($extern_name, $values = array('None'), $select = NULL)
+ {
+ $selectIterator = 1;
+
+ echo "<select name=\"{$extern_name}\">\n";
+ foreach($values as $option => $text)
+ {
+ if(!is_null($select) && $selectIterator !== (int)$select)
+ {
+ echo "<option value=\"{$option}\">{$text}</option>\n";
+ }
+ else
+ {
+ echo "<option value=\"{$option}\" selected=\"selected\">{$text}</option>\n";
+ }
+ $selectIterator++;
+ }
+ echo "</select>\n";
+ }
+
+ function textArea($extern_name, $rows = 10, $cols = 30, $value = NULL)
+ {
+ $value = filter_var($value, FILTER_SANITIZE_STRING);
+ echo "<textarea name=\"{$extern_name}\" rows=\"$rows\" cols=\"$cols\">{$value}</textarea>\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<br />\n"; + return; + } echo "<pre>" . $array_dump . "</pre><br/>\n"; //WriteLog($array_dump,BAYONET_LOG_INFO); } @@ -90,6 +95,10 @@ function queuePrint($obj, $force = false) echo $obj . "<br/>\n"; //WriteLog($message,BAYONET_LOG_INFO); } + else + { + echo "queuePrint: Invalid type of " . gettype($obj) . "<br/>\n"; + } } function logQueueFlush($force = false) @@ -117,6 +126,7 @@ function logQueueFlush($force = false) return false; } + echo "<b>" . count($log_message_queue) . " messages received.</b><br/><br/>\n"; foreach($log_message_queue as $message) { if($message != $log_message_queue[$messageCount - 1]) @@ -156,6 +166,7 @@ function logQueueFlush($force = false) ++$messageCount; } + echo "</div>"; 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) |