Enano CMS (1.1.x): comparison ajax.php

equal deleted inserted replaced

-:32429702305e
+:c72b545f1304
 $db = new $dbdriver();
 $db->connect();
 // result is sent using JSON
-$json = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
 $return = Array(
 'mode' => 'success',
 'users_real' => Array()
 );
 {
 $return = array(
 'mode' => 'error',
 'error' => 'Invalid URI'
 );
-die( $json->encode($return) );
+die( enano_json_encode($return) );
 }
 $allowanon = ( isset($_GET['allowanon']) && $_GET['allowanon'] == '1' ) ? '' : ' AND user_id > 1';
 $q = $db->sql_query('SELECT username FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username) LIKE ' . ENANO_SQLFUNC_LOWERCASE . '(\'%'.$name.'%\')' . $allowanon . ' ORDER BY username ASC;');
 if ( !$q )
 {
 $db->free_result();
 // all done! :-)
 $db->close();
-echo $json->encode( $return );
+echo enano_json_encode( $return );
 exit;
 }
 require('includes/common.php');
 if ( !$e )
 die( $db->get_error() );
 die('GOOD');
 break;
 case 'get_tags':
-$json = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
 $ret = array('tags' => array(), 'user_level' => $session->user_level, 'can_add' => $session->get_permissions('tag_create'));
 $q = $db->sql_query('SELECT t.tag_id, t.tag_name, pg.pg_target IS NOT NULL AS used_in_acl, t.user_id FROM '.table_prefix.'tags AS t
 LEFT JOIN '.table_prefix.'page_groups AS pg
 ON ( ( pg.pg_type = ' . PAGE_GRP_TAGGED . ' AND pg.pg_target=t.tag_name ) OR ( pg.pg_type IS NULL AND pg.pg_target IS NULL ) )
 'can_del' => $can_del,
 'acl' => ( $row['used_in_acl'] == 1 )
 );
 }
-echo $json->encode($ret);
+echo enano_json_encode($ret);
 break;
 case 'addtag':
-$json = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
 $resp = array(
 'success' => false,
 'error' => 'No error',
 'can_del' => ( $session->get_permissions('tag_delete_own') && $session->user_logged_in ),
 'in_acl' => false
 // first of course, are we allowed to tag pages?
 if ( !$session->get_permissions('tag_create') )
 {
 $resp['error'] = 'You are not permitted to tag pages.';
-die($json->encode($resp));
+die(enano_json_encode($resp));
 }
 // sanitize the tag name
 $tag = sanitize_tag($_POST['tag']);
 $tag = $db->escape($tag);
 if ( strlen($tag) < 2 )
 {
 $resp['error'] = 'Tags must consist of at least 2 alphanumeric characters.';
-die($json->encode($resp));
+die(enano_json_encode($resp));
 }
 // check if tag is already on page
 $q = $db->sql_query('SELECT 1 FROM '.table_prefix.'tags WHERE page_id=\'' . $db->escape($paths->page_id) . '\' AND namespace=\'' . $db->escape($paths->namespace) . '\' AND tag_name=\'' . $tag . '\';');
 if ( !$q )
 $db->_die();
 if ( $db->numrows() > 0 )
 {
 $resp['error'] = 'This page already has this tag.';
-die($json->encode($resp));
+die(enano_json_encode($resp));
 }
 $db->free_result();
 // tricky: make sure this tag isn't being used in some page group, and thus adding it could affect page access
 $can_edit_acl = ( $session->get_permissions('edit_acl') || $session->user_level >= USER_LEVEL_ADMIN );
 if ( !$q )
 $db->_die();
 if ( $db->numrows() > 0 && !$can_edit_acl )
 {
 $resp['error'] = 'This tag is used in an ACL page group, and thus can\'t be added to a page by people without administrator privileges.';
-die($json->encode($resp));
+die(enano_json_encode($resp));
 }
 $resp['in_acl'] = ( $db->numrows() > 0 );
 $db->free_result();
 // we're good
 $resp['success'] = true;
 $resp['tag'] = $tag;
 $resp['tag_id'] = $db->insert_id();
-echo $json->encode($resp);
+echo enano_json_encode($resp);
 break;
 case 'deltag':
 $tag_id = intval($_POST['tag_id']);
 if ( empty($tag_id) )

changeset 334	c72b545f1304
parent 326	ab66d6d1f1f4
child 335	67bd3121a12e