mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated category ajax files to use type instead of app and add callCheck.

This commit is contained in:
Thomas Tanghus 2012-10-19 00:06:18 +02:00
parent 72f2f53e24
commit f4fd4a5a52
3 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/ajax/vcategories/add.php
View File

@ -15,23 +15,26 @@ function debug($msg) {
} }
require_once '../../../lib/base.php'; require_once '../../../lib/base.php';
OC_JSON::checkLoggedIn();
$category = isset($_GET['category'])?strip_tags($_GET['category']):null;
$app = isset($_GET['app'])?$_GET['app']:null;
if(is_null($app)) { OCP\JSON::checkLoggedIn();
bailOut(OC_Contacts_App::$l10n->t('Application name not provided.')); OCP\JSON::callCheck();
$l = OC_L10N::get('core');
$category = isset($_POST['category']) ? strip_tags($_POST['category']) : null;
$type = isset($_POST['type']) ? $_POST['type'] : null;
if(is_null($type)) {
bailOut($l->t('Category type not provided.'));
} }
OC_JSON::checkAppEnabled($app);
if(is_null($category)) { if(is_null($category)) {
bailOut(OC_Contacts_App::$l10n->t('No category to add?')); bailOut($l->t('No category to add?'));
} }
debug(print_r($category, true)); debug(print_r($category, true));
$categories = new OC_VCategories($app); $categories = new OC_VCategories($type);
if($categories->hasCategory($category)) { if($categories->hasCategory($category)) {
bailOut(OC_Contacts_App::$l10n->t('This category already exists: '.$category)); bailOut(OC_Contacts_App::$l10n->t('This category already exists: '.$category));
} else { } else {

24
core/ajax/vcategories/delete.php
View File

@ -16,21 +16,25 @@ function debug($msg) {
} }
require_once '../../../lib/base.php'; require_once '../../../lib/base.php';
OC_JSON::checkLoggedIn();
$app = isset($_POST['app'])?$_POST['app']:null; OCP\JSON::checkLoggedIn();
$categories = isset($_POST['categories'])?$_POST['categories']:null; OCP\JSON::callCheck();
if(is_null($app)) {
bailOut(OC_Contacts_App::$l10n->t('Application name not provided.')); $l = OC_L10N::get('core');
$type = isset($_POST['type']) ? $_POST['type'] : null;
$categories = isset($_POST['categories']) ? $_POST['categories'] : null;
if(is_null($type)) {
bailOut($l->t('Object type not provided.'));
} }
OC_JSON::checkAppEnabled($app); debug('The application using category type "' . $type . '" uses the default file for deletion. OC_VObjects will not be updated.');
debug('The application "'.$app.'" uses the default file. OC_VObjects will not be updated.');
if(is_null($categories)) { if(is_null($categories)) {
bailOut('No categories selected for deletion.'); bailOut($l->t('No categories selected for deletion.'));
} }
$vcategories = new OC_VCategories($app); $vcategories = new OC_VCategories($type);
$vcategories->delete($categories); $vcategories->delete($categories);
OC_JSON::success(array('data' => array('categories'=>$vcategories->categories()))); OC_JSON::success(array('data' => array('categories'=>$vcategories->categories())));

15
core/ajax/vcategories/edit.php
View File

@ -17,16 +17,19 @@ function debug($msg) {
require_once '../../../lib/base.php'; require_once '../../../lib/base.php';
OC_JSON::checkLoggedIn(); OC_JSON::checkLoggedIn();
$app = isset($_GET['app'])?$_GET['app']:null;
if(is_null($app)) { $l = OC_L10N::get('core');
bailOut('Application name not provided.');
$type = isset($_GET['type']) ? $_GET['type'] : null;
if(is_null($type)) {
bailOut($l->t('Category type not provided.'));
} }
OC_JSON::checkAppEnabled($app); OC_JSON::checkAppEnabled($type);
$tmpl = new OC_TEMPLATE("core", "edit_categories_dialog"); $tmpl = new OCP\Template("core", "edit_categories_dialog");
$vcategories = new OC_VCategories($app); $vcategories = new OC_VCategories($type);
$categories = $vcategories->categories(); $categories = $vcategories->categories();
debug(print_r($categories, true)); debug(print_r($categories, true));
$tmpl->assign('categories', $categories); $tmpl->assign('categories', $categories);