Enano CMS (1.1.x): comparison plugins/SpecialUserFuncs.php

equal deleted inserted replaced

-:32429702305e
+:c72b545f1304
 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
 */
 global $db, $session, $paths, $template, $plugins; // Common objects
-$plugins->attachHook('base_classes_initted', '
+$plugins->attachHook('session_started', '
 global $paths;
 $paths->add_page(Array(
-\'name\'=>\'Log in\',
+\'name\'=>\'specialpage_log_in\',
 \'urlname\'=>\'Login\',
 \'namespace\'=>\'Special\',
 \'special\'=>0,\'visible\'=>1,\'comments_on\'=>0,\'protected\'=>1,\'delvotes\'=>0,\'delvote_ips\'=>\'\',
 ));
 $paths->add_page(Array(
-\'name\'=>\'Log out\',
+\'name\'=>\'specialpage_log_out\',
 \'urlname\'=>\'Logout\',
 \'namespace\'=>\'Special\',
 \'special\'=>0,\'visible\'=>1,\'comments_on\'=>0,\'protected\'=>1,\'delvotes\'=>0,\'delvote_ips\'=>\'\',
 ));
 $paths->add_page(Array(
-\'name\'=>\'Register\',
+\'name\'=>\'specialpage_register\',
 \'urlname\'=>\'Register\',
 \'namespace\'=>\'Special\',
 \'special\'=>0,\'visible\'=>1,\'comments_on\'=>0,\'protected\'=>1,\'delvotes\'=>0,\'delvote_ips\'=>\'\',
 ));
 $paths->add_page(Array(
-\'name\'=>\'Edit Profile\',
+\'name\'=>\'specialpage_preferences\',
 \'urlname\'=>\'Preferences\',
 \'namespace\'=>\'Special\',
 \'special\'=>0,\'visible\'=>1,\'comments_on\'=>0,\'protected\'=>1,\'delvotes\'=>0,\'delvote_ips\'=>\'\',
 ));
 $paths->add_page(Array(
-\'name\'=>\'Contributions\',
+\'name\'=>\'specialpage_contributions\',
 \'urlname\'=>\'Contributions\',
 \'namespace\'=>\'Special\',
 \'special\'=>0,\'visible\'=>1,\'comments_on\'=>0,\'protected\'=>1,\'delvotes\'=>0,\'delvote_ips\'=>\'\',
 ));
 $paths->add_page(Array(
-\'name\'=>\'Change style\',
+\'name\'=>\'specialpage_change_theme\',
 \'urlname\'=>\'ChangeStyle\',
 \'namespace\'=>\'Special\',
 \'special\'=>0,\'visible\'=>1,\'comments_on\'=>0,\'protected\'=>1,\'delvotes\'=>0,\'delvote_ips\'=>\'\',
 ));
 $paths->add_page(Array(
-\'name\'=>\'Activate user account\',
+\'name\'=>\'specialpage_activate_account\',
 \'urlname\'=>\'ActivateAccount\',
 \'namespace\'=>\'Special\',
 \'special\'=>0,\'visible\'=>1,\'comments_on\'=>0,\'protected\'=>1,\'delvotes\'=>0,\'delvote_ips\'=>\'\',
 ));
 $paths->add_page(Array(
-\'name\'=>\'Captcha\',
+\'name\'=>\'specialpage_captcha\',
 \'urlname\'=>\'Captcha\',
 \'namespace\'=>\'Special\',
 \'special\'=>0,\'visible\'=>1,\'comments_on\'=>0,\'protected\'=>1,\'delvotes\'=>0,\'delvote_ips\'=>\'\',
 ));
 $paths->add_page(Array(
-\'name\'=>\'Forgot password\',
+\'name\'=>\'specialpage_password_reset\',
 \'urlname\'=>\'PasswordReset\',
 \'namespace\'=>\'Special\',
 \'special\'=>0,\'visible\'=>1,\'comments_on\'=>0,\'protected\'=>1,\'delvotes\'=>0,\'delvote_ips\'=>\'\',
 ));
 $paths->add_page(Array(
-\'name\'=>\'Member list\',
+\'name\'=>\'specialpage_member_list\',
 \'urlname\'=>\'Memberlist\',
 \'namespace\'=>\'Special\',
 \'special\'=>0,\'visible\'=>1,\'comments_on\'=>0,\'protected\'=>1,\'delvotes\'=>0,\'delvote_ips\'=>\'\',
 ));
 $paths->add_page(Array(
-\'name\'=>\'Language exporter\',
+\'name\'=>\'specialpage_language_export\',
 \'urlname\'=>\'LangExportJSON\',
 \'namespace\'=>\'Special\',
 \'special\'=>0,\'visible\'=>0,\'comments_on\'=>0,\'protected\'=>1,\'delvotes\'=>0,\'delvote_ips\'=>\'\',
 ));
 $response[$x] = $y;
 }
 unset($x, $y);
 }
-$json = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
+$response = enano_json_encode($response);
-$response = $json->encode($response);
 echo $response;
 return null;
 }
 $level = ( isset($_GET['level']) && in_array($_GET['level'], array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9') ) ) ? intval($_GET['level']) : USER_LEVEL_MEMBER;
 global $__login_status;
 global $lang;
 if ( isset($_GET['act']) && $_GET['act'] == 'ajaxlogin' )
 {
 $plugins->attachHook('login_password_reset', 'SpecialLogin_SendResponse_PasswordReset($row[\'user_id\'], $row[\'temp_password\']);');
-$json = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
+$data = enano_json_decode($_POST['params']);
-$data = $json->decode($_POST['params']);
 $captcha_hash = ( isset($data['captcha_hash']) ) ? $data['captcha_hash'] : false;
 $captcha_code = ( isset($data['captcha_code']) ) ? $data['captcha_code'] : false;
 $level = ( isset($data['level']) ) ? intval($data['level']) : USER_LEVEL_MEMBER;
 $result = $session->login_with_crypto($data['username'], $data['crypt_data'], $data['crypt_key'], $data['challenge'], $level, $captcha_hash, $captcha_code);
 $session->start();
 'result' => 'error',
 'data' => $result,
 'captcha' => $captcha
 );
 }
-$response = $json->encode($response);
+$response = enano_json_encode($response);
 echo $response;
 $db->close();
 exit;
 }
 if(isset($_POST['login'])) {
 }
 }
 function SpecialLogin_SendResponse_PasswordReset($user_id, $passkey)
 {
-$json = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
 $response = Array(
 'result' => 'success_reset',
 'user_id' => $user_id,
 'temppass' => $passkey
 );
-$response = $json->encode($response);
+$response = enano_json_encode($response);
 echo $response;
 $db->close();
 exit;
 if ( $lang->lang_id == $lang_id )
 $lang_local =& $lang;
 else
 $lang_local = new Language($lang_id);
-$json = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
 $timestamp = date('D, j M Y H:i:s T', $lang_local->lang_timestamp);
 header("Last-Modified: $timestamp");
 header("Date: $timestamp");
 header('Content-type: text/javascript');
 $lang_local->fetch();
 echo "if ( typeof(enano_lang) != 'object' )
 var enano_lang = new Object();
-enano_lang[{$lang->lang_id}] = " . $json->encode($lang_local->strings) . ";";
+enano_lang[{$lang->lang_id}] = " . enano_json_encode($lang_local->strings) . ";";
 }
 ?>

changeset 334	c72b545f1304
parent 326	ab66d6d1f1f4
child 335	67bd3121a12e