Update edit user base, config template, class basic

Class.Basic
add general 8 char hash wrapper function (for adler32, fnv, jooa)

Edit Users
add first/last name to the basic user info

Config template
Update config template from current working template

www/admin/edit_base.inc

@@ -230,6 +230,8 @@
 				$elements[] = $form->form_create_element("password");
 				$elements[] = $form->form_create_element("password_change_interval");
 				$elements[] = $form->form_create_element("email");
+				$elements[] = $form->form_create_element("last_name");
+				$elements[] = $form->form_create_element("first_name");
 				$elements[] = $form->form_create_element("edit_group_id");
 				$elements[] = $form->form_create_element("edit_access_right_id");
 				$elements[] = $form->form_create_element("strict");

www/admin/table_arrays/array_edit_users.inc

@@ -2,24 +2,24 @@
 	$edit_users = array (
 		"table_array" => array (
 			"edit_user_id" => array (
-				"value" => $GLOBALS["edit_user_id"], 
+				"value" => $GLOBALS["edit_user_id"],
 				"type" => "hidden",
 				"pk" => 1,
 				"int" => 1
 			),
 			"username" => array (
-				"value" => $GLOBALS["username"], 
-				"output_name" => "Username", 
-				"mandatory" => 1, 
+				"value" => $GLOBALS["username"],
+				"output_name" => "Username",
+				"mandatory" => 1,
 				"error_check" => "unique|alphanumericextended",
 				"type" => "text"
 			),
 			"password" => array (
-				"value" => $GLOBALS["password"], 
+				"value" => $GLOBALS["password"],
 				"HIDDEN_value" => $GLOBALS["HIDDEN_password"],
 				"CONFIRM_value" => $GLOBALS["CONFIRM_password"],
-				"output_name" => "Password", 
-				"mandatory" => 1, 
+				"output_name" => "Password",
+				"mandatory" => 1,
 				"type" => "password", // later has to be password for encryption in database
 				'update' => array ( // connected field updates, and update data
 					'password_change_date' => array ( // db row to update
@@ -34,17 +34,18 @@
 				'output_name' => 'Password change interval',
 				'error_check' => 'intervalshort', // can be any date length format. n Y/M/D [not H/M/S], only one set, no combination
 				'type' => 'text',
+				'interval' => 1, // interval needs NULL write for empty
 				'size' => 5, // make it 5 chars long
 				'length' => 5
 			),
 			// password reset force interval, if set, user needs to reset password after X time period
 			"enabled" => array (
-				"value" => $GLOBALS["enabled"], 
-				"output_name" => "Enabled", 
-				"type" => "binary", 
+				"value" => $GLOBALS["enabled"],
+				"output_name" => "Enabled",
+				"type" => "binary",
 				"int" => 1,
 				"element_list" => array (
-					"1" => "Yes", 
+					"1" => "Yes",
 					"0" => "No"
 				)
 			),
@@ -79,28 +80,38 @@
 				)
 			),
 			"debug" => array (
-				"value" => $GLOBALS["debug"], 
-				"output_name" => "Debug", 
-				"type" => "binary", 
+				"value" => $GLOBALS["debug"],
+				"output_name" => "Debug",
+				"type" => "binary",
 				"int" => 1,
 				"element_list" => array (
-					"1" => "Yes", 
+					"1" => "Yes",
 					"0" => "No"
 				)
 			),
 			"db_debug" => array (
-				"value" => $GLOBALS["db_debug"], 
-				"output_name" => "DB Debug", 
-				"type" => "binary", 
+				"value" => $GLOBALS["db_debug"],
+				"output_name" => "DB Debug",
+				"type" => "binary",
 				"int" => 1,
 				"element_list" => array (
-					"1" => "Yes", 
+					"1" => "Yes",
 					"0" => "No"
 				)
 			),
 			"email" => array (
-				"value" => $GLOBALS["email"], 
-				"output_name" => "E-Mail", 
+				"value" => $GLOBALS["email"],
+				"output_name" => "E-Mail",
+				"type" => "text"
+			),
+			"last_name" => array (
+				"value" => $GLOBALS["last_name"],
+				"output_name" => "Last Name",
+				"type" => "text"
+			),
+			"first_name" => array (
+				"value" => $GLOBALS["first_name"],
+				"output_name" => "First Name",
 				"type" => "text"
 			),
 			"edit_language_id" => array (

www/configs/config.inc

@@ -258,12 +258,12 @@
 	{
 		// where to search for the files to include
 		$dirs = array (
-			LIBDIR, 
+			LIBDIR,
 			SMARTYDIR,
 			TABLEARRAYDIR,
 			'',
-			LIBS, 
-			SMARTY, 
+			LIBS,
+			SMARTY,
 			TABLE_ARRAYS,
 			__DIR__.'/'.LIBS,
 			__DIR__.'/'.SMARTY
@@ -279,5 +279,4 @@
 		}
 		return false;
 	}
-	
 ?>

www/configs/config.template.inc

@@ -1,10 +1,5 @@
 <?
 	/********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/configs/config.template.inc $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2013-02-18 16:27:24 +0900 (Mon, 18 Feb 2013) $
-	* $LastChangedRevision: 4382 $
-	*********************************************************************
 	* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 	* CREATED: 2003/06/10
 	* SHORT DESCRIPTION:
@@ -24,6 +19,17 @@
 	DEFINE('DEFAULT_ENCODING', "UTF-8");
 		
 	/************* PATHS *********************/
+	// ** NEW/BETTER DIR DECLARATIONS **
+	// path to original file (if symlink)
+	DEFINE('DIR', __DIR__."/");
+	// libs base path based on DIR
+	DEFINE('LIBDIR', DIR.'libs/');
+	// SMARTY path based on DIR
+	DEFINE('SMARTYDIR', DIR.'Smarty/');
+	// table arrays for Class Form
+	DEFINE('TABLEARRAYDIR', DIR.'table_arrays/');
+
+	// ** OLD DIR DECLARATIONS **
 	// path to document root
 	DEFINE('ROOT', getcwd()."/");
 	// libs path
@@ -230,6 +236,31 @@
 
 	// any other global definitons here
 //	DEFINE('SOME_ID', <SOME VALUE>);
-	
-	// $Id: config.template.inc 4382 2013-02-18 07:27:24Z gullevek $	
+
+	// function that will be called on top of each class include to load the class
+	function _spl_autoload($include_file)
+	{
+		// where to search for the files to include
+		$dirs = array (
+			LIBDIR,
+			SMARTYDIR,
+			TABLEARRAYDIR,
+			'',
+			LIBS,
+			SMARTY,
+			TABLE_ARRAYS,
+			__DIR__.'/'.LIBS,
+			__DIR__.'/'.SMARTY
+		);
+		// try to find and load the class ifle
+		foreach ($dirs as $folder)
+		{
+			if (file_exists($folder.$include_file))
+			{
+				require_once($folder.$include_file);
+				return true;
+			}
+		}
+		return false;
+	}
 ?>

www/libs/Class.Basic.inc

@@ -247,23 +247,68 @@
 			);
 			// the array with the mobile types that are valid
 			$this->mobile_email_type = array (
-				'.*@docomo\.ne\.jp$' => 'docomo',
-				'.*@([a-z0-9]{2}\.)?ezweb\.ne\.jp$' => 'kddi_ezweb', # correct are a[2-4], b2, c[1-9], e[2-9], h[2-4], t[1-9]
-				'.*@(ez[a-j]{1}\.)?ido\.ne\.jp$' => 'kddi', # ez[a-j] or nothing
-				'.*@([a-z]{2}\.)?sky\.tu-ka\.ne\.jp$' => 'kddi_tu-ka', # (sky group)
-				'.*@([a-z]{2}\.)?sky\.tk[kc]{1}\.ne\.jp$' => 'kddi_sky', # (sky group) [tkk,tkc only]
-				'.*@([a-z]{2}\.)?sky\.dtg\.ne\.jp$' => 'kddi', # dtg (sky group)
-				'.*@[tkdhcrnsq]{1}\.vodafone\.ne\.jp$' => 'softbank', # old vodafone [t,k,d,h,c,r,n,s,q]
-				'.*@jp-[dhtkrsnqc]{1}\.ne\.jp$' => 'softbank', # very old j-phone (pre vodafone) [d,h,t,k,r,s,n,q,c]
-				'.*@([dhtcrknsq]{1}\.)?softbank\.ne\.jp$' => 'softbank', # add i for iphone also as keitai, others similar to the vodafone group
-				'.*@i{1}\.softbank(\.ne)?\.jp$' => 'softbank_iphone', # add iPhone also as keitai and not as pc
-				'.*@disney\.ne\.jp$' => 'softbank_disney', # (kids)
-				'.*@willcom\.ne\.jp$' => 'willcom',
-				'.*@willcom\.com$' => 'willcom', # new for pdx.ne.jp address
-				'.*@pdx\.ne\.jp$' => 'willcom', # old pdx address for willcom
-				'.*@bandai\.jp$' => 'willcom', # willcom paipo! (kids)
-				'.*@pipopa\.ne\.jp$' => 'willcom', # willcom paipo! (kids)
-				'.*@([a-z0-9]{2,4}\.)?pdx\.ne\.jp$' => 'willcom' # actually only di,dj,dk,wm -> all others are "wrong", but none also allowed?
+				'.*@docomo\.ne\.jp$' => 'keitai_docomo',
+				'.*@([a-z0-9]{2}\.)?ezweb\.ne\.jp$' => 'keitai_kddi_ezweb', # correct are a[2-4], b2, c[1-9], e[2-9], h[2-4], t[1-9]
+				'.*@(ez[a-j]{1}\.)?ido\.ne\.jp$' => 'keitai_kddi_ido', # ez[a-j] or nothing
+				'.*@([a-z]{2}\.)?sky\.tu-ka\.ne\.jp$' => 'keitai_kddi_tu-ka', # (sky group)
+				'.*@([a-z]{2}\.)?sky\.tk[kc]{1}\.ne\.jp$' => 'keitai_kddi_sky', # (sky group) [tkk,tkc only]
+				'.*@([a-z]{2}\.)?sky\.dtg\.ne\.jp$' => 'keitai_kddi_dtg', # dtg (sky group)
+				'.*@[tkdhcrnsq]{1}\.vodafone\.ne\.jp$' => 'keitai_softbank_vodafone', # old vodafone [t,k,d,h,c,r,n,s,q]
+				'.*@jp-[dhtkrsnqc]{1}\.ne\.jp$' => 'keitai_softbank_j-phone', # very old j-phone (pre vodafone) [d,h,t,k,r,s,n,q,c]
+				'.*@([dhtcrknsq]{1}\.)?softbank\.ne\.jp$' => 'keitai_softbank', # add i for iphone also as keitai, others similar to the vodafone group
+				'.*@i{1}\.softbank(\.ne)?\.jp$' => 'smartphone_softbank_iphone', # add iPhone also as keitai and not as pc
+				'.*@disney\.ne\.jp$' => 'keitai_softbank_disney', # (kids)
+				'.*@willcom\.ne\.jp$' => 'keitai_willcom',
+				'.*@willcom\.com$' => 'keitai_willcom', # new for pdx.ne.jp address
+				'.*@wcm\.ne\.jp$' => 'keitai_willcom', # old willcom wcm.ne.jp
+				'.*@pdx\.ne\.jp$' => 'keitai_willcom_pdx', # old pdx address for willcom
+				'.*@bandai\.jp$' => 'keitai_willcom_bandai', # willcom paipo! (kids)
+				'.*@pipopa\.ne\.jp$' => 'keitai_willcom_pipopa', # willcom paipo! (kids)
+				'.*@([a-z0-9]{2,4}\.)?pdx\.ne\.jp$' => 'keitai_willcom_pdx', # actually only di,dj,dk,wm -> all others are "wrong", but none also allowed?
+				'.*@ymobile([1]{1})?\.ne\.jp$' => 'keitai_willcom_ymobile', # ymobile, ymobile1 techincally not willcom, but I group them there
+				'.*@y-mobile\.ne\.jp$' => 'keitai_willcom_ymobile', # y-mobile techincally not willcom, but I group them there
+				'.*@emnet\.ne\.jp$' => 'keitai_willcom_emnet', # e-mobile, group will willcom
+				'.*@emobile\.ne\.jp$' => 'keitai_willcom_emnet', # e-mobile, group will willcom
+				'.*@emobile-s\.ne\.jp$' => 'keitai_willcom_emnet' # e-mobile, group will willcom
+			);
+			// short list for mobile email types
+			$this->mobile_email_type_short = array (
+				'keitai_docomo' => 'docomo',
+				'keitai_kddi_ezweb' => 'kddi',
+				'keitai_kddi' => 'kddi',
+				'keitai_kddi_tu-ka' => 'kddi',
+				'keitai_kddi_sky' => 'kddi',
+				'keitai_softbank' => 'softbank',
+				'smartphone_softbank_iphone' => 'iphone',
+				'keitai_softbank_disney' => 'softbank',
+				'keitai_softbank_vodafone' => 'softbank',
+				'keitai_softbank_j-phone' => 'softbank',
+				'keitai_willcom' => 'willcom',
+				'keitai_willcom_pdx' => 'willcom',
+				'keitai_willcom_bandai' => 'willcom',
+				'keitai_willcom_pipopa' => 'willcom',
+				'keitai_willcom_ymobile' => 'willcom',
+				'keitai_willcom_emnet' => 'willcom',
+				'pc_html' => 'pc',
+				// old sets -> to be removed later
+				'docomo' => 'docomo',
+				'kddi_ezweb' => 'kddi',
+				'kddi' => 'kddi',
+				'kddi_tu-ka' => 'kddi',
+				'kddi_sky' => 'kddi',
+				'softbank' => 'softbank',
+				'keitai_softbank_iphone' => 'iphone',
+				'softbank_iphone' => 'iphone',
+				'softbank_disney' => 'softbank',
+				'softbank_vodafone' => 'softbank',
+				'softbank_j-phone' => 'softbank',
+				'willcom' => 'willcom',
+				'willcom_pdx' => 'willcom',
+				'willcom_bandai' => 'willcom',
+				'willcom_pipopa' => 'willcom',
+				'willcom_ymobile' => 'willcom',
+				'willcom_emnet' => 'willcom',
+				'pc' => 'pc'
 			);
 
 			// initial the session if there is no session running already
@@ -1397,6 +1442,19 @@
 				return $this->_crc32b($string);
 		}
 
+		// METHOD: _hash
+		// PARAMS: string, type of hash to use
+		// RETURN: hashed string
+		// DESC  : replacemend for _crc32b call (alternate)
+		//         defaults to adler 32, fnv132, fnv1a32, joaat
+		//         all that create 8 char long hashes
+		public function _hash($string, $hash_type = 'adler32')
+		{
+			if (!in_array($hash_type, array('adler32', 'fnv132', 'fnv1a32', 'joaat')))
+				$hash_type = 'adler32';
+			return hash($hash_type, $string);
+		}
+
 		// METHOD: checkPHPVersion
 		// PARAMS: $min_version: minimum version. in format x, x.y or x.y.z
 		//         $max_version: default empty, else in same format as min version
@@ -1792,10 +1850,11 @@
 		}
 
 		// METHOD: getEmailType
-		// PARAMS: email
+		// PARAMS: email, short == false
 		// RETURN: string for email type, eg "pc", "docomo", etc
 		// DESC:   guesses the email type (mostly for mobile) from the domain
-		public function getEmailType($email)
+		//         if second is set to true, it will return short naming scheme (only provider)
+		public function getEmailType($email, $short = false)
 		{  
 			// trip if there is no email address
 			if (!$email)
@@ -1804,10 +1863,27 @@
 			foreach ($this->mobile_email_type as $email_regex => $email_type)
 			{  
 				if (preg_match("/$email_regex/", $email))
-					return $email_type;
+				{
+					if ($short)
+						return $this->getShortEmailType($email_type);
+					else
+						return $email_type;
+				}
 			}
 			// if no previous return we assume this is a pc address
-			return "pc";
+			if ($short)
+				return "pc";
+			else
+				return "pc_html";
+		}
+
+		// METHOD: getShortEmailType
+		// PARAMS: long email type (not email)
+		// RETURN: short email type
+		// DESC  : gets the short email type from a long email type
+		public function getShortEmailType($email_type)
+		{
+			return $this->mobile_email_type_short[$email_type];
 		}
 
 		// METHOD: printDateTime

www/libs/Class.DB.Array.IO.inc

@@ -429,6 +429,13 @@ $this->debug('write_check', "[$column][".$this->table_array[$column]["value"]."]
 							$_value = $this->table_array[$column]["value"];
 						$q_data .= $_value;
 					}
+					elseif ($this->table_array[$column]["interval"])
+					{
+						// for interval we check if no value, then we set null
+						if (!$this->table_array[$column]["value"])
+							$_value = 'NULL';
+						$q_data .= $_value;
+					}
 					else
 					// normal string
 					{
@@ -500,7 +507,10 @@ $this->debug('write_check', "[$column][".$this->table_array[$column]["value"]."]
 			} 
 			// set primary key
 			if ($insert)
-				$this->ok = $this->table_array[$this->pk_name]["value"] = $this->insert_id;
+			{
+				$this->table_array[$this->pk_name]["value"] = $this->insert_id;
+				$this->ok = $this->insert_id;
+			}
 			// return the table if needed
 			return $this->table_array;
 		}                                           

www/libs/Class.DB.IO.inc

@@ -253,7 +253,7 @@
 		// only inside
 		// basic vars
 		private $dbh; // the dbh handler
-		private $db_debug; // DB_DEBUG ... (if set prints out debug msgs)
+		public $db_debug; // DB_DEBUG ... (if set prints out debug msgs)
 		private $db_name; // the DB connected to
 		private $db_user; // the username used
 		private $db_pwd; // the password used
@@ -523,7 +523,8 @@
 		//        msg -> optional message
 		// RETURN none
 		// DESC   if error_id set, writes long error string into error_msg
-		private function _db_error($cursor = '', $msg = '')
+		// MARK: needed to make public so it can be called from DB.Array.IO too
+		public function _db_error($cursor = '', $msg = '')
 		{
 			$where_called = $this->get_caller_method();
 			if ($cursor)

www/libs/Class.Form.Generate.inc

@@ -927,13 +927,13 @@
 								break;
 							case "alphanumeric":
 //$this->debug('edit', 'IN Alphanumeric');
-								if (!preg_match("/^[0-9A-Za-z_-]+$/", $this->table_array[$key]["value"]))
+								if (!preg_match("/^[0-9A-Za-z_\-]+$/", $this->table_array[$key]["value"]))
 									$this->msg .= sprintf($this->l->__("Please enter a valid alphanumeric (Numbers and Letters only also - and _, no spaces) value for the <b>%s</b> Field!<br>"), $this->table_array[$key]["output_name"]);
 								break;
 							// this one also allows @ and .
 							case "alphanumericextended":
 //$this->debug('edit', 'IN Alphanumeric');
-								if (!preg_match("/^[0-9A-Za-z_-@\.]+$/", $this->table_array[$key]["value"]))
+								if (!preg_match("/^[0-9A-Za-z_\-@\.]+$/", $this->table_array[$key]["value"]))
 									$this->msg .= sprintf($this->l->__("Please enter a valid alphanumeric extended (Numbers, Letters, -,  _, @ and . only, no spaces) value for the <b>%s</b> Field!<br>"), $this->table_array[$key]["output_name"]);
 								break;
 							case "password":
@@ -1211,7 +1211,7 @@
 					{
 						// if a where was given, set this key also [dangerous!]
 						
-						// posgres compatible insert
+						// postgreSQL compatible insert
 						$q = "INSERT INTO ".$this->table_array[$key]["table_name"]." (".$this->table_array[$key]["input_name"].") VALUES ('".addslashes($this->table_array[$key]["input_value"])."')";
 						$this->db_exec($q);
 						if ($this->table_array[$key]["where"])

www/libs/streams.php

@@ -49,7 +49,7 @@ class StringReader {
   var $_pos;
   var $_str;
 
-  function StringReader($str='') {
+  function __construct($str='') {
     $this->_str = $str;
     $this->_pos = 0;
   }
@@ -86,7 +86,7 @@ class FileReader {
   var $_fd;
   var $_length;
 
-  function FileReader($filename) {
+  function __construct($filename) {
     if (file_exists($filename)) {
 
       $this->_length=filesize($filename);
@@ -143,7 +143,7 @@ class FileReader {
 // Preloads entire file in memory first, then creates a StringReader
 // over it (it assumes knowledge of StringReader internals)
 class CachedFileReader extends StringReader {
-  function CachedFileReader($filename) {
+  function __construct($filename) {
     if (file_exists($filename)) {
 
       $length=filesize($filename);

www/smarty-3.1.27/plugins/function.html_options.php

@@ -183,7 +183,7 @@ function smarty_function_html_options_optoutput($key, $value, $selected, $id, $c
         $idx ++;
     } else {
         $_idx = 0;
-        $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id . '-' . $idx) : null, $class, $_idx);
+        $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id . '-' . $idx) : null, $class, $label, $_idx);
         $idx ++;
     }