Merge lp:~vierbergenlars/remotecp-panel/plugins_api into lp:remotecp-panel/1.x

[Lars Vierbergen]

Add the addons api support, also the other modules

[Lars Vierbergen (vierbergenlars)]

review: Approve

[Lars Vierbergen (vierbergenlars)]

review: Approve

[lp:~vierbergenlars/remotecp-panel/plugins_api]

47. By Lars Vierbergen on 2011-01-21

Add API for col1 & col3 + Update the default.php

[Lars Vierbergen (vierbergenlars)]

There is a file header wrong (check cpanel-incs/plugins/col3/default.php)

review: Needs Fixing

Unmerged revisions

=== added file 'cpanel-incs/plugins/col1/api.php'
--- cpanel-incs/plugins/col1/api.php	1970-01-01 00:00:00 +0000
+++ cpanel-incs/plugins/col1/api.php	2011-01-21 16:18:12 +0000
@@ -0,0 +1,53 @@
+<?php
+class col1 {
+	function gets() {
+		global $remote_connection;
+		$query = $remote_connection->query('SELECT * FROM `'.SITE.'_a_col1` ORDER BY `order` ASC');
+		$SECTIONS=array();
+		while($section=$query->fetch_assoc()) {
+			$SECTIONS[]=$section;
+		}
+		return $SECTIONS;
+	}
+	function get($id) {
+		global $remote_connection;
+		return  $remote_connection->query('SELECT * FROM `'.SITE.'_a_col1` WHERE `id`='.$id)->fetch_assoc();
+	}
+	function delete($id) {
+		global $remote_connection;
+		return $remote_connection->query('DELETE FROM `'.SITE.'_a_col1` WHERE `id`='.$id);
+	}
+	function add($props) {
+		global $remote_connection;
+		$defaults=array('title'=>'API_added_block','content'=>'','plugin-reference'=>0,'access'=>0);
+		$props=array_merge($default,$props);
+		$order=$remote_connection->query('SELECT * FROM `'.SITE.'_a_col1` ORDER BY `order` DESC')->fetch_assoc();
+		$order=$order['order']+1;
+		$remote_connection->query('INSERT INTO `'.SITE.'_a_col1` VALUES(NULL,'.$order.',\''.$props['title'].'\',\''.$props['content'].'\',\''.$props['plugin-reference'].'\''.$props['access'].')');
+		return $remote_connection->insert_id;
+	}
+	function move($id,$where) {
+		// $where > 0 : UP
+		// $where < 0 : DOWN
+		global $remote_connection;
+		$q0=$remote_connection->query('SELECT * FROM `'.SITE.'_col1` WHERE `id`='.$id);
+		$q1=$remote_connection->query('SELECT * FROM `'.SITE.'_col1` ORDER BY `order` DESC');
+		if(!$q0||!$q1) return false;
+		$r0=$q0->fetch_assoc();
+		$r1=$q1->fetch_assoc();
+		$old_pos=$r0['order'];
+		$max_pos=$r1['order'];
+		$new_pos=$old_pos-$where;
+		if($new_pos<1||$new_pos>$max_pos) return false;
+		return $remote_connection->query('UPDATE `'.SITE.'_col1` SET `order` = IF( `order` ='.$old_pos.', '.$new_pos.', '.$old_pos.' ) WHERE `order` IN ( '.$old_pos.', '.$new_pos.' )');
+	}
+	function edit($id,$new_props) {
+		global $remote_connection;
+		$sets='';
+		foreach($new_props as $col=>$prop) {
+			$sets.='`'.$col.'`=\''.$prop.'\', ';
+		}
+		$sets=substr($sets,0,-2);
+		return $remote_connection->query('UPDATE `'.SITE.'_col1` SET '.$sets.' WHERE `id`='.$id);
+	}
+}
\ No newline at end of file

=== modified file 'cpanel-incs/plugins/col1/default.php'
--- cpanel-incs/plugins/col1/default.php	2011-01-21 08:42:04 +0000
+++ cpanel-incs/plugins/col1/default.php	2011-01-21 16:18:12 +0000
@@ -13,51 +13,29 @@
  if(!hasSiteAddonLevel()) {$session->log('403','Site access denied ('.$site.')'); exit;} //Kill & log non-siteadmins (ze zouden hier nooit mogen geweest zijn :)
 if(!isset($_GET['function'])) {$_GET['function']="list"; }
 if($_GET['function']=="list") {
-	$query = $remote_connection->query('SELECT * FROM `'.$site.'_a_col1` ORDER BY `order` ASC'); ?>
+	$query = col1::gets(); ?>
 	<table><tr><th></th><th><?php echo $t->_('Title'); ?></th><th><?php echo $t->_('Actions'); ?></th></tr>
-	<?php while($section=$query->fetch_assoc()) {?>
+	<?php foreach($query as $section) {?>
 	<tr><td<?php if($section['plugin-reference']==NULL) { ?> ondblclick="col1.edit_rights.expand('<?php echo $site; ?>','<?php echo $section['id']; ?>',this,'<?php echo $section['access']; ?>')"><img src="<?php echo URL_IMG; ?>/Silk/bullet_<?php if($section['access']==0) { ?>green<?php } else if($section['access']==1) { ?>orange<?php } else if($section['access']==2) { ?>red<?php } ?>.png"> <?php } else { ?>><img src="<?php echo URL_IMG; ?>/Silk/bullet_black.png" alt=""><?php } ?></td><td ondblclick="col1.edit_title.expand('<?php echo $site; ?>','<?php echo $section['id']; ?>',this)"><?php echo $section['title']; ?></td><td><?php if($section['plugin-reference']==NULL) { ?><a onclick="col1.delete('<?php echo $site; ?>','<?php echo $section['id'] ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete section'); ?>"></a> <?php } ?><a onclick="col1.edit_order.down('<?php echo $site; ?>','<?php echo $section['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="<?php echo $t->_('Down'); ?>" title="<?php echo $t->_('Move section down'); ?>"></a> <a onclick="col1.edit_order.up('<?php echo $site; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="<?php echo $t->_('Up'); ?>" title="<?php echo $t->_('Move section up'); ?>"></a><?php if($section['plugin-reference']==NULL) { ?> <a onclick="col1.open_mce('<?php echo $site; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="<?php echo $t->_('Edit'); ?>" title="<?php echo $t->_('Edit section content'); ?>"></a><?php } ?></td></tr>
 	<?php } ?>
 	<tr onclick="col1.add('<?php echo $site; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="2"><?php echo $t->_('Add section'); ?></td></tr>
 	</table>
 <?php } 
 else if($_GET['function']=="delete") { 
-	$q= $remote_connection->query('DELETE FROM `'.$site.'_a_col1` WHERE `id`='.$_GET['id']);
-	if($q) { echo "true"; } else { echo "false"; } 
+	if(col1::delete($_GET['id'])) echo "true";
+	else echo "false";
 }
 else if($_GET['function']=="edit_title") {
-	$q= $remote_connection->query('UPDATE `'.$site.'_a_col1` SET `title`="'.$_GET['title'].'" WHERE `id`='.$_GET['id']);
-	if($q) { echo "true"; } else { echo "false"; } 
+	if(col1::edit($_GET['id'],array('title'=>$_GET['title']))) echo "true";
+	else echo "false";
 } 
 else if($_GET['function']=="move") {
-	$query0=$remote_connection->query('SELECT * FROM `'.$site.'_a_col1` WHERE `id`='.$_GET['id']);
-	if(!$query0) { echo "false"; exit; } //KILL bij query fout (vermijd foute update)
-	$res0=$query0->fetch_assoc();
-	$old_pos=$res0['order'];
-	if($_GET['move']=="up") {
-		$new_pos=$old_pos-1;
-	}
-	else if($_GET['move']=="down") {
-		$new_pos=$old_pos+1;
-	}
-	if(!isset($new_pos)||$new_pos<1) {
-		echo "false";
-		exit; //DO NOT execute query
-	}
-	$query1=$remote_connection->query('UPDATE `'.$site.'_a_col1` SET `order` = IF( `order` ='.$old_pos.', '.$new_pos.', '.$old_pos.' ) WHERE `order` IN ( '.$old_pos.', '.$new_pos.' )');
-	if($query1) { echo "true"; } else { echo "false"; }
+	if($_GET['move']=="up") $q=col1::move($_GET['id'],1);
+	else if($_GET['move']=="down") 	$q=col1::move($_GET['id'],-1);
 } 
 else if($_GET['function']=="new") {
-	$query0=$remote_connection->query('SELECT * FROM `'.$site.'_a_col1` ORDER BY `order` DESC');
-	if(!$query0) {
-		echo "false";
-		exit; //DO NOT execute query, error with first request.
-	}
-	$res0=$query0->fetch_assoc();
-	$order_last=$res0['order'];
-	$new_order_last=$order_last+1;
-	$q=$remote_connection->query('INSERT INTO `'.$site.'_a_col1` VALUES(NULL,'.$new_order_last.',"Nieuwe sectie","",NULL,0)');
-	if($q) { echo "true"; } else { echo "false"; }
+	if(col1::add(array('title'=>$t->_('New section'))) echo "true";
+	else echo "false";
 }
 else if($_GET['function']=="edit_rights") {
 	$query=$remote_connection->query('UPDATE `'.$site.'_a_col1` SET `access`='.$_GET['rights'].' WHERE `id`='.$_GET['id']);
@@ -66,11 +44,10 @@
 }
 else if($_GET['function']=="mce") {
 	if(isset($_GET['save'])) {
-		if($remote_connection->query('UPDATE `'.$site.'_a_col1` SET `content`="'.str_replace('"','\'',$_POST['section_main']).'" WHERE `id`='.$_GET['id']))
-		{ echo '<script language="JavaScript">alert("'.$t->_('Saved').'");</script>'; }
-		else { echo '<script language="JavaScript">alert("'.$t->_('Error while saving').'");</script>'; }
+		if(cms::edit($_GET['id'],array('content'=>$remote_connection->escape($_POST['section_main'])))) echo '<script language="JavaScript">alert("'.$t->_('Saved').'");</script>'; 
+		else echo '<script language="JavaScript">alert("'.$t->_('Error while saving').'");</script>'; 
 	}
-	$edit_data=$remote_connection->query('SELECT * FROM `'.$site.'_a_col1` WHERE `id`='.$_GET['id'])->fetch_assoc();?>
+	$edit_data=cms::get($_GET['id']);?>
 <script language="JavaScript" src="<?php echo URL_TINYMCE; ?>/tiny_mce/tiny_mce.js"></script>
 <script type="text/javascript">
 
@@ -85,7 +62,7 @@
 		// Theme options
 theme_advanced_buttons1 : "save,tinyautosave,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect",
 theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",
-theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visuala`id`,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,fullscreen",
+theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,fullscreen",
 theme_advanced_buttons4 : "styleprops,spellchecker,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking",
 		theme_advanced_toolbar_location : "top",
 		theme_advanced_toolbar_align : "left",

=== added file 'cpanel-incs/plugins/col3/api.php'
--- cpanel-incs/plugins/col3/api.php	1970-01-01 00:00:00 +0000
+++ cpanel-incs/plugins/col3/api.php	2011-01-21 16:18:12 +0000
@@ -0,0 +1,53 @@
+<?php
+class col3 {
+	function gets() {
+		global $remote_connection;
+		$query = $remote_connection->query('SELECT * FROM `'.SITE.'_a_col3` ORDER BY `order` ASC');
+		$SECTIONS=array();
+		while($section=$query->fetch_assoc()) {
+			$SECTIONS[]=$section;
+		}
+		return $SECTIONS;
+	}
+	function get($id) {
+		global $remote_connection;
+		return  $remote_connection->query('SELECT * FROM `'.SITE.'_a_col3` WHERE `id`='.$id)->fetch_assoc();
+	}
+	function delete($id) {
+		global $remote_connection;
+		return $remote_connection->query('DELETE FROM `'.SITE.'_a_col3` WHERE `id`='.$id);
+	}
+	function add($props) {
+		global $remote_connection;
+		$defaults=array('title'=>'API_added_block','content'=>'','plugin-reference'=>0,'access'=>0);
+		$props=array_merge($default,$props);
+		$order=$remote_connection->query('SELECT * FROM `'.SITE.'_a_col3` ORDER BY `order` DESC')->fetch_assoc();
+		$order=$order['order']+1;
+		$remote_connection->query('INSERT INTO `'.SITE.'_a_col3` VALUES(NULL,'.$order.',\''.$props['title'].'\',\''.$props['content'].'\',\''.$props['plugin-reference'].'\''.$props['access'].')');
+		return $remote_connection->insert_id;
+	}
+	function move($id,$where) {
+		// $where > 0 : UP
+		// $where < 0 : DOWN
+		global $remote_connection;
+		$q0=$remote_connection->query('SELECT * FROM `'.SITE.'_col3` WHERE `id`='.$id);
+		$q1=$remote_connection->query('SELECT * FROM `'.SITE.'_col3` ORDER BY `order` DESC');
+		if(!$q0||!$q1) return false;
+		$r0=$q0->fetch_assoc();
+		$r1=$q1->fetch_assoc();
+		$old_pos=$r0['order'];
+		$max_pos=$r1['order'];
+		$new_pos=$old_pos-$where;
+		if($new_pos<1||$new_pos>$max_pos) return false;
+		return $remote_connection->query('UPDATE `'.SITE.'_col3` SET `order` = IF( `order` ='.$old_pos.', '.$new_pos.', '.$old_pos.' ) WHERE `order` IN ( '.$old_pos.', '.$new_pos.' )');
+	}
+	function edit($id,$new_props) {
+		global $remote_connection;
+		$sets='';
+		foreach($new_props as $col=>$prop) {
+			$sets.='`'.$col.'`=\''.$prop.'\', ';
+		}
+		$sets=substr($sets,0,-2);
+		return $remote_connection->query('UPDATE `'.SITE.'_col3` SET '.$sets.' WHERE `id`='.$id);
+	}
+}
\ No newline at end of file

=== modified file 'cpanel-incs/plugins/col3/default.php'
--- cpanel-incs/plugins/col3/default.php	2011-01-21 08:42:04 +0000
+++ cpanel-incs/plugins/col3/default.php	2011-01-21 16:18:12 +0000
@@ -13,51 +13,29 @@
  if(!hasSiteAddonLevel()) {$session->log('403','Site access denied ('.$site.')'); exit;} //Kill & log non-siteadmins (ze zouden hier nooit mogen geweest zijn :)
 if(!isset($_GET['function'])) {$_GET['function']="list"; }
 if($_GET['function']=="list") {
-	$query = $remote_connection->query('SELECT * FROM `'.$site.'_a_col3` ORDER BY `order` ASC'); ?>
+	$query = col3::gets(); ?>
 	<table><tr><th></th><th><?php echo $t->_('Title'); ?></th><th><?php echo $t->_('Actions'); ?></th></tr>
-	<?php while($section=$query->fetch_assoc()) {?>
+	<?php foreach($query as $section) {?>
 	<tr><td<?php if($section['plugin-reference']==NULL) { ?> ondblclick="col3.edit_rights.expand('<?php echo $site; ?>','<?php echo $section['id']; ?>',this,'<?php echo $section['access']; ?>')"><img src="<?php echo URL_IMG; ?>/Silk/bullet_<?php if($section['access']==0) { ?>green<?php } else if($section['access']==1) { ?>orange<?php } else if($section['access']==2) { ?>red<?php } ?>.png"> <?php } else { ?>><img src="<?php echo URL_IMG; ?>/Silk/bullet_black.png" alt=""><?php } ?></td><td ondblclick="col3.edit_title.expand('<?php echo $site; ?>','<?php echo $section['id']; ?>',this)"><?php echo $section['title']; ?></td><td><?php if($section['plugin-reference']==NULL) { ?><a onclick="col3.delete('<?php echo $site; ?>','<?php echo $section['id'] ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete section'); ?>"></a> <?php } ?><a onclick="col3.edit_order.down('<?php echo $site; ?>','<?php echo $section['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="<?php echo $t->_('Down'); ?>" title="<?php echo $t->_('Move section down'); ?>"></a> <a onclick="col3.edit_order.up('<?php echo $site; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="<?php echo $t->_('Up'); ?>" title="<?php echo $t->_('Move section up'); ?>"></a><?php if($section['plugin-reference']==NULL) { ?> <a onclick="col3.open_mce('<?php echo $site; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="<?php echo $t->_('Edit'); ?>" title="<?php echo $t->_('Edit section content'); ?>"></a><?php } ?></td></tr>
 	<?php } ?>
 	<tr onclick="col3.add('<?php echo $site; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="2"><?php echo $t->_('Add section'); ?></td></tr>
 	</table>
 <?php } 
 else if($_GET['function']=="delete") { 
-	$q= $remote_connection->query('DELETE FROM `'.$site.'_a_col3` WHERE `id`='.$_GET['id']);
-	if($q) { echo "true"; } else { echo "false"; } 
+	if(col3::delete($_GET['id'])) echo "true";
+	else echo "false";
 }
 else if($_GET['function']=="edit_title") {
-	$q= $remote_connection->query('UPDATE `'.$site.'_a_col3` SET `title`="'.$_GET['title'].'" WHERE `id`='.$_GET['id']);
-	if($q) { echo "true"; } else { echo "false"; } 
+	if(col3::edit($_GET['id'],array('title'=>$_GET['title']))) echo "true";
+	else echo "false";
 } 
 else if($_GET['function']=="move") {
-	$query0=$remote_connection->query('SELECT * FROM `'.$site.'_a_col3` WHERE `id`='.$_GET['id']);
-	if(!$query0) { echo "false"; exit; } //KILL bij query fout (vermijd foute update)
-	$res0=$query0->fetch_assoc();
-	$old_pos=$res0['order'];
-	if($_GET['move']=="up") {
-		$new_pos=$old_pos-1;
-	}
-	else if($_GET['move']=="down") {
-		$new_pos=$old_pos+1;
-	}
-	if(!isset($new_pos)||$new_pos<1) {
-		echo "false";
-		exit; //DO NOT execute query
-	}
-	$query1=$remote_connection->query('UPDATE `'.$site.'_a_col3` SET `order` = IF( `order` ='.$old_pos.', '.$new_pos.', '.$old_pos.' ) WHERE `order` IN ( '.$old_pos.', '.$new_pos.' )');
-	if($query1) { echo "true"; } else { echo "false"; }
+	if($_GET['move']=="up") $q=col3::move($_GET['id'],1);
+	else if($_GET['move']=="down") 	$q=col3::move($_GET['id'],-1);
 } 
 else if($_GET['function']=="new") {
-	$query0=$remote_connection->query('SELECT * FROM `'.$site.'_a_col3` ORDER BY `order` DESC');
-	if(!$query0) {
-		echo "false";
-		exit; //DO NOT execute query, error with first request.
-	}
-	$res0=$query0->fetch_assoc();
-	$order_last=$res0['order'];
-	$new_order_last=$order_last+1;
-	$q=$remote_connection->query('INSERT INTO `'.$site.'_a_col3` VALUES(NULL,'.$new_order_last.',"Nieuwe sectie","",NULL,0)');
-	if($q) { echo "true"; } else { echo "false"; }
+	if(col3::add(array('title'=>$t->_('New section'))) echo "true";
+	else echo "false";
 }
 else if($_GET['function']=="edit_rights") {
 	$query=$remote_connection->query('UPDATE `'.$site.'_a_col3` SET `access`='.$_GET['rights'].' WHERE `id`='.$_GET['id']);
@@ -66,11 +44,10 @@
 }
 else if($_GET['function']=="mce") {
 	if(isset($_GET['save'])) {
-		if($remote_connection->query('UPDATE `'.$site.'_a_col3` SET `content`="'.str_replace('"','\'',$_POST['section_main']).'" WHERE `id`='.$_GET['id']))
-		{ echo '<script language="JavaScript">alert("'.$t->_('Saved').'");</script>'; }
-		else { echo '<script language="JavaScript">alert("'.$t->_('Error while saving').'");</script>'; }
+		if(cms::edit($_GET['id'],array('content'=>$remote_connection->escape($_POST['section_main'])))) echo '<script language="JavaScript">alert("'.$t->_('Saved').'");</script>'; 
+		else echo '<script language="JavaScript">alert("'.$t->_('Error while saving').'");</script>'; 
 	}
-	$edit_data=$remote_connection->query('SELECT * FROM `'.$site.'_a_col3` WHERE `id`='.$_GET['id'])->fetch_assoc();?>
+	$edit_data=cms::get($_GET['id']);?>
 <script language="JavaScript" src="<?php echo URL_TINYMCE; ?>/tiny_mce/tiny_mce.js"></script>
 <script type="text/javascript">
 
@@ -85,7 +62,7 @@
 		// Theme options
 theme_advanced_buttons1 : "save,tinyautosave,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect",
 theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",
-theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visuala`id`,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,fullscreen",
+theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,fullscreen",
 theme_advanced_buttons4 : "styleprops,spellchecker,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking",
 		theme_advanced_toolbar_location : "top",
 		theme_advanced_toolbar_align : "left",