Browse Source

Array -> array conversion. Manifest framework

Nathaniel van Diepen 10 years ago
parent
commit
432b018d2d
7 changed files with 75 additions and 58 deletions
  1. 45 28
      api.php
  2. 5 5
      index.php
  3. 5 5
      php/config.php
  4. 7 7
      php/functions.php
  5. 1 1
      php/include.php
  6. 8 8
      php/messages.php
  7. 4 4
      php/project.php

+ 45 - 28
api.php

@@ -2,7 +2,7 @@
 	require_once('php/include.php');
 	// TODO - Add API handling.
 	$method = $_SERVER['REQUEST_METHOD'];
-	$ret = Array();
+	$ret = array();
 	if(isset($_GET['type'])){
 		if(isset($_GET['id'])){
 			$id = $_GET['id'];
@@ -13,7 +13,7 @@
 						$ret['template'] = file_get_contents(PATH_DATA.'pages/user.template');
 					}
 					if($user = userObj($id)){
-						$context = Array(
+						$context = array(
 							'name'=>$user['name'],
 							'email'=>$user['email']
 						);
@@ -23,7 +23,7 @@
 						};
 						$ret['context'] = $context;
 					}else{
-						$ret['state'] = Array(
+						$ret['state'] = array(
 							'url'=>isset($_GET['back'])?$_GET['back']:'page-index'
 						);
 					}
@@ -35,7 +35,7 @@
 					if(false){
 						// TODO
 					}else{
-						$ret['state'] = Array(
+						$ret['state'] = array(
 							'url'=>isset($_GET['back'])?$_GET['back']:'page-index'
 						);
 					}
@@ -47,7 +47,7 @@
 					if(false){
 						// TODO
 					}else{
-						$ret['state'] = Array(
+						$ret['state'] = array(
 							'url'=>isset($_GET['back'])?$_GET['back']:'page-index'
 						);
 					}
@@ -59,7 +59,7 @@
 					if(false){
 						// TODO
 					}else{
-						$ret['state'] = Array(
+						$ret['state'] = array(
 							'url'=>isset($_GET['back'])?$_GET['back']:'page-index'
 						);
 					}
@@ -78,7 +78,7 @@
 						};
 						$ret['context'] = $context;
 					}else{
-						$ret['state'] = Array(
+						$ret['state'] = array(
 							'url'=>isset($_GET['back'])?$_GET['back']:'page-index'
 						);
 					}
@@ -89,7 +89,7 @@
 					if(false){
 						// TODO
 					}else{
-						$ret['state'] = Array(
+						$ret['state'] = array(
 							'url'=>isset($_GET['back'])?$_GET['back']:'page-index'
 						);
 					}
@@ -101,7 +101,7 @@
 					if(false){
 						// TODO
 					}else{
-						$ret['state'] = Array(
+						$ret['state'] = array(
 							'url'=>isset($_GET['back'])?$_GET['back']:'page-index'
 						);
 					}
@@ -113,13 +113,13 @@
 						if(!isset($_GET['template'])||$_GET['template']=='true'){
 							$ret['template'] = file_get_contents(PATH_DATA.'pages/'.$id.'.template');
 						}
-						$context = Array();
+						$context = array();
 						if($LOGGEDIN){
 							$context['key'] = true;
 							$context['user'] = userObj($_SESSION['username']);
 						};
 						if(file_exists(PATH_DATA.'pages/'.$id.'.options')){
-							$options = objectToArray(json_decode(file_get_contents(PATH_DATA.'pages/'.$id.'.options'),true));
+							$options = objectToarray(json_decode(file_get_contents(PATH_DATA.'pages/'.$id.'.options'),true));
 							if(isset($options['secure'])&&$options['secure']&&!$LOGGEDIN){
 								back(true);
 							}
@@ -146,7 +146,7 @@
 											if($LOGGEDIN){
 												$context['messages'] = messages($context['user']['id'],'user');
 											}else{
-												$context['messages'] = Array();
+												$context['messages'] = array();
 											}
 										break;
 									}
@@ -156,7 +156,7 @@
 								foreach($options['actions'] as $key){
 									switch($key){
 										case 'pm_mark_read':
-											query("UPDATE `users` SET last_pm_check=CURRENT_TIMESTAMP WHERE id='%d'; ",Array(userId($_SESSION['username'])));
+											query("UPDATE `users` SET last_pm_check=CURRENT_TIMESTAMP WHERE id='%d'; ",array(userId($_SESSION['username'])));
 										break;
 									}
 								}
@@ -168,11 +168,28 @@
 					}
 					retj($ret,$title);
 				break;
+				case 'manifest':
+					case 'pages':
+						if(isset($_GET['manifest'])){
+							$files = array_diff(scandir(dirname(PATH_DATA.'/'.$_GET['manifest'])),array('..', '.'));
+							foreach($files as $k => $file){
+								$files[$k] = basename($file)."\n";
+							}
+							retj(array(
+								'manifest'=>$files
+							));
+						}else{
+							retj(array(
+								'error'=>'Manifest not defined'
+							));
+						}
+					break;
+				break;
 				case 'action':
 						switch($id){
 							case 'login':
-								$ret['state'] = Array(
-									'data'=>Array(
+								$ret['state'] = array(
+									'data'=>array(
 										'type'=>'page',
 										'id'=>'login',
 									)
@@ -190,8 +207,8 @@
 								retj($ret,$id);
 							break;
 							case 'register':
-								$ret['state'] = Array(
-									'data'=>Array(
+								$ret['state'] = array(
+									'data'=>array(
 										'type'=>'page',
 										'id'=>'register'
 									)
@@ -202,7 +219,7 @@
 											if(addUser($_GET['username'],$_GET['password'],$_GET['email'])){
 												$key = login($_GET['username'],$_GET['password']);
 												$_SESSION['username'] = $_GET['username'];
-												sendMail('welcome','Welcome!',$_GET['email'],get('email'),Array($_GET['username'],$_GET['password'],get('email')));
+												sendMail('welcome','Welcome!',$_GET['email'],get('email'),array($_GET['username'],$_GET['password'],get('email')));
 											}else{
 												$ret['error'] = "Could not add user. ".$mysqli->error;
 											}
@@ -219,8 +236,8 @@
 							break;
 							case 'project':
 								back(true);
-								$ret['state'] = Array(
-									'data'=>Array(
+								$ret['state'] = array(
+									'data'=>array(
 										'type'=>'page',
 										'id'=>$id,
 									)
@@ -253,7 +270,7 @@
 							break;
 							case 'notifications':
 								if($LOGGEDIN){
-									if($res = query("SELECT count(m.id) as notifications,UNIX_TIMESTAMP(max(m.timestamp)) as timestamp FROM `messages` m JOIN `users` u ON u.id = m.to_id WHERE u.id = %d AND u.last_pm_check < m.timestamp;",Array(userId($_SESSION['username'])))){
+									if($res = query("SELECT count(m.id) as notifications,UNIX_TIMESTAMP(max(m.timestamp)) as timestamp FROM `messages` m JOIN `users` u ON u.id = m.to_id WHERE u.id = %d AND u.last_pm_check < m.timestamp;",array(userId($_SESSION['username'])))){
 										$res = $res->fetch_assoc();
 										$ret['count'] = $res['notifications'];
 										$ret['timestamp'] = $res['timestamp'];
@@ -264,7 +281,7 @@
 							case 'comment':
 								if(isset($_GET['comment_type'])&&isset($_GET['comment_id'])&&isset($_GET['message'])){
 									$cid = $_GET['comment_id'];
-									$ret = Array(
+									$ret = array(
 										'state'=>stateObj($_GET['comment_type'],$cid)
 									);
 									switch($_GET['comment_type']){
@@ -273,7 +290,7 @@
 												$ret['error'] = "fn doesn't exist!";
 											}
 											if(!project_comment($cid,$_GET['message'])){
-												$ret = Array(
+												$ret = array(
 													'error'=>'Could not comment on project'
 												);
 											}
@@ -283,30 +300,30 @@
 									}
 								}else{
 									$ret['error'] = 'Missing comment paremeters';
-									$ret['state'] = Array(
+									$ret['state'] = array(
 										'title'=>'error'
 									);
 								}
 								retj($ret,$ret['state']['title']);
 							break;
 							default:
-								retj(Array(
+								retj(array(
 									'error'=>'Invalid action.'
 								));
 						}
 				break;
 				default:
-					retj(Array(
+					retj(array(
 						'error'=>'Invalid type.'
 					));
 			}
 		}else{
-			retj(Array(
+			retj(array(
 				'error'=>'ID missing.'
 			));
 		}
 	}else{
-		retj(Array(
+		retj(array(
 		'error'=>'Type missing.'
 	));
 	}

+ 5 - 5
index.php

@@ -24,7 +24,7 @@
 			case 'state':
 				die(
 					json_encode(
-						Array(
+						array(
 							'state'=>stateObj($type,$id)
 						)
 					)
@@ -34,12 +34,12 @@
 				require_once('api.php');
 			break;
 			case 'settings':
-				$settings = Array();
-				$keys = Array('expire');
+				$settings = array();
+				$keys = array('expire');
 				foreach($keys as $key){
 					$settings[$key] = get($key);
 				}
-				die(json_encode(Array(
+				die(json_encode(array(
 					'settings'=>$settings,
 					'version'=>file_get_contents(PATH_DATA.'version')
 				)));
@@ -50,7 +50,7 @@
 			case 'error':
 				die(
 					json_encode(
-						Array(
+						array(
 							'error'=>isset($_GET['error'])?$_GET['error']:'Error'
 						)
 					)

+ 5 - 5
php/config.php

@@ -19,7 +19,7 @@
 				//case E_:$errnostr='';break;
 				default:$errnostr='Unkown Error';
 			}
-			echo json_encode(Array(
+			echo json_encode(array(
 				'error'=>"\n{$errnostr}: {$error['message']} on {$error['file']}[{$error['line']}]"
 			));
 		}else{
@@ -41,11 +41,11 @@
 	define('PATH_DATA',PATH_ROOT.'data/');
 	global $config;
 	if(file_exists(PATH_CONFIG)){
-		$config = objectToArray(json_decode(file_get_contents(PATH_CONFIG),true));
+		$config = objectToarray(json_decode(file_get_contents(PATH_CONFIG),true));
 	}else{
-		$config = Array();
+		$config = array();
 	}
-	$config = array_merge($config,objectToArray(json_decode(file_get_contents(PATH_DEFAULT_CONFIG),true)));
+	$config = array_merge($config,objectToarray(json_decode(file_get_contents(PATH_DEFAULT_CONFIG),true)));
 	function get($setting){
 		global $config;
 		if(isset($config[$setting])){
@@ -60,7 +60,7 @@
 		file_put_contents(PAT_CONFIG,json_encode($config));
 		return $value;
 	}
-	function objectToArray($d){
+	function objectToarray($d){
 		if(is_object($d)){
 			// Gets the properties of the given object
 			// with get_object_vars function

+ 7 - 7
php/functions.php

@@ -8,7 +8,7 @@
 		if(!isset($_GET['no_state'])){
 			// State
 			if(!isset($json['state'])){
-				$json['state'] = Array();
+				$json['state'] = array();
 			}
 			unset($_GET['password']);
 			unset($_GET['password1']);
@@ -51,12 +51,12 @@
 		if(!isset($_GET['topbar'])){
 			// Tobar
 			if($LOGGEDIN){
-				$context = Array(
+				$context = array(
 					'user'=>userObj($_SESSION['username']),
 					'key'=>true
 				);
 			}else{
-				$context = Array();
+				$context = array();
 			}
 			$context['title'] = $title;
 			if(!isset($_GET['no_state'])){
@@ -67,7 +67,7 @@
 			}else{
 				$topbar = file_get_contents(PATH_DATA.'topbars/default.template');
 			}
-			$json['topbar'] = Array(
+			$json['topbar'] = array(
 				'template'=>$topbar,
 				'context'=>$context
 			);
@@ -98,14 +98,14 @@
 		if($ifNotLoggedIn && $LOGGEDIN){
 			return false;
 		}
-		retj(Array(
-			'state'=>Array(
+		retj(array(
+			'state'=>array(
 				'url'=>isset($_GET['back'])?$_GET['back']:'page-index'
 			)
 		));
 	}
 	function stateObj($type,$id){
-		$json = Array(
+		$json = array(
 			'data'=>$_GET
 		);
 		$title = ucwords($type.' - '.$id);

+ 1 - 1
php/include.php

@@ -1,6 +1,6 @@
 <?php
 	if(!is_writable(session_save_path())){
-		retj(Array(
+		retj(array(
 			'error'=>'Session save path ('.session_save_path().') is not writable.'
 		),'error');
 	}

+ 8 - 8
php/messages.php

@@ -4,8 +4,8 @@
 	function messages($id,$type){
 		switch($type){
 			case 'project':
-				if($res = query("SELECT m.id, u.name, m.message, UNIX_TIMESTAMP(m.timestamp) as timestamp FROM `messages` m JOIN `users` u ON u.id = m.from_id WHERE m.p_id='%d'",Array($id))){
-					$arr = Array();
+				if($res = query("SELECT m.id, u.name, m.message, UNIX_TIMESTAMP(m.timestamp) as timestamp FROM `messages` m JOIN `users` u ON u.id = m.from_id WHERE m.p_id='%d'",array($id))){
+					$arr = array();
 					while($row = $res->fetch_assoc()){
 						array_push($arr,$row);
 					}
@@ -13,10 +13,10 @@
 				}
 			break;
 			case 'user':
-				if($res = query("SELECT  m.id, uf.name as \"from\", ut.name as \"to\", m.message, UNIX_TIMESTAMP(m.timestamp) as timestamp, m.timestamp > ut.last_pm_check as is_new FROM `messages` m JOIN `users` uf ON uf.id = m.from_id JOIN `users` ut ON ut.id = m.to_id WHERE (m.from_id='%d' AND m.to_id IS NOT NULL) OR m.to_id='%d' ORDER BY m.timestamp DESC",Array($id,$id))){
-					$arr = Array();
+				if($res = query("SELECT  m.id, uf.name as \"from\", ut.name as \"to\", m.message, UNIX_TIMESTAMP(m.timestamp) as timestamp, m.timestamp > ut.last_pm_check as is_new FROM `messages` m JOIN `users` uf ON uf.id = m.from_id JOIN `users` ut ON ut.id = m.to_id WHERE (m.from_id='%d' AND m.to_id IS NOT NULL) OR m.to_id='%d' ORDER BY m.timestamp DESC",array($id,$id))){
+					$arr = array();
 					while($row = $res->fetch_assoc()){
-						$msg = Array(
+						$msg = array(
 							'id'=>$row['id'],
 							'from'=>$row['from'],
 							'to'=>$row['to'],
@@ -32,16 +32,16 @@
 				}
 			break;
 		}
-		return Array();
+		return array();
 	}
 	function project_comment($project,$message){
-		if(query("INSERT INTO `bugs`.`messages` (`id`,`timestamp`,`from_id`,`to_id`,`p_id`,`s_id`,`i_id`,`message`) VALUES(NULL,CURRENT_TIMESTAMP,'%d',NULL,'%d',NULL,NULL,'%s');",Array(userId($_SESSION['username']),$project,$message))){
+		if(query("INSERT INTO `bugs`.`messages` (`id`,`timestamp`,`from_id`,`to_id`,`p_id`,`s_id`,`i_id`,`message`) VALUES(NULL,CURRENT_TIMESTAMP,'%d',NULL,'%d',NULL,NULL,'%s');",array(userId($_SESSION['username']),$project,$message))){
 			return true;
 		}
 		return false;
 	}
 	function personal_message($toId,$message){
-		if(query("INSERT INTO `bugs`.`messages` (`id`,`timestamp`,`from_id`,`to_id`,`p_id`,`s_id`,`i_id`,`message`) VALUES(NULL,CURRENT_TIMESTAMP,'%d','%d',NULL,NULL,NULL,'%s');",Array(userId($_SESSION['username']),$toId,$message))){
+		if(query("INSERT INTO `bugs`.`messages` (`id`,`timestamp`,`from_id`,`to_id`,`p_id`,`s_id`,`i_id`,`message`) VALUES(NULL,CURRENT_TIMESTAMP,'%d','%d',NULL,NULL,NULL,'%s');",array(userId($_SESSION['username']),$toId,$message))){
 			return true;
 		}
 		return false;

+ 4 - 4
php/project.php

@@ -3,7 +3,7 @@
 	require_once(PATH_PHP.'database.php');
 	require_once(PATH_PHP.'messages.php');
 	function projectObj($id){
-		if($res = query("SELECT p.title,p.id,p.description,u.name as user FROM `projects` p JOIN `users` u ON u.id = p.u_id  WHERE p.id='%d'",Array($id))){
+		if($res = query("SELECT p.title,p.id,p.description,u.name as user FROM `projects` p JOIN `users` u ON u.id = p.u_id  WHERE p.id='%d'",array($id))){
 			if($res->num_rows == 1){
 				$project = $res->fetch_assoc();
 				$project['user'] = userObj($project['user']);
@@ -22,13 +22,13 @@
 			}
 			$user = userId($user);
 			if(false != $user){
-				if($res = query("SELECT id FROM `projects` WHERE title = '%s' AND u_id = %d",Array($title,$user))){
+				if($res = query("SELECT id FROM `projects` WHERE title = '%s' AND u_id = %d",array($title,$user))){
 					if($res->num_rows){
 						return false;
 					}
 				}
-				if(query("INSERT INTO `projects` (title,description,u_id) VALUES ('%s','%s',%d)",Array($title,$description,$user))){
-					if($res = query("SELECT id FROM `projects` WHERE title = '%s' AND description = '%s' AND u_id = %d",Array($title,$description,$user))){
+				if(query("INSERT INTO `projects` (title,description,u_id) VALUES ('%s','%s',%d)",array($title,$description,$user))){
+					if($res = query("SELECT id FROM `projects` WHERE title = '%s' AND description = '%s' AND u_id = %d",array($title,$description,$user))){
 						if($res->num_rows == 1){
 							$res = $res->fetch_assoc();
 							project_comment($res['id'],'Project created');