'; - enano_debug_print_backtrace(); - echo ''; - exit; - } - $rf =& $this->rand_func; - return $rf($s, $m); - } - - function seed_func($s) - { - $rf =& $this->seed_func; - return $rf($s); - } - - function hash_func($s) - { - $rf =& $this->hash_func; - return $rf($s); - } - + + var $site_tags = array(); + var $tag_pos = 0; + var $rand_func = "mt_rand"; + var $seed_func = "mt_srand"; + var $hash_func = "sha1"; + var $output = "png"; + var $use_dict = false; + var $dict_location = ""; + var $max_word_length = 7; + var $col_type = 1; + var $max_attempts = 20; + var $font_locations = Array(); + var $bg_type = 3; + var $blur_bg = false; + var $bg_images = Array(); + var $merge_type = 0; + var $morph_bg = true; + var $im, $im2, $im3; + var $font_size = 36; + var $debug = false; + + function __construct($s, $r = false) + { + parent::__construct($s, $r); + + // try to avoid the 'free p*rn' method of CAPTCHA circumvention + // see en.wikipedia.org/wiki/CAPTCHA for more info + // $this->site_tags[0] = "To avoid spam, please do NOT enter the text if"; + // $this->site_tags[1] = "this site is not puremango.co.uk"; + // or more simply: + // $site_tags[0] = "for use only on puremango.co.uk"; + // reword or add lines as you please + // or if you don't want any text: + $this->site_tags = array(); + + // where to write the above: + // 0=top + // 1=bottom + // 2=both + $this->tag_pos = 1; + + // functions to call for random number generation + // mt_rand produces 'better' random numbers + // but if your server doesn't support it, it's fine to use rand instead + $this->rand_func = "mt_rand"; + $this->seed_func = "mt_srand"; + + // which type of hash to use? + // possible values: "sha1", "md5", "crc32" + // sha1 supported by PHP4.3.0+ + // md5 supported by PHP3+ + // crc32 supported by PHP4.0.1+ + $this->hash_func = $this->session_fetch('hash_func', 'sha1'); + // store in session so can validate in form processor + + // image type: + // possible values: "jpg", "png", "gif" + // jpg doesn't support transparency (transparent bg option ends up white) + // png isn't supported by old browsers (see http://www.libpng.org/pub/png/pngstatus.html) + // gif may not be supported by your GD Lib. + $this->output = "png"; + + // 0=generate pseudo-random string, true=use dictionary + // dictionary is easier to recognise + // - both for humans and computers, so use random string if you're paranoid. + $this->use_dict = false; + // if your server is NOT set up to deny web access to files beginning ".ht" + // then you should ensure the dictionary file is kept outside the web directory + // eg: if www.foo.com/index.html points to c:\website\www\index.html + // then the dictionary should be placed in c:\website\dict.txt + // test your server's config by trying to access the dictionary through a web browser + // you should NOT be able to view the contents. + // can leave this blank if not using dictionary + $this->dict_location = ENANO_ROOT . "/includes/captcha/dicts/default.php"; + + // used to calculate image width, and for non-dictionary word generation + $this->max_word_length = 7; + + // text colour + // 0=one random colour for all letters + // 1=different random colour for each letter + $this->col_type = 1; + + // maximum times a user can refresh the image + // on a 6500 word dictionary, I think 15-50 is enough to not annoy users and make BF unfeasble. + // further notes re: BF attacks in "avoid brute force attacks" section, below + // on the other hand, those attempting OCR will find the ability to request new images + // very useful; if they can't crack one, just grab an easier target... + // for the ultra-paranoid, setting it to <5 will still work for most users + $this->max_attempts = 20; + + // list of fonts to use + // font size should be around 35 pixels wide for each character. + // you can use my GD fontmaker script at www.puremango.co.uk to create your own fonts + // There are other programs to can create GD fonts, but my script allows a greater + // degree of control over exactly how wide each character is, and is therefore + // recommended for 'special' uses. For normal use of GD fonts, + // the GDFontGenerator @ http://www.philiplb.de is excellent for convering ttf to GD + + // the fonts included with freeCap *only* include lowercase alphabetic characters + // so are not suitable for most other uses + // to increase security, you really should add other fonts + $this->font_locations = Array( + //ENANO_ROOT . "/includes/captcha/fonts/assimila.ttf", + //ENANO_ROOT . "/includes/captcha/fonts/elephant.ttf", + //ENANO_ROOT . "/includes/captcha/fonts/swash_normal.ttf", + //ENANO_ROOT . "/includes/captcha/fonts/.ttf", + //ENANO_ROOT . "/includes/captcha/fonts/trekker_regular.ttf" + ENANO_ROOT . "/includes/captcha/fonts/FreeMonoBold.ttf", + ENANO_ROOT . "/includes/captcha/fonts/FreeSerifBold.ttf", + ENANO_ROOT . "/includes/captcha/fonts/LiberationSans-Bold.ttf", + ); + + // background: + // 0=transparent (if jpg, white) + // 1=white bg with grid + // 2=white bg with squiggles + // 3=morphed image blocks + // 'random' background from v1.3 didn't provide any extra security (according to 2 independent experts) + // many thanks to http://ocr-research.org.ua and http://sam.zoy.org/pwntcha/ for testing + // for jpgs, 'transparent' is white + $this->bg_type = 3; + // should we blur the background? (looks nicer, makes text easier to read, takes longer) + $this->blur_bg = false; + + // for bg_type 3, which images should we use? + // if you add your own, make sure they're fairly 'busy' images (ie a lot of shapes in them) + $this->bg_images = Array( + ENANO_ROOT . "/includes/captcha/pics/freecap_im1.jpg", + ENANO_ROOT . "/includes/captcha/pics/freecap_im2.jpg", + ENANO_ROOT . "/includes/captcha/pics/freecap_im3.jpg", + ENANO_ROOT . "/includes/captcha/pics/freecap_im4.jpg", + ENANO_ROOT . "/includes/captcha/pics/allyourbase.jpg" + ); + + // for non-transparent backgrounds only: + // if 0, merges CAPTCHA with bg + // if 1, write CAPTCHA over bg + $this->merge_type = 0; + // should we morph the bg? (recommend yes, but takes a little longer to compute) + $this->morph_bg = true; + + // you shouldn't need to edit anything below this, but it's extensively commented if you do want to play + // have fun, and email me with ideas, or improvements to the code (very interested in speed improvements) + // hope this script saves some spam :-) + } + + ////////////////////////////////////////////////////// + ////// Functions: + ////////////////////////////////////////////////////// + function make_seed() { + // from http://php.net/srand + list($usec, $sec) = explode(' ', microtime()); + return (float) $sec + ((float) $usec * 100000); + } + + function rand_color() { + $rf =& $this->rand_func; + if($this->bg_type==3) + { + // needs darker colour.. + return $rf(10,100); + } else { + return $rf(60,170); + } + } + + function myImageBlur($im) + { + // w00t. my very own blur function + // in GD2, there's a gaussian blur function. bunch of bloody show-offs... :-) + + $width = imagesx($im); + $height = imagesy($im); + + $temp_im = ImageCreateTrueColor($width,$height); + $bg = ImageColorAllocate($temp_im,150,150,150); + + // preserves transparency if in orig image + ImageColorTransparent($temp_im,$bg); + + // fill bg + ImageFill($temp_im,0,0,$bg); + + // anything higher than 3 makes it totally unreadable + // might be useful in a 'real' blur function, though (ie blurring pictures not text) + $distance = 1; + // use $distance=30 to have multiple copies of the word. not sure if this is useful. + + // blur by merging with itself at different x/y offsets: + ImageCopyMerge($temp_im, $im, 0, 0, 0, $distance, $width, $height-$distance, 70); + ImageCopyMerge($im, $temp_im, 0, 0, $distance, 0, $width-$distance, $height, 70); + ImageCopyMerge($temp_im, $im, 0, $distance, 0, 0, $width, $height, 70); + ImageCopyMerge($im, $temp_im, $distance, 0, 0, 0, $width, $height, 70); + // remove temp image + ImageDestroy($temp_im); + + return $im; + } + + function sendImage($pic) + { + // output image with appropriate headers + global $output,$im,$im2,$im3; + // ENANO - obfuscation technique disabled + // (this is for ethical reasons - ask dan at enanocms.org for information on why) + // Basically it outputs an X-Captcha header showing freeCap version, etc. Unnecessary + // header(base64_decode("WC1DYXB0Y2hhOiBmcmVlQ2FwIDEuNCAtIHd3dy5wdXJlbWFuZ28uY28udWs=")); + + if ( $this->debug ) + { + $x = imagesx($pic) - 70; + $y = imagesy($pic) - 20; + + $code = $this->get_code(); + $red = ImageColorAllocateAlpha($pic, 0xAA, 0, 0, 72); + ImageString($pic, 5, $x, $y, $code, $red); + ImageString($pic, 5, 5, $y, "[debug mode]", $red); + } + + switch($this->output) + { + // add other cases as desired + case "jpg": + header("Content-Type: image/jpeg"); + ImageJPEG($pic); + break; + case "gif": + header("Content-Type: image/gif"); + ImageGIF($pic); + break; + case "png": + default: + header("Content-Type: image/png"); + ImagePNG($pic); + break; + } + + // kill GD images (removes from memory) + ImageDestroy($this->im); + ImageDestroy($this->im2); + ImageDestroy($pic); + if(!empty($this->im3)) + { + ImageDestroy($this->im3); + } + exit(); + } + + function make_image() + { + ////////////////////////////////////////////////////// + ////// Create Images + initialise a few things + ////////////////////////////////////////////////////// + + // seed random number generator + // PHP 4.2.0+ doesn't need this, but lower versions will + $this->seed_func($this->make_seed()); + + // how faded should the bg be? (100=totally gone, 0=bright as the day) + // to test how much protection the bg noise gives, take a screenshot of the freeCap image + // and take it into a photo editor. play with contrast and brightness. + // If you can remove most of the bg, then it's not a good enough percentage + switch($this->bg_type) + { + case 0: + break; + case 1: + case 2: + $bg_fade_pct = 65; + break; + case 3: + $bg_fade_pct = 50; + break; + } + // slightly randomise the bg fade + $bg_fade_pct += $this->rand_func(-2,2); + + // read each font and get font character widths + // $font_widths = Array(); + // for($i=0 ; $i
'; + enano_debug_print_backtrace(); + echo ''; + exit; + } + $rf =& $this->rand_func; + return $rf($s, $m); + } + + function seed_func($s) + { + $rf =& $this->seed_func; + return $rf($s); + } + + function hash_func($s) + { + $rf =& $this->hash_func; + return $rf($s); + } + } diff -r de56132c008d -r bdac73ed481e includes/captcha/engine_potpourri.php --- a/includes/captcha/engine_potpourri.php Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/captcha/engine_potpourri.php Sun Mar 28 23:10:46 2010 -0400 @@ -22,310 +22,310 @@ class captcha_engine_potpourri extends captcha_base { - var $captcha_config; - - function __construct($sid, $r = false) - { - parent::__construct($sid, $r); - - $hex = Array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'); - $latticecolor = '#'; - for ( $i = 0; $i < 6; $i++ ) - $latticecolor .= $hex[mt_rand(0, 15)]; - - $this->captcha_config = array ( - 'width' => '350', - 'height' => '90', - 'background_color' => '#E5ECF9', - 'jpeg' => '0', - 'jpeg_quality' => '95', - 'pre_letters' => '1', - 'pre_letters_great' => '0', - 'font' => '1', - 'chess' => '2', - 'ellipses' => '2', - 'arcs' => '2', - 'lines' => '2', - 'image' => '0', - 'gammacorrect' => '0.8', - 'foreground_lattice_x' => (string)mt_rand(25, 30), - 'foreground_lattice_y' => (string)mt_rand(25, 30), - 'lattice_color' => $latticecolor, - ); - } - - function make_image() - { - $code = $this->get_code(); - - // Prefs - $total_width = $this->captcha_config['width']; - $total_height = $this->captcha_config['height']; - - $hex_bg_color = $this->get_rgb($this->captcha_config['background_color']); - $bg_color = array(); - $bg_color = explode(",", $hex_bg_color); - - $jpeg = $this->captcha_config['jpeg']; - $img_quality = $this->captcha_config['jpeg_quality']; - // Max quality is 95 - - $pre_letters = $this->captcha_config['pre_letters']; - $pre_letter_great = $this->captcha_config['pre_letters_great']; - $rnd_font = $this->captcha_config['font']; - $chess = $this->captcha_config['chess']; - $ellipses = $this->captcha_config['ellipses']; - $arcs = $this->captcha_config['arcs']; - $lines = $this->captcha_config['lines']; - $image = $this->captcha_config['image']; - - $gammacorrect = $this->captcha_config['gammacorrect']; - - $foreground_lattice_y = $this->captcha_config['foreground_lattice_y']; - $foreground_lattice_x = $this->captcha_config['foreground_lattice_x']; - $hex_lattice_color = $this->get_rgb($this->captcha_config['lattice_color']); - $rgb_lattice_color = array(); - $rgb_lattice_color = explode(",", $hex_lattice_color); - - $font_debug = false; - - // Fonts and images init - if ($image) - { - $bg_imgs = array(); - if ($img_dir = opendir(ENANO_ROOT.'/includes/captcha/pics/')) - { - while (true == ($file = @readdir($img_dir))) - { - if ((substr(strtolower($file), -3) == 'jpg') || (substr(strtolower($file), -3) == 'gif')) - { - $bg_imgs[] = $file; - } - } - closedir($img_dir); - } - // Grab a random Background Image or set FALSE if none was found - $bg_img = ( count($bg_imgs) ) ? rand(0, (count($bg_imgs)-1)) : false; - } - - $fonts = array(); - if ($fonts_dir = opendir(ENANO_ROOT . '/includes/captcha/fonts/')) - { - while (true == ($file = @readdir($fonts_dir))) - { - if ((substr(strtolower($file), strlen($file)-3, strlen($file)) == 'ttf')) - { - $fonts[] = $file; - } - } - closedir($fonts_dir); - } else { - die('Error reading directory: '.ENANO_ROOT.'/includes/captcha/fonts/'); - } - $font = mt_rand(0, (count($fonts)-1)); - - // Generate - $image = ($this->gdVersion() >= 2) ? imagecreatetruecolor($total_width, $total_height) : imagecreate($total_width, $total_height); - $background_color = imagecolorallocate($image, $bg_color[0], $bg_color[1], $bg_color[2]); - imagefill($image, 0, 0, $background_color); - - // Generate backgrund - if ($chess == '1' || $chess == '2' && rand(0,1)) - { - // Draw rectangles - for($i = 0; $i <= 8; $i++) - { - $rectanglecolor = imagecolorallocate($image, rand(100,200),rand(100,200),rand(100,200)); - imagefilledrectangle($image, 0, 0, round($total_width-($total_width/8*$i)), round($total_height), $rectanglecolor); - $rectanglecolor = imagecolorallocate($image, rand(100,200),rand(100,200),rand(100,200)); - imagefilledrectangle($image, 0, 0, round($total_width-($total_width/8*$i)), round($total_height/2), $rectanglecolor); - } - } - if ($ellipses == '1' || $ellipses == '2' && rand(0,1)) - { - // Draw random ellipses - for ($i = 1; $i <= 60; $i++) - { - $ellipsecolor = imagecolorallocate($image, rand(100,250),rand(100,250),rand(100,250)); - imagefilledellipse($image, round(rand(0, $total_width)), round(rand(0, $total_height)), round(rand(0, $total_width/8)), round(rand(0, $total_height/4)), $ellipsecolor); - } - } - if ($arcs == '1' || $arcs == '2' && rand(0,1)) - { - // Draw random partial ellipses - for ($i = 0; $i <= 30; $i++) - { - $linecolor = imagecolorallocate($image, rand(120,255),rand(120,255),rand(120,255)); - $cx = round(rand(1, $total_width)); - $cy = round(rand(1, $total_height)); - $int_w = round(rand(1, $total_width/2)); - $int_h = round(rand(1, $total_height)); - imagearc($image, $cx, $cy, $int_w, $int_h, round(rand(0, 190)), round(rand(191, 360)), $linecolor); - imagearc($image, $cx-1, $cy-1, $int_w, $int_h, round(rand(0, 190)), round(rand(191, 360)), $linecolor); - } - } - if ($lines == '1' || $lines == '2' && rand(0,1)) - { - // Draw random lines - for ($i = 0; $i <= 50; $i++) - { - $linecolor = imagecolorallocate($image, rand(120,255),rand(120,255),rand(120,255)); - imageline($image, round(rand(1, $total_width*3)), round(rand(1, $total_height*5)), round(rand(1, $total_width/2)), round(rand(1, $total_height*2)), $linecolor); - } - } - - $text_color_array = array('255,51,0', '51,77,255', '204,51,102', '0,153,0', '255,166,2', '255,0,255', '255,0,0', '0,255,0', '0,0,255', '0,255,255'); - shuffle($text_color_array); - $pre_text_color_array = array('255,71,20', '71,20,224', '224,71,122', '20,173,20', '255,186,22', '25,25,25'); - shuffle($pre_text_color_array); - $white = imagecolorallocate($image, 255, 255, 255); - $gray = imagecolorallocate($image, 100, 100, 100); - $black = imagecolorallocate($image, 0, 0, 0); - $lattice_color = imagecolorallocate($image, $rgb_lattice_color[0], $rgb_lattice_color[1], $rgb_lattice_color[2]); - - $x_char_position = (round(($total_width - 12) / strlen($code)) + mt_rand(-3, 5)); - - for ($i = 0; $i < strlen($code); $i++) - { - mt_srand((double)microtime()*1000000); - - $char = $code{$i}; - $size = mt_rand(floor($total_height / 3.5), ceil($total_height / 2.8)); - $font = ($rnd_font) ? rand(0, (count($fonts)-1)) : $font; - $angle = mt_rand(-30, 30); - - $char_pos = array(); - $char_pos = imagettfbbox($size, $angle, ENANO_ROOT.'/includes/captcha/fonts/'.$fonts[$font], $char); - $letter_width = abs($char_pos[0]) + abs($char_pos[4]); - $letter_height = abs($char_pos[1]) + abs($char_pos[5]); - - $x_pos = ($x_char_position / 4) + ($i * $x_char_position); - ($i == strlen($code)-1 && $x_pos >= ($total_width - ($letter_width + 5))) ? $x_pos = ($total_width - ($letter_width + 5)) : ''; - $y_pos = mt_rand(($size * 1.4 ), $total_height - ($size * 0.4)); - - // Pre letters - $size = ($pre_letter_great) ? $size + (2 * $pre_letters) : $size - (2 * $pre_letters); - for ($count = 1; $count <= $pre_letters; $count++) - { - $pre_angle = $angle + mt_rand(-20, 20); - - $text_color = $pre_text_color_array[mt_rand(0,count($pre_text_color_array)-1)]; - $text_color = explode(",", $text_color); - $textcolor = imagecolorallocate($image, $text_color[0], $text_color[1], $text_color[2]); - - imagettftext($image, $size, $pre_angle, $x_pos, $y_pos-2, $white, ENANO_ROOT.'/includes/captcha/fonts/'.$fonts[$font], $char); - imagettftext($image, $size, $pre_angle, $x_pos+2, $y_pos, $black, ENANO_ROOT.'/includes/captcha/fonts/'.$fonts[$font], $char); - imagettftext($image, $size, $pre_angle, $x_pos+1, $y_pos-1, $textcolor, ENANO_ROOT.'/includes/captcha/fonts/'.$fonts[$font], $char); - - $size = ($pre_letter_great) ? $size - 2 : $size + 2; - } - - // Final letters - $text_color = $text_color_array[mt_rand(0,count($text_color_array)-1)]; - $text_color = explode(",", $text_color); - $textcolor = imagecolorallocate($image, $text_color[0], $text_color[1], $text_color[2]); - - imagettftext($image, $size, $angle, $x_pos, $y_pos-2, $white, ENANO_ROOT.'/includes/captcha/fonts/'.$fonts[$font], $char); - imagettftext($image, $size, $angle, $x_pos+2, $y_pos, $black, ENANO_ROOT.'/includes/captcha/fonts/'.$fonts[$font], $char); - imagettftext($image, $size, $angle, $x_pos+1, $y_pos-1, $textcolor, ENANO_ROOT.'/includes/captcha/fonts/'.$fonts[$font], $char); - } - - - ($gammacorrect) ? imagegammacorrect($image, 1.0, $gammacorrect) : ''; - - // Generate a white lattice in foreground - if ($foreground_lattice_y) - { - // x lines - $ih = round($total_height / $foreground_lattice_y); - for ($i = 0; $i <= $ih; $i++) - { - imageline($image, 0, $i*$foreground_lattice_y, $total_width, $i*$foreground_lattice_y, $lattice_color); - } - } - if ($foreground_lattice_x) - { - // y lines - $iw = round($total_width / $foreground_lattice_x); - for ($i = 0; $i <= $iw; $i++) - { - imageline($image, $i*$foreground_lattice_x, 0, $i*$foreground_lattice_x, $total_height, $lattice_color); - } - } - - // Font debug - if ($font_debug && !$rnd_font) - { - imagestring($image, 5, 2, 0, $fonts[$font], $white); - imagestring($image, 5, 5, 0, $fonts[$font], $white); - imagestring($image, 5, 4, 2, $fonts[$font], $gray); - imagestring($image, 5, 3, 1, $fonts[$font], $black); - } - - // Display - header("Last-Modified: " . gmdate("D, d M Y H:i:s") ." GMT"); - header("Pragma: no-cache"); - header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate"); - (!$jpeg) ? header("Content-Type: image/png") : header("Content-Type: image/jpeg"); - - (!$jpeg) ? imagepng($image) : imagejpeg($image, '', $img_quality); - imagedestroy($image); - } - - // Function get_rgb by Frank Burian - // http://www.phpfuncs.org/?content=show&id=46 - function get_rgb($hex) { - $hex_array = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 'A' => 10, 'B' => 11, 'C' => 12, 'D' => 13, 'E' => 14, - 'F' => 15); - $hex = str_replace('#', '', strtoupper($hex)); - if (($length = strlen($hex)) == 3) { - $hex = $hex{0}.$hex{0}.$hex{1}.$hex{1}.$hex{2}.$hex{2}; - $length = 6; - } - if ($length != 6 or strlen(str_replace(array_keys($hex_array), '', $hex))) - return NULL; - $rgb['r'] = $hex_array[$hex{0}] * 16 + $hex_array[$hex{1}]; - $rgb['g'] = $hex_array[$hex{2}] * 16 + $hex_array[$hex{3}]; - $rgb['b']= $hex_array[$hex{4}] * 16 + $hex_array[$hex{5}]; - return $rgb['r'].','.$rgb['g'].','.$rgb['b']; - } - - // Function gdVersion by Hagan Fox - // http://de3.php.net/manual/en/function.gd-info.php#52481 - function gdVersion($user_ver = 0) - { - if (! extension_loaded('gd')) { return; } - static $gd_ver = 0; - // Just accept the specified setting if it's 1. - if ($user_ver == 1) { $gd_ver = 1; return 1; } - // Use the static variable if function was called previously. - if ($user_ver !=2 && $gd_ver > 0 ) { return $gd_ver; } - // Use the gd_info() function if possible. - if (function_exists('gd_info')) { - $ver_info = gd_info(); - preg_match('/\d/', $ver_info['GD Version'], $match); - $gd_ver = $match[0]; - return $match[0]; - } - // If phpinfo() is disabled use a specified / fail-safe choice... - if (preg_match('/phpinfo/', ini_get('disable_functions'))) { - if ($user_ver == 2) { - $gd_ver = 2; - return 2; - } else { - $gd_ver = 1; - return 1; - } - } - // ...otherwise use phpinfo(). - ob_start(); - phpinfo(8); - $info = ob_get_contents(); - ob_end_clean(); - $info = stristr($info, 'gd version'); - preg_match('/\d/', $info, $match); - $gd_ver = $match[0]; - return $match[0]; - } + var $captcha_config; + + function __construct($sid, $r = false) + { + parent::__construct($sid, $r); + + $hex = Array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'); + $latticecolor = '#'; + for ( $i = 0; $i < 6; $i++ ) + $latticecolor .= $hex[mt_rand(0, 15)]; + + $this->captcha_config = array ( + 'width' => '350', + 'height' => '90', + 'background_color' => '#E5ECF9', + 'jpeg' => '0', + 'jpeg_quality' => '95', + 'pre_letters' => '1', + 'pre_letters_great' => '0', + 'font' => '1', + 'chess' => '2', + 'ellipses' => '2', + 'arcs' => '2', + 'lines' => '2', + 'image' => '0', + 'gammacorrect' => '0.8', + 'foreground_lattice_x' => (string)mt_rand(25, 30), + 'foreground_lattice_y' => (string)mt_rand(25, 30), + 'lattice_color' => $latticecolor, + ); + } + + function make_image() + { + $code = $this->get_code(); + + // Prefs + $total_width = $this->captcha_config['width']; + $total_height = $this->captcha_config['height']; + + $hex_bg_color = $this->get_rgb($this->captcha_config['background_color']); + $bg_color = array(); + $bg_color = explode(",", $hex_bg_color); + + $jpeg = $this->captcha_config['jpeg']; + $img_quality = $this->captcha_config['jpeg_quality']; + // Max quality is 95 + + $pre_letters = $this->captcha_config['pre_letters']; + $pre_letter_great = $this->captcha_config['pre_letters_great']; + $rnd_font = $this->captcha_config['font']; + $chess = $this->captcha_config['chess']; + $ellipses = $this->captcha_config['ellipses']; + $arcs = $this->captcha_config['arcs']; + $lines = $this->captcha_config['lines']; + $image = $this->captcha_config['image']; + + $gammacorrect = $this->captcha_config['gammacorrect']; + + $foreground_lattice_y = $this->captcha_config['foreground_lattice_y']; + $foreground_lattice_x = $this->captcha_config['foreground_lattice_x']; + $hex_lattice_color = $this->get_rgb($this->captcha_config['lattice_color']); + $rgb_lattice_color = array(); + $rgb_lattice_color = explode(",", $hex_lattice_color); + + $font_debug = false; + + // Fonts and images init + if ($image) + { + $bg_imgs = array(); + if ($img_dir = opendir(ENANO_ROOT.'/includes/captcha/pics/')) + { + while (true == ($file = @readdir($img_dir))) + { + if ((substr(strtolower($file), -3) == 'jpg') || (substr(strtolower($file), -3) == 'gif')) + { + $bg_imgs[] = $file; + } + } + closedir($img_dir); + } + // Grab a random Background Image or set FALSE if none was found + $bg_img = ( count($bg_imgs) ) ? rand(0, (count($bg_imgs)-1)) : false; + } + + $fonts = array(); + if ($fonts_dir = opendir(ENANO_ROOT . '/includes/captcha/fonts/')) + { + while (true == ($file = @readdir($fonts_dir))) + { + if ((substr(strtolower($file), strlen($file)-3, strlen($file)) == 'ttf')) + { + $fonts[] = $file; + } + } + closedir($fonts_dir); + } else { + die('Error reading directory: '.ENANO_ROOT.'/includes/captcha/fonts/'); + } + $font = mt_rand(0, (count($fonts)-1)); + + // Generate + $image = ($this->gdVersion() >= 2) ? imagecreatetruecolor($total_width, $total_height) : imagecreate($total_width, $total_height); + $background_color = imagecolorallocate($image, $bg_color[0], $bg_color[1], $bg_color[2]); + imagefill($image, 0, 0, $background_color); + + // Generate backgrund + if ($chess == '1' || $chess == '2' && rand(0,1)) + { + // Draw rectangles + for($i = 0; $i <= 8; $i++) + { + $rectanglecolor = imagecolorallocate($image, rand(100,200),rand(100,200),rand(100,200)); + imagefilledrectangle($image, 0, 0, round($total_width-($total_width/8*$i)), round($total_height), $rectanglecolor); + $rectanglecolor = imagecolorallocate($image, rand(100,200),rand(100,200),rand(100,200)); + imagefilledrectangle($image, 0, 0, round($total_width-($total_width/8*$i)), round($total_height/2), $rectanglecolor); + } + } + if ($ellipses == '1' || $ellipses == '2' && rand(0,1)) + { + // Draw random ellipses + for ($i = 1; $i <= 60; $i++) + { + $ellipsecolor = imagecolorallocate($image, rand(100,250),rand(100,250),rand(100,250)); + imagefilledellipse($image, round(rand(0, $total_width)), round(rand(0, $total_height)), round(rand(0, $total_width/8)), round(rand(0, $total_height/4)), $ellipsecolor); + } + } + if ($arcs == '1' || $arcs == '2' && rand(0,1)) + { + // Draw random partial ellipses + for ($i = 0; $i <= 30; $i++) + { + $linecolor = imagecolorallocate($image, rand(120,255),rand(120,255),rand(120,255)); + $cx = round(rand(1, $total_width)); + $cy = round(rand(1, $total_height)); + $int_w = round(rand(1, $total_width/2)); + $int_h = round(rand(1, $total_height)); + imagearc($image, $cx, $cy, $int_w, $int_h, round(rand(0, 190)), round(rand(191, 360)), $linecolor); + imagearc($image, $cx-1, $cy-1, $int_w, $int_h, round(rand(0, 190)), round(rand(191, 360)), $linecolor); + } + } + if ($lines == '1' || $lines == '2' && rand(0,1)) + { + // Draw random lines + for ($i = 0; $i <= 50; $i++) + { + $linecolor = imagecolorallocate($image, rand(120,255),rand(120,255),rand(120,255)); + imageline($image, round(rand(1, $total_width*3)), round(rand(1, $total_height*5)), round(rand(1, $total_width/2)), round(rand(1, $total_height*2)), $linecolor); + } + } + + $text_color_array = array('255,51,0', '51,77,255', '204,51,102', '0,153,0', '255,166,2', '255,0,255', '255,0,0', '0,255,0', '0,0,255', '0,255,255'); + shuffle($text_color_array); + $pre_text_color_array = array('255,71,20', '71,20,224', '224,71,122', '20,173,20', '255,186,22', '25,25,25'); + shuffle($pre_text_color_array); + $white = imagecolorallocate($image, 255, 255, 255); + $gray = imagecolorallocate($image, 100, 100, 100); + $black = imagecolorallocate($image, 0, 0, 0); + $lattice_color = imagecolorallocate($image, $rgb_lattice_color[0], $rgb_lattice_color[1], $rgb_lattice_color[2]); + + $x_char_position = (round(($total_width - 12) / strlen($code)) + mt_rand(-3, 5)); + + for ($i = 0; $i < strlen($code); $i++) + { + mt_srand((double)microtime()*1000000); + + $char = $code{$i}; + $size = mt_rand(floor($total_height / 3.5), ceil($total_height / 2.8)); + $font = ($rnd_font) ? rand(0, (count($fonts)-1)) : $font; + $angle = mt_rand(-30, 30); + + $char_pos = array(); + $char_pos = imagettfbbox($size, $angle, ENANO_ROOT.'/includes/captcha/fonts/'.$fonts[$font], $char); + $letter_width = abs($char_pos[0]) + abs($char_pos[4]); + $letter_height = abs($char_pos[1]) + abs($char_pos[5]); + + $x_pos = ($x_char_position / 4) + ($i * $x_char_position); + ($i == strlen($code)-1 && $x_pos >= ($total_width - ($letter_width + 5))) ? $x_pos = ($total_width - ($letter_width + 5)) : ''; + $y_pos = mt_rand(($size * 1.4 ), $total_height - ($size * 0.4)); + + // Pre letters + $size = ($pre_letter_great) ? $size + (2 * $pre_letters) : $size - (2 * $pre_letters); + for ($count = 1; $count <= $pre_letters; $count++) + { + $pre_angle = $angle + mt_rand(-20, 20); + + $text_color = $pre_text_color_array[mt_rand(0,count($pre_text_color_array)-1)]; + $text_color = explode(",", $text_color); + $textcolor = imagecolorallocate($image, $text_color[0], $text_color[1], $text_color[2]); + + imagettftext($image, $size, $pre_angle, $x_pos, $y_pos-2, $white, ENANO_ROOT.'/includes/captcha/fonts/'.$fonts[$font], $char); + imagettftext($image, $size, $pre_angle, $x_pos+2, $y_pos, $black, ENANO_ROOT.'/includes/captcha/fonts/'.$fonts[$font], $char); + imagettftext($image, $size, $pre_angle, $x_pos+1, $y_pos-1, $textcolor, ENANO_ROOT.'/includes/captcha/fonts/'.$fonts[$font], $char); + + $size = ($pre_letter_great) ? $size - 2 : $size + 2; + } + + // Final letters + $text_color = $text_color_array[mt_rand(0,count($text_color_array)-1)]; + $text_color = explode(",", $text_color); + $textcolor = imagecolorallocate($image, $text_color[0], $text_color[1], $text_color[2]); + + imagettftext($image, $size, $angle, $x_pos, $y_pos-2, $white, ENANO_ROOT.'/includes/captcha/fonts/'.$fonts[$font], $char); + imagettftext($image, $size, $angle, $x_pos+2, $y_pos, $black, ENANO_ROOT.'/includes/captcha/fonts/'.$fonts[$font], $char); + imagettftext($image, $size, $angle, $x_pos+1, $y_pos-1, $textcolor, ENANO_ROOT.'/includes/captcha/fonts/'.$fonts[$font], $char); + } + + + ($gammacorrect) ? imagegammacorrect($image, 1.0, $gammacorrect) : ''; + + // Generate a white lattice in foreground + if ($foreground_lattice_y) + { + // x lines + $ih = round($total_height / $foreground_lattice_y); + for ($i = 0; $i <= $ih; $i++) + { + imageline($image, 0, $i*$foreground_lattice_y, $total_width, $i*$foreground_lattice_y, $lattice_color); + } + } + if ($foreground_lattice_x) + { + // y lines + $iw = round($total_width / $foreground_lattice_x); + for ($i = 0; $i <= $iw; $i++) + { + imageline($image, $i*$foreground_lattice_x, 0, $i*$foreground_lattice_x, $total_height, $lattice_color); + } + } + + // Font debug + if ($font_debug && !$rnd_font) + { + imagestring($image, 5, 2, 0, $fonts[$font], $white); + imagestring($image, 5, 5, 0, $fonts[$font], $white); + imagestring($image, 5, 4, 2, $fonts[$font], $gray); + imagestring($image, 5, 3, 1, $fonts[$font], $black); + } + + // Display + header("Last-Modified: " . gmdate("D, d M Y H:i:s") ." GMT"); + header("Pragma: no-cache"); + header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate"); + (!$jpeg) ? header("Content-Type: image/png") : header("Content-Type: image/jpeg"); + + (!$jpeg) ? imagepng($image) : imagejpeg($image, '', $img_quality); + imagedestroy($image); + } + + // Function get_rgb by Frank Burian + // http://www.phpfuncs.org/?content=show&id=46 + function get_rgb($hex) { + $hex_array = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 'A' => 10, 'B' => 11, 'C' => 12, 'D' => 13, 'E' => 14, + 'F' => 15); + $hex = str_replace('#', '', strtoupper($hex)); + if (($length = strlen($hex)) == 3) { + $hex = $hex{0}.$hex{0}.$hex{1}.$hex{1}.$hex{2}.$hex{2}; + $length = 6; + } + if ($length != 6 or strlen(str_replace(array_keys($hex_array), '', $hex))) + return NULL; + $rgb['r'] = $hex_array[$hex{0}] * 16 + $hex_array[$hex{1}]; + $rgb['g'] = $hex_array[$hex{2}] * 16 + $hex_array[$hex{3}]; + $rgb['b']= $hex_array[$hex{4}] * 16 + $hex_array[$hex{5}]; + return $rgb['r'].','.$rgb['g'].','.$rgb['b']; + } + + // Function gdVersion by Hagan Fox + // http://de3.php.net/manual/en/function.gd-info.php#52481 + function gdVersion($user_ver = 0) + { + if (! extension_loaded('gd')) { return; } + static $gd_ver = 0; + // Just accept the specified setting if it's 1. + if ($user_ver == 1) { $gd_ver = 1; return 1; } + // Use the static variable if function was called previously. + if ($user_ver !=2 && $gd_ver > 0 ) { return $gd_ver; } + // Use the gd_info() function if possible. + if (function_exists('gd_info')) { + $ver_info = gd_info(); + preg_match('/\d/', $ver_info['GD Version'], $match); + $gd_ver = $match[0]; + return $match[0]; + } + // If phpinfo() is disabled use a specified / fail-safe choice... + if (preg_match('/phpinfo/', ini_get('disable_functions'))) { + if ($user_ver == 2) { + $gd_ver = 2; + return 2; + } else { + $gd_ver = 1; + return 1; + } + } + // ...otherwise use phpinfo(). + ob_start(); + phpinfo(8); + $info = ob_get_contents(); + ob_end_clean(); + $info = stristr($info, 'gd version'); + preg_match('/\d/', $info, $match); + $gd_ver = $match[0]; + return $match[0]; + } } diff -r de56132c008d -r bdac73ed481e includes/clientside/css/enano-shared-ie.css --- a/includes/clientside/css/enano-shared-ie.css Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/css/enano-shared-ie.css Sun Mar 28 23:10:46 2010 -0400 @@ -3,27 +3,27 @@ */ * html span.tc_small_index_1 { - filter: alpha(opacity=100); + filter: alpha(opacity=100); } * html span.tc_small_index_2 { - filter: alpha(opacity=80); + filter: alpha(opacity=80); } * html span.tc_small_index_3 { - filter: alpha(opacity=60); + filter: alpha(opacity=60); } * html span.tc_small_index_4 { - filter: alpha(opacity=50); + filter: alpha(opacity=50); } * html span.tc_small_index_5 { - filter: alpha(opacity=45); + filter: alpha(opacity=45); } * html span.tc_small_index_6 { - filter: alpha(opacity=40); + filter: alpha(opacity=40); } * html span.tc_small_index_7 { - filter: alpha(opacity=35); + filter: alpha(opacity=35); } * html span.tc_small_index_8 { - filter: alpha(opacity=30); + filter: alpha(opacity=30); } diff -r de56132c008d -r bdac73ed481e includes/clientside/css/enano-shared.css --- a/includes/clientside/css/enano-shared.css Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/css/enano-shared.css Sun Mar 28 23:10:46 2010 -0400 @@ -17,143 +17,143 @@ div.success-box-mini { background-image: url(../../../images/mini-success.png); background-position: 5px center; background-repeat: no-repeat; background-color: #F4FFF4; border: 1px solid #406080; padding: 4px 4px 4px 26px; margin: 1em 0; min-height: 17px; } a img { - border-width: 0; + border-width: 0; } /* Similar to the Mediawikian alert box (usermessage) */ div.alert { - background-color: #F09090; - border: 1px solid #D03030; - color: #300000; - padding: 3px; - position: relative; - top: -3px; + background-color: #F09090; + border: 1px solid #D03030; + color: #300000; + padding: 3px; + position: relative; + top: -3px; } /* toolbar */ div.toolbar { - border-bottom: 1px solid #909090; - background-color: #D0D0D0; - padding: 2px 0; - height: 22px; - font-family: arial, sans-serif; - font-size: 8pt; + border-bottom: 1px solid #909090; + background-color: #D0D0D0; + padding: 2px 0; + height: 22px; + font-family: arial, sans-serif; + font-size: 8pt; } div.toolbar ul { - margin: 0; - padding: 0; + margin: 0; + padding: 0; } div.toolbar ul li { - list-style: none; - margin: 0; - float: left; + list-style: none; + margin: 0; + float: left; } div.toolbar a img { - opacity: 0.6; - /*filter: alpha(opacity=60);*/ + opacity: 0.6; + /*filter: alpha(opacity=60);*/ } div.toolbar a:hover img, div.toolbar a:focus img { - opacity: 1; - /*filter: alpha(opacity=100);*/ + opacity: 1; + /*filter: alpha(opacity=100);*/ } div.toolbar a { - display: block; - padding: 2px; - border: 1px solid transparent; - cursor: default; - width: auto; - color: #000000; - margin: 0 2px; - max-height: 16px; - text-decoration: none; + display: block; + padding: 2px; + border: 1px solid transparent; + cursor: default; + width: auto; + color: #000000; + margin: 0 2px; + max-height: 16px; + text-decoration: none; } div.toolbar a:hover, div.toolbar a:focus { - border: 1px solid #202090; - background-color: #ceceed; - color: #000000; - text-decoration: none; + border: 1px solid #202090; + background-color: #ceceed; + color: #000000; + text-decoration: none; } div.toolbar a:active { - border: 1px solid #A0A0A0; - background-color: #E0E0E0; + border: 1px solid #A0A0A0; + background-color: #E0E0E0; } div.toolbar img { - margin: 0; - padding: 0; - display: inline; - border-width: 0px; + margin: 0; + padding: 0; + display: inline; + border-width: 0px; } div.toolbar a span { - position: relative; - top: -4px; + position: relative; + top: -4px; } div.toolbar li span { - padding-left: 2px; - padding-right: 5px; + padding-left: 2px; + padding-right: 5px; } /* vertical toolbar */ div.toolbar_vert { - border: 1px solid #909090; - background-color: #D0D0D0; - padding: 2px 0; + border: 1px solid #909090; + background-color: #D0D0D0; + padding: 2px 0; } div.toolbar_vert ul { - margin: 0; - padding: 0; + margin: 0; + padding: 0; } div.toolbar_vert ul li { - list-style: none; - margin: 0; + list-style: none; + margin: 0; } div.toolbar_vert a img { - opacity: 0.6; - /*filter: alpha(opacity=60);*/ + opacity: 0.6; + /*filter: alpha(opacity=60);*/ } div.toolbar_vert a:hover img { - opacity: 1; - /*filter: alpha(opacity=100);*/ + opacity: 1; + /*filter: alpha(opacity=100);*/ } div.toolbar_vert a { - display: block; - padding: 2px; - border: 1px solid transparent; - cursor: default; - width: auto; - color: #000000; - margin: 0 2px; - max-height: 16px; - text-decoration: none; + display: block; + padding: 2px; + border: 1px solid transparent; + cursor: default; + width: auto; + color: #000000; + margin: 0 2px; + max-height: 16px; + text-decoration: none; } div.toolbar_vert a:hover { - border: 1px solid #202090; - background-color: #ceceed; - color: #000000; - text-decoration: none; + border: 1px solid #202090; + background-color: #ceceed; + color: #000000; + text-decoration: none; } div.toolbar_vert a:active { - border: 1px solid #A0A0A0; - background-color: #E0E0E0; + border: 1px solid #A0A0A0; + background-color: #E0E0E0; } div.toolbar_vert img { - margin: 0; - padding: 0; - display: inline; - border-width: 0px; + margin: 0; + padding: 0; + display: inline; + border-width: 0px; } div.toolbar_vert a span { - position: relative; - top: -4px; + position: relative; + top: -4px; } div.toolbar_vert li span { - padding-left: 2px; - padding-right: 5px; + padding-left: 2px; + padding-right: 5px; } div.toolbar_vert li > span { - display: block; - padding: 4px 5px; + display: block; + padding: 4px 5px; } div.breadcrumbs { margin: 10px 0; padding: 5px; border: 1px solid #AAAAAA; background-color: #E8E8E8; font-size: smaller; font-weight: bold; } @@ -182,8 +182,8 @@ /* Search results */ div.search-result, div.search-hibar, div.search-lobar { - font-family: arial, helvetica, sans-serif; - font-size: 8pt; + font-family: arial, helvetica, sans-serif; + font-size: 8pt; } div.search-result h3 { font-size: 14pt; margin: 10px 0 0 0; } div.search-result h3 a { color: blue !important; font-weight: normal; padding-bottom: 0; } @@ -201,41 +201,41 @@ */ input.js-search-box { - font-size: 13px; - margin: 0; - padding: 1px !important; - background-image: url(../../../images/search-box-normal.gif); - height: 15px; - background-repeat: repeat-x; - border-width: 1px; - border-style: solid; - border-color: #6c6c6c; - color: #C0C0C0; + font-size: 13px; + margin: 0; + padding: 1px !important; + background-image: url(../../../images/search-box-normal.gif); + height: 15px; + background-repeat: repeat-x; + border-width: 1px; + border-style: solid; + border-color: #6c6c6c; + color: #C0C0C0; } input.js-search-box:focus { - background-image: url(../../../images/search-box-hilite.gif); - color: #666; + background-image: url(../../../images/search-box-hilite.gif); + color: #666; } div.js-search-submit { - display: block; - position: absolute; - width: 24px; - height: 19px; - font-size: 1px; - line-height: 19px; - clip: rect(0px, 24px, 19px, 0px); - overflow: hidden; - margin: 0; - padding: 0; - background: transparent url(../../../images/search-btn-normal.png) no-repeat !important; - background-repeat: no-repeat; - cursor: pointer; + display: block; + position: absolute; + width: 24px; + height: 19px; + font-size: 1px; + line-height: 19px; + clip: rect(0px, 24px, 19px, 0px); + overflow: hidden; + margin: 0; + padding: 0; + background: transparent url(../../../images/search-btn-normal.png) no-repeat !important; + background-repeat: no-repeat; + cursor: pointer; } div.js-search-submit:hover { - background-image: url(../../../images/search-btn-hilite.png); + background-image: url(../../../images/search-btn-hilite.png); } /* @@ -243,105 +243,105 @@ */ div.menu, div.menu_nojs { - background-color: #D0D0D0; - border: 1px solid #A0A0A0; - font-size: 9pt; + background-color: #D0D0D0; + border: 1px solid #A0A0A0; + font-size: 9pt; } div.menu a, div.menu div.label { - padding: 2pt 5px; - text-decoration: none; - display: block; - float: left; - color: #404040; + padding: 2pt 5px; + text-decoration: none; + display: block; + float: left; + color: #404040; } div.menu_nojs a, div.menu_nojs div.label { - padding: 2pt 5px; - text-decoration: none; - display: block; - color: #404040; + padding: 2pt 5px; + text-decoration: none; + display: block; + color: #404040; } div.menu div.label, div.menu_nojs div.label { - color: #101010; + color: #101010; } div.menu span.sep, div.menu_nojs span.sep { - display: block; - float: left; - width: 5px; + display: block; + float: left; + width: 5px; } div.menu div.multopts, div.menu_nojs div.multopts { - line-height: 17pt; + line-height: 17pt; } div.menu div.multopts a, div.menu div.multopts div.label, div.menu_nojs div.multopts a, div.menu_nojs div.multopts div.label { - float: none; - display: inline; + float: none; + display: inline; } div.menu a:hover, div.menu_nojs a:hover { - color: #FFFFFF; - background-color: #808080; + color: #FFFFFF; + background-color: #808080; } div.menu input[type ^="text"], div.menu input[type ^="password"], div.menu_nojs input[type ^="text"], div.menu_nojs input[type ^="password"] { - border-width: 0; - font-size: 9pt; - padding: 4px 5px; - max-width: 70px; - background-color: #E0E0E0; + border-width: 0; + font-size: 9pt; + padding: 4px 5px; + max-width: 70px; + background-color: #E0E0E0; } div.menu input[type ^="text"]:hover, div.menu input[type ^="password"]:hover, div.menu_nojs input[type ^="text"]:hover, div.menu_nojs input[type ^="password"]:hover { - background-color: #E8E8E8; + background-color: #E8E8E8; } div.menu input[type ^="text"]:focus, div.menu input[type ^="password"]:focus, div.menu_nojs input[type ^="text"]:focus, div.menu_nojs input[type ^="password"]:focus { - background-color: #F0F0F0; + background-color: #F0F0F0; } div.menu input[type ^="button"], div.menu input[type ^="submit"], div.menu_nojs input[type ^="button"], div.menu_nojs input[type ^="submit"] { - border-width: 0; - font-size: 9pt; - padding: 3px 5px; - max-width: 70px; + border-width: 0; + font-size: 9pt; + padding: 3px 5px; + max-width: 70px; } div.menu a.current, div.menu a.current:hover, div.menu_nojs a.current, div.menu_nojs a.current:hover { - color: #FFFFFF; - background-color: #505050; + color: #FFFFFF; + background-color: #505050; } div.menu ul { - display: none; - position: absolute; - padding: 0; - margin: 0; - background-color: #D0D0D0; - border: 1px solid #A0A0A0; - min-width: 120px; + display: none; + position: absolute; + padding: 0; + margin: 0; + background-color: #D0D0D0; + border: 1px solid #A0A0A0; + min-width: 120px; } div.menu_nojs ul { - display: block; - clear: both; + display: block; + clear: both; } div.menu ul li, div.menu_nojs ul li { - list-style: none; + list-style: none; } div.menu ul a, div.menu_nojs ul a { - float: none; - margin: 0; + float: none; + margin: 0; } span.menuclear { - font-size: 1px; - height: 0px; - width: 0px; - clear: left; - line-height: 0px; - display: block; + font-size: 1px; + height: 0px; + width: 0px; + clear: left; + line-height: 0px; + display: block; } /* Progress bars */ div.progressbar { - padding: 2px; - background-color: #90A0B0; - width: 308px; + padding: 2px; + background-color: #90A0B0; + width: 308px; } div.progressbar_inner { - min-width: 30px; - color: white; - background-color: #7080A0; - padding: 4px; + min-width: 30px; + color: white; + background-color: #7080A0; + padding: 4px; } /* User notification - courtest of wikipedia.org (not sure if this is included with MediaWiki) */ /* user notification thing */ @@ -355,26 +355,26 @@ vertical-align: middle; } .usermessage a:link, .usermessage a:active, .usermessage a:visited { - color: #CA7520; + color: #CA7520; } .usermessage a:hover { - color: #AA5500 !important; + color: #AA5500 !important; } .usermessage h2 { - border-bottom-color: #ef8500 !important; - color: black; + border-bottom-color: #ef8500 !important; + color: black; } div.thumbnail { - display: table; - border: 1px solid #AAAAAA; - background-color: #F0F0F0; - padding: 4px; - margin-bottom: 10px; + display: table; + border: 1px solid #AAAAAA; + background-color: #F0F0F0; + padding: 4px; + margin-bottom: 10px; } div.thumbnail-inner { - background-image: url(../../../images/thumbnail.png); - background-position: top right; - background-repeat: no-repeat; + background-image: url(../../../images/thumbnail.png); + background-position: top right; + background-repeat: no-repeat; } /* Tables where diffs are shown */ @@ -386,366 +386,366 @@ /* Tag cloud */ span.tc_word_normal { - font-family: Arial, helvetica, sans-serif; - font-size: 10pt; - letter-spacing: 3px; - padding: 4px 4px 4px 4px; + font-family: Arial, helvetica, sans-serif; + font-size: 10pt; + letter-spacing: 3px; + padding: 4px 4px 4px 4px; } span.tc_word_small { - font-family: Arial, helvetica, sans-serif; - font-size: 8pt; - color: #000; + font-family: Arial, helvetica, sans-serif; + font-size: 8pt; + color: #000; } span.tc_word_normal a, span.tc_word_small a { - color: inherit !important; - text-decoration: none !important; + color: inherit !important; + text-decoration: none !important; } /* These are from http://www.lotsofcode.com/php/tutorials/tag-cloud */ span.tc_normal_index_1 { - color: #000; - font-size: 2.4em; + color: #000; + font-size: 2.4em; } span.tc_normal_index_2 { - color: #333; - font-size: 2.2em; + color: #333; + font-size: 2.2em; } span.tc_normal_index_3 { - color: #666; - font-size: 2.0em; + color: #666; + font-size: 2.0em; } span.tc_normal_index_4 { - color: #999; - font-size: 1em; + color: #999; + font-size: 1em; } span.tc_normal_index_5 { - color: #aaa; - font-size: 1.6em; + color: #aaa; + font-size: 1.6em; } span.tc_normal_index_6 { - color: #bbb; - font-size: 1.4em; + color: #bbb; + font-size: 1.4em; } span.tc_normal_index_7 { - color: #ccc; - font-size: 1.2em; + color: #ccc; + font-size: 1.2em; } span.tc_normal_index_8 { - color: #ddd; - font-size: 0.8em; + color: #ddd; + font-size: 0.8em; } span.tc_small_index_1 { - opacity: 1; - font-size: 1.4em; + opacity: 1; + font-size: 1.4em; } span.tc_small_index_2 { - opacity: 0.8; - font-size: 1.3em; + opacity: 0.8; + font-size: 1.3em; } span.tc_small_index_3 { - opacity: 0.6; - font-size: 1.2em; + opacity: 0.6; + font-size: 1.2em; } span.tc_small_index_4 { - opacity: 0.5; - font-size: 1em; + opacity: 0.5; + font-size: 1em; } span.tc_small_index_5 { - opacity: 0.45; - font-size: 1.3em; + opacity: 0.45; + font-size: 1.3em; } span.tc_small_index_6 { - opacity: 0.4; - font-size: 1.1em; + opacity: 0.4; + font-size: 1.1em; } span.tc_small_index_7 { - opacity: 0.35; - font-size: 0.9em; + opacity: 0.35; + font-size: 0.9em; } span.tc_small_index_8 { - opacity: 0.3; - font-size: 0.7em; + opacity: 0.3; + font-size: 0.7em; } /* Default private message AJAX interface styles (colors and style based on those of Gmail) */ div#privmsgs { - /* Neal prefers this border but I personally consider it distasteful because it detracts from the Gmail-ey look. - border: 1px solid #c0c0c0; */ - background-color: white; - color: black; + /* Neal prefers this border but I personally consider it distasteful because it detracts from the Gmail-ey look. + border: 1px solid #c0c0c0; */ + background-color: white; + color: black; } span.pm_link { - color: #0000ff; - cursor: pointer; - text-decoration: underline; + color: #0000ff; + cursor: pointer; + text-decoration: underline; } span.pm_link_folder { - display: block; - text-decoration: none; - padding: 3px; - border-radius: 5px 0 0 5px; - -moz-border-radius: 5px 0 0 5px; + display: block; + text-decoration: none; + padding: 3px; + border-radius: 5px 0 0 5px; + -moz-border-radius: 5px 0 0 5px; } span.pm_link_selected { - background-color: #c3d9ff; - font-weight: bold; - text-decoration: underline; + background-color: #c3d9ff; + font-weight: bold; + text-decoration: underline; } span.pm_link_selected_trash { - background-color: #d9d9db; + background-color: #d9d9db; } div.pm_break { - height: 10px; + height: 10px; } span#pm_btn_compose { - margin-top: 5px; + margin-top: 5px; } div.pm_main { - background-color: #c3d9ff; - padding: 5px 5px 3px 5px; - margin-left: 12em; - min-height: 16em; - border-radius: 5px; - -moz-border-radius: 5px; + background-color: #c3d9ff; + padding: 5px 5px 3px 5px; + margin-left: 12em; + min-height: 16em; + border-radius: 5px; + -moz-border-radius: 5px; } div.pm_main_trash { - background-color: #d9d9db; + background-color: #d9d9db; } div.pm_status { - display: table; - background-color: #cc0000; - padding: 3px; - margin: 0 auto; - color: white; + display: table; + background-color: #cc0000; + padding: 3px; + margin: 0 auto; + color: white; } div.pm_teaser { - background-color: white; - color: black; - text-align: center; - padding: 8em 1em 8em 1em; + background-color: white; + color: black; + text-align: center; + padding: 8em 1em 8em 1em; } div.pm_mlist_message { - background-color: #e8eef7; - color: black; - border-bottom: 1px solid #d8d8d8; - cursor: pointer; + background-color: #e8eef7; + color: black; + border-bottom: 1px solid #d8d8d8; + cursor: pointer; } div.pm_mlist_message span.pm_subject { - font-weight: normal; - display: inline-block; - clip: rect(0px, auto, auto, 0px); - overflow: hidden; - margin: 0 3px 0 0; + font-weight: normal; + display: inline-block; + clip: rect(0px, auto, auto, 0px); + overflow: hidden; + margin: 0 3px 0 0; } div.pm_mlist_message span.pm_sender { - display: inline-block; - width: 30%; - margin: 0 10px 0% 4px; - font-weight: normal; - clip: rect(0px, auto, auto, 0px); - overflow: hidden; + display: inline-block; + width: 30%; + margin: 0 10px 0% 4px; + font-weight: normal; + clip: rect(0px, auto, auto, 0px); + overflow: hidden; } div.pm_mlist_message span.pm_miniclip { - color: #909090; - display: inline-block; - clip: rect(0px, auto, auto, 0px); - overflow: hidden; + color: #909090; + display: inline-block; + clip: rect(0px, auto, auto, 0px); + overflow: hidden; } div.pm_messagelist_inner { - min-height: 12em; - background-color: white; + min-height: 12em; + background-color: white; } div.pm_mlist_message_unread { - background-color: white; + background-color: white; } div.pm_mlist_message_unread span.pm_subject { - font-weight: bold; + font-weight: bold; } div.pm_mlist_message_unread span.pm_sender { - font-weight: bold; + font-weight: bold; } div.pm_mlist_message_selected { - background-color: #ffffcc; + background-color: #ffffcc; } span.pm_toolbar_label { - color: black; - font-weight: bold; + color: black; + font-weight: bold; } div.noborderbottom * { - border-bottom-width: 0px; + border-bottom-width: 0px; } div.nobordertop * { - border-top-width: 0px; + border-top-width: 0px; } /* Theme buttons in admin CP */ div.themebutton { - width: 216px; - float: left; - background-position: center center; - background-repeat: no-repeat; - margin-right: 10px; - padding: 5px; - border: 1px solid #F0F0F0; + width: 216px; + float: left; + background-position: center center; + background-repeat: no-repeat; + margin-right: 10px; + padding: 5px; + border: 1px solid #F0F0F0; } div.themebutton_theme_disabled { - background-color: #D84308; + background-color: #D84308; } div.themebutton_theme_system { - display: none; + display: none; } div.themebutton a.tb-inner { - opacity: 0; - filter: alpha(opacity=0); - display: block; - height: 110px; - padding-top: 40px; - text-align: center; - font-size: 40px; - text-decoration: none; + opacity: 0; + filter: alpha(opacity=0); + display: block; + height: 110px; + padding-top: 40px; + text-align: center; + font-size: 40px; + text-decoration: none; } div.themebutton_theme_system a.tb-inner { - font-size: 28px; - height: 100px; - padding-top: 50px; + font-size: 28px; + height: 100px; + padding-top: 50px; } div.themebutton a.tb-inner:hover { - opacity: 0.75; - filter: alpha(opacity=75); - background-color: #ffffff; + opacity: 0.75; + filter: alpha(opacity=75); + background-color: #ffffff; } div.themebutton a.tb-inner span.themename { - font-size: 8pt; - color: #606060; - display: block; + font-size: 8pt; + color: #606060; + display: block; } div.themebutton div.status { - opacity: 0.75; - filter: alpha(opacity=75); - background-image: url(../../../images/loading-big.gif); - background-repeat: no-repeat; - background-position: center center; - background-color: #ffffff; - height: 150px; + opacity: 0.75; + filter: alpha(opacity=75); + background-image: url(../../../images/loading-big.gif); + background-repeat: no-repeat; + background-position: center center; + background-color: #ffffff; + height: 150px; } /* Expandable fieldsets */ fieldset legend a.expander { - padding-left: 11px; - background-position: left center; - background-repeat: no-repeat; - color: inherit; - cursor: pointer; + padding-left: 11px; + background-position: left center; + background-repeat: no-repeat; + color: inherit; + cursor: pointer; } fieldset legend a.expander:hover { - color: inherit; + color: inherit; } fieldset legend a.expander-closed { - background-image: url(../../../images/expander/closed.gif); - + background-image: url(../../../images/expander/closed.gif); + } fieldset legend a.expander-closed:hover { - background-image: url(../../../images/expander/closed-prelight.gif); + background-image: url(../../../images/expander/closed-prelight.gif); } fieldset legend a.expander-open { - background-image: url(../../../images/expander/open.gif); - padding-left: 17px; + background-image: url(../../../images/expander/open.gif); + padding-left: 17px; } fieldset legend a.expander-open:hover { - background-image: url(../../../images/expander/open-prelight.gif); + background-image: url(../../../images/expander/open-prelight.gif); } /* Flown-in mini prompts */ div.miniprompt { - position: absolute; - z-index: 999; + position: absolute; + z-index: 999; } div.miniprompt div.mp-top, div.miniprompt div.mp-bottom { - width: 388px; - height: 57px; - background-image: url(../../../images/prompt-top.png); - background-repeat: no-repeat; - background-position: center center; + width: 388px; + height: 57px; + background-image: url(../../../images/prompt-top.png); + background-repeat: no-repeat; + background-position: center center; } div.miniprompt div.mp-bottom { - height: 42px; - background-image: url(../../../images/prompt-bottom.png); + height: 42px; + background-image: url(../../../images/prompt-bottom.png); } div.miniprompt div.mp-body { - padding: 0 44px 10px 44px; - width: 300px; - background-image: url(../../../images/prompt-body.png); - background-repeat: repeat-y; - background-position: center center; + padding: 0 44px 10px 44px; + width: 300px; + background-image: url(../../../images/prompt-body.png); + background-repeat: repeat-y; + background-position: center center; } div.miniprompt h3 { - /* fix padding issues on firefox */ - margin: 0 0 10px 0; + /* fix padding issues on firefox */ + margin: 0 0 10px 0; } /* for buttons */ div.miniprompt div.mp-buttons { - text-align: right; - position: relative; - top: 10px; + text-align: right; + position: relative; + top: 10px; } /* pseudo-buttons made with tags */ .abutton { - padding: 3px 5px; - background-color: #f0f0f0; - cursor: pointer; - margin: 0 3px; - text-decoration: none; + padding: 3px 5px; + background-color: #f0f0f0; + cursor: pointer; + margin: 0 3px; + text-decoration: none; } .abutton:hover { - color: #f0f0f0 !important; - background-color: #606060; + color: #f0f0f0 !important; + background-color: #606060; } .abutton.block { - display: block; - width: 60%; - margin: 0 auto 10px auto; + display: block; + width: 60%; + margin: 0 auto 10px auto; } .abutton_green { color: #008800 !important; } @@ -756,46 +756,46 @@ .abutton_red:hover { background-color: #880000 !important; } .abutton_img, .abutton.icon { - background-image: url('../../../images/mini-error.png'); - background-position: 4px center; - background-repeat: no-repeat; - padding-left: 24px; + background-image: url('../../../images/mini-error.png'); + background-position: 4px center; + background-repeat: no-repeat; + padding-left: 24px; } /* User rank administration */ div.rankadmin-left { - float: left; - border: 1px solid #e0e0e0; - margin: 0 1.4em 0 0; - padding: 0.6em; + float: left; + border: 1px solid #e0e0e0; + margin: 0 1.4em 0 0; + padding: 0.6em; } a.rankadmin-editlink { - display: block; - font-size: large; - padding: 3px; - text-decoration: none; + display: block; + font-size: large; + padding: 3px; + text-decoration: none; } a.rankadmin-createlink { - border-top: 1px solid #a0a0a0; + border-top: 1px solid #a0a0a0; } a.rankadmin-editlink:hover { - background-color: #f0f0f0; + background-color: #f0f0f0; } div.rankadmin-right { - float: left; + float: left; } .adminiconsprite { - width: 16px; - height: 16px; - background-image: url(../../../images/icons/applets/sprite.png); - background-position: center center; - background-repeat: no-repeat; + width: 16px; + height: 16px; + background-image: url(../../../images/icons/applets/sprite.png); + background-position: center center; + background-repeat: no-repeat; } /* @@ -805,49 +805,49 @@ */ div.userpage_wrap { - /* Content starts at 4.05em */ - position: relative; - top: 4em; - margin-bottom: 4em; - border: 0.05em solid #a0a0a0; + /* Content starts at 4.05em */ + position: relative; + top: 4em; + margin-bottom: 4em; + border: 0.05em solid #a0a0a0; } ul.userpage_links { - top: -3.05em; - position: absolute; - padding-left: 10px; - list-style-type: none !important; - list-style-image: none !important; + top: -3.05em; + position: absolute; + padding-left: 10px; + list-style-type: none !important; + list-style-image: none !important; } ul.userpage_links li { - line-height: 1.85em; - border-width: 0.05em 0.05em 0 0.05em; - float: left; - margin-right: 5px; - padding: 0 7px; - list-style-type: none !important; - list-style-image: none !important; - border-style: solid; - border-color: #808080; + line-height: 1.85em; + border-width: 0.05em 0.05em 0 0.05em; + float: left; + margin-right: 5px; + padding: 0 7px; + list-style-type: none !important; + list-style-image: none !important; + border-style: solid; + border-color: #808080; } ul.userpage_links li.userpage_tab_active { - border-bottom-color: #ffffff; - border-bottom-width: 0.05em; - line-height: 2.05em; - margin-top: -0.2em; - font-weight: bold; + border-bottom-color: #ffffff; + border-bottom-width: 0.05em; + line-height: 2.05em; + margin-top: -0.2em; + font-weight: bold; } ul.userpage_links li:hover { - border-bottom-color: #ffffff; - cursor: pointer; + border-bottom-color: #ffffff; + cursor: pointer; } div.userpage_block { - clear: both; - padding: 10px; + clear: both; + padding: 10px; } /* @@ -855,12 +855,12 @@ */ div.acl_inherit { - padding: 5px; - margin-bottom: 1px; + padding: 5px; + margin-bottom: 1px; } td.acl_inherit_key { - width: 15px; + width: 15px; } .acl_enano_default { background-color: #FFFFC6; } @@ -875,12 +875,12 @@ .acl_local_user { background-color: #FFB6B6; } span.acl_failed_deps { - font-weight: bold; - font-size: smaller; + font-weight: bold; + font-size: smaller; } span.acl_failed_deps span.title { - color: #ff0000; + color: #ff0000; } /** @@ -888,84 +888,84 @@ */ div#theme-selector-wrapper { - position: absolute; - width: 100%; - margin: 0; - padding: 0; - top: 0; - margin-top: 75px; + position: absolute; + width: 100%; + margin: 0; + padding: 0; + top: 0; + margin-top: 75px; } div#theme-selector-body { - margin: 0 auto; - padding: 20px; - background-color: #ffffff; - text-align: center; - /* width: 708px; */ - width: 130px; - height: 130px; + margin: 0 auto; + padding: 20px; + background-color: #ffffff; + text-align: center; + /* width: 708px; */ + width: 130px; + height: 130px; } div#theme-selector-inner h3 { - font-size: x-large; + font-size: x-large; } div#theme-selector-inner ul { - list-style-type: none; - margin: 0; - padding: 0; + list-style-type: none; + margin: 0; + padding: 0; } div#theme-selector-inner ul li { - float: left; + float: left; } div#theme-selector-inner ul li a { - display: block; - border: 1px solid #d0d0d0; - padding: 4px; - width: 216px; - line-height: 150px; - text-align: center; - margin: 2px 5px; - text-decoration: none; - background-position: center center; - background-repeat: no-repeat; - background-image: url(../../../images/themepreview.png); + display: block; + border: 1px solid #d0d0d0; + padding: 4px; + width: 216px; + line-height: 150px; + text-align: center; + margin: 2px 5px; + text-decoration: none; + background-position: center center; + background-repeat: no-repeat; + background-image: url(../../../images/themepreview.png); } div#theme-selector-inner ul li a span { - color: #456798; - background-color: #fff; - opacity: 0; - filter: alpha(opacity=0); - display: block; - width: 216px; - line-height: 150px; - font-size: x-large; + color: #456798; + background-color: #fff; + opacity: 0; + filter: alpha(opacity=0); + display: block; + width: 216px; + line-height: 150px; + font-size: x-large; } div#theme-selector-inner ul li a:hover span { - opacity: 0.6; - filter: alpha(opacity=60); + opacity: 0.6; + filter: alpha(opacity=60); } div#theme-selector-inner .abutton { - font-size: x-large; + font-size: x-large; } div#theme-selector-inner ul li a span.loading { - background-image: url(../../../images/loading-big.gif); - background-position: center center; - background-repeat: no-repeat; + background-image: url(../../../images/loading-big.gif); + background-position: center center; + background-repeat: no-repeat; } div.theme-selector-spinner { - height: 130px; - background-image: url(../../../images/loading-big.gif); - background-position: center center; - background-repeat: no-repeat; - margin: 0 auto; + height: 130px; + background-image: url(../../../images/loading-big.gif); + background-position: center center; + background-repeat: no-repeat; + margin: 0 auto; } /** @@ -973,69 +973,69 @@ */ div.sbedit-block { - background-color: #f7f7f7; - border: 1px solid #c2c2c2; - padding: 4px; - width: 150px; - margin: 0 7px 5px 0; + background-color: #f7f7f7; + border: 1px solid #c2c2c2; + padding: 4px; + width: 150px; + margin: 0 7px 5px 0; } div.sbedit-block.disabled { - background-color: #ffe2e2; - border-color: #c7a1a1; + background-color: #ffe2e2; + border-color: #c7a1a1; } div.sbedit-handle { - background-color: #c7c7c7; - border: 1px solid #909090; - padding: 2px; - margin-bottom: 3px; - cursor: move; + background-color: #c7c7c7; + border: 1px solid #909090; + padding: 2px; + margin-bottom: 3px; + cursor: move; } div.sbedit-block.disabled div.sbedit-handle { - background-color: #c77272; - border-color: #aa6060; + background-color: #c77272; + border-color: #aa6060; } div.sbedit-handle input { - display: none; - width: 96%; + display: none; + width: 96%; } div.sbedit-float { - position: absolute; - top: 20px; - left: 20px; + position: absolute; + top: 20px; + left: 20px; } td.sbedit-column { - vertical-align: top; - /* 150 + 4*2 + 7 + 3 (the 3 being a trial-and-error computation) */ - width: 168px; + vertical-align: top; + /* 150 + 4*2 + 7 + 3 (the 3 being a trial-and-error computation) */ + width: 168px; } .ui-sortable-placeholder { - background-color: #e2e2e2 !important; - border: 1px dashed #b7b7b7 !important; - visibility: visible !important; - height: 50px !important; + background-color: #e2e2e2 !important; + border: 1px dashed #b7b7b7 !important; + visibility: visible !important; + height: 50px !important; } .ui-sortable-helper { - opacity: 0.6; - filter: alpha(opacity=60); + opacity: 0.6; + filter: alpha(opacity=60); } .emptymessage { - line-height: 140px; - color: #a0a0a0; - border-bottom-width: 0 !important; - text-align: center; - font-size: xx-large; - font-weight: normal; + line-height: 140px; + color: #a0a0a0; + border-bottom-width: 0 !important; + text-align: center; + font-size: xx-large; + font-weight: normal; } .log_addfilter { - display: none; + display: none; } diff -r de56132c008d -r bdac73ed481e includes/clientside/jscompress.php --- a/includes/clientside/jscompress.php Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/jscompress.php Sun Mar 28 23:10:46 2010 -0400 @@ -21,11 +21,11 @@ // First check to see if something already declared this function.... it happens often. if ( !function_exists('microtime_float') ) { - function microtime_float() - { - list($usec, $sec) = explode(" ", microtime()); - return ((float)$usec + (float)$sec); - } + function microtime_float() + { + list($usec, $sec) = explode(" ", microtime()); + return ((float)$usec + (float)$sec); + } } $local_start = microtime_float(); @@ -43,25 +43,25 @@ // .enanodev is found in the Enano root (not /repo/). if ( strpos(__FILE__, '/repo/') && ( file_exists('../../.enanodev') || file_exists('../../../.enanodev') ) ) { - // We have a development directory. Remove /repo/ from the picture. - $filename = str_replace('/repo/', '/', __FILE__); + // We have a development directory. Remove /repo/ from the picture. + $filename = str_replace('/repo/', '/', __FILE__); } else { - // Standard Enano installation - $filename = __FILE__; + // Standard Enano installation + $filename = __FILE__; } // ENANO_ROOT is sometimes defined by plugins like AjIM that need the constant before the Enano API is initialized if ( !defined('ENANO_ROOT') ) - define('ENANO_ROOT', dirname(dirname(dirname($filename)))); + define('ENANO_ROOT', dirname(dirname(dirname($filename)))); chdir(ENANO_ROOT); require('includes/common.php'); if ( !defined('ENANO_CLI') ) { - die_friendly('Not for web use', '
This script is designed to be run from a command-line environment.
'); + die_friendly('Not for web use', 'This script is designed to be run from a command-line environment.
'); } // if ( !getConfig('cdn_path') ) @@ -79,7 +79,7 @@ $path = ( isset($_SERVER['PATH']) ) ? $_SERVER['PATH'] : false; if ( !$path ) { - die_semicritical('Can\'t get your PATH', 'Unable to get the PATH environment variable'); + die_semicritical('Can\'t get your PATH', 'Unable to get the PATH environment variable'); } $path = ( strtolower(PHP_OS) === 'win32' ) ? explode(';', $path) : explode(':', $path); @@ -87,18 +87,18 @@ foreach ( $path as $dir ) { - if ( file_exists("$dir/zip$pathext") ) - { - $have_zip = true; - break; - } + if ( file_exists("$dir/zip$pathext") ) + { + $have_zip = true; + break; + } } if ( !$have_zip ) { - // no zupport zor zipping ziles - echo "\x1B[31;1mnot found\x1B[0m\n\x1B[1mPlease install the zip utility using your distribution's package manager\nand then rerun this script.\x1B[0m"; - exit(1); + // no zupport zor zipping ziles + echo "\x1B[31;1mnot found\x1B[0m\n\x1B[1mPlease install the zip utility using your distribution's package manager\nand then rerun this script.\x1B[0m"; + exit(1); } echo "\x1B[1mall good\x1B[0m\n"; @@ -106,8 +106,8 @@ if ( !@mkdir('includes/clientside/staticmin') ) { - echo "\x1B[31;1mcouldn't create temp directory\x1B[0m\n\x1B[1mCheck permissions please, we couldn't create includes/clientside/staticmin.\x1B[0m"; - exit(1); + echo "\x1B[31;1mcouldn't create temp directory\x1B[0m\n\x1B[1mCheck permissions please, we couldn't create includes/clientside/staticmin.\x1B[0m"; + exit(1); } require('includes/clientside/jsres.php'); @@ -120,8 +120,8 @@ $handle = @fopen('./enano-lib-basic.js', 'w'); if ( !$handle ) { - echo "\x1B[31;1mcouldn't open file\x1B[0m\n\x1B[1mCheck permissions please, we couldn't create a file inside includes/clientside/staticmin.\x1B[0m"; - exit(1); + echo "\x1B[31;1mcouldn't open file\x1B[0m\n\x1B[1mCheck permissions please, we couldn't create a file inside includes/clientside/staticmin.\x1B[0m"; + exit(1); } fwrite($handle, $everything); @@ -130,29 +130,29 @@ // for each JS file in includes/clientside/static, compress & write if ( $dr = @opendir('../static') ) { - while ( $dh = @readdir($dr) ) - { - if ( !preg_match('/\.js$/', $dh) || $dh === 'enano-lib-basic.js' ) - continue; - - $contents = @file_get_contents("../static/$dh"); - $compressed = jsres_cache_check($dh, $contents); - $compressed = str_replace('/* JavaScriptCompressor 0.8 [www.devpro.it], thanks to Dean Edwards for idea [dean.edwards.name] */' . "\r\n", '', $compressed); - - $handle = @fopen("./$dh", 'w'); - if ( !$handle ) - { - echo "\x1B[31;1mcouldn't open file\x1B[0m\n\x1B[1mCheck permissions please, we couldn't create a file inside includes/clientside/staticmin.\x1B[0m"; - exit(1); - } - fwrite($handle, $compressed); - fclose($handle); - } + while ( $dh = @readdir($dr) ) + { + if ( !preg_match('/\.js$/', $dh) || $dh === 'enano-lib-basic.js' ) + continue; + + $contents = @file_get_contents("../static/$dh"); + $compressed = jsres_cache_check($dh, $contents); + $compressed = str_replace('/* JavaScriptCompressor 0.8 [www.devpro.it], thanks to Dean Edwards for idea [dean.edwards.name] */' . "\r\n", '', $compressed); + + $handle = @fopen("./$dh", 'w'); + if ( !$handle ) + { + echo "\x1B[31;1mcouldn't open file\x1B[0m\n\x1B[1mCheck permissions please, we couldn't create a file inside includes/clientside/staticmin.\x1B[0m"; + exit(1); + } + fwrite($handle, $compressed); + fclose($handle); + } } else { - echo "\x1B[31;1mcouldn't open includes directory\x1B[0m\n\x1B[1mUnable to get our hands into includes/clientside/static/ to compress everything.\x1B[0m"; - exit(1); + echo "\x1B[31;1mcouldn't open includes directory\x1B[0m\n\x1B[1mUnable to get our hands into includes/clientside/static/ to compress everything.\x1B[0m"; + exit(1); } echo "\x1B[1mdone\x1B[0m\n"; @@ -161,9 +161,9 @@ $result = system('zip -yrq9 ../enano-lib.zip *.js'); if ( $result != 0 ) { - // failure - echo "\x1B[31;1mzip creation failed\x1B[0m\n\x1B[1mzip returned result $result\x1B[0m"; - exit(1); + // failure + echo "\x1B[31;1mzip creation failed\x1B[0m\n\x1B[1mzip returned result $result\x1B[0m"; + exit(1); } echo "\x1B[1mdone\x1B[0m\n"; @@ -175,11 +175,11 @@ if ( $dr = @opendir('./staticmin') ) { - while ( $dh = @readdir($dr) ) - { - if ( preg_match('/\.js$/', $dh) ) - unlink("./staticmin/$dh"); - } + while ( $dh = @readdir($dr) ) + { + if ( preg_match('/\.js$/', $dh) ) + unlink("./staticmin/$dh"); + } } @rmdir('./staticmin'); diff -r de56132c008d -r bdac73ed481e includes/clientside/jsres.php --- a/includes/clientside/jsres.php Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/jsres.php Sun Mar 28 23:10:46 2010 -0400 @@ -16,7 +16,7 @@ // if Enano's already loaded, we've been included from a helper script if ( defined('ENANO_CONFIG_FETCHED') ) - define('ENANO_JSRES_SETUP_ONLY', 1); + define('ENANO_JSRES_SETUP_ONLY', 1); if ( !defined('ENANO_JSRES_SETUP_ONLY') ): @@ -29,11 +29,11 @@ // First check to see if something already declared this function.... it happens often. if ( !function_exists('microtime_float') ) { - function microtime_float() - { - list($usec, $sec) = explode(" ", microtime()); - return ((float)$usec + (float)$sec); - } + function microtime_float() + { + list($usec, $sec) = explode(" ", microtime()); + return ((float)$usec + (float)$sec); + } } $local_start = microtime_float(); @@ -51,18 +51,18 @@ // development server using the script found on hg.enanocms.org. if ( strpos(__FILE__, '/repo/') && ( file_exists('../../.enanodev') || file_exists('../../../.enanodev') ) ) { - // We have a development directory. Remove /repo/ from the picture. - $filename = str_replace('/repo/', '/', __FILE__); + // We have a development directory. Remove /repo/ from the picture. + $filename = str_replace('/repo/', '/', __FILE__); } else { - // Standard Enano installation - $filename = __FILE__; + // Standard Enano installation + $filename = __FILE__; } // ENANO_ROOT is sometimes defined by plugins like AjIM that need the constant before the Enano API is initialized if ( !defined('ENANO_ROOT') ) - define('ENANO_ROOT', dirname(dirname(dirname($filename)))); + define('ENANO_ROOT', dirname(dirname(dirname($filename)))); chdir(ENANO_ROOT); @@ -76,25 +76,25 @@ // Files safe to run full (aggressive) compression on $full_compress_safe = array( - // Sorted by file size, descending (du -b *.js | sort -n) - 'crypto.js', - 'ajax.js', - 'editor.js', - 'functions.js', - 'login.js', - 'acl.js', - 'misc.js', - 'comments.js', - 'autofill.js', - 'dropdown.js', - 'paginate.js', - 'enano-lib-basic.js', - 'pwstrength.js', - 'flyin.js', - 'rank-manager.js', - 'userpage.js', - 'template-compiler.js', - 'toolbar.js', + // Sorted by file size, descending (du -b *.js | sort -n) + 'crypto.js', + 'ajax.js', + 'editor.js', + 'functions.js', + 'login.js', + 'acl.js', + 'misc.js', + 'comments.js', + 'autofill.js', + 'dropdown.js', + 'paginate.js', + 'enano-lib-basic.js', + 'pwstrength.js', + 'flyin.js', + 'rank-manager.js', + 'userpage.js', + 'template-compiler.js', + 'toolbar.js', ); // Files that should NOT be compressed due to already being compressed, licensing, or invalid produced code @@ -107,13 +107,13 @@ $do_gzip = false; if ( isset($_SERVER['HTTP_ACCEPT_ENCODING']) && getConfig('gzip_output', false) == 1 ) { - $acceptenc = str_replace(' ', '', strtolower($_SERVER['HTTP_ACCEPT_ENCODING'])); - $acceptenc = explode(',', $acceptenc); - if ( in_array('gzip', $acceptenc) ) - { - $do_gzip = true; - ob_start(); - } + $acceptenc = str_replace(' ', '', strtolower($_SERVER['HTTP_ACCEPT_ENCODING'])); + $acceptenc = explode(',', $acceptenc); + if ( in_array('gzip', $acceptenc) ) + { + $do_gzip = true; + ob_start(); + } } // Output format will always be JS @@ -129,16 +129,16 @@ // note - obfuscated for optimization purposes. The exact same code except properly indented is in enano-lib-basic. if ( isset($_GET['early']) ) { - header('ETag: enanocms-lib-early-r3'); - header('Expires: Wed, 1 Jan 2020 00:00:00 GMT'); - - echo <<Debug window
", "aclDebugWin"); - setTimeout(function() { - aclDebugWin.pre = aclDebugWin.document.createElement('pre'); - aclDebugWin.pre.appendChild(aclDebugWin.document.createTextNode(text)); - aclDebugWin.b = aclDebugWin.document.getElementsByTagName('body')[0]; - aclDebugWin.b.appendChild(aclDebugWin.pre);}, 1000); + if(!aclDebugWin) + aclDebugWin = pseudoWindowOpen("data:text/html;plain,Debug window
", "aclDebugWin"); + setTimeout(function() { + aclDebugWin.pre = aclDebugWin.document.createElement('pre'); + aclDebugWin.pre.appendChild(aclDebugWin.document.createTextNode(text)); + aclDebugWin.b = aclDebugWin.document.getElementsByTagName('body')[0]; + aclDebugWin.b.appendChild(aclDebugWin.pre);}, 1000); } var pseudoWindows = new Object(); function pseudoWindowOpen(url, id) { - if(pseudoWindows[id]) - { - document.getElementById('pseudowin_ifr_'+id).src = url; - } - else - { - win = document.createElement('iframe'); - win.style.position='fixed'; - win.style.width = '640px'; - win.style.height = '480px'; - win.style.top = '0px'; - win.style.left = '0px'; - win.style.zIndex = getHighestZ() + 1; - win.style.backgroundColor = '#FFFFFF'; - win.name = 'pseudo_ifr_'+id; - win.id = 'pseudowindow_ifr_'+id; - win.src = url; - body = document.getElementsByTagName('body')[0]; - body.appendChild(win); - } - win_obj = eval("( pseudo_ifr_"+id+" )"); - return win_obj; + if(pseudoWindows[id]) + { + document.getElementById('pseudowin_ifr_'+id).src = url; + } + else + { + win = document.createElement('iframe'); + win.style.position='fixed'; + win.style.width = '640px'; + win.style.height = '480px'; + win.style.top = '0px'; + win.style.left = '0px'; + win.style.zIndex = getHighestZ() + 1; + win.style.backgroundColor = '#FFFFFF'; + win.name = 'pseudo_ifr_'+id; + win.id = 'pseudowindow_ifr_'+id; + win.src = url; + body = document.getElementsByTagName('body')[0]; + body.appendChild(win); + } + win_obj = eval("( pseudo_ifr_"+id+" )"); + return win_obj; } function __aclJSONSubmitAjaxHandler(params) { - params = toJSONString(params); - params = ajaxEscape(params); - ajaxPost(stdAjaxPrefix+'&_mode=acljson', 'acl_params='+params, function(ajax) { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - var response = String(ajax.responseText + ''); - if ( !check_json_response(response) ) - { - handle_invalid_json(ajax.responseText); - return false; - } - try - { - var data = parseJSON(ajax.responseText); - } - catch(e) - { - handle_invalid_json(ajax.responseText); - return false; - } - aclDataCache = data; - switch(data.mode) - { - case 'seltarget': - - // Build the ACL edit form - aclBuildRuleEditor(data); - - break; - case 'success': - var note = document.createElement('div'); - note.className = 'info-box'; - note.style.marginLeft = '0'; - var b = document.createElement('b'); - b.appendChild(document.createTextNode($lang.get('acl_lbl_save_success_title'))); - note.appendChild(b); - note.appendChild(document.createElement('br')); - note.appendChild(document.createTextNode($lang.get('acl_lbl_save_success_body', { target_name: data.target_name }))); - note.appendChild(document.createElement('br')); - - /* - var a = document.createElement('a'); - a.href = '#'; - a.id = aclManagerID + '_btn_dismiss'; - a.appendChild(document.createTextNode('[ ' + $lang.get('acl_btn_success_dismiss') + ' :')); - note.appendChild(a); - var a2 = document.createElement('a'); - a2.href = '#'; - a.id = aclManagerID + '_btn_close'; - a2.appendChild(document.createTextNode(': ' + $lang.get('acl_btn_success_close') + ' ]')); - note.appendChild(a2); - */ - - var a_dismiss = document.createElement('a'); - a_dismiss.href = '#'; - a_dismiss.appendChild(document.createTextNode('[ ' + $lang.get('acl_btn_success_dismiss') + ' :')); - note.appendChild(a_dismiss); - - var a_close = document.createElement('a'); - a_close.href = '#'; - a_close.appendChild(document.createTextNode(': ' + $lang.get('acl_btn_success_close') + ' ]')); - note.appendChild(a_close); - - document.getElementById(aclManagerID + '_main').insertBefore(note, document.getElementById(aclManagerID + '_main').firstChild); - - a_dismiss.setAttribute('onclick', 'var parent = this.parentNode.parentNode; parent.removeChild(this.parentNode); return false;'); - a_close.setAttribute('onclick', 'killACLManager(); return false;'); - - if ( !document.getElementById(aclManagerID+'_deletelnk') ) - { - var p = document.createElement('p'); - p.innerHTML = '' + $lang.get('acl_lbl_deleterule') + ''; - p.id = aclManagerID + '_deletelnk'; - p.style.textAlign = 'right'; - - document.getElementById(aclManagerID + '_main').appendChild(p); - } - - document.getElementById(aclManagerID+'_main').scrollTop = 0; - document.getElementById(aclManagerID+'_main').style.backgroundImage = 'none'; - - aclDataCache.mode = 'save_edit'; - break; - case 'delete': - - params = { - 'mode' : 'listgroups' - }; - params = toJSONString(params); - params = ajaxEscape(params); - ajaxPost(stdAjaxPrefix+'&_mode=acljson', 'acl_params='+params, function(ajax) { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - document.getElementById(aclManagerID+'_main').innerHTML = ''; - document.getElementById(aclManagerID + '_back').style.display = 'none'; - document.getElementById(aclManagerID + '_next').value = $lang.get('etc_wizard_next'); - ajaxACLSwitchToSelector(); - - // note - var note = document.createElement('div'); - note.className = 'info-box-mini'; - note.appendChild(document.createTextNode($lang.get('acl_lbl_delete_success'))); - - // button: dismiss note - var a_dismiss = document.createElement('a'); - a_dismiss.href = '#'; - a_dismiss.onclick = function() - { - var p = this.parentNode; - domOpacity(p, 100, 0, 500); - window.setTimeout(function() - { - p.parentNode.removeChild(p); - }, 600); - return false; - } - a_dismiss.appendChild(document.createTextNode($lang.get('acl_btn_success_dismiss'))); - note.appendChild(a_dismiss); - // add a space - note.appendChild(document.createTextNode(' / ')); - - // button: dismiss note - var a_close = document.createElement('a'); - a_close.href = '#'; - a_close.onclick = function() - { - killACLManager(); - return false; - } - a_close.appendChild(document.createTextNode($lang.get('acl_btn_success_close'))); - note.appendChild(a_close); - - // style note - domObjChangeOpac(note, 0); - note.style.position = 'absolute'; - // icon padding L + icon padding R + icon width + right padding + border width L + border width R - note.style.width = ($dynano(aclManagerID + '_main').Width() - ( 5 + 5 + 16 + 4 + 1 + 1 )) + 'px'; - - // make tangible, then calculate height and position right above button panel - var panel = document.getElementById(aclManagerID + '_panel'); - panel.parentNode.parentNode.appendChild(note); - note.style.top = '401px'; - note.style.left = '0px'; - - opacity(note, 0, 100, 500); - } - }, true); - - break; - case 'error': - alert("Server side processing error:\n"+data.error); - break; - case 'debug': - aclDebug(data.text); - break; - case 'list_existing': - aclSetViewListExistingRespond(data); - break; - case 'trace': - aclDrawTraceWrapper(data); - break; - default: - handle_invalid_json(ajax.responseText); - break; - } - } - }, true); + params = toJSONString(params); + params = ajaxEscape(params); + ajaxPost(stdAjaxPrefix+'&_mode=acljson', 'acl_params='+params, function(ajax) { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + var response = String(ajax.responseText + ''); + if ( !check_json_response(response) ) + { + handle_invalid_json(ajax.responseText); + return false; + } + try + { + var data = parseJSON(ajax.responseText); + } + catch(e) + { + handle_invalid_json(ajax.responseText); + return false; + } + aclDataCache = data; + switch(data.mode) + { + case 'seltarget': + + // Build the ACL edit form + aclBuildRuleEditor(data); + + break; + case 'success': + var note = document.createElement('div'); + note.className = 'info-box'; + note.style.marginLeft = '0'; + var b = document.createElement('b'); + b.appendChild(document.createTextNode($lang.get('acl_lbl_save_success_title'))); + note.appendChild(b); + note.appendChild(document.createElement('br')); + note.appendChild(document.createTextNode($lang.get('acl_lbl_save_success_body', { target_name: data.target_name }))); + note.appendChild(document.createElement('br')); + + /* + var a = document.createElement('a'); + a.href = '#'; + a.id = aclManagerID + '_btn_dismiss'; + a.appendChild(document.createTextNode('[ ' + $lang.get('acl_btn_success_dismiss') + ' :')); + note.appendChild(a); + var a2 = document.createElement('a'); + a2.href = '#'; + a.id = aclManagerID + '_btn_close'; + a2.appendChild(document.createTextNode(': ' + $lang.get('acl_btn_success_close') + ' ]')); + note.appendChild(a2); + */ + + var a_dismiss = document.createElement('a'); + a_dismiss.href = '#'; + a_dismiss.appendChild(document.createTextNode('[ ' + $lang.get('acl_btn_success_dismiss') + ' :')); + note.appendChild(a_dismiss); + + var a_close = document.createElement('a'); + a_close.href = '#'; + a_close.appendChild(document.createTextNode(': ' + $lang.get('acl_btn_success_close') + ' ]')); + note.appendChild(a_close); + + document.getElementById(aclManagerID + '_main').insertBefore(note, document.getElementById(aclManagerID + '_main').firstChild); + + a_dismiss.setAttribute('onclick', 'var parent = this.parentNode.parentNode; parent.removeChild(this.parentNode); return false;'); + a_close.setAttribute('onclick', 'killACLManager(); return false;'); + + if ( !document.getElementById(aclManagerID+'_deletelnk') ) + { + var p = document.createElement('p'); + p.innerHTML = '' + $lang.get('acl_lbl_deleterule') + ''; + p.id = aclManagerID + '_deletelnk'; + p.style.textAlign = 'right'; + + document.getElementById(aclManagerID + '_main').appendChild(p); + } + + document.getElementById(aclManagerID+'_main').scrollTop = 0; + document.getElementById(aclManagerID+'_main').style.backgroundImage = 'none'; + + aclDataCache.mode = 'save_edit'; + break; + case 'delete': + + params = { + 'mode' : 'listgroups' + }; + params = toJSONString(params); + params = ajaxEscape(params); + ajaxPost(stdAjaxPrefix+'&_mode=acljson', 'acl_params='+params, function(ajax) { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + document.getElementById(aclManagerID+'_main').innerHTML = ''; + document.getElementById(aclManagerID + '_back').style.display = 'none'; + document.getElementById(aclManagerID + '_next').value = $lang.get('etc_wizard_next'); + ajaxACLSwitchToSelector(); + + // note + var note = document.createElement('div'); + note.className = 'info-box-mini'; + note.appendChild(document.createTextNode($lang.get('acl_lbl_delete_success'))); + + // button: dismiss note + var a_dismiss = document.createElement('a'); + a_dismiss.href = '#'; + a_dismiss.onclick = function() + { + var p = this.parentNode; + domOpacity(p, 100, 0, 500); + window.setTimeout(function() + { + p.parentNode.removeChild(p); + }, 600); + return false; + } + a_dismiss.appendChild(document.createTextNode($lang.get('acl_btn_success_dismiss'))); + note.appendChild(a_dismiss); + // add a space + note.appendChild(document.createTextNode(' / ')); + + // button: dismiss note + var a_close = document.createElement('a'); + a_close.href = '#'; + a_close.onclick = function() + { + killACLManager(); + return false; + } + a_close.appendChild(document.createTextNode($lang.get('acl_btn_success_close'))); + note.appendChild(a_close); + + // style note + domObjChangeOpac(note, 0); + note.style.position = 'absolute'; + // icon padding L + icon padding R + icon width + right padding + border width L + border width R + note.style.width = ($dynano(aclManagerID + '_main').Width() - ( 5 + 5 + 16 + 4 + 1 + 1 )) + 'px'; + + // make tangible, then calculate height and position right above button panel + var panel = document.getElementById(aclManagerID + '_panel'); + panel.parentNode.parentNode.appendChild(note); + note.style.top = '401px'; + note.style.left = '0px'; + + opacity(note, 0, 100, 500); + } + }, true); + + break; + case 'error': + alert("Server side processing error:\n"+data.error); + break; + case 'debug': + aclDebug(data.text); + break; + case 'list_existing': + aclSetViewListExistingRespond(data); + break; + case 'trace': + aclDrawTraceWrapper(data); + break; + default: + handle_invalid_json(ajax.responseText); + break; + } + } + }, true); } function aclBuildRuleEditor(data, from_direct) { - var act_desc = ( data.type == 'new' ) ? $lang.get('acl_lbl_editwin_title_create') : $lang.get('acl_lbl_editwin_title_edit'); - var target_type_t = ( data.target_type == 1 ) ? $lang.get('acl_target_type_group') : $lang.get('acl_target_type_user'); - var target_name_t = data.target_name; - var scope_type = ( data.page_id == false && data.namespace == false ) ? $lang.get('acl_scope_type_wholesite') : ( data.namespace == '__PageGroup' ) ? $lang.get('acl_scope_type_pagegroup') : $lang.get('acl_scope_type_thispage'); - - document.getElementById(aclManagerID + '_next').style.display = 'inline'; - - html = ''+act_desc+'
'; - html += '' + $lang.get('acl_lbl_editwin_body', { target_type: target_type_t, target: target_name_t, scope_type: scope_type }) + '
'; - - // preset management - var load_flags = 'href="#" onclick="aclShowPresetLoader(); return false;"'; - var save_flags = 'href="#" onclick="aclShowPresetSave(); return false;"'; - html += '' + $lang.get('acl_lbl_deleterule') + '
'; - - var main = document.getElementById(aclManagerID + '_main'); - main.innerHTML = html; - - var form = document.getElementById(aclManagerID + '_formobj_id'); - - if ( from_direct ) - { - var modeobj = document.getElementById(aclManagerID + '_mode'); - modeobj.value = 'save_edit'; - } - else - { - var modeobj = form_fetch_field(form, 'mode'); - if ( modeobj ) - modeobj.value = 'save_' + data.type; - else - alert('modeobj is invalid: '+modeobj); - } - - aclPermList = array_keys(data.acl_types); - - document.getElementById(aclManagerID + '_back').style.display = 'inline'; - document.getElementById(aclManagerID + '_next').value = $lang.get('etc_save_changes'); + var act_desc = ( data.type == 'new' ) ? $lang.get('acl_lbl_editwin_title_create') : $lang.get('acl_lbl_editwin_title_edit'); + var target_type_t = ( data.target_type == 1 ) ? $lang.get('acl_target_type_group') : $lang.get('acl_target_type_user'); + var target_name_t = data.target_name; + var scope_type = ( data.page_id == false && data.namespace == false ) ? $lang.get('acl_scope_type_wholesite') : ( data.namespace == '__PageGroup' ) ? $lang.get('acl_scope_type_pagegroup') : $lang.get('acl_scope_type_thispage'); + + document.getElementById(aclManagerID + '_next').style.display = 'inline'; + + html = ''+act_desc+'
'; + html += '' + $lang.get('acl_lbl_editwin_body', { target_type: target_type_t, target: target_name_t, scope_type: scope_type }) + '
'; + + // preset management + var load_flags = 'href="#" onclick="aclShowPresetLoader(); return false;"'; + var save_flags = 'href="#" onclick="aclShowPresetSave(); return false;"'; + html += '' + $lang.get('acl_lbl_deleterule') + '
'; + + var main = document.getElementById(aclManagerID + '_main'); + main.innerHTML = html; + + var form = document.getElementById(aclManagerID + '_formobj_id'); + + if ( from_direct ) + { + var modeobj = document.getElementById(aclManagerID + '_mode'); + modeobj.value = 'save_edit'; + } + else + { + var modeobj = form_fetch_field(form, 'mode'); + if ( modeobj ) + modeobj.value = 'save_' + data.type; + else + alert('modeobj is invalid: '+modeobj); + } + + aclPermList = array_keys(data.acl_types); + + document.getElementById(aclManagerID + '_back').style.display = 'inline'; + document.getElementById(aclManagerID + '_next').value = $lang.get('etc_save_changes'); } function __aclBuildGroupsHTML(groups) { - var groups = groups.groups; - select = document.createElement('select'); - for(var i in groups) - { - if(typeof(groups[i]['name']) == 'string' && i != 'toJSONString') - { - o = document.createElement('option'); - o.value = groups[i]['id']; - t = document.createTextNode(groups[i]['name']); - o.appendChild(t); - select.appendChild(o); - } - } - return select; + var groups = groups.groups; + select = document.createElement('select'); + for(var i in groups) + { + if(typeof(groups[i]['name']) == 'string' && i != 'toJSONString') + { + o = document.createElement('option'); + o.value = groups[i]['id']; + t = document.createTextNode(groups[i]['name']); + o.appendChild(t); + select.appendChild(o); + } + } + return select; } function __aclBuildWizardWindow() { - darken(aclDisableTransitionFX, 70, 'acldarkener'); - var box = document.createElement('div'); - box.style.width = '640px' - box.style.height = IE ? '500px' : '440px'; - box.style.position = 'fixed'; - width = getWidth(); - height = getHeight(); - box.style.left = ( width / 2 - 320 ) + 'px'; - box.style.top = ( height / 2 - 250 ) + 'px'; - box.style.backgroundColor = 'white'; - box.style.zIndex = getHighestZ() + 1; - box.id = aclManagerID; - box.style.opacity = '0'; - box.style.filter = 'alpha(opacity=0)'; - box.style.display = 'none'; - - var mainwin = document.createElement('div'); - mainwin.id = aclManagerID + '_main'; - mainwin.style.clip = 'rect(0px,640px,440px,0px)'; - mainwin.style.overflow = 'auto'; - mainwin.style.width = '620px'; - mainwin.style.height = '420px'; - - var panel = document.createElement('div'); - panel.style.width = '620px'; - panel.style.padding = '10px'; - panel.style.lineHeight = '40px'; - panel.style.textAlign = 'right'; - panel.style.position = 'fixed'; - if ( IE ) - { - panel.style.left = '0px'; - panel.style.top = '440px'; - } - else - { - panel.style.left = ( width / 2 - 320 ) + 'px'; - panel.style.top = ( height / 2 + 190 ) + 'px'; - } - panel.style.backgroundColor = '#D0D0D0'; - panel.style.opacity = '0'; - panel.style.filter = 'alpha(opacity=0)'; - panel.id = aclManagerID + '_panel'; - - var form = document.createElement('form'); - form.method = 'post'; - form.action = 'javascript:void(0)'; - form.onsubmit = function() { if(this.username && !submitAuthorized) return false; __aclSubmitManager(this); return false; }; - form.name = aclManagerID + '_formobj'; - form.id = aclManagerID + '_formobj_id'; - - var back = document.createElement('input'); - back.type = 'button'; - back.value = $lang.get('etc_wizard_back'); - back.style.fontWeight = 'normal'; - back.onclick = function() { ajaxACLSwitchToSelector(); return false; }; - back.style.display = 'none'; - back.id = aclManagerID + '_back'; - - var saver = document.createElement('input'); - saver.type = 'submit'; - saver.value = $lang.get('etc_wizard_next'); - saver.style.fontWeight = 'bold'; - saver.id = aclManagerID + '_next'; - - var closer = document.createElement('input'); - closer.type = 'button'; - closer.value = $lang.get('etc_cancel_changes'); - closer.onclick = function() - { - miniPromptMessage({ - title: $lang.get('acl_msg_closeacl_confirm_title'), - message: $lang.get('acl_msg_closeacl_confirm_body'), - buttons: [ - { - text: $lang.get('acl_btn_close'), - color: 'red', - style: { - fontWeight: 'bold' - }, - onclick: function(e) - { - killACLManager(); - miniPromptDestroy(this); - } - }, - { - text: $lang.get('etc_cancel'), - onclick: function(e) - { - miniPromptDestroy(this); - } - } - ] - }); - return false; - } - - var spacer1 = document.createTextNode(' '); - var spacer2 = document.createTextNode(' '); - - panel.appendChild(back); - panel.appendChild(spacer1); - panel.appendChild(saver); - panel.appendChild(spacer2); - panel.appendChild(closer); - form.appendChild(mainwin); - form.appendChild(panel); - box.appendChild(form); - - var body = document.getElementsByTagName('body')[0]; - body.appendChild(box); - if ( aclDisableTransitionFX ) - { - document.getElementById(aclManagerID).style.display = 'block'; - changeOpac(100, aclManagerID); - changeOpac(100, aclManagerID + '_panel'); - } - else - { - setTimeout("document.getElementById('"+aclManagerID+"').style.display = 'block'; opacity('"+aclManagerID+"', 0, 100, 250); opacity('"+aclManagerID + '_panel'+"', 0, 100, 250);", 500); - } - - console.debug(panel); + darken(aclDisableTransitionFX, 70, 'acldarkener'); + var box = document.createElement('div'); + box.style.width = '640px' + box.style.height = IE ? '500px' : '440px'; + box.style.position = 'fixed'; + width = getWidth(); + height = getHeight(); + box.style.left = ( width / 2 - 320 ) + 'px'; + box.style.top = ( height / 2 - 250 ) + 'px'; + box.style.backgroundColor = 'white'; + box.style.zIndex = getHighestZ() + 1; + box.id = aclManagerID; + box.style.opacity = '0'; + box.style.filter = 'alpha(opacity=0)'; + box.style.display = 'none'; + + var mainwin = document.createElement('div'); + mainwin.id = aclManagerID + '_main'; + mainwin.style.clip = 'rect(0px,640px,440px,0px)'; + mainwin.style.overflow = 'auto'; + mainwin.style.width = '620px'; + mainwin.style.height = '420px'; + + var panel = document.createElement('div'); + panel.style.width = '620px'; + panel.style.padding = '10px'; + panel.style.lineHeight = '40px'; + panel.style.textAlign = 'right'; + panel.style.position = 'fixed'; + if ( IE ) + { + panel.style.left = '0px'; + panel.style.top = '440px'; + } + else + { + panel.style.left = ( width / 2 - 320 ) + 'px'; + panel.style.top = ( height / 2 + 190 ) + 'px'; + } + panel.style.backgroundColor = '#D0D0D0'; + panel.style.opacity = '0'; + panel.style.filter = 'alpha(opacity=0)'; + panel.id = aclManagerID + '_panel'; + + var form = document.createElement('form'); + form.method = 'post'; + form.action = 'javascript:void(0)'; + form.onsubmit = function() { if(this.username && !submitAuthorized) return false; __aclSubmitManager(this); return false; }; + form.name = aclManagerID + '_formobj'; + form.id = aclManagerID + '_formobj_id'; + + var back = document.createElement('input'); + back.type = 'button'; + back.value = $lang.get('etc_wizard_back'); + back.style.fontWeight = 'normal'; + back.onclick = function() { ajaxACLSwitchToSelector(); return false; }; + back.style.display = 'none'; + back.id = aclManagerID + '_back'; + + var saver = document.createElement('input'); + saver.type = 'submit'; + saver.value = $lang.get('etc_wizard_next'); + saver.style.fontWeight = 'bold'; + saver.id = aclManagerID + '_next'; + + var closer = document.createElement('input'); + closer.type = 'button'; + closer.value = $lang.get('etc_cancel_changes'); + closer.onclick = function() + { + miniPromptMessage({ + title: $lang.get('acl_msg_closeacl_confirm_title'), + message: $lang.get('acl_msg_closeacl_confirm_body'), + buttons: [ + { + text: $lang.get('acl_btn_close'), + color: 'red', + style: { + fontWeight: 'bold' + }, + onclick: function(e) + { + killACLManager(); + miniPromptDestroy(this); + } + }, + { + text: $lang.get('etc_cancel'), + onclick: function(e) + { + miniPromptDestroy(this); + } + } + ] + }); + return false; + } + + var spacer1 = document.createTextNode(' '); + var spacer2 = document.createTextNode(' '); + + panel.appendChild(back); + panel.appendChild(spacer1); + panel.appendChild(saver); + panel.appendChild(spacer2); + panel.appendChild(closer); + form.appendChild(mainwin); + form.appendChild(panel); + box.appendChild(form); + + var body = document.getElementsByTagName('body')[0]; + body.appendChild(box); + if ( aclDisableTransitionFX ) + { + document.getElementById(aclManagerID).style.display = 'block'; + changeOpac(100, aclManagerID); + changeOpac(100, aclManagerID + '_panel'); + } + else + { + setTimeout("document.getElementById('"+aclManagerID+"').style.display = 'block'; opacity('"+aclManagerID+"', 0, 100, 250); opacity('"+aclManagerID + '_panel'+"', 0, 100, 250);", 500); + } + + console.debug(panel); } function killACLManager() { - el = document.getElementById(aclManagerID); - if(el) - { - if ( aclDisableTransitionFX ) - { - enlighten(true, 'acldarkener'); - el.parentNode.removeChild(el); - } - else - { - opacity(aclManagerID, 100, 0, 500); - setTimeout('var el = document.getElementById(aclManagerID); el.parentNode.removeChild(el); enlighten(false, "acldarkener");', 750); - } - } + el = document.getElementById(aclManagerID); + if(el) + { + if ( aclDisableTransitionFX ) + { + enlighten(true, 'acldarkener'); + el.parentNode.removeChild(el); + } + else + { + opacity(aclManagerID, 100, 0, 500); + setTimeout('var el = document.getElementById(aclManagerID); el.parentNode.removeChild(el); enlighten(false, "acldarkener");', 750); + } + } } function __aclSubmitManager(form) { - console.debug(form); - var thefrm = form; - // var thefrm = document.forms[form.name]; - var modeobj = form_fetch_field(thefrm, 'mode'); - if ( typeof(modeobj) == 'object' ) - { - var mode = (thefrm.mode.value) ? thefrm.mode.value : 'cant_get'; - } - else - { - var mode = ''; - } - switch(mode) - { - case 'cant_get': - alert('BUG: can\'t get the state value from the form field.'); - break; - case 'seltarget': - var target_type = parseInt(getRadioState(thefrm, 'target_type', ['1', '2'])); - if(isNaN(target_type)) - { - alert($lang.get('acl_err_pleaseselect_targettype')); - return false; - } - target_id = ( target_type == 1 ) ? parseInt(thefrm.group_id.value) : thefrm.username.value; - - obj = { 'mode' : mode, 'target_type' : target_type, 'target_id' : target_id }; - - thispage = strToPageID(title); - do_scopesel = ( thispage[0] == aclDataCache.page_id && thispage[1] == aclDataCache.namespace ); - - if(do_scopesel) - { - scope = getRadioState(thefrm, 'scope', ['page', 'group', 'global']); - if(scope == 'page') - { - pageid = strToPageID(title); - obj['page_id'] = pageid[0]; - obj['namespace'] = pageid[1]; - } - else if(scope == 'global') - { - obj['page_id'] = false; - obj['namespace'] = false; - } - else if(scope == 'group') - { - obj['page_id'] = document.getElementById('enACL_pgsel_1048576').value; - obj['namespace'] = '__PageGroup'; - } - else - { - alert('Invalid scope'); - return false; - } - } - else - { - obj['page_id'] = aclDataCache.page_id; - obj['namespace'] = aclDataCache.namespace; - } - if(target_id == '') - { - alert($lang.get('acl_err_pleaseselect_username')); - return false; - } - __aclJSONSubmitAjaxHandler(obj); - break; - case 'save_edit': - case 'save_new': - var form = document.forms[aclManagerID + '_formobj']; - selections = new Object(); - var dbg = ''; - var warned_everyone = false; - for(var i in aclPermList) - { - selections[aclPermList[i]] = getRadioState(form, aclPermList[i], ['i', 1, 2, 3, 4]); - // If we're editing permissions for everyone on the entire site and the - // admin selected to deny privileges, give a stern warning about it. - if ( selections[aclPermList[i]] == 1 && aclDataCache.target_type == 1 /* ACL_TYPE_GROUP */ && aclDataCache.target_id == 1 && !warned_everyone ) - { - warned_everyone = true; - if ( !confirm($lang.get('acl_msg_deny_everyone_confirm')) ) - { - return false; - } - } - dbg += aclPermList[i] + ': ' + selections[aclPermList[i]] + "\n"; - if(!selections[aclPermList[i]]) - { - alert("Invalid return from getRadioState: "+i+": "+selections[i]+" ("+typeof(selections[i])+")"); - return false; - } - } - obj = new Object(); - obj['perms'] = selections; - obj['mode'] = mode; - obj['target_type'] = aclDataCache.target_type; - obj['target_id'] = aclDataCache.target_id; - obj['target_name'] = aclDataCache.target_name; - obj['page_id'] = aclDataCache.page_id; - obj['namespace'] = aclDataCache.namespace; - __aclJSONSubmitAjaxHandler(obj); - break; - case 'trace': - var params = { - mode: 'trace', - user: document.getElementById(aclManagerID + 'trace_user').value, - page: document.getElementById(aclManagerID + 'trace_page').value - }; - __aclJSONSubmitAjaxHandler(params); - break; - default: - alert("JSON form submit: invalid mode string "+mode+", stopping execution"); - return false; - break; - } + console.debug(form); + var thefrm = form; + // var thefrm = document.forms[form.name]; + var modeobj = form_fetch_field(thefrm, 'mode'); + if ( typeof(modeobj) == 'object' ) + { + var mode = (thefrm.mode.value) ? thefrm.mode.value : 'cant_get'; + } + else + { + var mode = ''; + } + switch(mode) + { + case 'cant_get': + alert('BUG: can\'t get the state value from the form field.'); + break; + case 'seltarget': + var target_type = parseInt(getRadioState(thefrm, 'target_type', ['1', '2'])); + if(isNaN(target_type)) + { + alert($lang.get('acl_err_pleaseselect_targettype')); + return false; + } + target_id = ( target_type == 1 ) ? parseInt(thefrm.group_id.value) : thefrm.username.value; + + obj = { 'mode' : mode, 'target_type' : target_type, 'target_id' : target_id }; + + thispage = strToPageID(title); + do_scopesel = ( thispage[0] == aclDataCache.page_id && thispage[1] == aclDataCache.namespace ); + + if(do_scopesel) + { + scope = getRadioState(thefrm, 'scope', ['page', 'group', 'global']); + if(scope == 'page') + { + pageid = strToPageID(title); + obj['page_id'] = pageid[0]; + obj['namespace'] = pageid[1]; + } + else if(scope == 'global') + { + obj['page_id'] = false; + obj['namespace'] = false; + } + else if(scope == 'group') + { + obj['page_id'] = document.getElementById('enACL_pgsel_1048576').value; + obj['namespace'] = '__PageGroup'; + } + else + { + alert('Invalid scope'); + return false; + } + } + else + { + obj['page_id'] = aclDataCache.page_id; + obj['namespace'] = aclDataCache.namespace; + } + if(target_id == '') + { + alert($lang.get('acl_err_pleaseselect_username')); + return false; + } + __aclJSONSubmitAjaxHandler(obj); + break; + case 'save_edit': + case 'save_new': + var form = document.forms[aclManagerID + '_formobj']; + selections = new Object(); + var dbg = ''; + var warned_everyone = false; + for(var i in aclPermList) + { + selections[aclPermList[i]] = getRadioState(form, aclPermList[i], ['i', 1, 2, 3, 4]); + // If we're editing permissions for everyone on the entire site and the + // admin selected to deny privileges, give a stern warning about it. + if ( selections[aclPermList[i]] == 1 && aclDataCache.target_type == 1 /* ACL_TYPE_GROUP */ && aclDataCache.target_id == 1 && !warned_everyone ) + { + warned_everyone = true; + if ( !confirm($lang.get('acl_msg_deny_everyone_confirm')) ) + { + return false; + } + } + dbg += aclPermList[i] + ': ' + selections[aclPermList[i]] + "\n"; + if(!selections[aclPermList[i]]) + { + alert("Invalid return from getRadioState: "+i+": "+selections[i]+" ("+typeof(selections[i])+")"); + return false; + } + } + obj = new Object(); + obj['perms'] = selections; + obj['mode'] = mode; + obj['target_type'] = aclDataCache.target_type; + obj['target_id'] = aclDataCache.target_id; + obj['target_name'] = aclDataCache.target_name; + obj['page_id'] = aclDataCache.page_id; + obj['namespace'] = aclDataCache.namespace; + __aclJSONSubmitAjaxHandler(obj); + break; + case 'trace': + var params = { + mode: 'trace', + user: document.getElementById(aclManagerID + 'trace_user').value, + page: document.getElementById(aclManagerID + 'trace_page').value + }; + __aclJSONSubmitAjaxHandler(params); + break; + default: + alert("JSON form submit: invalid mode string "+mode+", stopping execution"); + return false; + break; + } } function getRadioState(form, name, valArray) { - // Konqueror/Safari fix - if ( form[name] ) - { - var formitem = form[name]; - if ( String(formitem) == '[object DOMNamedNodesCollection]' || is_Safari ) - { - var i = 0; - var radios = new Array(); - var radioids = new Array(); - while(true) - { - var elem = formitem[i]; - if ( !elem ) - break; - radios.push(elem); - if ( !elem.id ) - { - elem.id = 'autoRadioBtn_' + Math.floor(Math.random() * 1000000); - } - radioids.push(elem.id); - i++; - } - var cr; - for ( var i = 0; i < radios.length; i++ ) - { - cr = document.getElementById(radioids[i]); - if ( cr.value == 'on' || cr.checked == true ) - { - try { - return ( typeof ( valArray[i] ) != 'undefined' ) ? valArray[i] : false; - } catch(e) { - // alert('Didn\'t get value for index: ' + i); - return false; - } - } - } - return false; - } - } - inputs = form.getElementsByTagName('input'); - radios = new Array(); - for(var i in inputs) - { - if(inputs[i]) if(inputs[i].type == 'radio') - radios.push(inputs[i]); - } - for(var i in radios) - { - if(radios[i].checked && radios[i].name == name) - return radios[i].value; - } - return false; + // Konqueror/Safari fix + if ( form[name] ) + { + var formitem = form[name]; + if ( String(formitem) == '[object DOMNamedNodesCollection]' || is_Safari ) + { + var i = 0; + var radios = new Array(); + var radioids = new Array(); + while(true) + { + var elem = formitem[i]; + if ( !elem ) + break; + radios.push(elem); + if ( !elem.id ) + { + elem.id = 'autoRadioBtn_' + Math.floor(Math.random() * 1000000); + } + radioids.push(elem.id); + i++; + } + var cr; + for ( var i = 0; i < radios.length; i++ ) + { + cr = document.getElementById(radioids[i]); + if ( cr.value == 'on' || cr.checked == true ) + { + try { + return ( typeof ( valArray[i] ) != 'undefined' ) ? valArray[i] : false; + } catch(e) { + // alert('Didn\'t get value for index: ' + i); + return false; + } + } + } + return false; + } + } + inputs = form.getElementsByTagName('input'); + radios = new Array(); + for(var i in inputs) + { + if(inputs[i]) if(inputs[i].type == 'radio') + radios.push(inputs[i]); + } + for(var i in radios) + { + if(radios[i].checked && radios[i].name == name) + return radios[i].value; + } + return false; } function __aclSetAllRadios(val, valArray) { - val = String(val); - var form = document.forms[aclManagerID + '_formobj']; - if (!form) - { - return false; - } - var inputs = form.getElementsByTagName('input'); - var radios = new Array(); - var dbg = ''; - for(var i = 0; i < inputs.length; i++) - { - dbg += String(inputs[i]) + "\n"; - if(inputs[i].type == 'radio') - radios.push(inputs[i]); - } - for(var i in radios) - { - if(radios[i].value == val) - radios[i].checked = true; - else - radios[i].checked = false; - } + val = String(val); + var form = document.forms[aclManagerID + '_formobj']; + if (!form) + { + return false; + } + var inputs = form.getElementsByTagName('input'); + var radios = new Array(); + var dbg = ''; + for(var i = 0; i < inputs.length; i++) + { + dbg += String(inputs[i]) + "\n"; + if(inputs[i].type == 'radio') + radios.push(inputs[i]); + } + for(var i in radios) + { + if(radios[i].value == val) + radios[i].checked = true; + else + radios[i].checked = false; + } } function __aclDeleteRule() { - if(!aclDataCache) - { - if ( window.console ) - { - try{ console.error('ACL editor: can\'t load data cache on delete'); } catch(e) {}; - } - return false; - } - if(aclDataCache.mode != 'seltarget' && aclDataCache.mode != 'save_new' && aclDataCache.mode != 'save_edit') - { - if ( window.console ) - { - try{ console.error('ACL editor: wrong mode on aclDataCache: ' + aclDataCache.mode); } catch(e) {}; - } - return false; - } - parms = { - 'target_type' : aclDataCache.target_type, - 'target_id' : aclDataCache.target_id, - 'target_name' : aclDataCache.target_name, - 'page_id' : aclDataCache.page_id, - 'namespace' : aclDataCache.namespace, - 'mode' : 'delete' - }; - __aclJSONSubmitAjaxHandler(parms); + if(!aclDataCache) + { + if ( window.console ) + { + try{ console.error('ACL editor: can\'t load data cache on delete'); } catch(e) {}; + } + return false; + } + if(aclDataCache.mode != 'seltarget' && aclDataCache.mode != 'save_new' && aclDataCache.mode != 'save_edit') + { + if ( window.console ) + { + try{ console.error('ACL editor: wrong mode on aclDataCache: ' + aclDataCache.mode); } catch(e) {}; + } + return false; + } + parms = { + 'target_type' : aclDataCache.target_type, + 'target_id' : aclDataCache.target_id, + 'target_name' : aclDataCache.target_name, + 'page_id' : aclDataCache.page_id, + 'namespace' : aclDataCache.namespace, + 'mode' : 'delete' + }; + __aclJSONSubmitAjaxHandler(parms); } function aclSetViewListExisting() { - if ( !document.getElementById(aclManagerID) ) - { - return false; - } - - var main = document.getElementById(aclManagerID + '_main'); - main.innerHTML = ''; - main.style.backgroundImage = 'url(' + scriptPath + '/images/loading-big.gif)'; - main.style.backgroundRepeat = 'no-repeat'; - main.style.backgroundPosition = 'center center'; - - var parms = { - 'mode' : 'list_existing' - }; - __aclJSONSubmitAjaxHandler(parms); + if ( !document.getElementById(aclManagerID) ) + { + return false; + } + + var main = document.getElementById(aclManagerID + '_main'); + main.innerHTML = ''; + main.style.backgroundImage = 'url(' + scriptPath + '/images/loading-big.gif)'; + main.style.backgroundRepeat = 'no-repeat'; + main.style.backgroundPosition = 'center center'; + + var parms = { + 'mode' : 'list_existing' + }; + __aclJSONSubmitAjaxHandler(parms); } function aclSetViewListExistingRespond(data) { - var main = document.getElementById(aclManagerID + '_main'); - main.style.padding = '10px'; - main.innerHTML = ''; - - var heading = document.createElement('h3'); - heading.appendChild(document.createTextNode($lang.get('acl_msg_scale_intro_title'))); - main.appendChild(heading); - - var p = document.createElement('p'); - p.appendChild(document.createTextNode($lang.get('acl_msg_scale_intro_body'))); - main.appendChild(p); - - - main.innerHTML += data.key; - main.style.backgroundImage = 'none'; - - document.getElementById(aclManagerID + '_back').style.display = 'inline'; - document.getElementById(aclManagerID + '_next').style.display = 'none'; - - for ( var i = 0; i < data.rules.length; i++ ) - { - var rule = data.rules[i]; - // build the rule, this is just more boring DOM crap. - var div = document.createElement('div'); - div.style.padding = '5px 3px'; - div.style.backgroundColor = '#' + rule.color; - div.style.cursor = 'pointer'; - div.rule_id = rule.rule_id; - div.onclick = function() - { - var main = document.getElementById(aclManagerID + '_main'); - main.innerHTML = ''; - main.style.backgroundImage = 'url(' + scriptPath + '/images/loading-big.gif)'; - ajaxOpenDirectACLRule(parseInt(this.rule_id)); - } - div.innerHTML = rule.score_string; - main.appendChild(div); - } + var main = document.getElementById(aclManagerID + '_main'); + main.style.padding = '10px'; + main.innerHTML = ''; + + var heading = document.createElement('h3'); + heading.appendChild(document.createTextNode($lang.get('acl_msg_scale_intro_title'))); + main.appendChild(heading); + + var p = document.createElement('p'); + p.appendChild(document.createTextNode($lang.get('acl_msg_scale_intro_body'))); + main.appendChild(p); + + + main.innerHTML += data.key; + main.style.backgroundImage = 'none'; + + document.getElementById(aclManagerID + '_back').style.display = 'inline'; + document.getElementById(aclManagerID + '_next').style.display = 'none'; + + for ( var i = 0; i < data.rules.length; i++ ) + { + var rule = data.rules[i]; + // build the rule, this is just more boring DOM crap. + var div = document.createElement('div'); + div.style.padding = '5px 3px'; + div.style.backgroundColor = '#' + rule.color; + div.style.cursor = 'pointer'; + div.rule_id = rule.rule_id; + div.onclick = function() + { + var main = document.getElementById(aclManagerID + '_main'); + main.innerHTML = ''; + main.style.backgroundImage = 'url(' + scriptPath + '/images/loading-big.gif)'; + ajaxOpenDirectACLRule(parseInt(this.rule_id)); + } + div.innerHTML = rule.score_string; + main.appendChild(div); + } } function aclSetViewDebugTools() { - // selection window for viewing effective permissions - var main = document.getElementById(aclManagerID + '_main'); - main.innerHTML = ''; + // selection window for viewing effective permissions + var main = document.getElementById(aclManagerID + '_main'); + main.innerHTML = ''; - // set the submission handler to trace - var thefrm = document.forms[aclManagerID + '_formobj']; - var modeobj = form_fetch_field(thefrm, 'mode'); - modeobj.value = 'trace'; - - // show the back button - document.getElementById(aclManagerID + '_back').style.display = 'inline'; - - // - // start building - // - - // selection interface - var selector = document.createElement('div'); - - var table = document.createElement('table'); - - // username - var tr_user = document.createElement('tr'); - var td_user_l = document.createElement('td'); - var lbl_user = document.createElement('label'); - lbl_user.setAttribute('for', aclManagerID + 'trace_user'); - lbl_user.appendChild(document.createTextNode($lang.get('acl_lbl_trace_user'))); - td_user_l.appendChild(lbl_user); - tr_user.appendChild(td_user_l); - - var td_user_i = document.createElement('td'); - var i_user = document.createElement('input'); - i_user.type = 'text'; - i_user.id = aclManagerID + 'trace_user'; - i_user.onkeyup = function() { new AutofillUsername(this, true); }; - i_user.size = '20'; - td_user_i.appendChild(i_user); - tr_user.appendChild(td_user_i); - - table.appendChild(tr_user); - - // page - var tr_page = document.createElement('tr'); - var td_page_l = document.createElement('td'); - var lbl_page = document.createElement('label'); - lbl_page.setAttribute('for', aclManagerID + 'trace_page'); - lbl_page.appendChild(document.createTextNode($lang.get('acl_lbl_trace_page'))); - td_page_l.appendChild(lbl_page); - tr_page.appendChild(td_page_l); - - var td_page_i = document.createElement('td'); - var i_page = document.createElement('input'); - i_page.type = 'text'; - i_page.id = aclManagerID + 'trace_page'; - i_page.onkeyup = function() { new AutofillPage(this); }; - i_page.size = '20'; - td_page_i.appendChild(i_page); - tr_page.appendChild(td_page_i); - - table.appendChild(tr_page); - - selector.appendChild(table); - - // wrapper - - var container = document.createElement('div'); - - container.style.margin = 'auto'; - container.style.width = '360px'; - container.style.paddingTop = '90px'; - - var head = document.createElement('h2'); - head.appendChild(document.createTextNode($lang.get('acl_lbl_trace_title'))); - - var desc = document.createElement('p'); - desc.innerHTML = $lang.get('acl_lbl_trace_body'); - - container.appendChild(head); - container.appendChild(desc); - container.appendChild(selector); - - main.appendChild(container); + // set the submission handler to trace + var thefrm = document.forms[aclManagerID + '_formobj']; + var modeobj = form_fetch_field(thefrm, 'mode'); + modeobj.value = 'trace'; + + // show the back button + document.getElementById(aclManagerID + '_back').style.display = 'inline'; + + // + // start building + // + + // selection interface + var selector = document.createElement('div'); + + var table = document.createElement('table'); + + // username + var tr_user = document.createElement('tr'); + var td_user_l = document.createElement('td'); + var lbl_user = document.createElement('label'); + lbl_user.setAttribute('for', aclManagerID + 'trace_user'); + lbl_user.appendChild(document.createTextNode($lang.get('acl_lbl_trace_user'))); + td_user_l.appendChild(lbl_user); + tr_user.appendChild(td_user_l); + + var td_user_i = document.createElement('td'); + var i_user = document.createElement('input'); + i_user.type = 'text'; + i_user.id = aclManagerID + 'trace_user'; + i_user.onkeyup = function() { new AutofillUsername(this, true); }; + i_user.size = '20'; + td_user_i.appendChild(i_user); + tr_user.appendChild(td_user_i); + + table.appendChild(tr_user); + + // page + var tr_page = document.createElement('tr'); + var td_page_l = document.createElement('td'); + var lbl_page = document.createElement('label'); + lbl_page.setAttribute('for', aclManagerID + 'trace_page'); + lbl_page.appendChild(document.createTextNode($lang.get('acl_lbl_trace_page'))); + td_page_l.appendChild(lbl_page); + tr_page.appendChild(td_page_l); + + var td_page_i = document.createElement('td'); + var i_page = document.createElement('input'); + i_page.type = 'text'; + i_page.id = aclManagerID + 'trace_page'; + i_page.onkeyup = function() { new AutofillPage(this); }; + i_page.size = '20'; + td_page_i.appendChild(i_page); + tr_page.appendChild(td_page_i); + + table.appendChild(tr_page); + + selector.appendChild(table); + + // wrapper + + var container = document.createElement('div'); + + container.style.margin = 'auto'; + container.style.width = '360px'; + container.style.paddingTop = '90px'; + + var head = document.createElement('h2'); + head.appendChild(document.createTextNode($lang.get('acl_lbl_trace_title'))); + + var desc = document.createElement('p'); + desc.innerHTML = $lang.get('acl_lbl_trace_body'); + + container.appendChild(head); + container.appendChild(desc); + container.appendChild(selector); + + main.appendChild(container); } function aclTraceKey() { - var div = document.createElement('div'); - $(div).addClass('tblholder'); - var table = document.createElement('table'); - $(table).attr('cellspacing', '1').attr('cellpadding', '4'); - - var inherit_list = ['enano_default', 'global_everyone', 'global_group', 'global_user', 'pg_everyone', 'pg_group', 'pg_user', 'local_everyone', 'local_group', 'local_user']; - for ( var i = 0; i < inherit_list.length; i++ ) - { - var t = inherit_list[i]; - var tr = document.createElement('tr'); - var td_key = document.createElement('td'); - $(td_key).addClass('acl_' + t).addClass('acl_inherit_key'); - tr.appendChild(td_key); - var td_explain = document.createElement('td'); - $(td_explain).addClass(i % 2 == 0 ? 'row1' : 'row2'); - td_explain.appendChild(document.createTextNode($lang.get('acl_inherit_key_' + t))); - tr.appendChild(td_explain); - table.appendChild(tr); - } - div.appendChild(table); - return div; + var div = document.createElement('div'); + $(div).addClass('tblholder'); + var table = document.createElement('table'); + $(table).attr('cellspacing', '1').attr('cellpadding', '4'); + + var inherit_list = ['enano_default', 'global_everyone', 'global_group', 'global_user', 'pg_everyone', 'pg_group', 'pg_user', 'local_everyone', 'local_group', 'local_user']; + for ( var i = 0; i < inherit_list.length; i++ ) + { + var t = inherit_list[i]; + var tr = document.createElement('tr'); + var td_key = document.createElement('td'); + $(td_key).addClass('acl_' + t).addClass('acl_inherit_key'); + tr.appendChild(td_key); + var td_explain = document.createElement('td'); + $(td_explain).addClass(i % 2 == 0 ? 'row1' : 'row2'); + td_explain.appendChild(document.createTextNode($lang.get('acl_inherit_key_' + t))); + tr.appendChild(td_explain); + table.appendChild(tr); + } + div.appendChild(table); + return div; } function aclTraceModalKey() { - load_component('messagebox'); - miniPrompt(function(parent) - { - // heading - var h3 = document.createElement('h3'); - h3.appendChild(document.createTextNode($lang.get('acl_msg_trace_key'))); - parent.appendChild(h3); - - var key = aclTraceKey(); - parent.appendChild(key); - - var p = document.createElement('p'); - $(p).css('text-align', 'center'); - - var closer = document.createElement('a'); - $(closer).addClass('abutton').addClass('abutton_red').css('font-weight', 'bold'); - closer.appendChild(document.createTextNode($lang.get('etc_close'))); - closer.href = '#'; - $(closer).click(function(e) - { - miniPromptDestroy(this); - return false; - }); - - p.appendChild(closer); - parent.appendChild(p); - }); + load_component('messagebox'); + miniPrompt(function(parent) + { + // heading + var h3 = document.createElement('h3'); + h3.appendChild(document.createTextNode($lang.get('acl_msg_trace_key'))); + parent.appendChild(h3); + + var key = aclTraceKey(); + parent.appendChild(key); + + var p = document.createElement('p'); + $(p).css('text-align', 'center'); + + var closer = document.createElement('a'); + $(closer).addClass('abutton').addClass('abutton_red').css('font-weight', 'bold'); + closer.appendChild(document.createTextNode($lang.get('etc_close'))); + closer.href = '#'; + $(closer).click(function(e) + { + miniPromptDestroy(this); + return false; + }); + + p.appendChild(closer); + parent.appendChild(p); + }); } function aclDrawTraceWrapper(data) { - // hide the next button - document.getElementById(aclManagerID + '_next').style.display = 'none'; - - var trace_by_perm = aclDrawTraceByPerm(data); - var trace_by_rule = aclDrawTraceByRule(data); - - trace_by_perm.id = 'aclDebugTraceViewPerm'; - trace_by_rule.id = 'aclDebugTraceViewRule'; - - var start_with_rule = ( readCookie('acl_trace_view') == 'rule' ); - - if ( start_with_rule ) - { - trace_by_perm.style.display = 'none'; - } - else - { - trace_by_rule.style.display = 'none'; - } - - // selection window for viewing effective permissions - var main = document.getElementById(aclManagerID + '_main'); - main.innerHTML = ''; - - var wrapper = document.createElement('div'); - $(wrapper).css('padding-bottom', '20px'); - - var floatlink = document.createElement('div'); - $(floatlink).css('float', 'right').css('margin-left', '20px').css('margin-bottom', '20px').css('text-align', 'right'); - var a_toggle = document.createElement('a'); - $(a_toggle).attr('id', 'aclDebugTraceViewToggle'); - a_toggle.innerHTML = '» '; - a_toggle.innerHTML += start_with_rule ? $lang.get('acl_btn_sort_perm') : $lang.get('acl_btn_sort_rule'); - a_toggle.href = '#'; - floatlink.appendChild(a_toggle); - floatlink.appendChild(document.createElement('br')); - var a_key = document.createElement('a'); - $(a_key).css('font-size', 'smaller'); - a_key.innerHTML = '» '; - a_key.innerHTML += $lang.get('acl_btn_view_key'); - a_key.href = '#'; - floatlink.appendChild(a_key); - wrapper.appendChild(floatlink); - - var h3 = document.createElement('h3'); - h3.appendChild(document.createTextNode($lang.get('acl_msg_debug_main_title'))); - wrapper.appendChild(h3); - var p = document.createElement('p'); - p.appendChild(document.createTextNode($lang.get('acl_msg_debug_main_body'))); - wrapper.appendChild(p); - - wrapper.appendChild(trace_by_perm); - wrapper.appendChild(trace_by_rule); - - main.appendChild(wrapper); - - $(a_toggle).click(function(e) - { - aclTraceToggleViews(); - return false; - }); - - $(a_key).click(function(e) - { - aclTraceModalKey(); - return false; - }); + // hide the next button + document.getElementById(aclManagerID + '_next').style.display = 'none'; + + var trace_by_perm = aclDrawTraceByPerm(data); + var trace_by_rule = aclDrawTraceByRule(data); + + trace_by_perm.id = 'aclDebugTraceViewPerm'; + trace_by_rule.id = 'aclDebugTraceViewRule'; + + var start_with_rule = ( readCookie('acl_trace_view') == 'rule' ); + + if ( start_with_rule ) + { + trace_by_perm.style.display = 'none'; + } + else + { + trace_by_rule.style.display = 'none'; + } + + // selection window for viewing effective permissions + var main = document.getElementById(aclManagerID + '_main'); + main.innerHTML = ''; + + var wrapper = document.createElement('div'); + $(wrapper).css('padding-bottom', '20px'); + + var floatlink = document.createElement('div'); + $(floatlink).css('float', 'right').css('margin-left', '20px').css('margin-bottom', '20px').css('text-align', 'right'); + var a_toggle = document.createElement('a'); + $(a_toggle).attr('id', 'aclDebugTraceViewToggle'); + a_toggle.innerHTML = '» '; + a_toggle.innerHTML += start_with_rule ? $lang.get('acl_btn_sort_perm') : $lang.get('acl_btn_sort_rule'); + a_toggle.href = '#'; + floatlink.appendChild(a_toggle); + floatlink.appendChild(document.createElement('br')); + var a_key = document.createElement('a'); + $(a_key).css('font-size', 'smaller'); + a_key.innerHTML = '» '; + a_key.innerHTML += $lang.get('acl_btn_view_key'); + a_key.href = '#'; + floatlink.appendChild(a_key); + wrapper.appendChild(floatlink); + + var h3 = document.createElement('h3'); + h3.appendChild(document.createTextNode($lang.get('acl_msg_debug_main_title'))); + wrapper.appendChild(h3); + var p = document.createElement('p'); + p.appendChild(document.createTextNode($lang.get('acl_msg_debug_main_body'))); + wrapper.appendChild(p); + + wrapper.appendChild(trace_by_perm); + wrapper.appendChild(trace_by_rule); + + main.appendChild(wrapper); + + $(a_toggle).click(function(e) + { + aclTraceToggleViews(); + return false; + }); + + $(a_key).click(function(e) + { + aclTraceModalKey(); + return false; + }); } function aclTraceToggleViews() { - var trace_by_perm = document.getElementById('aclDebugTraceViewPerm'); - var trace_by_rule = document.getElementById('aclDebugTraceViewRule'); - - var toggler = document.getElementById('aclDebugTraceViewToggle'); - var newtext; - - if ( trace_by_perm.style.display == 'none' ) - { - newtext = $lang.get('acl_btn_sort_rule'); - $(trace_by_rule).hide('blind', {}, 750, function() - { - $(trace_by_perm).show('blind', {}, 750); - }); - createCookie('acl_trace_view', 'perm'); - } - else - { - newtext = $lang.get('acl_btn_sort_perm'); - $(trace_by_perm).hide('blind', {}, 750, function() - { - $(trace_by_rule).show('blind', {}, 750); - }); - createCookie('acl_trace_view', 'rule'); - } - $(toggler).fadeOut(500, function() - { - this.innerHTML = '» ' + newtext; - $(this).fadeIn(500); - }); + var trace_by_perm = document.getElementById('aclDebugTraceViewPerm'); + var trace_by_rule = document.getElementById('aclDebugTraceViewRule'); + + var toggler = document.getElementById('aclDebugTraceViewToggle'); + var newtext; + + if ( trace_by_perm.style.display == 'none' ) + { + newtext = $lang.get('acl_btn_sort_rule'); + $(trace_by_rule).hide('blind', {}, 750, function() + { + $(trace_by_perm).show('blind', {}, 750); + }); + createCookie('acl_trace_view', 'perm'); + } + else + { + newtext = $lang.get('acl_btn_sort_perm'); + $(trace_by_perm).hide('blind', {}, 750, function() + { + $(trace_by_rule).show('blind', {}, 750); + }); + createCookie('acl_trace_view', 'rule'); + } + $(toggler).fadeOut(500, function() + { + this.innerHTML = '» ' + newtext; + $(this).fadeIn(500); + }); } function aclDrawTraceByPerm(data) { - var wrapper = document.createElement('div'); - // wrapper.style.display = 'none'; - - // temporarily append wrapper to body to allow onclick to work - // var body = document.getElementsByTagName('body')[0]; - // body.appendChild(wrapper); - - for ( var i in data.perms ) - { - var perm = data.perms[i]; - var item = document.createElement('div'); - item.className = perm.divclass; - - // first row - permission name + current setting - // use innerHTML here to allow for HTML in localized permission types - item.innerHTML += '' + perm.perm_name + ' - ' + perm.perm_value + ''; - item.appendChild(document.createElement('br')); - - // second row - permission localized name + rule ID - var sm = document.createElement('small'); - sm.innerHTML = perm.perm_src; - - item.appendChild(sm); - - wrapper.appendChild(item); - - // whole row is now in the document - if ( perm.rule_id != -1 ) - { - sm.innerHTML += ' ['; - // rule is editable - var editlink = document.createElement('a'); - editlink.href = 'javascript:ajaxOpenDirectACLRule(' + perm.rule_id + ');'; - editlink.appendChild(document.createTextNode($lang.get('acl_btn_edit_rule'))); - sm.appendChild(editlink); - sm.innerHTML += ']'; - } - - if ( perm.bad_deps.length > 0 ) - { - var bd = document.createElement('span'); - $(bd).addClass('acl_failed_deps'); - var failed_deps = ''; - for ( var i = 0; i < perm.bad_deps.length; i++ ) - { - if ( i > 0 ) - failed_deps += ', '; - failed_deps += data.perms[perm.bad_deps[i]].perm_name; - } - var title = document.createElement('span'); - $(title).addClass('title'); - title.appendChild(document.createTextNode($lang.get('acl_msg_failed_deps'))); - bd.appendChild(title); - bd.appendChild(document.createTextNode(failed_deps)); - - item.appendChild(document.createElement('br')); - item.appendChild(bd); - } - } - - // var ret = wrapper.cloneNode(true); - // body.removeChild(wrapper); - // wrapper = false; - // ret.style.display = 'block'; - // console.debug(ret); - // return ret; - return wrapper; + var wrapper = document.createElement('div'); + // wrapper.style.display = 'none'; + + // temporarily append wrapper to body to allow onclick to work + // var body = document.getElementsByTagName('body')[0]; + // body.appendChild(wrapper); + + for ( var i in data.perms ) + { + var perm = data.perms[i]; + var item = document.createElement('div'); + item.className = perm.divclass; + + // first row - permission name + current setting + // use innerHTML here to allow for HTML in localized permission types + item.innerHTML += '' + perm.perm_name + ' - ' + perm.perm_value + ''; + item.appendChild(document.createElement('br')); + + // second row - permission localized name + rule ID + var sm = document.createElement('small'); + sm.innerHTML = perm.perm_src; + + item.appendChild(sm); + + wrapper.appendChild(item); + + // whole row is now in the document + if ( perm.rule_id != -1 ) + { + sm.innerHTML += ' ['; + // rule is editable + var editlink = document.createElement('a'); + editlink.href = 'javascript:ajaxOpenDirectACLRule(' + perm.rule_id + ');'; + editlink.appendChild(document.createTextNode($lang.get('acl_btn_edit_rule'))); + sm.appendChild(editlink); + sm.innerHTML += ']'; + } + + if ( perm.bad_deps.length > 0 ) + { + var bd = document.createElement('span'); + $(bd).addClass('acl_failed_deps'); + var failed_deps = ''; + for ( var i = 0; i < perm.bad_deps.length; i++ ) + { + if ( i > 0 ) + failed_deps += ', '; + failed_deps += data.perms[perm.bad_deps[i]].perm_name; + } + var title = document.createElement('span'); + $(title).addClass('title'); + title.appendChild(document.createTextNode($lang.get('acl_msg_failed_deps'))); + bd.appendChild(title); + bd.appendChild(document.createTextNode(failed_deps)); + + item.appendChild(document.createElement('br')); + item.appendChild(bd); + } + } + + // var ret = wrapper.cloneNode(true); + // body.removeChild(wrapper); + // wrapper = false; + // ret.style.display = 'block'; + // console.debug(ret); + // return ret; + return wrapper; } function aclDrawTraceByRule(data) { - var wrapper = document.createElement('div'); - var groupdata = {}; - - for ( var i in data.perms ) - { - var perm = data.perms[i]; - if ( !groupdata[perm['rule_id']] ) - { - groupdata[perm['rule_id']] = { - meta: { - divclass: perm.divclass, - perm_src: perm.perm_src, - rule_id: perm.rule_id - }, - rules: {} - }; - } - groupdata[perm['rule_id']]['rules'][i] = perm; - } - - for ( var i in groupdata ) - { - var group = groupdata[i]; - var grp = document.createElement('div'); - var head = document.createElement('div'); - head.className = group.meta.divclass; - var span = document.createElement('span'); - span.style.fontSize = 'larger'; - span.appendChild(document.createTextNode(group.meta.perm_src)); - head.appendChild(span); - if ( group.meta.rule_id != -1 ) - { - head.innerHTML += ' ['; - // rule is editable - var editlink = document.createElement('a'); - editlink.href = 'javascript:ajaxOpenDirectACLRule(' + group.meta.rule_id + ');'; - editlink.appendChild(document.createTextNode($lang.get('acl_btn_edit_rule'))); - head.appendChild(editlink); - head.innerHTML += ']'; - } - grp.appendChild(head); - for ( var i in group.rules ) - { - var rule = group.rules[i]; - var rulediv = document.createElement('div'); - rulediv.style.padding = '3px 12px'; - rulediv.innerHTML += rule.perm_name + ': '; - var b = document.createElement('strong'); - b.appendChild(document.createTextNode(rule.perm_value)); - rulediv.appendChild(b); - grp.appendChild(rulediv); - - if ( rule.bad_deps.length > 0 ) - { - var bd = document.createElement('span'); - $(bd).addClass('acl_failed_deps'); - var failed_deps = ''; - for ( var i = 0; i < rule.bad_deps.length; i++ ) - { - if ( i > 0 ) - failed_deps += ', '; - failed_deps += data.perms[rule.bad_deps[i]].perm_name; - } - var title = document.createElement('span'); - $(title).addClass('title'); - title.appendChild(document.createTextNode($lang.get('acl_msg_failed_deps'))); - bd.appendChild(title); - bd.appendChild(document.createTextNode(failed_deps)); - - rulediv.appendChild(document.createElement('br')); - rulediv.appendChild(bd); - } - } - wrapper.appendChild(grp); - } - - return wrapper; + var wrapper = document.createElement('div'); + var groupdata = {}; + + for ( var i in data.perms ) + { + var perm = data.perms[i]; + if ( !groupdata[perm['rule_id']] ) + { + groupdata[perm['rule_id']] = { + meta: { + divclass: perm.divclass, + perm_src: perm.perm_src, + rule_id: perm.rule_id + }, + rules: {} + }; + } + groupdata[perm['rule_id']]['rules'][i] = perm; + } + + for ( var i in groupdata ) + { + var group = groupdata[i]; + var grp = document.createElement('div'); + var head = document.createElement('div'); + head.className = group.meta.divclass; + var span = document.createElement('span'); + span.style.fontSize = 'larger'; + span.appendChild(document.createTextNode(group.meta.perm_src)); + head.appendChild(span); + if ( group.meta.rule_id != -1 ) + { + head.innerHTML += ' ['; + // rule is editable + var editlink = document.createElement('a'); + editlink.href = 'javascript:ajaxOpenDirectACLRule(' + group.meta.rule_id + ');'; + editlink.appendChild(document.createTextNode($lang.get('acl_btn_edit_rule'))); + head.appendChild(editlink); + head.innerHTML += ']'; + } + grp.appendChild(head); + for ( var i in group.rules ) + { + var rule = group.rules[i]; + var rulediv = document.createElement('div'); + rulediv.style.padding = '3px 12px'; + rulediv.innerHTML += rule.perm_name + ': '; + var b = document.createElement('strong'); + b.appendChild(document.createTextNode(rule.perm_value)); + rulediv.appendChild(b); + grp.appendChild(rulediv); + + if ( rule.bad_deps.length > 0 ) + { + var bd = document.createElement('span'); + $(bd).addClass('acl_failed_deps'); + var failed_deps = ''; + for ( var i = 0; i < rule.bad_deps.length; i++ ) + { + if ( i > 0 ) + failed_deps += ', '; + failed_deps += data.perms[rule.bad_deps[i]].perm_name; + } + var title = document.createElement('span'); + $(title).addClass('title'); + title.appendChild(document.createTextNode($lang.get('acl_msg_failed_deps'))); + bd.appendChild(title); + bd.appendChild(document.createTextNode(failed_deps)); + + rulediv.appendChild(document.createElement('br')); + rulediv.appendChild(bd); + } + } + wrapper.appendChild(grp); + } + + return wrapper; } function aclShowPresetLoader() { - var prompt = miniPrompt(function(parent) - { - parent.innerHTML = '
';
- });
- var request = toJSONString({
- mode: 'list_presets'
- });
- ajaxPost(stdAjaxPrefix + '&_mode=acljson', 'acl_params=' + ajaxEscape(request), function(ajax)
- {
- if ( ajax.readyState == 4 && ajax.status == 200 )
- {
- if ( !check_json_response(ajax.responseText) )
- {
- miniPromptDestroy(prompt);
- return handle_invalid_json(ajax.responseText);
- }
- var response = parseJSON(ajax.responseText);
- if ( response.mode == 'error' )
- {
- alert(response.error);
- miniPromptDestroy(prompt);
- return false;
- }
- prompt = prompt.firstChild.nextSibling;
- prompt.style.textAlign = 'center';
- prompt.innerHTML = '' + $lang.get('acl_lbl_preset_load_title') + '
'; - - if ( response.presets.length > 0 ) - { - // selection box - var para = document.createElement('p'); - var select = document.createElement('select'); - - var option = document.createElement('option'); - option.value = '0'; - option.appendChild(document.createTextNode($lang.get('acl_lbl_preset_load'))); - select.appendChild(option); - - for ( var i = 0; i < response.presets.length; i++ ) - { - var preset = response.presets[i]; - var option = document.createElement('option'); - option.value = preset.rule_id; - option.preset_data = preset; - option.appendChild(document.createTextNode($lang.get(preset.preset_name))); - select.appendChild(option); - } - - para.appendChild(select); - prompt.appendChild(para); - - // buttons - var buttons = document.createElement('p'); - - // load button - var btn_load = document.createElement('a'); - btn_load.className = 'abutton abutton_green'; - btn_load.style.fontWeight = 'bold'; - btn_load.appendChild(document.createTextNode($lang.get('acl_btn_load_preset'))); - btn_load.selectobj = select; - btn_load.onclick = function() - { - if ( this.selectobj.value == '0' ) - { - alert($lang.get('acl_err_select_preset')); - return false; - } - // retrieve preset data - for ( var i = 0; i < this.selectobj.childNodes.length; i++ ) - { - if ( this.selectobj.childNodes[i].tagName == 'OPTION' ) - { - var node = this.selectobj.childNodes[i]; - if ( node.value == this.selectobj.value ) - { - aclSetRulesAbsolute(node.preset_data.rules); - break; - } - } - } - miniPromptDestroy(this); - return false; - } - btn_load.href = '#'; - buttons.appendChild(btn_load); - - buttons.appendChild(document.createTextNode(' ')); - - // cancel button - var btn_cancel = document.createElement('a'); - btn_cancel.className = 'abutton'; - btn_cancel.appendChild(document.createTextNode($lang.get('etc_cancel'))); - btn_cancel.onclick = function() - { - miniPromptDestroy(this); - return false; - } - btn_cancel.href = '#'; - buttons.appendChild(btn_cancel); - - prompt.appendChild(buttons); - } - else - { - // "no presets" - prompt.innerHTML += '' + $lang.get('acl_msg_no_presets', { close_flags: 'href="#" onclick="miniPromptDestroy(this); return false;"' }) + '
'; - } - } - }); + var prompt = miniPrompt(function(parent) + { + parent.innerHTML = '';
+ });
+ var request = toJSONString({
+ mode: 'list_presets'
+ });
+ ajaxPost(stdAjaxPrefix + '&_mode=acljson', 'acl_params=' + ajaxEscape(request), function(ajax)
+ {
+ if ( ajax.readyState == 4 && ajax.status == 200 )
+ {
+ if ( !check_json_response(ajax.responseText) )
+ {
+ miniPromptDestroy(prompt);
+ return handle_invalid_json(ajax.responseText);
+ }
+ var response = parseJSON(ajax.responseText);
+ if ( response.mode == 'error' )
+ {
+ alert(response.error);
+ miniPromptDestroy(prompt);
+ return false;
+ }
+ prompt = prompt.firstChild.nextSibling;
+ prompt.style.textAlign = 'center';
+ prompt.innerHTML = '' + $lang.get('acl_lbl_preset_load_title') + '
'; + + if ( response.presets.length > 0 ) + { + // selection box + var para = document.createElement('p'); + var select = document.createElement('select'); + + var option = document.createElement('option'); + option.value = '0'; + option.appendChild(document.createTextNode($lang.get('acl_lbl_preset_load'))); + select.appendChild(option); + + for ( var i = 0; i < response.presets.length; i++ ) + { + var preset = response.presets[i]; + var option = document.createElement('option'); + option.value = preset.rule_id; + option.preset_data = preset; + option.appendChild(document.createTextNode($lang.get(preset.preset_name))); + select.appendChild(option); + } + + para.appendChild(select); + prompt.appendChild(para); + + // buttons + var buttons = document.createElement('p'); + + // load button + var btn_load = document.createElement('a'); + btn_load.className = 'abutton abutton_green'; + btn_load.style.fontWeight = 'bold'; + btn_load.appendChild(document.createTextNode($lang.get('acl_btn_load_preset'))); + btn_load.selectobj = select; + btn_load.onclick = function() + { + if ( this.selectobj.value == '0' ) + { + alert($lang.get('acl_err_select_preset')); + return false; + } + // retrieve preset data + for ( var i = 0; i < this.selectobj.childNodes.length; i++ ) + { + if ( this.selectobj.childNodes[i].tagName == 'OPTION' ) + { + var node = this.selectobj.childNodes[i]; + if ( node.value == this.selectobj.value ) + { + aclSetRulesAbsolute(node.preset_data.rules); + break; + } + } + } + miniPromptDestroy(this); + return false; + } + btn_load.href = '#'; + buttons.appendChild(btn_load); + + buttons.appendChild(document.createTextNode(' ')); + + // cancel button + var btn_cancel = document.createElement('a'); + btn_cancel.className = 'abutton'; + btn_cancel.appendChild(document.createTextNode($lang.get('etc_cancel'))); + btn_cancel.onclick = function() + { + miniPromptDestroy(this); + return false; + } + btn_cancel.href = '#'; + buttons.appendChild(btn_cancel); + + prompt.appendChild(buttons); + } + else + { + // "no presets" + prompt.innerHTML += '' + $lang.get('acl_msg_no_presets', { close_flags: 'href="#" onclick="miniPromptDestroy(this); return false;"' }) + '
'; + } + } + }); } function aclSetRulesAbsolute(rules) { - __aclSetAllRadios('i'); - - var form = document.forms[aclManagerID + '_formobj']; - if (!form) - { - return false; - } - var inputs = form.getElementsByTagName('input'); - var radios = new Array(); - var dbg = ''; - for(var i = 0; i < inputs.length; i++) - { - if(inputs[i].type == 'radio') - radios.push(inputs[i]); - } - for(var i in radios) - { - if ( typeof(rules[ radios[i]['name'] ]) == 'number' ) - { - radios[i].checked = ( rules[radios[i]['name']] == radios[i].value ); - } - } + __aclSetAllRadios('i'); + + var form = document.forms[aclManagerID + '_formobj']; + if (!form) + { + return false; + } + var inputs = form.getElementsByTagName('input'); + var radios = new Array(); + var dbg = ''; + for(var i = 0; i < inputs.length; i++) + { + if(inputs[i].type == 'radio') + radios.push(inputs[i]); + } + for(var i in radios) + { + if ( typeof(rules[ radios[i]['name'] ]) == 'number' ) + { + radios[i].checked = ( rules[radios[i]['name']] == radios[i].value ); + } + } } function aclShowPresetSave() { - miniPrompt(function(parent) - { - parent.style.textAlign = 'center'; - - parent.innerHTML = '' + $lang.get('acl_lbl_preset_save_title') + '
'; - var input = document.createElement('input'); - input.id = aclManagerID + '_preset_save'; - input.type = 'text'; - input.size = '30'; - input.onkeypress = function(e) - { - // javascript sucks. IE and several others throw myriad errors unless it's done this way. - if ( e ) - if ( e.keyCode ) - if ( e.keyCode == 13 ) - { - if ( aclSavePreset() ) - { - if ( window.opera ) - { - // damn weird opera bug. - var input = this; - setTimeout(function() - { - miniPromptDestroy(input); - }, 10); - } - else - { - miniPromptDestroy(this); - } - } - } - else if ( e.keyCode == 27 ) - { - miniPromptDestroy(this); - } - } - var para = document.createElement('p'); - para.appendChild(input); - - parent.appendChild(para); - - // buttons - var buttons = document.createElement('p'); - - // save button - var btn_save = document.createElement('a'); - btn_save.className = 'abutton abutton_green'; - btn_save.style.fontWeight = 'bold'; - btn_save.appendChild(document.createTextNode($lang.get('acl_btn_save_preset'))); - btn_save.selectobj = select; - btn_save.onclick = function() - { - if ( aclSavePreset() ) - { - miniPromptDestroy(this); - } - return false; - } - btn_save.href = '#'; - buttons.appendChild(btn_save); - - buttons.appendChild(document.createTextNode(' ')); - - // cancel button - var btn_cancel = document.createElement('a'); - btn_cancel.className = 'abutton'; - btn_cancel.appendChild(document.createTextNode($lang.get('etc_cancel'))); - btn_cancel.onclick = function() - { - miniPromptDestroy(this); - return false; - } - btn_cancel.href = '#'; - buttons.appendChild(btn_cancel); - - parent.appendChild(buttons); - - var timeout = ( aclDisableTransitionFX ) ? 10 : 1000; - setTimeout(function() - { - input.focus(); - }, timeout); - }); + miniPrompt(function(parent) + { + parent.style.textAlign = 'center'; + + parent.innerHTML = '' + $lang.get('acl_lbl_preset_save_title') + '
'; + var input = document.createElement('input'); + input.id = aclManagerID + '_preset_save'; + input.type = 'text'; + input.size = '30'; + input.onkeypress = function(e) + { + // javascript sucks. IE and several others throw myriad errors unless it's done this way. + if ( e ) + if ( e.keyCode ) + if ( e.keyCode == 13 ) + { + if ( aclSavePreset() ) + { + if ( window.opera ) + { + // damn weird opera bug. + var input = this; + setTimeout(function() + { + miniPromptDestroy(input); + }, 10); + } + else + { + miniPromptDestroy(this); + } + } + } + else if ( e.keyCode == 27 ) + { + miniPromptDestroy(this); + } + } + var para = document.createElement('p'); + para.appendChild(input); + + parent.appendChild(para); + + // buttons + var buttons = document.createElement('p'); + + // save button + var btn_save = document.createElement('a'); + btn_save.className = 'abutton abutton_green'; + btn_save.style.fontWeight = 'bold'; + btn_save.appendChild(document.createTextNode($lang.get('acl_btn_save_preset'))); + btn_save.selectobj = select; + btn_save.onclick = function() + { + if ( aclSavePreset() ) + { + miniPromptDestroy(this); + } + return false; + } + btn_save.href = '#'; + buttons.appendChild(btn_save); + + buttons.appendChild(document.createTextNode(' ')); + + // cancel button + var btn_cancel = document.createElement('a'); + btn_cancel.className = 'abutton'; + btn_cancel.appendChild(document.createTextNode($lang.get('etc_cancel'))); + btn_cancel.onclick = function() + { + miniPromptDestroy(this); + return false; + } + btn_cancel.href = '#'; + buttons.appendChild(btn_cancel); + + parent.appendChild(buttons); + + var timeout = ( aclDisableTransitionFX ) ? 10 : 1000; + setTimeout(function() + { + input.focus(); + }, timeout); + }); } function aclSavePreset() { - var input = document.getElementById(aclManagerID + '_preset_save'); - if ( trim(input.value) == '' ) - { - alert($lang.get('acl_err_preset_name_empty')); - return false; - } - var form = document.forms[aclManagerID + '_formobj'], selections = {}; - var dbg = ''; - var warned_everyone = false; - for(var i in aclPermList) - { - selections[aclPermList[i]] = getRadioState(form, aclPermList[i], ['i', 1, 2, 3, 4]); - // If we're editing permissions for everyone on the entire site and the - // admin selected to deny privileges, give a stern warning about it. - if ( selections[aclPermList[i]] == 1 && aclDataCache.target_type == 1 /* ACL_TYPE_GROUP */ && aclDataCache.target_id == 1 && !warned_everyone ) - { - warned_everyone = true; - if ( !confirm($lang.get('acl_msg_deny_everyone_confirm')) ) - { - return false; - } - } - dbg += aclPermList[i] + ': ' + selections[aclPermList[i]] + "\n"; - if(!selections[aclPermList[i]]) - { - alert("Invalid return from getRadioState: "+i+": "+selections[i]+" ("+typeof(selections[i])+")"); - return false; - } - } - - var packet = toJSONString({ - mode: 'save_preset', - preset_name: input.value, - perms: selections - }); - - var whitey = whiteOutElement(document.getElementById(aclManagerID)); - - ajaxPost(stdAjaxPrefix + '&_mode=acljson', 'acl_params=' + ajaxEscape(packet), function(ajax) - { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - if ( !check_json_response(ajax.responseText) ) - { - whitey.parentNode.removeChild(whitey); - return handle_invalid_json(ajax.responseText); - } - var response = parseJSON(ajax.responseText); - if ( response.mode == 'error' ) - { - whitey.parentNode.removeChild(whitey); - alert(response.error); - return false; - } - whiteOutReportSuccess(whitey); - } - }); - - return true; + var input = document.getElementById(aclManagerID + '_preset_save'); + if ( trim(input.value) == '' ) + { + alert($lang.get('acl_err_preset_name_empty')); + return false; + } + var form = document.forms[aclManagerID + '_formobj'], selections = {}; + var dbg = ''; + var warned_everyone = false; + for(var i in aclPermList) + { + selections[aclPermList[i]] = getRadioState(form, aclPermList[i], ['i', 1, 2, 3, 4]); + // If we're editing permissions for everyone on the entire site and the + // admin selected to deny privileges, give a stern warning about it. + if ( selections[aclPermList[i]] == 1 && aclDataCache.target_type == 1 /* ACL_TYPE_GROUP */ && aclDataCache.target_id == 1 && !warned_everyone ) + { + warned_everyone = true; + if ( !confirm($lang.get('acl_msg_deny_everyone_confirm')) ) + { + return false; + } + } + dbg += aclPermList[i] + ': ' + selections[aclPermList[i]] + "\n"; + if(!selections[aclPermList[i]]) + { + alert("Invalid return from getRadioState: "+i+": "+selections[i]+" ("+typeof(selections[i])+")"); + return false; + } + } + + var packet = toJSONString({ + mode: 'save_preset', + preset_name: input.value, + perms: selections + }); + + var whitey = whiteOutElement(document.getElementById(aclManagerID)); + + ajaxPost(stdAjaxPrefix + '&_mode=acljson', 'acl_params=' + ajaxEscape(packet), function(ajax) + { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + if ( !check_json_response(ajax.responseText) ) + { + whitey.parentNode.removeChild(whitey); + return handle_invalid_json(ajax.responseText); + } + var response = parseJSON(ajax.responseText); + if ( response.mode == 'error' ) + { + whitey.parentNode.removeChild(whitey); + alert(response.error); + return false; + } + whiteOutReportSuccess(whitey); + } + }); + + return true; } function array_keys(obj) { - keys = new Array(); - for(var i in obj) - keys.push(i); - return keys; + keys = new Array(); + for(var i in obj) + keys.push(i); + return keys; } diff -r de56132c008d -r bdac73ed481e includes/clientside/static/admin-menu.js --- a/includes/clientside/static/admin-menu.js Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/static/admin-menu.js Sun Mar 28 23:10:46 2010 -0400 @@ -24,20 +24,20 @@ if ( /admin_menu_state=/.test(document.cookie) ) { - var ck = (String(document.cookie).match(/admin_menu_state=([0-9]+)/))[1]; - if(ck) - { - ck = parseInt(ck); - } - else - { - ck = 0; - } - ck = ( isNaN(ck) ) ? 0 : ck; + var ck = (String(document.cookie).match(/admin_menu_state=([0-9]+)/))[1]; + if(ck) + { + ck = parseInt(ck); + } + else + { + ck = 0; + } + ck = ( isNaN(ck) ) ? 0 : ck; } else { - var ck = 0; + var ck = 0; } function tree (a_items, a_template, s_target) { @@ -63,26 +63,26 @@ } this.toggle = function (n_id,co) { var o_item = this.a_index[n_id]; o_item.open(o_item.b_opened,co); }; - this.open = function (n_id,co) { var o_item = this.a_index[n_id]; o_item.open(false,co); }; + this.open = function (n_id,co) { var o_item = this.a_index[n_id]; o_item.open(false,co); }; this.select = function (n_id) { return this.a_index[n_id].select(); }; this.mout = function (n_id) { this.a_index[n_id].upstatus(true) }; this.mover = function (n_id) { this.a_index[n_id].upstatus() }; this.a_children = []; for (var i = 0; i < a_items.length; i++) - { + { new tree_item(this, i); - } + } this.n_id = trees.length; trees[this.n_id] = this; for (var i = 0; i < this.a_children.length; i++) - { - if ( s_target ) - document.getElementById(s_target).innerHTML += this.a_children[i].init(); - else - document.write(this.a_children[i].init()); + { + if ( s_target ) + document.getElementById(s_target).innerHTML += this.a_children[i].init(); + else + document.write(this.a_children[i].init()); this.a_children[i].open(false, true); } } @@ -103,57 +103,57 @@ this.a_children = []; for (var i = 0; i < this.a_config.length - 2; i++) - { + { new tree_item(this, i); - } - + } + this.get_icon = item_get_icon; this.open = item_open; this.select = item_select; this.init = item_init; this.upstatus = item_upstatus; this.is_last = function () { return this.n_order == this.o_parent.a_children.length - 1 }; - - // CODE MODIFICATION - // added: - // Do we need to open the branch? - n = Math.pow(2, this.n_id); - var disp = ( ck & n ) ? true : false; - s = ( disp ) ? 'open' : 'closed'; - //if(s=='open') alert(this.n_id + ': ' + s); - if(disp) setTimeout('trees['+trees.length+'].open('+this.n_id+', true);', 10); - // END MODIFICATIONS + + // CODE MODIFICATION + // added: + // Do we need to open the branch? + n = Math.pow(2, this.n_id); + var disp = ( ck & n ) ? true : false; + s = ( disp ) ? 'open' : 'closed'; + //if(s=='open') alert(this.n_id + ': ' + s); + if(disp) setTimeout('trees['+trees.length+'].open('+this.n_id+', true);', 10); + // END MODIFICATIONS } function item_open (b_close, nocookie) { - //alert('item_open('+this.n_id+');'); + //alert('item_open('+this.n_id+');'); var o_idiv = get_element('i_div' + this.o_root.n_id + '_' + this.n_id); if (!o_idiv) return; if (!o_idiv.innerHTML) { var a_children = []; for (var i = 0; i < this.a_children.length; i++) - { + { a_children[i]= this.a_children[i].init(); - } + } o_idiv.innerHTML = a_children.join(''); } o_idiv.style.display = (b_close ? 'none' : 'block'); - - // CODE MODIFICATION - // added: - if(!nocookie) - { - // The idea here is to use a bitwise field. Nice 'n simple, right? Object of the game is to assemble - // a binary number that depicts the open/closed state of the entire menu in one cookie. - n = Math.pow(2, this.n_id); - ck = ( b_close ) ? ck-n : ck+n; - //alert('open(): doing the cookie routine for id '+this.n_id+"\nResult for bitwise op: "+ck); - createCookie('admin_menu_state', ck, 365); - } else { - //alert('open(): NOT doing the cookie routine for id '+this.n_id); - } - // END MODIFICATIONS + + // CODE MODIFICATION + // added: + if(!nocookie) + { + // The idea here is to use a bitwise field. Nice 'n simple, right? Object of the game is to assemble + // a binary number that depicts the open/closed state of the entire menu in one cookie. + n = Math.pow(2, this.n_id); + ck = ( b_close ) ? ck-n : ck+n; + //alert('open(): doing the cookie routine for id '+this.n_id+"\nResult for bitwise op: "+ck); + createCookie('admin_menu_state', ck, 365); + } else { + //alert('open(): NOT doing the cookie routine for id '+this.n_id); + } + // END MODIFICATIONS this.b_opened = !b_close; var o_jicon = document.images['j_img' + this.o_root.n_id + '_' + this.n_id], @@ -191,14 +191,14 @@ return '| ' + (this.n_depth ? a_offset.join('') + (this.a_children.length
? ' |
' + $lang.get('onpage_protect_heading') + '
'); - $(parent).append('' + $lang.get('onpage_protect_msg_select_level') + '
'); - - $(parent).append(''); - $(parent).append('| ' + $lang.get('onpage_protect_lbl_reason') + ' | ' + $lang.get('onpage_protect_lbl_reason_hint') + ' |
' + $lang.get('onpage_protect_heading') + '
'); + $(parent).append('' + $lang.get('onpage_protect_msg_select_level') + '
'); + + $(parent).append(''); + $(parent).append('| ' + $lang.get('onpage_protect_lbl_reason') + ' | ' + $lang.get('onpage_protect_lbl_reason_hint') + ' |
';
-
- // tenemos la confirmación y la razón - borre la página.
- setAjaxLoading();
- ajaxPost(stdAjaxPrefix + '&_mode=deletepage', 'reason=' + ajaxEscape(trim(reason.value)), function(ajax)
- {
- if ( ajax.readyState == 4 && ajax.status == 200 )
- {
- unsetAjaxLoading();
-
- // show the response in the same prompt window
- prompt_obj.style.textAlign = 'center';
- prompt_obj.innerHTML = '';
-
- var p1 = document.createElement('div');
- p1.style.marginBottom = '15px';
- p1.appendChild(document.createTextNode(ajax.responseText));
- prompt_obj.appendChild(p1);
-
- var p2 = document.createElement('p');
- var a = document.createElement('a');
- a.className = 'abutton';
- a.href = '#';
- a.appendChild(document.createTextNode($lang.get('etc_close')));
- a.onclick = function()
- {
- miniPromptDestroy(this);
- window.location.reload();
- return false;
- }
- p2.appendChild(a);
- prompt_obj.appendChild(a);
-
- a.focus();
- }
- });
-
- return true;
+ prompt_obj = miniPromptGetParent(prompt_obj).childNodes[1];
+ var inputs = prompt_obj.getElementsByTagName('input');
+ var reason = inputs[0];
+ var confirm = inputs[1];
+
+ if ( trim(reason.value) == '' )
+ {
+ // flash the background of the reason entry
+ $(reason.parentNode).effect("highlight", {}, 1000);
+ return false;
+ }
+
+ if ( !confirm.checked )
+ {
+ // flash the background of the confirm checkbox
+ $(confirm.parentNode).effect("highlight", {}, 1000);
+ return false;
+ }
+
+ prompt_obj.innerHTML = '';
+
+ // tenemos la confirmación y la razón - borre la página.
+ setAjaxLoading();
+ ajaxPost(stdAjaxPrefix + '&_mode=deletepage', 'reason=' + ajaxEscape(trim(reason.value)), function(ajax)
+ {
+ if ( ajax.readyState == 4 && ajax.status == 200 )
+ {
+ unsetAjaxLoading();
+
+ // show the response in the same prompt window
+ prompt_obj.style.textAlign = 'center';
+ prompt_obj.innerHTML = '';
+
+ var p1 = document.createElement('div');
+ p1.style.marginBottom = '15px';
+ p1.appendChild(document.createTextNode(ajax.responseText));
+ prompt_obj.appendChild(p1);
+
+ var p2 = document.createElement('p');
+ var a = document.createElement('a');
+ a.className = 'abutton';
+ a.href = '#';
+ a.appendChild(document.createTextNode($lang.get('etc_close')));
+ a.onclick = function()
+ {
+ miniPromptDestroy(this);
+ window.location.reload();
+ return false;
+ }
+ p2.appendChild(a);
+ prompt_obj.appendChild(a);
+
+ a.focus();
+ }
+ });
+
+ return true;
}
window.ajaxDelVote = function()
{
- load_component(['l10n', 'messagebox', 'flyin', 'fadefilter']);
-
- // IE <6 pseudo-compatibility
- if ( KILL_SWITCH )
- return true;
- miniPromptMessage({
- title: $lang.get('ajax_delvote_confirm_title'),
- message: $lang.get('ajax_delvote_confirm_body'),
- buttons: [
- {
- text: $lang.get('ajax_delvote_btn_submit'),
- color: 'red',
- style: {
- fontWeight: 'bold'
- },
- onclick: function(e)
- {
- miniPromptDestroy(this);
- setAjaxLoading();
- ajaxGet(stdAjaxPrefix+'&_mode=delvote', function(ajax) {
- if ( ajax.readyState == 4 && ajax.status == 200 ) {
- unsetAjaxLoading();
- alert(ajax.responseText);
- }
- }, true);
- }
- },
- {
- text: $lang.get('etc_cancel'),
- onclick: function(e)
- {
- miniPromptDestroy(this);
- }
- }
- ]
- });
+ load_component(['l10n', 'messagebox', 'flyin', 'fadefilter']);
+
+ // IE <6 pseudo-compatibility
+ if ( KILL_SWITCH )
+ return true;
+ miniPromptMessage({
+ title: $lang.get('ajax_delvote_confirm_title'),
+ message: $lang.get('ajax_delvote_confirm_body'),
+ buttons: [
+ {
+ text: $lang.get('ajax_delvote_btn_submit'),
+ color: 'red',
+ style: {
+ fontWeight: 'bold'
+ },
+ onclick: function(e)
+ {
+ miniPromptDestroy(this);
+ setAjaxLoading();
+ ajaxGet(stdAjaxPrefix+'&_mode=delvote', function(ajax) {
+ if ( ajax.readyState == 4 && ajax.status == 200 ) {
+ unsetAjaxLoading();
+ alert(ajax.responseText);
+ }
+ }, true);
+ }
+ },
+ {
+ text: $lang.get('etc_cancel'),
+ onclick: function(e)
+ {
+ miniPromptDestroy(this);
+ }
+ }
+ ]
+ });
}
window.ajaxResetDelVotes = function()
{
- load_component(['l10n', 'messagebox', 'flyin', 'fadefilter']);
-
- // IE <6 pseudo-compatibility
- if ( KILL_SWITCH )
- return true;
- miniPromptMessage({
- title: $lang.get('ajax_delvote_reset_confirm_title'),
- message: $lang.get('ajax_delvote_reset_confirm_body'),
- buttons: [
- {
- text: $lang.get('ajax_delvote_reset_btn_submit'),
- color: 'red',
- style: {
- fontWeight: 'bold'
- },
- onclick: function(e)
- {
- var box = miniPromptGetParent(this);
- var whitey = whiteOutMiniPrompt(box);
- ajaxGet(stdAjaxPrefix+'&_mode=resetdelvotes', function(ajax) {
- if ( ajax.readyState == 4 && ajax.status == 200 ) {
- whiteOutReportSuccess(whitey);
-
- item = document.getElementById('mdgDeleteVoteNoticeBox');
- if(item)
- {
- opacity('mdgDeleteVoteNoticeBox', 100, 0, 1000);
- setTimeout("document.getElementById('mdgDeleteVoteNoticeBox').style.display = 'none';", 1000);
- }
- }
- }, true);
- }
- },
- {
- text: $lang.get('etc_cancel'),
- onclick: function(e)
- {
- miniPromptDestroy(this);
- }
- }
- ]
- });
+ load_component(['l10n', 'messagebox', 'flyin', 'fadefilter']);
+
+ // IE <6 pseudo-compatibility
+ if ( KILL_SWITCH )
+ return true;
+ miniPromptMessage({
+ title: $lang.get('ajax_delvote_reset_confirm_title'),
+ message: $lang.get('ajax_delvote_reset_confirm_body'),
+ buttons: [
+ {
+ text: $lang.get('ajax_delvote_reset_btn_submit'),
+ color: 'red',
+ style: {
+ fontWeight: 'bold'
+ },
+ onclick: function(e)
+ {
+ var box = miniPromptGetParent(this);
+ var whitey = whiteOutMiniPrompt(box);
+ ajaxGet(stdAjaxPrefix+'&_mode=resetdelvotes', function(ajax) {
+ if ( ajax.readyState == 4 && ajax.status == 200 ) {
+ whiteOutReportSuccess(whitey);
+
+ item = document.getElementById('mdgDeleteVoteNoticeBox');
+ if(item)
+ {
+ opacity('mdgDeleteVoteNoticeBox', 100, 0, 1000);
+ setTimeout("document.getElementById('mdgDeleteVoteNoticeBox').style.display = 'none';", 1000);
+ }
+ }
+ }, true);
+ }
+ },
+ {
+ text: $lang.get('etc_cancel'),
+ onclick: function(e)
+ {
+ miniPromptDestroy(this);
+ }
+ }
+ ]
+ });
}
// Editing/saving category information
@@ -608,1181 +608,1181 @@
window.ajaxCatEdit = function()
{
- // IE <6 pseudo-compatibility
- if ( KILL_SWITCH )
- return true;
- setAjaxLoading();
- ajaxGet(stdAjaxPrefix+'&_mode=catedit', function(ajax) {
- if ( ajax.readyState == 4 && ajax.status == 200 ) {
- unsetAjaxLoading();
- edit_open = false;
- eval(ajax.responseText);
- }
- });
+ // IE <6 pseudo-compatibility
+ if ( KILL_SWITCH )
+ return true;
+ setAjaxLoading();
+ ajaxGet(stdAjaxPrefix+'&_mode=catedit', function(ajax) {
+ if ( ajax.readyState == 4 && ajax.status == 200 ) {
+ unsetAjaxLoading();
+ edit_open = false;
+ eval(ajax.responseText);
+ }
+ });
}
window.ajaxCatSave = function()
{
- // IE <6 pseudo-compatibility
- if ( KILL_SWITCH )
- return true;
- if(!catlist)
- {
- alert('Var catlist has no properties');
- return;
- }
- query='';
- for(i=0;i
');
- $('#theme-selector-inner').append('' + $lang.get('ajax_thmsel_msg_success') + '
'); - $('#theme-selector-inner').append(''); - $('#theme-selector-inner').append('' + $lang.get('ajax_thmsel_btn_close_hint') + '
');
+ $('#theme-selector-inner').append('' + $lang.get('ajax_thmsel_msg_success') + '
'); + $('#theme-selector-inner').append(''); + $('#theme-selector-inner').append('' + $lang.get('ajax_thmsel_btn_close_hint') + '
Making request...'; - var url = makeUrlNS('Admin', 'Home', 'src=ajax'); - ajaxPost(url, 'act=kill_php', function(ajax) { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - if ( ajax.responseText == '1' ) - { - var $killdiv = $dynano('php_killer'); - //$killdiv.object.innerHTML = '
Embedded PHP in pages has been disabled.'; - $killdiv.object.parentNode.removeChild($killdiv.object); - var newdiv = document.createElement('div'); - // newdiv.style = $killdiv.object.style; - newdiv.className = $killdiv.object.className; - newdiv.innerHTML = '
' + $lang.get('ajax_killphp_success'); - $killdiv.object.parentNode.appendChild(newdiv); - $killdiv.object.parentNode.removeChild($killdiv.object); - } - else - { - var $killdiv = $dynano('php_killer'); - $killdiv.object.innerHTML = ajax.responseText; - } - } - }); + // IE <6 pseudo-compatibility + if ( KILL_SWITCH ) + return true; + if ( !confirm($lang.get('ajax_killphp_confirm')) ) + return false; + var $killdiv = $dynano('php_killer'); + if ( !$killdiv.object ) + { + alert('Can\'t get kill div object'); + return false; + } + $killdiv.object.innerHTML = '
Making request...'; + var url = makeUrlNS('Admin', 'Home', 'src=ajax'); + ajaxPost(url, 'act=kill_php', function(ajax) { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + if ( ajax.responseText == '1' ) + { + var $killdiv = $dynano('php_killer'); + //$killdiv.object.innerHTML = '
Embedded PHP in pages has been disabled.'; + $killdiv.object.parentNode.removeChild($killdiv.object); + var newdiv = document.createElement('div'); + // newdiv.style = $killdiv.object.style; + newdiv.className = $killdiv.object.className; + newdiv.innerHTML = '
' + $lang.get('ajax_killphp_success'); + $killdiv.object.parentNode.appendChild(newdiv); + $killdiv.object.parentNode.removeChild($killdiv.object); + } + else + { + var $killdiv = $dynano('php_killer'); + $killdiv.object.innerHTML = ajax.responseText; + } + } + }); } var catHTMLBuf = false; window.ajaxCatToTag = function() { - if ( KILL_SWITCH ) - return false; - setAjaxLoading(); - ajaxGet(stdAjaxPrefix + '&_mode=get_tags', function(ajax) - { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - unsetAjaxLoading(); - var resptext = String(ajax.responseText + ' '); - resptext = resptext.substr(0, resptext.length-1); - if ( resptext.substr(0, 1) != '{' ) - { - handle_invalid_json(resptext); - return false; - } - var json = parseJSON(resptext); - var catbox = document.getElementById('mdgCatBox'); - if ( !catbox ) - return false; - var linkbox = catbox.parentNode.firstChild.firstChild.nextSibling; - linkbox.firstChild.nodeValue = $lang.get('catedit_catbox_link_showcategorization'); - linkbox.onclick = function() { ajaxTagToCat(); return false; }; - catHTMLBuf = catbox.innerHTML; - catbox.innerHTML = ''; - catbox.appendChild(document.createTextNode($lang.get('tags_lbl_page_tags')+' ')); - if ( json.tags.length < 1 ) - { - catbox.appendChild(document.createTextNode($lang.get('tags_lbl_no_tags'))); - } - for ( var i = 0; i < json.tags.length; i++ ) - { - catbox.appendChild(document.createTextNode(json.tags[i].name)); - if ( json.tags[i].can_del ) - { - catbox.appendChild(document.createTextNode(' ')); - var a = document.createElement('a'); - a.appendChild(document.createTextNode('[X]')); - a.href = '#'; - a._js_tag_id = json.tags[i].id; - a.onclick = function() { ajaxDeleteTag(this, this._js_tag_id); return false; } - catbox.appendChild(a); - } - if ( ( i + 1 ) < json.tags.length ) - catbox.appendChild(document.createTextNode(', ')); - } - if ( json.can_add ) - { - catbox.appendChild(document.createTextNode(' ')); - var addlink = document.createElement('a'); - addlink.href = '#'; - addlink.onclick = function() { try { ajaxAddTagStage1(); } catch(e) { }; return false; }; - addlink.appendChild(document.createTextNode($lang.get('tags_btn_add_tag'))); - catbox.appendChild(addlink); - } - } - }); + if ( KILL_SWITCH ) + return false; + setAjaxLoading(); + ajaxGet(stdAjaxPrefix + '&_mode=get_tags', function(ajax) + { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + unsetAjaxLoading(); + var resptext = String(ajax.responseText + ' '); + resptext = resptext.substr(0, resptext.length-1); + if ( resptext.substr(0, 1) != '{' ) + { + handle_invalid_json(resptext); + return false; + } + var json = parseJSON(resptext); + var catbox = document.getElementById('mdgCatBox'); + if ( !catbox ) + return false; + var linkbox = catbox.parentNode.firstChild.firstChild.nextSibling; + linkbox.firstChild.nodeValue = $lang.get('catedit_catbox_link_showcategorization'); + linkbox.onclick = function() { ajaxTagToCat(); return false; }; + catHTMLBuf = catbox.innerHTML; + catbox.innerHTML = ''; + catbox.appendChild(document.createTextNode($lang.get('tags_lbl_page_tags')+' ')); + if ( json.tags.length < 1 ) + { + catbox.appendChild(document.createTextNode($lang.get('tags_lbl_no_tags'))); + } + for ( var i = 0; i < json.tags.length; i++ ) + { + catbox.appendChild(document.createTextNode(json.tags[i].name)); + if ( json.tags[i].can_del ) + { + catbox.appendChild(document.createTextNode(' ')); + var a = document.createElement('a'); + a.appendChild(document.createTextNode('[X]')); + a.href = '#'; + a._js_tag_id = json.tags[i].id; + a.onclick = function() { ajaxDeleteTag(this, this._js_tag_id); return false; } + catbox.appendChild(a); + } + if ( ( i + 1 ) < json.tags.length ) + catbox.appendChild(document.createTextNode(', ')); + } + if ( json.can_add ) + { + catbox.appendChild(document.createTextNode(' ')); + var addlink = document.createElement('a'); + addlink.href = '#'; + addlink.onclick = function() { try { ajaxAddTagStage1(); } catch(e) { }; return false; }; + addlink.appendChild(document.createTextNode($lang.get('tags_btn_add_tag'))); + catbox.appendChild(addlink); + } + } + }); } var addtag_open = false; window.ajaxAddTagStage1 = function() { - if ( addtag_open ) - return false; - var catbox = document.getElementById('mdgCatBox'); - var adddiv = document.createElement('div'); - var text = document.createElement('input'); - var addlink = document.createElement('a'); - addlink.href = '#'; - addlink.onclick = function() { ajaxAddTagStage2(this.parentNode.firstChild.nextSibling.value, this.parentNode); return false; }; - addlink.appendChild(document.createTextNode($lang.get('tags_btn_add'))); - text.type = 'text'; - text.size = '15'; - text.onkeyup = function(e) - { - if ( e.keyCode == 13 ) - { - ajaxAddTagStage2(this.value, this.parentNode); - } - } - - adddiv.style.margin = '5px 0 0 0'; - adddiv.appendChild(document.createTextNode($lang.get('tags_lbl_add_tag')+' ')); - adddiv.appendChild(text); - adddiv.appendChild(document.createTextNode(' ')); - adddiv.appendChild(addlink); - catbox.appendChild(adddiv); - addtag_open = true; + if ( addtag_open ) + return false; + var catbox = document.getElementById('mdgCatBox'); + var adddiv = document.createElement('div'); + var text = document.createElement('input'); + var addlink = document.createElement('a'); + addlink.href = '#'; + addlink.onclick = function() { ajaxAddTagStage2(this.parentNode.firstChild.nextSibling.value, this.parentNode); return false; }; + addlink.appendChild(document.createTextNode($lang.get('tags_btn_add'))); + text.type = 'text'; + text.size = '15'; + text.onkeyup = function(e) + { + if ( e.keyCode == 13 ) + { + ajaxAddTagStage2(this.value, this.parentNode); + } + } + + adddiv.style.margin = '5px 0 0 0'; + adddiv.appendChild(document.createTextNode($lang.get('tags_lbl_add_tag')+' ')); + adddiv.appendChild(text); + adddiv.appendChild(document.createTextNode(' ')); + adddiv.appendChild(addlink); + catbox.appendChild(adddiv); + addtag_open = true; } var addtag_nukeme = false; window.ajaxAddTagStage2 = function(tag, nukeme) { - if ( !addtag_open ) - return false; - if ( addtag_nukeme ) - return false; - addtag_nukeme = nukeme; - tag = ajaxEscape(tag); - setAjaxLoading(); - ajaxPost(stdAjaxPrefix + '&_mode=addtag', 'tag=' + tag, function(ajax) - { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - unsetAjaxLoading(); - var nukeme = addtag_nukeme; - addtag_nukeme = false; - var resptext = String(ajax.responseText + ' '); - resptext = resptext.substr(0, resptext.length-1); - if ( resptext.substr(0, 1) != '{' ) - { - handle_invalid_json(resptext); - return false; - } - var json = parseJSON(resptext); - var parent = nukeme.parentNode; - parent.removeChild(nukeme); - addtag_open = false; - if ( json.success ) - { - var node = parent.childNodes[1]; - var insertafter = false; - var nukeafter = false; - if ( node.nodeValue == $lang.get('tags_lbl_no_tags') ) - { - nukeafter = true; - } - insertafter = parent.childNodes[ parent.childNodes.length - 3 ]; - // these need to be inserted in reverse order - if ( json.can_del ) - { - var a = document.createElement('a'); - a.appendChild(document.createTextNode('[X]')); - a.href = '#'; - a._js_tag_id = json.tag_id; - a.onclick = function() { ajaxDeleteTag(this, this._js_tag_id); return false; } - insertAfter(parent, a, insertafter); - insertAfter(parent, document.createTextNode(' '), insertafter); - } - insertAfter(parent, document.createTextNode(json.tag), insertafter); - if ( !nukeafter ) - { - insertAfter(parent, document.createTextNode(', '), insertafter); - } - if ( nukeafter ) - { - parent.removeChild(insertafter); - } - } - else - { - alert(json.error); - } - } - }); + if ( !addtag_open ) + return false; + if ( addtag_nukeme ) + return false; + addtag_nukeme = nukeme; + tag = ajaxEscape(tag); + setAjaxLoading(); + ajaxPost(stdAjaxPrefix + '&_mode=addtag', 'tag=' + tag, function(ajax) + { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + unsetAjaxLoading(); + var nukeme = addtag_nukeme; + addtag_nukeme = false; + var resptext = String(ajax.responseText + ' '); + resptext = resptext.substr(0, resptext.length-1); + if ( resptext.substr(0, 1) != '{' ) + { + handle_invalid_json(resptext); + return false; + } + var json = parseJSON(resptext); + var parent = nukeme.parentNode; + parent.removeChild(nukeme); + addtag_open = false; + if ( json.success ) + { + var node = parent.childNodes[1]; + var insertafter = false; + var nukeafter = false; + if ( node.nodeValue == $lang.get('tags_lbl_no_tags') ) + { + nukeafter = true; + } + insertafter = parent.childNodes[ parent.childNodes.length - 3 ]; + // these need to be inserted in reverse order + if ( json.can_del ) + { + var a = document.createElement('a'); + a.appendChild(document.createTextNode('[X]')); + a.href = '#'; + a._js_tag_id = json.tag_id; + a.onclick = function() { ajaxDeleteTag(this, this._js_tag_id); return false; } + insertAfter(parent, a, insertafter); + insertAfter(parent, document.createTextNode(' '), insertafter); + } + insertAfter(parent, document.createTextNode(json.tag), insertafter); + if ( !nukeafter ) + { + insertAfter(parent, document.createTextNode(', '), insertafter); + } + if ( nukeafter ) + { + parent.removeChild(insertafter); + } + } + else + { + alert(json.error); + } + } + }); } window.ajaxDeleteTag = function(parentobj, tag_id) { - var arrDelete = [ parentobj, parentobj.previousSibling, parentobj.previousSibling.previousSibling ]; - var parent = parentobj.parentNode; - var writeNoTags = false; - if ( parentobj.previousSibling.previousSibling.previousSibling.nodeValue == ', ' ) - arrDelete.push(parentobj.previousSibling.previousSibling.previousSibling); - else if ( parentobj.previousSibling.previousSibling.previousSibling.nodeValue == $lang.get('tags_lbl_page_tags') + ' ' ) - arrDelete.push(parentobj.nextSibling); - - if ( parentobj.previousSibling.previousSibling.previousSibling.nodeValue == $lang.get('tags_lbl_page_tags') + ' ' && - parentobj.nextSibling.nextSibling.firstChild ) - if ( parentobj.nextSibling.nextSibling.firstChild.nodeValue == $lang.get('tags_btn_add_tag')) - writeNoTags = true; - - ajaxPost(stdAjaxPrefix + '&_mode=deltag', 'tag_id=' + String(tag_id), function(ajax) - { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - if ( ajax.responseText == 'success' ) - { - for ( var i = 0; i < arrDelete.length; i++ ) - { - try - { - parent.removeChild(arrDelete[i]); - } catch(e) {} - } - if ( writeNoTags ) - { - var node1 = document.createTextNode($lang.get('tags_lbl_no_tags')); - var node2 = document.createTextNode(' '); - insertAfter(parent, node1, parent.firstChild); - insertAfter(parent, node2, node1); - } - } - else - { - alert(ajax.responseText); - } - } - }); + var arrDelete = [ parentobj, parentobj.previousSibling, parentobj.previousSibling.previousSibling ]; + var parent = parentobj.parentNode; + var writeNoTags = false; + if ( parentobj.previousSibling.previousSibling.previousSibling.nodeValue == ', ' ) + arrDelete.push(parentobj.previousSibling.previousSibling.previousSibling); + else if ( parentobj.previousSibling.previousSibling.previousSibling.nodeValue == $lang.get('tags_lbl_page_tags') + ' ' ) + arrDelete.push(parentobj.nextSibling); + + if ( parentobj.previousSibling.previousSibling.previousSibling.nodeValue == $lang.get('tags_lbl_page_tags') + ' ' && + parentobj.nextSibling.nextSibling.firstChild ) + if ( parentobj.nextSibling.nextSibling.firstChild.nodeValue == $lang.get('tags_btn_add_tag')) + writeNoTags = true; + + ajaxPost(stdAjaxPrefix + '&_mode=deltag', 'tag_id=' + String(tag_id), function(ajax) + { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + if ( ajax.responseText == 'success' ) + { + for ( var i = 0; i < arrDelete.length; i++ ) + { + try + { + parent.removeChild(arrDelete[i]); + } catch(e) {} + } + if ( writeNoTags ) + { + var node1 = document.createTextNode($lang.get('tags_lbl_no_tags')); + var node2 = document.createTextNode(' '); + insertAfter(parent, node1, parent.firstChild); + insertAfter(parent, node2, node1); + } + } + else + { + alert(ajax.responseText); + } + } + }); } window.ajaxTagToCat = function() { - if ( !catHTMLBuf ) - return false; - var catbox = document.getElementById('mdgCatBox'); - if ( !catbox ) - return false; - addtag_open = false; - var linkbox = catbox.parentNode.firstChild.firstChild.nextSibling; - linkbox.firstChild.nodeValue = $lang.get('tags_catbox_link'); - linkbox.onclick = function() { ajaxCatToTag(); return false; }; - catbox.innerHTML = catHTMLBuf; - catHTMLBuf = false; + if ( !catHTMLBuf ) + return false; + var catbox = document.getElementById('mdgCatBox'); + if ( !catbox ) + return false; + addtag_open = false; + var linkbox = catbox.parentNode.firstChild.firstChild.nextSibling; + linkbox.firstChild.nodeValue = $lang.get('tags_catbox_link'); + linkbox.onclick = function() { ajaxCatToTag(); return false; }; + catbox.innerHTML = catHTMLBuf; + catHTMLBuf = false; } var keepalive_interval = false; window.ajaxPingServer = function() { - ajaxGet(stdAjaxPrefix + '&_mode=ping', function(ajax) - { - }); + ajaxGet(stdAjaxPrefix + '&_mode=ping', function(ajax) + { + }); } window.ajaxToggleKeepalive = function() { - if ( readCookie('admin_keepalive') == '1' ) - { - createCookie('admin_keepalive', '0', 3650); - if ( keepalive_interval ) - clearInterval(keepalive_interval); - var span = document.getElementById('keepalivestat'); - span.firstChild.nodeValue = $lang.get('adm_btn_keepalive_off'); - } - else - { - createCookie('admin_keepalive', '1', 3650); - if ( !keepalive_interval ) - keepalive_interval = setInterval('ajaxPingServer();', 600000); - var span = document.getElementById('keepalivestat'); - span.firstChild.nodeValue = $lang.get('adm_btn_keepalive_on'); - ajaxPingServer(); - } + if ( readCookie('admin_keepalive') == '1' ) + { + createCookie('admin_keepalive', '0', 3650); + if ( keepalive_interval ) + clearInterval(keepalive_interval); + var span = document.getElementById('keepalivestat'); + span.firstChild.nodeValue = $lang.get('adm_btn_keepalive_off'); + } + else + { + createCookie('admin_keepalive', '1', 3650); + if ( !keepalive_interval ) + keepalive_interval = setInterval('ajaxPingServer();', 600000); + var span = document.getElementById('keepalivestat'); + span.firstChild.nodeValue = $lang.get('adm_btn_keepalive_on'); + ajaxPingServer(); + } } var keepalive_onload = function() { - if ( readCookie('admin_keepalive') == '1' ) - { - if ( !keepalive_interval ) - keepalive_interval = setInterval('ajaxPingServer();', 600000); - var span = document.getElementById('keepalivestat'); - span.firstChild.nodeValue = $lang.get('adm_btn_keepalive_on'); - } - else - { - if ( keepalive_interval ) - clearInterval(keepalive_interval); - var span = document.getElementById('keepalivestat'); - span.firstChild.nodeValue = $lang.get('adm_btn_keepalive_off'); - } + if ( readCookie('admin_keepalive') == '1' ) + { + if ( !keepalive_interval ) + keepalive_interval = setInterval('ajaxPingServer();', 600000); + var span = document.getElementById('keepalivestat'); + span.firstChild.nodeValue = $lang.get('adm_btn_keepalive_on'); + } + else + { + if ( keepalive_interval ) + clearInterval(keepalive_interval); + var span = document.getElementById('keepalivestat'); + span.firstChild.nodeValue = $lang.get('adm_btn_keepalive_off'); + } }; window.aboutKeepAlive = function() { - load_component(['messagebox', 'flyin', 'fadefilter']); - new MessageBox(MB_OK|MB_ICONINFORMATION, $lang.get('user_keepalive_info_title'), $lang.get('user_keepalive_info_body')); + load_component(['messagebox', 'flyin', 'fadefilter']); + new MessageBox(MB_OK|MB_ICONINFORMATION, $lang.get('user_keepalive_info_title'), $lang.get('user_keepalive_info_body')); } window.ajaxUpdateCheck = function(targetelement) { - if ( !document.getElementById(targetelement) ) - { - return false; - } - var target = document.getElementById(targetelement); - target.innerHTML = ''; - var img = document.createElement('img'); - img.src = cdnPath + '/images/loading.gif'; - img.alt = 'Loading...'; - target.appendChild(img); - ajaxGet(makeUrlNS('Admin', 'Home/updates.xml'), function(ajax) - { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - var releases = new Array(); - var update_available = false; - if ( ajax.responseXML == null ) - { - alert("Error fetching updates list:\n" + ajax.responseText); - return false; - } - if ( ajax.responseXML.firstChild.tagName == 'enano' ) - { - var enanotag = ajax.responseXML.firstChild; - for ( var i = 0; i < enanotag.childNodes.length; i++ ) - { - if ( enanotag.childNodes[i].tagName == 'error' ) - { - alert(enanotag.childNodes[i].firstChild.nodeValue); - } - else if ( enanotag.childNodes[i].tagName == 'latest' ) - { - // got
'+ajax.responseText+' Close'; - var body = document.getElementsByTagName('body'); - body = body[0]; - bannerOff(rDnsBannerObj); - body.appendChild(thediv); - thediv.style.display = 'block'; - left = fetch_dimensions(thediv); - thediv.style.display = 'none'; - left = right - left['w']; - thediv.style.left = left + 'px'; - thediv.style.display = 'block'; - fadeInfoBoxes(); - } - }); + if(text) var ipaddr = text; + else var ipaddr = o.innerHTML; + rDnsObj = o; + rDnsBannerObj = bannerOn('Retrieving reverse DNS info...'); + ajaxGet(stdAjaxPrefix+'&_mode=rdns&ip='+ipaddr, function(ajax) { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + off = fetch_offset(rDnsObj); + dim = fetch_dimensions(rDnsObj); + right = off['left'] + dim['w']; + top = off['top'] + dim['h']; + var thediv = document.createElement('div'); + thediv.className = 'info-box'; + thediv.style.margin = '0'; + thediv.style.position = 'absolute'; + thediv.style.top = top + 'px'; + thediv.style.display = 'none'; + thediv.style.zIndex = getHighestZ() + 2; + thediv.id = 'mdgDynamic_rDnsInfoDiv_'+Math.floor(Math.random() * 1000000); + // FIXME: l10n + thediv.innerHTML = 'Reverse DNS:
'+ajax.responseText+' Close'; + var body = document.getElementsByTagName('body'); + body = body[0]; + bannerOff(rDnsBannerObj); + body.appendChild(thediv); + thediv.style.display = 'block'; + left = fetch_dimensions(thediv); + thediv.style.display = 'none'; + left = right - left['w']; + thediv.style.left = left + 'px'; + thediv.style.display = 'block'; + fadeInfoBoxes(); + } + }); } window.ajaxGzipCheck = function() { - var resultdiv = document.getElementById('gzip_check_result'); - if ( !resultdiv ) - return false; - - resultdiv.innerHTML = '
';
- ajaxPost(makeUrlNS('Admin', 'GeneralConfig'), 'act=gzip_check', function(ajax)
- {
- if ( ajax.readyState == 4 && ajax.status == 200 )
- {
- resultdiv.innerHTML = '';
- var response = String(ajax.responseText + '');
- if ( !check_json_response(response) )
- {
- handle_invalid_json(response);
- return false;
- }
- response = parseJSON(response);
- if ( response.error )
- {
- resultdiv.innerHTML = '';
+ ajaxPost(makeUrlNS('Admin', 'GeneralConfig'), 'act=gzip_check', function(ajax)
+ {
+ if ( ajax.readyState == 4 && ajax.status == 200 )
+ {
+ resultdiv.innerHTML = '';
+ var response = String(ajax.responseText + '');
+ if ( !check_json_response(response) )
+ {
+ handle_invalid_json(response);
+ return false;
+ }
+ response = parseJSON(response);
+ if ( response.error )
+ {
+ resultdiv.innerHTML = 'Comment system Javascript runtime: invalid JSON response from server, response text:
' + ajax.responseText + ''; + return false; + } + var response = parseJSON(ajax.responseText); + switch(response.mode) + { + case 'fetch': + if(response.template) + comment_template = response.template; + setAjaxLoading(); + renderComments(response); + unsetAjaxLoading(); + break; + case 'refetch': + var html = ''; + for ( var i = 0; i < response.comments.length; i++ ) + { + html += window._render_comment(response.comments[i], response); + } + $('#' + response.passback.paginator_id + '_0') + .css('height', 'auto') + .css('background-color', 'transparent') + .css('background-image', 'none') + .fadeTo('fast', 100) + .html(html); + break; + case 'redraw': + redrawComment(response); + break; + case 'annihilate': + annihiliateComment(response.id); + break; + case 'materialize': + alert($lang.get('comment_msg_comment_posted')); + hideCommentForm(); + materializeComment(response); + break; + case 'error': + load_component(['messagebox', 'fadefilter', 'flyin']); + new MessageBox(MB_OK|MB_ICONSTOP, ( response.title ? response.title : $lang.get('comment_ajax_err_generic_title') ), response.error); + break; + default: + alert(ajax.responseText); + break; + } + } + }); } window.renderComments = function(data) { - - var html = ''; - - // Header - - html += '
' + $lang.get('comment_heading') + '
'; - - var ns = ENANO_PAGE_TYPE; - - // Counters - if ( data.auth_mod_comments ) - { - var cnt = ( data.auth_mod_comments ) ? data.count_total : data.count_appr; - - var subst = { - num_comments: cnt, - page_type: ns - } - var count_msg = ( cnt == 0 ) ? $lang.get('comment_msg_count_zero', subst) : ( ( cnt == 1 ) ? $lang.get('comment_msg_count_one', subst) : $lang.get('comment_msg_count_plural', subst) ); - - html += "" + count_msg + ''; - if ( data.count_unappr > 0 ) - { - html += ' ' + $lang.get('comment_msg_count_unapp_mod', { num_unapp: data.count_unappr }) + ''; - } - html += '
'; - } - else - { - var cnt = data.count_appr; - - var subst = { - num_comments: cnt, - page_type: ns - } - var count_msg = ( cnt == 0 ) ? $lang.get('comment_msg_count_zero', subst) : ( ( cnt == 1 ) ? $lang.get('comment_msg_count_one', subst) : $lang.get('comment_msg_count_plural', subst) ); - - html += "" + count_msg; - if ( data.count_unappr > 0 ) - { - var unappr_msg = ( data.count_unappr == 1 ) ? $lang.get('comment_msg_count_unapp_one') : $lang.get('comment_msg_count_unapp_plural', { num_unapp: data.count_unappr }); - html += ' ' + unappr_msg; - } - html += '
'; - } - - // Comment display - - if ( data.count_total > 0 ) - { - comment_render_track = 0; - var commentpages = new paginator(data.comments, _render_comment, 0, data.per_page, data, Math.ceil(data.count_total / data.per_page), window._comment_page_flip); - html += commentpages.html; - } - - if ( data.auth_post_comments ) - { - // Posting form - - html += '' + $lang.get('comment_postform_title') + '
'; - html += '' + $lang.get('comment_postform_blurb'); - if ( data.approval_needed ) - html+=' ' + $lang.get('comment_postform_blurb_unapp'); - html += ' ' + $lang.get('comment_postform_blurb_link') + '
'; - html += ''; - } - - document.getElementById('ajaxEditContainer').innerHTML = html; - if ( document.getElementById('commentform_message') ) - { - document.getElementById('commentform_message').allow_wysiwyg = data.auth_edit_wysiwyg - } - - for ( i = 0; i < data.comments.length; i++ ) - { - document.getElementById('comment_source_'+i).value = data.comments[i].comment_source; - } - + + var html = ''; + + // Header + + html += '' + $lang.get('comment_heading') + '
'; + + var ns = ENANO_PAGE_TYPE; + + // Counters + if ( data.auth_mod_comments ) + { + var cnt = ( data.auth_mod_comments ) ? data.count_total : data.count_appr; + + var subst = { + num_comments: cnt, + page_type: ns + } + var count_msg = ( cnt == 0 ) ? $lang.get('comment_msg_count_zero', subst) : ( ( cnt == 1 ) ? $lang.get('comment_msg_count_one', subst) : $lang.get('comment_msg_count_plural', subst) ); + + html += "" + count_msg + ''; + if ( data.count_unappr > 0 ) + { + html += ' ' + $lang.get('comment_msg_count_unapp_mod', { num_unapp: data.count_unappr }) + ''; + } + html += '
'; + } + else + { + var cnt = data.count_appr; + + var subst = { + num_comments: cnt, + page_type: ns + } + var count_msg = ( cnt == 0 ) ? $lang.get('comment_msg_count_zero', subst) : ( ( cnt == 1 ) ? $lang.get('comment_msg_count_one', subst) : $lang.get('comment_msg_count_plural', subst) ); + + html += "" + count_msg; + if ( data.count_unappr > 0 ) + { + var unappr_msg = ( data.count_unappr == 1 ) ? $lang.get('comment_msg_count_unapp_one') : $lang.get('comment_msg_count_unapp_plural', { num_unapp: data.count_unappr }); + html += ' ' + unappr_msg; + } + html += '
'; + } + + // Comment display + + if ( data.count_total > 0 ) + { + comment_render_track = 0; + var commentpages = new paginator(data.comments, _render_comment, 0, data.per_page, data, Math.ceil(data.count_total / data.per_page), window._comment_page_flip); + html += commentpages.html; + } + + if ( data.auth_post_comments ) + { + // Posting form + + html += '' + $lang.get('comment_postform_title') + '
'; + html += '' + $lang.get('comment_postform_blurb'); + if ( data.approval_needed ) + html+=' ' + $lang.get('comment_postform_blurb_unapp'); + html += ' ' + $lang.get('comment_postform_blurb_link') + '
'; + html += ''; + } + + document.getElementById('ajaxEditContainer').innerHTML = html; + if ( document.getElementById('commentform_message') ) + { + document.getElementById('commentform_message').allow_wysiwyg = data.auth_edit_wysiwyg + } + + for ( i = 0; i < data.comments.length; i++ ) + { + document.getElementById('comment_source_'+i).value = data.comments[i].comment_source; + } + } var _render_comment = function(this_comment, data) { - var i = comment_render_track; - comment_render_track++; - var parser = new templateParser(comment_template); - var tplvars = new Object(); - - if ( this_comment.approved != '1' && !data.auth_mod_comments ) - return ''; - - tplvars.ID = i; - tplvars.DATETIME = this_comment.time; - tplvars.SUBJECT = this_comment.subject; - tplvars.DATA = this_comment.comment_data; - tplvars.SIGNATURE = this_comment.signature; - - if ( this_comment.approved == '0' ) - tplvars.SUBJECT += ' ' + $lang.get('comment_msg_note_unapp') + ''; - else if ( this_comment.approved == '2' ) - tplvars.SUBJECT += ' ' + $lang.get('comment_msg_note_spam') + ''; - - // Name - tplvars.NAME = this_comment.name; - if ( this_comment.user_id > 1 ) - tplvars.NAME = '' + this_comment.name + ''; - - // Avatar - if ( this_comment.user_has_avatar == '1' ) - { - tplvars.AVATAR_URL = this_comment.avatar_path; - tplvars.USERPAGE_LINK = makeUrlNS('User', this_comment.name); - tplvars.AVATAR_ALT = $lang.get('usercp_avatar_image_alt', { username: this_comment.name }); - } - - // User level - tplvars.USER_LEVEL = ''; - if ( this_comment.user_title ) - tplvars.USER_LEVEL += this_comment.user_title; - if ( this_comment.rank_title && this_comment.user_title ) - tplvars.USER_LEVEL += ''; - if ( this_comment.rank_title ) - tplvars.USER_LEVEL += $lang.get(this_comment.rank_title); - - // Send PM link - tplvars.SEND_PM_LINK=(this_comment.user_id>1)?'' + $lang.get('comment_btn_send_privmsg') + '
':''; - - // Add buddy link - tplvars.ADD_BUDDY_LINK=(this_comment.user_id>1)?'' + $lang.get('comment_btn_add_buddy') + '
':''; - - // Edit link - tplvars.EDIT_LINK='' + $lang.get('comment_btn_edit') + ''; - - // Delete link - tplvars.DELETE_LINK='' + $lang.get('comment_btn_delete') + ''; - - // Moderation: (Un)approve link - var appr = ( this_comment.approved == 1 ) ? $lang.get('comment_btn_mod_unapprove') : $lang.get('comment_btn_mod_approve'); - tplvars.MOD_APPROVE_LINK=''+appr+''; - - // Moderation: Delete post link - tplvars.MOD_DELETE_LINK='' + $lang.get('comment_btn_mod_delete') + ''; - - // Moderation: IP address link - if ( this_comment.have_ip ) - { - tplvars.MOD_IP_LINK = '' + $lang.get('comment_btn_mod_ip_logged') + ''; - } - else - { - tplvars.MOD_IP_LINK = $lang.get('comment_btn_mod_ip_missing'); - } - - var tplbool = new Object(); - - tplbool.signature = ( this_comment.signature == '' ) ? false : true; - tplbool.can_edit = ( data.auth_edit_comments && ( ( this_comment.user_id == data.user_id && data.logged_in ) || data.auth_mod_comments ) ); - tplbool.auth_mod = data.auth_mod_comments; - tplbool.is_friend = ( this_comment.is_buddy == 1 && this_comment.is_friend == 1 ); - tplbool.is_foe = ( this_comment.is_buddy == 1 && this_comment.is_friend == 0 ); - tplbool.user_has_avatar = ( this_comment.user_has_avatar == '1' ); - - if ( tplbool.is_friend ) - tplvars.USER_LEVEL += '
' + $lang.get('comment_on_friend_list') + ''; - else if ( tplbool.is_foe ) - tplvars.USER_LEVEL += '
' + $lang.get('comment_on_foe_list') + ''; - - parser.assign_vars(tplvars); - parser.assign_bool(tplbool); - - var ret = '
'; + if ( this_comment.rank_title ) + tplvars.USER_LEVEL += $lang.get(this_comment.rank_title); + + // Send PM link + tplvars.SEND_PM_LINK=(this_comment.user_id>1)?'' + $lang.get('comment_btn_send_privmsg') + '
':''; + + // Add buddy link + tplvars.ADD_BUDDY_LINK=(this_comment.user_id>1)?'' + $lang.get('comment_btn_add_buddy') + '
':''; + + // Edit link + tplvars.EDIT_LINK='' + $lang.get('comment_btn_edit') + ''; + + // Delete link + tplvars.DELETE_LINK='' + $lang.get('comment_btn_delete') + ''; + + // Moderation: (Un)approve link + var appr = ( this_comment.approved == 1 ) ? $lang.get('comment_btn_mod_unapprove') : $lang.get('comment_btn_mod_approve'); + tplvars.MOD_APPROVE_LINK=''+appr+''; + + // Moderation: Delete post link + tplvars.MOD_DELETE_LINK='' + $lang.get('comment_btn_mod_delete') + ''; + + // Moderation: IP address link + if ( this_comment.have_ip ) + { + tplvars.MOD_IP_LINK = '' + $lang.get('comment_btn_mod_ip_logged') + ''; + } + else + { + tplvars.MOD_IP_LINK = $lang.get('comment_btn_mod_ip_missing'); + } + + var tplbool = new Object(); + + tplbool.signature = ( this_comment.signature == '' ) ? false : true; + tplbool.can_edit = ( data.auth_edit_comments && ( ( this_comment.user_id == data.user_id && data.logged_in ) || data.auth_mod_comments ) ); + tplbool.auth_mod = data.auth_mod_comments; + tplbool.is_friend = ( this_comment.is_buddy == 1 && this_comment.is_friend == 1 ); + tplbool.is_foe = ( this_comment.is_buddy == 1 && this_comment.is_friend == 0 ); + tplbool.user_has_avatar = ( this_comment.user_has_avatar == '1' ); + + if ( tplbool.is_friend ) + tplvars.USER_LEVEL += '
' + $lang.get('comment_on_friend_list') + ''; + else if ( tplbool.is_foe ) + tplvars.USER_LEVEL += '
' + $lang.get('comment_on_foe_list') + ''; + + parser.assign_vars(tplvars); + parser.assign_bool(tplbool); + + var ret = '
'; - if ( data.rank_data.rank_title ) - tplvars.USER_LEVEL += $lang.get(data.rank_data.rank_title); - - // Send PM link - tplvars.SEND_PM_LINK=(data.user_id>1)?'' + $lang.get('comment_btn_send_privmsg') + '
':''; - - // Add buddy link - tplvars.ADD_BUDDY_LINK=(data.user_id>1)?'' + $lang.get('comment_btn_add_buddy') + '
':''; - - // Edit link - tplvars.EDIT_LINK='' + $lang.get('comment_btn_edit') + ''; - - // Delete link - tplvars.DELETE_LINK='' + $lang.get('comment_btn_delete') + ''; - - // Moderation: (Un)approve link - var appr = ( data.approved == 1 ) ? $lang.get('comment_btn_mod_unapprove') : $lang.get('comment_btn_mod_approve'); - tplvars.MOD_APPROVE_LINK=''+appr+''; - - // Moderation: Delete post link - tplvars.MOD_DELETE_LINK='' + $lang.get('comment_btn_mod_delete') + ''; - - // Moderation: IP address link - tplvars.MOD_IP_LINK = '' + $lang.get('comment_btn_mod_ip_logged') + ''; - - var tplbool = new Object(); - - tplbool.signature = ( data.signature == '' ) ? false : true; - tplbool.can_edit = ( data.auth_edit_comments && ( ( data.user_id == data.user_id && data.logged_in ) || data.auth_mod_comments ) ); - tplbool.auth_mod = data.auth_mod_comments; - tplbool.user_has_avatar = ( data.user_has_avatar == '1' ); - - parser.assign_vars(tplvars); - parser.assign_bool(tplbool); - - var div = document.createElement('div'); - div.id = 'comment_holder_'+i; - - div.innerHTML = '' + parser.run(); - - if ( brother ) - { - brother.parentNode.insertBefore(div, brother.nextSibling); - } - else - { - // No comments in ajaxEditContainer, insert it after the header - var aec = document.getElementById("ajaxEditContainer"); - aec.insertBefore(div, aec.firstChild.nextSibling.nextSibling); - } - - document.getElementById('comment_source_'+i).value = data.comment_source; - - var cnt = document.getElementById('comment_count_inner').innerHTML; - cnt = parseInt(cnt); - if ( isNaN(cnt) ) - cnt = 0; - - var subst = { - num_comments: cnt, - page_type: ENANO_PAGE_TYPE - } - - var count_msg = ( cnt == 0 ) ? $lang.get('comment_msg_count_zero', subst) : ( ( cnt == 1 ) ? $lang.get('comment_msg_count_one', subst) : $lang.get('comment_msg_count_plural', subst) ); - - document.getElementById('comment_status').firstChild.innerHTML = count_msg; - - if(document.getElementById('comment_approve_'+i)) - { - var is_unappr = document.getElementById('comment_approve_'+i).firstChild.nodeValue; - is_unappr = ( is_unappr == $lang.get('comment_btn_mod_approve') ); - if ( is_unappr ) - { - comment_increment_unapproval(); - } - } - + var i = 0; + var brother; + while ( true ) + { + var x = document.getElementById('comment_holder_'+i); + if(!x) + break; + brother = x; + i++; + } + + var parser = new templateParser(comment_template); + var tplvars = new Object(); + + if ( data.approved != '1' && !data.auth_mod_comments ) + return false; + + tplvars.ID = i; + tplvars.DATETIME = data.time; + tplvars.SUBJECT = data.subject; + tplvars.DATA = data.comment_data; + tplvars.SIGNATURE = data.signature; + + tplvars.NAME = data.name; + if ( data.user_id > 1 ) + tplvars.NAME = '' + data.name + ''; + + if ( data.approved != '1' ) + tplvars.SUBJECT += ' ' + ( data.approved == '2' ? $lang.get('comment_msg_note_spam') : $lang.get('comment_msg_note_unapp') ) + ''; + + // Name + tplvars.NAME = data.name; + if ( data.user_id > 1 ) + tplvars.NAME = '' + data.name + ''; + + // Avatar + if ( data.user_has_avatar == '1' ) + { + tplvars.AVATAR_URL = data.avatar_path; + tplvars.USERPAGE_LINK = makeUrlNS('User', data.name); + tplvars.AVATAR_ALT = $lang.get('usercp_avatar_image_alt', { username: data.name }); + } + + // User level + tplvars.USER_LEVEL = ''; + if ( data.rank_data.user_title ) + tplvars.USER_LEVEL += data.rank_data.user_title; + if ( data.rank_data.rank_title && data.rank_data.user_title ) + tplvars.USER_LEVEL += '
'; + if ( data.rank_data.rank_title ) + tplvars.USER_LEVEL += $lang.get(data.rank_data.rank_title); + + // Send PM link + tplvars.SEND_PM_LINK=(data.user_id>1)?'' + $lang.get('comment_btn_send_privmsg') + '
':''; + + // Add buddy link + tplvars.ADD_BUDDY_LINK=(data.user_id>1)?'' + $lang.get('comment_btn_add_buddy') + '
':''; + + // Edit link + tplvars.EDIT_LINK='' + $lang.get('comment_btn_edit') + ''; + + // Delete link + tplvars.DELETE_LINK='' + $lang.get('comment_btn_delete') + ''; + + // Moderation: (Un)approve link + var appr = ( data.approved == 1 ) ? $lang.get('comment_btn_mod_unapprove') : $lang.get('comment_btn_mod_approve'); + tplvars.MOD_APPROVE_LINK=''+appr+''; + + // Moderation: Delete post link + tplvars.MOD_DELETE_LINK='' + $lang.get('comment_btn_mod_delete') + ''; + + // Moderation: IP address link + tplvars.MOD_IP_LINK = '' + $lang.get('comment_btn_mod_ip_logged') + ''; + + var tplbool = new Object(); + + tplbool.signature = ( data.signature == '' ) ? false : true; + tplbool.can_edit = ( data.auth_edit_comments && ( ( data.user_id == data.user_id && data.logged_in ) || data.auth_mod_comments ) ); + tplbool.auth_mod = data.auth_mod_comments; + tplbool.user_has_avatar = ( data.user_has_avatar == '1' ); + + parser.assign_vars(tplvars); + parser.assign_bool(tplbool); + + var div = document.createElement('div'); + div.id = 'comment_holder_'+i; + + div.innerHTML = '' + parser.run(); + + if ( brother ) + { + brother.parentNode.insertBefore(div, brother.nextSibling); + } + else + { + // No comments in ajaxEditContainer, insert it after the header + var aec = document.getElementById("ajaxEditContainer"); + aec.insertBefore(div, aec.firstChild.nextSibling.nextSibling); + } + + document.getElementById('comment_source_'+i).value = data.comment_source; + + var cnt = document.getElementById('comment_count_inner').innerHTML; + cnt = parseInt(cnt); + if ( isNaN(cnt) ) + cnt = 0; + + var subst = { + num_comments: cnt, + page_type: ENANO_PAGE_TYPE + } + + var count_msg = ( cnt == 0 ) ? $lang.get('comment_msg_count_zero', subst) : ( ( cnt == 1 ) ? $lang.get('comment_msg_count_one', subst) : $lang.get('comment_msg_count_plural', subst) ); + + document.getElementById('comment_status').firstChild.innerHTML = count_msg; + + if(document.getElementById('comment_approve_'+i)) + { + var is_unappr = document.getElementById('comment_approve_'+i).firstChild.nodeValue; + is_unappr = ( is_unappr == $lang.get('comment_btn_mod_approve') ); + if ( is_unappr ) + { + comment_increment_unapproval(); + } + } + } window.comment_decrement_unapproval = function() { - if ( document.getElementById('comment_count_unapp_inner') ) - { - var num_unapp = parseInt(document.getElementById('comment_count_unapp_inner').innerHTML); - if ( !isNaN(num_unapp) ) - { - num_unapp = num_unapp - 1; - if ( num_unapp == 0 ) - { - var p = document.getElementById('comment_status'); - p.removeChild(p.childNodes[2]); - p.removeChild(p.childNodes[1]); - } - else - { - var count_msg = $lang.get('comment_msg_count_unapp_mod', { num_unapp: num_unapp }); - document.getElementById('comment_count_unapp_inner').parentNode.innerHTML = count_msg; - } - } - } + if ( document.getElementById('comment_count_unapp_inner') ) + { + var num_unapp = parseInt(document.getElementById('comment_count_unapp_inner').innerHTML); + if ( !isNaN(num_unapp) ) + { + num_unapp = num_unapp - 1; + if ( num_unapp == 0 ) + { + var p = document.getElementById('comment_status'); + p.removeChild(p.childNodes[2]); + p.removeChild(p.childNodes[1]); + } + else + { + var count_msg = $lang.get('comment_msg_count_unapp_mod', { num_unapp: num_unapp }); + document.getElementById('comment_count_unapp_inner').parentNode.innerHTML = count_msg; + } + } + } } window.comment_increment_unapproval = function() { - if ( document.getElementById('comment_count_unapp_inner') ) - { - var num_unapp = parseInt(document.getElementById('comment_count_unapp_inner').innerHTML); - if ( isNaN(num_unapp) ) - num_unapp = 0; - num_unapp = num_unapp + 1; - var count_msg = $lang.get('comment_msg_count_unapp_mod', { num_unapp: num_unapp }); - document.getElementById('comment_count_unapp_inner').parentNode.innerHTML = count_msg; - } - else - { - var count_msg = $lang.get('comment_msg_count_unapp_mod', { num_unapp: 1 }); - var status = document.getElementById('comment_status'); - if ( !status.childNodes[1] ) - status.appendChild(document.createTextNode(' ')); - var span = document.createElement('span'); - span.id = 'comment_status_unapp'; - span.style.color = '#D84308'; - span.innerHTML = count_msg; - status.appendChild(span); - } + if ( document.getElementById('comment_count_unapp_inner') ) + { + var num_unapp = parseInt(document.getElementById('comment_count_unapp_inner').innerHTML); + if ( isNaN(num_unapp) ) + num_unapp = 0; + num_unapp = num_unapp + 1; + var count_msg = $lang.get('comment_msg_count_unapp_mod', { num_unapp: num_unapp }); + document.getElementById('comment_count_unapp_inner').parentNode.innerHTML = count_msg; + } + else + { + var count_msg = $lang.get('comment_msg_count_unapp_mod', { num_unapp: 1 }); + var status = document.getElementById('comment_status'); + if ( !status.childNodes[1] ) + status.appendChild(document.createTextNode(' ')); + var span = document.createElement('span'); + span.id = 'comment_status_unapp'; + span.style.color = '#D84308'; + span.innerHTML = count_msg; + status.appendChild(span); + } } window._comment_page_flip = function(paginator, page_number) { - // get ID - var random_id = paginator.random_id; - // update paginate control - paginator.set_page(page_number); - $('.' + random_id + '_control').html(paginator._build_control(page_number)); - paginator.offset = page_number; - // set to loading state - $('#' + random_id + '_0') - .css('height', 500) - .html('') - .fadeTo("fast", 0.7) - .css('background-position', 'center 51px') - .css('background-repeat', 'no-repeat') - .css('background-color', 'white') - .css('background-image', 'url(' + cdnPath + '/images/loading-big.gif' + ')') - .animate({ height: 150 }, 500, function() - { - // load the new comments - ajaxComments({ - mode: 'fetch', - pagenum: page_number, - passback: { - paginator_id: random_id - } - }); - }); + // get ID + var random_id = paginator.random_id; + // update paginate control + paginator.set_page(page_number); + $('.' + random_id + '_control').html(paginator._build_control(page_number)); + paginator.offset = page_number; + // set to loading state + $('#' + random_id + '_0') + .css('height', 500) + .html('') + .fadeTo("fast", 0.7) + .css('background-position', 'center 51px') + .css('background-repeat', 'no-repeat') + .css('background-color', 'white') + .css('background-image', 'url(' + cdnPath + '/images/loading-big.gif' + ')') + .animate({ height: 150 }, 500, function() + { + // load the new comments + ajaxComments({ + mode: 'fetch', + pagenum: page_number, + passback: { + paginator_id: random_id + } + }); + }); } window.viewCommentIP = function(id, local_id) { - // set "loading" indicator on IP button - var span = $dynano('comment_ip_' + local_id).object; - if ( !span ) - return false; - span.innerHTML = '
Mouse: x: '+mouseX+', y:' + mouseY + '
' + document.getElementById('debug').innerHTML; - - if(bias) - { - if ( ( mouseX < fieldUL['left'] + 2 || mouseX > fieldUL['right'] - 5 ) || - ( mouseY_local < fieldUL['top'] - 2 || mouseY_local > fieldUL['bottom'] - 2 ) ) - { - return false; - } - } - else - { - if ( ( mouseX < fieldUL['left'] || mouseX > fieldUL['right'] ) || - ( mouseY_local < fieldUL['top'] || mouseY_local > fieldUL['bottom'] ) ) - return false; - } - - return true; + var fieldUL = new Object(); + var dim = fetch_dimensions(obj); + var off = fetch_offset(obj); + fieldUL['top'] = off['top']; + fieldUL['left'] = off['left']; + fieldUL['right'] = off['left'] + dim['w']; + fieldUL['bottom'] = off['top'] + dim['h']; + + var mouseY_local = mouseY + getScrollOffset(); + + // document.getElementById('debug').innerHTML = '
Mouse: x: '+mouseX+', y:' + mouseY + '
' + document.getElementById('debug').innerHTML; + + if(bias) + { + if ( ( mouseX < fieldUL['left'] + 2 || mouseX > fieldUL['right'] - 5 ) || + ( mouseY_local < fieldUL['top'] - 2 || mouseY_local > fieldUL['bottom'] - 2 ) ) + { + return false; + } + } + else + { + if ( ( mouseX < fieldUL['left'] || mouseX > fieldUL['right'] ) || + ( mouseY_local < fieldUL['top'] || mouseY_local > fieldUL['bottom'] ) ) + return false; + } + + return true; } function jBoxGarbageCollection(e) { - setMousePos(e); - var menus = document.getElementsByClassName('div', 'menu'); - if ( menus.length > 0 ) - { - for ( var i in menus ) - { - if ( typeof(menus[i]) != 'object') - continue; // toJSONString() compatibility - var uls = menus[i].getElementsByTagName('ul'); - if ( uls.length > 0 ) - { - for ( var j = 0; j < uls.length; j++ ) - { - if ( !isOverObj(uls[j], false, e) ) - { - $dynano(uls[j].previousSibling).rmClass('liteselected'); - //uls[j].style.display = 'none'; - slideIn(uls[j]); - } - } - } - var uls = getElementsByClassName(menus[i], 'divs', 'submenu'); - if ( uls.length > 0 ) - { - for ( var j = 0; j < uls.length; j++ ) - { - if ( !isOverObj(uls[j], false, e) ) - { - $dynano(uls[j].previousSibling).rmClass('liteselected'); - //uls[j].style.display = 'none'; - slideIn(uls[j]); - } - } - } - } - } + setMousePos(e); + var menus = document.getElementsByClassName('div', 'menu'); + if ( menus.length > 0 ) + { + for ( var i in menus ) + { + if ( typeof(menus[i]) != 'object') + continue; // toJSONString() compatibility + var uls = menus[i].getElementsByTagName('ul'); + if ( uls.length > 0 ) + { + for ( var j = 0; j < uls.length; j++ ) + { + if ( !isOverObj(uls[j], false, e) ) + { + $dynano(uls[j].previousSibling).rmClass('liteselected'); + //uls[j].style.display = 'none'; + slideIn(uls[j]); + } + } + } + var uls = getElementsByClassName(menus[i], 'divs', 'submenu'); + if ( uls.length > 0 ) + { + for ( var j = 0; j < uls.length; j++ ) + { + if ( !isOverObj(uls[j], false, e) ) + { + $dynano(uls[j].previousSibling).rmClass('liteselected'); + //uls[j].style.display = 'none'; + slideIn(uls[j]); + } + } + } + } + } } document.onclick = jBoxGarbageCollection; var getElementsByClassName = function(parent, type, cls) { - if(!type) - type = '*'; - ret = new Array(); - if ( !parent ) - return ret; - el = parent.getElementsByTagName(type); - for ( var i = 0; i < el.length; i++ ) - { - if ( typeof(el[i]) != 'object') - continue; // toJSONString() compatibility - if(el[i].className) - { - if(el[i].className.indexOf(' ') > 0) - { - classes = el[i].className.split(' '); - } - else - { - classes = new Array(); - classes.push(el[i].className); - } - if ( in_array(cls, classes) ) - ret.push(el[i]); - } - } - return ret; + if(!type) + type = '*'; + ret = new Array(); + if ( !parent ) + return ret; + el = parent.getElementsByTagName(type); + for ( var i = 0; i < el.length; i++ ) + { + if ( typeof(el[i]) != 'object') + continue; // toJSONString() compatibility + if(el[i].className) + { + if(el[i].className.indexOf(' ') > 0) + { + classes = el[i].className.split(' '); + } + else + { + classes = new Array(); + classes.push(el[i].className); + } + if ( in_array(cls, classes) ) + ret.push(el[i]); + } + } + return ret; } document.getElementsByClassName = function(type, cls) { - return getElementsByClassName(document, type, cls); + return getElementsByClassName(document, type, cls); } function setMousePos(event) { - if(IE) - { - if(!event) - { - event = window.event; - } - clX = event.clientX; - if ( document.body ) - sL = document.body.scrollLeft; - else - sL = 0; - mouseX = clX + sL; - mouseY = event.clientY + ( document.body ? document.body.scrollTop : 0 ); - return; - } - if( typeof(event.clientX) == 'number' ) - { - mouseX = event.clientX; - mouseY = event.clientY; - return; - } - else if( typeof(event.layerX) == 'number' ) - { - mouseX = event.layerX; - mouseY = event.layerY; - return; - } - else if( typeof(event.offsetX) == 'number' ) - { - mouseX = event.offsetX; - mouseY = event.offsetY; - return; - } - else if( typeof(event.screenX) == 'number' ) - { - mouseX = event.screenX; - mouseY = event.screenY; - return; - } - else if( typeof(event.x) == 'number' ) - { - mouseX = event.x; - mouseY = event.y; - return; - } + if(IE) + { + if(!event) + { + event = window.event; + } + clX = event.clientX; + if ( document.body ) + sL = document.body.scrollLeft; + else + sL = 0; + mouseX = clX + sL; + mouseY = event.clientY + ( document.body ? document.body.scrollTop : 0 ); + return; + } + if( typeof(event.clientX) == 'number' ) + { + mouseX = event.clientX; + mouseY = event.clientY; + return; + } + else if( typeof(event.layerX) == 'number' ) + { + mouseX = event.layerX; + mouseY = event.layerY; + return; + } + else if( typeof(event.offsetX) == 'number' ) + { + mouseX = event.offsetX; + mouseY = event.offsetY; + return; + } + else if( typeof(event.screenX) == 'number' ) + { + mouseX = event.screenX; + mouseY = event.screenY; + return; + } + else if( typeof(event.x) == 'number' ) + { + mouseX = event.x; + mouseY = event.y; + return; + } } document.onmousemove = function(e) { - setMousePos(e); + setMousePos(e); }; function removeTextNodes(obj) { - if(obj) - { - if(typeof(obj.tagName) != 'string' || ( String(obj) == '[object Text]' && is_Safari ) ) - { - if ( ( obj.nodeType == 3 && obj.data.match(/^([\s]*)$/ig) ) ) // || ( typeof(obj.innerHTML) == undefined && is_Safari ) ) - { - obj.parentNode.removeChild(obj); - return; - } - } - if(obj.firstChild) - { - for(var i = 0; i < obj.childNodes.length; i++) - { - removeTextNodes(obj.childNodes[i]); - } - } - } + if(obj) + { + if(typeof(obj.tagName) != 'string' || ( String(obj) == '[object Text]' && is_Safari ) ) + { + if ( ( obj.nodeType == 3 && obj.data.match(/^([\s]*)$/ig) ) ) // || ( typeof(obj.innerHTML) == undefined && is_Safari ) ) + { + obj.parentNode.removeChild(obj); + return; + } + } + if(obj.firstChild) + { + for(var i = 0; i < obj.childNodes.length; i++) + { + removeTextNodes(obj.childNodes[i]); + } + } + } } diff -r de56132c008d -r bdac73ed481e includes/clientside/static/dynano.js --- a/includes/clientside/static/dynano.js Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/static/dynano.js Sun Mar 28 23:10:46 2010 -0400 @@ -2,196 +2,196 @@ var $dynano = function(id) { - return new DNobj(id); + return new DNobj(id); } function DNobj(id) { - if ( id == undefined ) - { - return {}; - } - this.object = ( typeof(id) == 'object' ) ? id : document.getElementById(id); - if ( !this.object ) - { - console.warn('Dynano: requested object is bad. id parameter follows.'); - console.debug(id); - this.object = false; - return this; - } - if ( this.object.Dynano ) - { - return this.object.Dynano; - } - this.object.Dynano = this; - - this.height = __DNObjGetHeight(this.object); - this.width = __DNObjGetWidth(this.object); - - if ( this.object.tagName == 'TEXTAREA' && ( typeof(tinyMCE) == 'object' || typeof(tinyMCE_GZ) == 'object' ) ) - { - this.object.dnIsMCE = 'no'; - this.switchToMCE = DN_switchToMCE; - this.destroyMCE = DN_destroyMCE; - this.getContent = DN_mceFetchContent; - this.setContent = DN_mceSetContent; - this.makeSwitchable = DN_makeSwitchableTA; - this.isMCE = DN_isMCE; - } + if ( id == undefined ) + { + return {}; + } + this.object = ( typeof(id) == 'object' ) ? id : document.getElementById(id); + if ( !this.object ) + { + console.warn('Dynano: requested object is bad. id parameter follows.'); + console.debug(id); + this.object = false; + return this; + } + if ( this.object.Dynano ) + { + return this.object.Dynano; + } + this.object.Dynano = this; + + this.height = __DNObjGetHeight(this.object); + this.width = __DNObjGetWidth(this.object); + + if ( this.object.tagName == 'TEXTAREA' && ( typeof(tinyMCE) == 'object' || typeof(tinyMCE_GZ) == 'object' ) ) + { + this.object.dnIsMCE = 'no'; + this.switchToMCE = DN_switchToMCE; + this.destroyMCE = DN_destroyMCE; + this.getContent = DN_mceFetchContent; + this.setContent = DN_mceSetContent; + this.makeSwitchable = DN_makeSwitchableTA; + this.isMCE = DN_isMCE; + } } function __DNObjGetHeight(o) { - return o.offsetHeight; + return o.offsetHeight; } function __DNObjGetWidth(o) { - return o.offsetWidth; + return o.offsetWidth; } function addClass(obj, clsname) { - var cnt = obj.className; - var space = ( (cnt + '').length > 0 ) ? ' ' : ''; - var cls = cnt + space + clsname; - obj.className = cls; + var cnt = obj.className; + var space = ( (cnt + '').length > 0 ) ? ' ' : ''; + var cls = cnt + space + clsname; + obj.className = cls; } function rmClass(obj, clsname) { - var cnt = obj.className; - if ( cnt == clsname ) - { - obj.className = ''; - } - else - { - cnt = cnt.replace(clsname, ''); - cnt = trim(cnt); - obj.className = cnt; - } + var cnt = obj.className; + if ( cnt == clsname ) + { + obj.className = ''; + } + else + { + cnt = cnt.replace(clsname, ''); + cnt = trim(cnt); + obj.className = cnt; + } } function hasClass(obj, clsname) { - var cnt = obj.className; - if ( !cnt ) - return false; - if ( cnt == clsname ) - return true; - cnt = cnt.split(' '); - - for ( var i in cnt ) - if ( cnt[i] == clsname ) - return true; - - return false; + var cnt = obj.className; + if ( !cnt ) + return false; + if ( cnt == clsname ) + return true; + cnt = cnt.split(' '); + + for ( var i in cnt ) + if ( cnt[i] == clsname ) + return true; + + return false; } function __DNObjGetLeft(obj) { - var left_offset = obj.offsetLeft; - while ((obj = obj.offsetParent) != null) { - left_offset += obj.offsetLeft; - } - return left_offset; + var left_offset = obj.offsetLeft; + while ((obj = obj.offsetParent) != null) { + left_offset += obj.offsetLeft; + } + return left_offset; } function __DNObjGetTop(obj) { - var left_offset = obj.offsetTop; - while ((obj = obj.offsetParent) != null) { - left_offset += obj.offsetTop; - } - return left_offset; + var left_offset = obj.offsetTop; + while ((obj = obj.offsetParent) != null) { + left_offset += obj.offsetTop; + } + return left_offset; } function DN_switchToMCE(performWikiTransform) { - if ( !this.object.id ) - this.object.id = 'textarea_' + Math.floor(Math.random() * 1000000); - if ( !this.object.name ) - this.object.name = 'textarea_' + Math.floor(Math.random() * 1000000); - // Updated for TinyMCE 3.x - if ( performWikiTransform ) - { - this.object.value = DN_WikitextToXHTML(this.object.value); - } - // If tinyMCE init hasn't been called yet, do it now. - if ( !tinymce_initted ) - { - console.info('$dynano().switchToMCE(): doing "exact"-type MCE init'); - enano_tinymce_options.mode = 'exact'; - enano_tinymce_options.elements = this.object.id; - initTinyMCE(); - this.object.dnIsMCE = 'yes'; - return true; - } - else - { - console.info('$dynano().switchToMCE(): tinyMCE already loaded, calling mceAddControl'); - tinymce.EditorManager.execCommand("mceAddControl", true, this.object.id); - this.object.dnIsMCE = 'yes'; - } - return this; + if ( !this.object.id ) + this.object.id = 'textarea_' + Math.floor(Math.random() * 1000000); + if ( !this.object.name ) + this.object.name = 'textarea_' + Math.floor(Math.random() * 1000000); + // Updated for TinyMCE 3.x + if ( performWikiTransform ) + { + this.object.value = DN_WikitextToXHTML(this.object.value); + } + // If tinyMCE init hasn't been called yet, do it now. + if ( !tinymce_initted ) + { + console.info('$dynano().switchToMCE(): doing "exact"-type MCE init'); + enano_tinymce_options.mode = 'exact'; + enano_tinymce_options.elements = this.object.id; + initTinyMCE(); + this.object.dnIsMCE = 'yes'; + return true; + } + else + { + console.info('$dynano().switchToMCE(): tinyMCE already loaded, calling mceAddControl'); + tinymce.EditorManager.execCommand("mceAddControl", true, this.object.id); + this.object.dnIsMCE = 'yes'; + } + return this; } function DN_destroyMCE(performWikiTransform) { - //if ( !this.object.dn_is_mce ) - // return this; - if ( this.object.id && window.tinymce ) - { - // TinyMCE 2.x - // tinymce.EditorManager.removeMCEControl(this.object.name); - // TinyMCE 3.x - var ed = tinymce.EditorManager.getInstanceById(this.object.id); - if ( ed ) - { - if ( !tinymce.EditorManager.execCommand("mceRemoveEditor", false, this.object.id) ) - alert('could not destroy editor'); - if ( performWikiTransform ) - { - this.object.value = DN_XHTMLToWikitext(this.object.value); - } - } - } - this.object.dnIsMCE = 'no'; - return this; + //if ( !this.object.dn_is_mce ) + // return this; + if ( this.object.id && window.tinymce ) + { + // TinyMCE 2.x + // tinymce.EditorManager.removeMCEControl(this.object.name); + // TinyMCE 3.x + var ed = tinymce.EditorManager.getInstanceById(this.object.id); + if ( ed ) + { + if ( !tinymce.EditorManager.execCommand("mceRemoveEditor", false, this.object.id) ) + alert('could not destroy editor'); + if ( performWikiTransform ) + { + this.object.value = DN_XHTMLToWikitext(this.object.value); + } + } + } + this.object.dnIsMCE = 'no'; + return this; } function DN_isMCE() { - return ( this.object.dnIsMCE == 'yes' ); + return ( this.object.dnIsMCE == 'yes' ); } function DN_mceFetchContent() { - if ( this.object.name ) - { - var text = this.object.value; - if ( tinymce.EditorManager.get(this.object.id) ) - { - var editor = tinymce.EditorManager.get(this.object.id); - text = editor.getContent(); - } - return text; - } - else - { - return this.object.value; - } + if ( this.object.name ) + { + var text = this.object.value; + if ( tinymce.EditorManager.get(this.object.id) ) + { + var editor = tinymce.EditorManager.get(this.object.id); + text = editor.getContent(); + } + return text; + } + else + { + return this.object.value; + } } function DN_mceSetContent(text) { - if ( this.object.name ) - { - this.object.value = text; - if ( tinymce.EditorManager.get(this.object.id) ) - { - var editor = tinymce.EditorManager.get(this.object.id); - editor.setContent(text); - } - } - else - { - this.object.value = text; - } + if ( this.object.name ) + { + this.object.value = text; + if ( tinymce.EditorManager.get(this.object.id) ) + { + var editor = tinymce.EditorManager.get(this.object.id); + editor.setContent(text); + } + } + else + { + this.object.value = text; + } } var P_BOTTOM = 1; @@ -199,137 +199,137 @@ function DN_makeSwitchableTA(pos) { - if ( this.toggler ) - return false; - - if ( !pos ) - pos = P_BOTTOM; - - load_component('l10n'); - var cookiename = 'enano_editor_mode'; - - var toggler = document.createElement('div'); - toggler.dynano = this; - this.toggler = toggler; - - if ( !this.object.id ) - this.object.id = 'dynano_auto_' + Math.floor(Math.random() * 1000000); - - toggler.s_mode_text = $lang.get('editor_btn_wikitext'); - toggler.s_mode_graphical = $lang.get('editor_btn_graphical'); - - toggler.set_text = function() - { - if ( this.dynano.object.dnIsMCE == 'yes' ) - this.dynano.destroyMCE(); - - this.innerHTML = ''; - this.appendChild(document.createTextNode(this.s_mode_text + ' | ')); - - var link = document.createElement('a'); - link.href = '#'; - link.onclick = function() - { - this.parentNode.set_graphical(); - return false; - } - link.appendChild(document.createTextNode(this.s_mode_graphical)); - this.appendChild(link); - - createCookie('enano_editor_mode', 'text', 365); - } - - toggler.set_graphical = function() - { - this.dynano.switchToMCE(); - this.innerHTML = ''; - - var link = document.createElement('a'); - link.href = '#'; - link.onclick = function() - { - this.parentNode.set_text(); - return false; - } - link.appendChild(document.createTextNode(this.s_mode_text)); - this.appendChild(link); - - this.appendChild(document.createTextNode(' | ' + this.s_mode_graphical)); - createCookie('enano_editor_mode', 'tinymce', 365); - } - - toggler.style.styleFloat = 'right'; - toggler.style.cssFloat = 'right'; - if ( pos == P_BOTTOM ) - { - insertAfter(this.object.parentNode, toggler, this.object); - } - else - { - this.object.parentNode.insertBefore(toggler, this.object); - } - - if ( readCookie(cookiename) == 'tinymce' ) - { - toggler.set_graphical(); - } - else - { - toggler.set_text(); - } + if ( this.toggler ) + return false; + + if ( !pos ) + pos = P_BOTTOM; + + load_component('l10n'); + var cookiename = 'enano_editor_mode'; + + var toggler = document.createElement('div'); + toggler.dynano = this; + this.toggler = toggler; + + if ( !this.object.id ) + this.object.id = 'dynano_auto_' + Math.floor(Math.random() * 1000000); + + toggler.s_mode_text = $lang.get('editor_btn_wikitext'); + toggler.s_mode_graphical = $lang.get('editor_btn_graphical'); + + toggler.set_text = function() + { + if ( this.dynano.object.dnIsMCE == 'yes' ) + this.dynano.destroyMCE(); + + this.innerHTML = ''; + this.appendChild(document.createTextNode(this.s_mode_text + ' | ')); + + var link = document.createElement('a'); + link.href = '#'; + link.onclick = function() + { + this.parentNode.set_graphical(); + return false; + } + link.appendChild(document.createTextNode(this.s_mode_graphical)); + this.appendChild(link); + + createCookie('enano_editor_mode', 'text', 365); + } + + toggler.set_graphical = function() + { + this.dynano.switchToMCE(); + this.innerHTML = ''; + + var link = document.createElement('a'); + link.href = '#'; + link.onclick = function() + { + this.parentNode.set_text(); + return false; + } + link.appendChild(document.createTextNode(this.s_mode_text)); + this.appendChild(link); + + this.appendChild(document.createTextNode(' | ' + this.s_mode_graphical)); + createCookie('enano_editor_mode', 'tinymce', 365); + } + + toggler.style.styleFloat = 'right'; + toggler.style.cssFloat = 'right'; + if ( pos == P_BOTTOM ) + { + insertAfter(this.object.parentNode, toggler, this.object); + } + else + { + this.object.parentNode.insertBefore(toggler, this.object); + } + + if ( readCookie(cookiename) == 'tinymce' ) + { + toggler.set_graphical(); + } + else + { + toggler.set_text(); + } } function DN_WikitextToXHTML(text) { - return DN_AjaxGetTransformedText(text, 'xhtml'); + return DN_AjaxGetTransformedText(text, 'xhtml'); } function DN_XHTMLToWikitext(text) { - return DN_AjaxGetTransformedText(text, 'wikitext'); + return DN_AjaxGetTransformedText(text, 'wikitext'); } // AJAX to the server to transform text function DN_AjaxGetTransformedText(text, to) { - // get an XHR instance - var ajax = ajaxMakeXHR(); - - var uri = stdAjaxPrefix + '&_mode=transform&to=' + to; - var parms = 'text=' + ajaxEscape(text); - try - { - ajax.open('POST', uri, false); - ajax.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); - // Setting Content-length in Safari triggers a warning - if ( !is_Safari ) - { - ajax.setRequestHeader("Content-length", parms.length); - } - ajax.send(parms); - // async request, so if status != 200 at this point then we're screwed - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - var response = String(ajax.responseText + ''); - if ( !check_json_response(response) ) - { - handle_invalid_json(response); - return text; - } - response = parseJSON(response); - if ( response.mode == 'error' ) - { - alert(response.error); - return text; - } - return response.text; - } - } - catch(e) - { - console.warn('DN_AjaxGetTransformedText: XHR failed'); - } - return text; + // get an XHR instance + var ajax = ajaxMakeXHR(); + + var uri = stdAjaxPrefix + '&_mode=transform&to=' + to; + var parms = 'text=' + ajaxEscape(text); + try + { + ajax.open('POST', uri, false); + ajax.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + // Setting Content-length in Safari triggers a warning + if ( !is_Safari ) + { + ajax.setRequestHeader("Content-length", parms.length); + } + ajax.send(parms); + // async request, so if status != 200 at this point then we're screwed + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + var response = String(ajax.responseText + ''); + if ( !check_json_response(response) ) + { + handle_invalid_json(response); + return text; + } + response = parseJSON(response); + if ( response.mode == 'error' ) + { + alert(response.error); + return text; + } + return response.text; + } + } + catch(e) + { + console.warn('DN_AjaxGetTransformedText: XHR failed'); + } + return text; } DNobj.prototype.addClass = function(clsname) { addClass(this.object, clsname); return this; }; diff -r de56132c008d -r bdac73ed481e includes/clientside/static/editor.js --- a/includes/clientside/static/editor.js Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/static/editor.js Sun Mar 28 23:10:46 2010 -0400 @@ -9,1167 +9,1167 @@ window.ajaxEditor = function(revid) { - if ( KILL_SWITCH ) - return true; - if ( editor_open ) - return true; - load_component(['l10n', 'template-compiler', 'messagebox', 'fadefilter', 'flyin', 'toolbar']); - selectButtonMinor('edit'); - selectButtonMajor('article'); - setAjaxLoading(); - - var rev_id_uri = ( revid ) ? '&revid=' + revid : ''; - ajaxGet(stdAjaxPrefix + '&_mode=getsource' + rev_id_uri, function(ajax) - { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - unsetAjaxLoading(); - - var response = String(ajax.responseText + ''); - if ( !check_json_response(response) ) - { - handle_invalid_json(response); - return false; - } - - response = parseJSON(response); - if ( response.mode == 'error' ) - { - unselectAllButtonsMinor(); - new MessageBox(MB_OK | MB_ICONSTOP, $lang.get('editor_err_server'), response.error); - return false; - } - - if ( !response.auth_view_source ) - { - unselectAllButtonsMinor(); - new MessageBox(MB_OK | MB_ICONSTOP, $lang.get('editor_err_access_denied_title'), $lang.get('editor_err_access_denied_body')); - return false; - } - - // do we need to enter a captcha before saving the page? - var captcha_hash = ( response.require_captcha ) ? response.captcha_id : false; - - ajaxBuildEditor((!response.auth_edit), response.time, response.allow_wysiwyg, captcha_hash, response.revid, response.undo_info, response); - } - }); + if ( KILL_SWITCH ) + return true; + if ( editor_open ) + return true; + load_component(['l10n', 'template-compiler', 'messagebox', 'fadefilter', 'flyin', 'toolbar']); + selectButtonMinor('edit'); + selectButtonMajor('article'); + setAjaxLoading(); + + var rev_id_uri = ( revid ) ? '&revid=' + revid : ''; + ajaxGet(stdAjaxPrefix + '&_mode=getsource' + rev_id_uri, function(ajax) + { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + unsetAjaxLoading(); + + var response = String(ajax.responseText + ''); + if ( !check_json_response(response) ) + { + handle_invalid_json(response); + return false; + } + + response = parseJSON(response); + if ( response.mode == 'error' ) + { + unselectAllButtonsMinor(); + new MessageBox(MB_OK | MB_ICONSTOP, $lang.get('editor_err_server'), response.error); + return false; + } + + if ( !response.auth_view_source ) + { + unselectAllButtonsMinor(); + new MessageBox(MB_OK | MB_ICONSTOP, $lang.get('editor_err_access_denied_title'), $lang.get('editor_err_access_denied_body')); + return false; + } + + // do we need to enter a captcha before saving the page? + var captcha_hash = ( response.require_captcha ) ? response.captcha_id : false; + + ajaxBuildEditor((!response.auth_edit), response.time, response.allow_wysiwyg, captcha_hash, response.revid, response.undo_info, response); + } + }); } window.ajaxBuildEditor = function(readonly, timestamp, allow_wysiwyg, captcha_hash, revid, undo_info, response) { - // Set flags - // We don't want the fancy confirmation framework to trigger if the user is only viewing the page source - if ( !readonly ) - { - editor_open = true; - disableUnload(); - } - - // Destroy existing contents of page container - if ( editor_use_modal_window ) - { - darken(true, 70, 'enano_editor_darkener'); - // Build a div with 80% width, centered, and 10px from the top of the window - var edcon = document.createElement('div'); - edcon.style.position = 'absolute'; - edcon.style.backgroundColor = '#FFFFFF'; - edcon.style.padding = '10px'; - edcon.style.width = '80%'; - edcon.style.zIndex = getHighestZ() + 1; - edcon.id = 'ajaxEditContainerModal'; - - // Positioning - var top = getScrollOffset() + 10; - var left = ( getWidth() / 10 ) - 10; // 10% of window width on either side - 10px for padding = perfect centering effect - edcon.style.top = String(top) + 'px'; - edcon.style.left = String(left) + 'px'; - var body = document.getElementsByTagName('body')[0]; - - // Set opacity to 0 - domObjChangeOpac(0, edcon); - body.appendChild(edcon); - } - else - { - var edcon = document.getElementById('ajaxEditContainer'); - for ( var i = edcon.childNodes.length - 1; i >= 0; i-- ) - { - edcon.removeChild(edcon.childNodes[i]); - } - } - - var content = response.src; - - // - // BUILD EDITOR - // - - var heading = document.createElement('h3'); - heading.style.cssFloat = 'left'; - heading.style.styleFloat = 'left'; - heading.style.marginTop = '0px'; - heading.style.marginBottom = '0px'; - heading.appendChild(document.createTextNode($lang.get('editor_msg_editor_heading'))); - - // Plaintext/wikitext toggler - // Only build the editor if using TinyMCE is allowed. THIS IS WEAK - // AND CANNOT BE MADE ANY STRONGER. - - if ( allow_wysiwyg ) - { - var toggler = document.createElement('p'); - toggler.style.marginLeft = '0'; - toggler.style.textAlign = 'right'; - - var span_wiki = document.createElement('span'); - var span_mce = document.createElement('span'); - span_wiki.id = 'enano_edit_btn_pt'; - span_mce.id = 'enano_edit_btn_mce'; - - // to-wikitext button - var a = document.createElement('a'); - a.href = '#'; - a.className = 'abutton image abutton_green'; - a.appendChild(gen_sprite(scriptPath + '/images/editor/sprite.png', 16, 16, 0, 96)); - a.appendChild(document.createTextNode(' ' + $lang.get('editor_btn_wikitext'))); - span_wiki.appendChild(a); - toggler.appendChild(span_wiki); - - // to-HTML button - var a = document.createElement('a'); - a.href = '#'; - a.className = 'abutton image abutton_blue'; - a.appendChild(gen_sprite(scriptPath + '/images/editor/sprite.png', 16, 16, 0, 112)); - a.appendChild(document.createTextNode(' ' + $lang.get('editor_btn_graphical'))); - span_mce.appendChild(a); - toggler.appendChild(span_mce); - - if ( response.page_format == 'xhtml' ) - { - // Current selection is TinyMCE - make span_wiki have the link and span_mce be plaintext - span_mce.style.display = 'none'; - } - else - { - // Current selection is wikitext - set span_wiki to plaintext and span_mce to link - span_wiki.style.display = 'none'; - } - } - - // Form (to allow submits from MCE to trigger a real save) - var form = document.createElement('form'); - form.action = 'javascript:void(0);'; - form.onsubmit = function() - { - ajaxEditorSave(); - return false; - } - - // Draft notice - if ( response.have_draft && !readonly ) - { - var dn = document.createElement('div'); - dn.className = 'warning-box'; - dn.id = 'ajax_edit_draft_notice'; - dn.innerHTML = '' + $lang.get('editor_msg_have_draft_title') + '
'; - dn.innerHTML += $lang.get('editor_msg_have_draft_body', { author: response.draft_author, time: response.draft_time }); - } - - // Old-revision notice - if ( revid > 0 ) - { - var oldrev_box = document.createElement('div'); - oldrev_box.className = 'usermessage'; - oldrev_box.appendChild(document.createTextNode($lang.get('editor_msg_editing_old_revision'))); - } - - // Preview holder - var preview_anchor = document.createElement('a'); - preview_anchor.name = 'ajax_preview'; - preview_anchor.id = 'ajax_preview'; - var preview_container = document.createElement('div'); - preview_container.id = 'enano_editor_preview'; - preview_container.style.clear = 'left'; - - // Textarea containing the content - var ta_wrapper = document.createElement('div'); - ta_wrapper.style.margin = '10px 0'; - // ta_wrapper.style.clear = 'both'; - var textarea = document.createElement('textarea'); - ta_wrapper.appendChild(textarea); - - textarea.id = 'ajaxEditArea'; - textarea.rows = '20'; - textarea.cols = '60'; - textarea.style.width = '98.7%'; - - // Revision metadata controls - var tblholder = document.createElement('div'); - tblholder.className = 'tblholder'; - var metatable = document.createElement('table'); - metatable.setAttribute('border', '0'); - metatable.setAttribute('cellspacing', '1'); - metatable.setAttribute('cellpadding', '4'); - - if ( readonly ) - { - // Close Viewer button - var toolbar = ''; - var head = new templateParser(response.toolbar_templates.toolbar_start); - var button = new templateParser(response.toolbar_templates.toolbar_button); - var tail = new templateParser(response.toolbar_templates.toolbar_end); - - toolbar += head.run(); - - button.assign_bool({ - show_title: true - }); - - // Button: close - button.assign_vars({ - TITLE: $lang.get('editor_btn_closeviewer'), - IMAGE: editor_img_path + '/discard.gif', - SPRITE: gen_sprite_html(editor_img_path + '/sprite.png', 16, 16, 0, 16), - FLAGS: 'href="#" onclick="ajaxReset(true); return false;"' - }); - toolbar += button.run(); - toolbar += tail.run(); - } - else - { - // First row: edit summary - var tr1 = document.createElement('tr'); - var td1_1 = document.createElement('td'); - var td1_2 = document.createElement('td'); - td1_1.className = 'row2'; - td1_2.className = 'row1'; - td1_2.style.width = '70%'; - td1_1.appendChild(document.createTextNode($lang.get('editor_lbl_edit_summary'))); - td1_1.appendChild(document.createElement('br')); - var small = document.createElement('small'); - small.appendChild(document.createTextNode($lang.get('editor_lbl_edit_summary_explain'))); - td1_1.appendChild(small); - - var field_es = document.createElement('input'); - field_es.id = 'enano_editor_field_summary'; - field_es.type = 'text'; - field_es.size = '40'; - field_es.style.width = '96%'; - - if ( revid > 0 ) - { - undo_info.last_rev_id = revid; - field_es.value = $lang.get('editor_reversion_edit_summary', undo_info); - } - - td1_2.appendChild(field_es); - - tr1.appendChild(td1_1); - tr1.appendChild(td1_2); - - // Second row: minor edit - var tr2 = document.createElement('tr'); - var td2_1 = document.createElement('td'); - var td2_2 = document.createElement('td'); - td2_1.className = 'row2'; - td2_2.className = 'row1'; - td2_1.appendChild(document.createTextNode($lang.get('editor_lbl_minor_edit'))); - td2_1.appendChild(document.createElement('br')); - var small = document.createElement('small'); - small.appendChild(document.createTextNode($lang.get('editor_lbl_minor_edit_explain'))); - td2_1.appendChild(small); - - var label = document.createElement('label'); - var field_mi = document.createElement('input'); - field_mi.id = 'enano_editor_field_minor'; - field_mi.type = 'checkbox'; - label.appendChild(field_mi); - label.appendChild(document.createTextNode(' ')); - label.appendChild(document.createTextNode($lang.get('editor_lbl_minor_edit_field'))); - td2_2.appendChild(label); - - tr2.appendChild(td2_1); - tr2.appendChild(td2_2); - - if ( captcha_hash ) - { - // generate captcha field (effectively third row) - var tr4 = document.createElement('tr'); - var td4_1 = document.createElement('td'); - var td4_2 = document.createElement('td'); - td4_1.className = 'row2'; - td4_2.className = 'row1'; - - td4_1.appendChild(document.createTextNode($lang.get('editor_lbl_field_captcha'))); - td4_1.appendChild(document.createElement('br')); - var small2 = document.createElement('small'); - small2.appendChild(document.createTextNode($lang.get('editor_msg_captcha_pleaseenter'))); - small2.appendChild(document.createElement('br')); - small2.appendChild(document.createElement('br')); - small2.appendChild(document.createTextNode($lang.get('editor_msg_captcha_blind'))); - td4_1.appendChild(small2); - - var img = document.createElement('img'); - img.src = makeUrlNS('Special', 'Captcha/' + captcha_hash); - img.setAttribute('enano:captcha_hash', captcha_hash); - img.id = 'enano_editor_captcha_img'; - img.onclick = function() - { - this.src = makeUrlNS('Special', 'Captcha/' + this.getAttribute('enano:captcha_hash') + '/' + Math.floor(Math.random() * 100000)); - } - img.style.cursor = 'pointer'; - td4_2.appendChild(img); - td4_2.appendChild(document.createElement('br')); - td4_2.appendChild(document.createTextNode($lang.get('editor_lbl_field_captcha_code') + ' ')); - var input = document.createElement('input'); - input.type = 'text'; - input.id = 'enano_editor_field_captcha'; - input.setAttribute('enano:captcha_hash', captcha_hash); - input.size = '9'; - td4_2.appendChild(input); - - tr4.appendChild(td4_1); - tr4.appendChild(td4_2); - } - - // Third row: controls - - var toolbar = ''; - var head = new templateParser(response.toolbar_templates.toolbar_start); - var button = new templateParser(response.toolbar_templates.toolbar_button); - var label = new templateParser(response.toolbar_templates.toolbar_label); - var tail = new templateParser(response.toolbar_templates.toolbar_end); - - button.assign_bool({ - show_title: true - }); - - toolbar += head.run(); - - // Button: Save - button.assign_vars({ - TITLE: $lang.get('editor_btn_save'), - IMAGE: editor_img_path + '/save.gif', - SPRITE: gen_sprite_html(editor_img_path + '/sprite.png', 16, 16, 0, 64), - FLAGS: 'href="#" onclick="ajaxEditorSave(); return false;"' - }); - toolbar += button.run(); - - // Button: preview - button.assign_vars({ - TITLE: $lang.get('editor_btn_preview'), - IMAGE: editor_img_path + '/preview.gif', - SPRITE: gen_sprite_html(editor_img_path + '/sprite.png', 16, 16, 0, 32), - FLAGS: 'href="#" onclick="ajaxEditorGenPreview(); return false;"' - }); - toolbar += button.run(); - - // Button: revert - button.assign_vars({ - TITLE: $lang.get('editor_btn_revert'), - IMAGE: editor_img_path + '/revert.gif', - SPRITE: gen_sprite_html(editor_img_path + '/sprite.png', 16, 16, 0, 48), - FLAGS: 'href="#" onclick="ajaxEditorRevertToLatest(); return false;"' - }); - toolbar += button.run(); - - // Button: diff - button.assign_vars({ - TITLE: $lang.get('editor_btn_diff'), - IMAGE: editor_img_path + '/diff.gif', - SPRITE: gen_sprite_html(editor_img_path + '/sprite.png', 16, 16, 0, 0), - FLAGS: 'href="#" onclick="ajaxEditorShowDiffs(); return false;"' - }); - toolbar += button.run(); - - // Button: cancel - button.assign_vars({ - TITLE: $lang.get('editor_btn_cancel'), - IMAGE: editor_img_path + '/discard.gif', - SPRITE: gen_sprite_html(editor_img_path + '/sprite.png', 16, 16, 0, 16), - FLAGS: 'href="#" onclick="ajaxEditorCancel(); return false;"' - }); - toolbar += button.run(); - - // Separator - label.assign_vars({ - TITLE: ' ' - }); - toolbar += label.run(); - - // Button: Save draft - button.assign_vars({ - TITLE: $lang.get('editor_btn_savedraft'), - IMAGE: editor_img_path + '/savedraft.gif', - SPRITE: false, - FLAGS: 'href="#" onclick="ajaxPerformAutosave(); return false;" id="ajax_edit_savedraft_btn"' - }); - toolbar += button.run(); - - toolbar += tail.run(); - - metatable.appendChild(tr1); - metatable.appendChild(tr2); - if ( captcha_hash ) - { - metatable.appendChild(tr4); - } - // metatable.appendChild(tr3); - } - tblholder.appendChild(metatable); - - // Edit disclaimer/notice - if ( response.edit_notice ) - { - var en_div = document.createElement('div'); - en_div.innerHTML = response.edit_notice; - en_div.className = 'usermessage'; - en_div.style.margin = '10px 0 0 0'; - } - - // Put it all together... - form.appendChild(heading); - if ( allow_wysiwyg ) - form.appendChild(toggler); - - if ( dn ) - form.appendChild(dn); - - if ( oldrev_box ) - form.appendChild(oldrev_box); - - form.appendChild(preview_anchor); - form.appendChild(preview_container); - form.appendChild(ta_wrapper); - if ( !readonly ) - form.appendChild(tblholder); - form.innerHTML += '
'; + dn.innerHTML += $lang.get('editor_msg_have_draft_body', { author: response.draft_author, time: response.draft_time }); + } + + // Old-revision notice + if ( revid > 0 ) + { + var oldrev_box = document.createElement('div'); + oldrev_box.className = 'usermessage'; + oldrev_box.appendChild(document.createTextNode($lang.get('editor_msg_editing_old_revision'))); + } + + // Preview holder + var preview_anchor = document.createElement('a'); + preview_anchor.name = 'ajax_preview'; + preview_anchor.id = 'ajax_preview'; + var preview_container = document.createElement('div'); + preview_container.id = 'enano_editor_preview'; + preview_container.style.clear = 'left'; + + // Textarea containing the content + var ta_wrapper = document.createElement('div'); + ta_wrapper.style.margin = '10px 0'; + // ta_wrapper.style.clear = 'both'; + var textarea = document.createElement('textarea'); + ta_wrapper.appendChild(textarea); + + textarea.id = 'ajaxEditArea'; + textarea.rows = '20'; + textarea.cols = '60'; + textarea.style.width = '98.7%'; + + // Revision metadata controls + var tblholder = document.createElement('div'); + tblholder.className = 'tblholder'; + var metatable = document.createElement('table'); + metatable.setAttribute('border', '0'); + metatable.setAttribute('cellspacing', '1'); + metatable.setAttribute('cellpadding', '4'); + + if ( readonly ) + { + // Close Viewer button + var toolbar = ''; + var head = new templateParser(response.toolbar_templates.toolbar_start); + var button = new templateParser(response.toolbar_templates.toolbar_button); + var tail = new templateParser(response.toolbar_templates.toolbar_end); + + toolbar += head.run(); + + button.assign_bool({ + show_title: true + }); + + // Button: close + button.assign_vars({ + TITLE: $lang.get('editor_btn_closeviewer'), + IMAGE: editor_img_path + '/discard.gif', + SPRITE: gen_sprite_html(editor_img_path + '/sprite.png', 16, 16, 0, 16), + FLAGS: 'href="#" onclick="ajaxReset(true); return false;"' + }); + toolbar += button.run(); + toolbar += tail.run(); + } + else + { + // First row: edit summary + var tr1 = document.createElement('tr'); + var td1_1 = document.createElement('td'); + var td1_2 = document.createElement('td'); + td1_1.className = 'row2'; + td1_2.className = 'row1'; + td1_2.style.width = '70%'; + td1_1.appendChild(document.createTextNode($lang.get('editor_lbl_edit_summary'))); + td1_1.appendChild(document.createElement('br')); + var small = document.createElement('small'); + small.appendChild(document.createTextNode($lang.get('editor_lbl_edit_summary_explain'))); + td1_1.appendChild(small); + + var field_es = document.createElement('input'); + field_es.id = 'enano_editor_field_summary'; + field_es.type = 'text'; + field_es.size = '40'; + field_es.style.width = '96%'; + + if ( revid > 0 ) + { + undo_info.last_rev_id = revid; + field_es.value = $lang.get('editor_reversion_edit_summary', undo_info); + } + + td1_2.appendChild(field_es); + + tr1.appendChild(td1_1); + tr1.appendChild(td1_2); + + // Second row: minor edit + var tr2 = document.createElement('tr'); + var td2_1 = document.createElement('td'); + var td2_2 = document.createElement('td'); + td2_1.className = 'row2'; + td2_2.className = 'row1'; + td2_1.appendChild(document.createTextNode($lang.get('editor_lbl_minor_edit'))); + td2_1.appendChild(document.createElement('br')); + var small = document.createElement('small'); + small.appendChild(document.createTextNode($lang.get('editor_lbl_minor_edit_explain'))); + td2_1.appendChild(small); + + var label = document.createElement('label'); + var field_mi = document.createElement('input'); + field_mi.id = 'enano_editor_field_minor'; + field_mi.type = 'checkbox'; + label.appendChild(field_mi); + label.appendChild(document.createTextNode(' ')); + label.appendChild(document.createTextNode($lang.get('editor_lbl_minor_edit_field'))); + td2_2.appendChild(label); + + tr2.appendChild(td2_1); + tr2.appendChild(td2_2); + + if ( captcha_hash ) + { + // generate captcha field (effectively third row) + var tr4 = document.createElement('tr'); + var td4_1 = document.createElement('td'); + var td4_2 = document.createElement('td'); + td4_1.className = 'row2'; + td4_2.className = 'row1'; + + td4_1.appendChild(document.createTextNode($lang.get('editor_lbl_field_captcha'))); + td4_1.appendChild(document.createElement('br')); + var small2 = document.createElement('small'); + small2.appendChild(document.createTextNode($lang.get('editor_msg_captcha_pleaseenter'))); + small2.appendChild(document.createElement('br')); + small2.appendChild(document.createElement('br')); + small2.appendChild(document.createTextNode($lang.get('editor_msg_captcha_blind'))); + td4_1.appendChild(small2); + + var img = document.createElement('img'); + img.src = makeUrlNS('Special', 'Captcha/' + captcha_hash); + img.setAttribute('enano:captcha_hash', captcha_hash); + img.id = 'enano_editor_captcha_img'; + img.onclick = function() + { + this.src = makeUrlNS('Special', 'Captcha/' + this.getAttribute('enano:captcha_hash') + '/' + Math.floor(Math.random() * 100000)); + } + img.style.cursor = 'pointer'; + td4_2.appendChild(img); + td4_2.appendChild(document.createElement('br')); + td4_2.appendChild(document.createTextNode($lang.get('editor_lbl_field_captcha_code') + ' ')); + var input = document.createElement('input'); + input.type = 'text'; + input.id = 'enano_editor_field_captcha'; + input.setAttribute('enano:captcha_hash', captcha_hash); + input.size = '9'; + td4_2.appendChild(input); + + tr4.appendChild(td4_1); + tr4.appendChild(td4_2); + } + + // Third row: controls + + var toolbar = ''; + var head = new templateParser(response.toolbar_templates.toolbar_start); + var button = new templateParser(response.toolbar_templates.toolbar_button); + var label = new templateParser(response.toolbar_templates.toolbar_label); + var tail = new templateParser(response.toolbar_templates.toolbar_end); + + button.assign_bool({ + show_title: true + }); + + toolbar += head.run(); + + // Button: Save + button.assign_vars({ + TITLE: $lang.get('editor_btn_save'), + IMAGE: editor_img_path + '/save.gif', + SPRITE: gen_sprite_html(editor_img_path + '/sprite.png', 16, 16, 0, 64), + FLAGS: 'href="#" onclick="ajaxEditorSave(); return false;"' + }); + toolbar += button.run(); + + // Button: preview + button.assign_vars({ + TITLE: $lang.get('editor_btn_preview'), + IMAGE: editor_img_path + '/preview.gif', + SPRITE: gen_sprite_html(editor_img_path + '/sprite.png', 16, 16, 0, 32), + FLAGS: 'href="#" onclick="ajaxEditorGenPreview(); return false;"' + }); + toolbar += button.run(); + + // Button: revert + button.assign_vars({ + TITLE: $lang.get('editor_btn_revert'), + IMAGE: editor_img_path + '/revert.gif', + SPRITE: gen_sprite_html(editor_img_path + '/sprite.png', 16, 16, 0, 48), + FLAGS: 'href="#" onclick="ajaxEditorRevertToLatest(); return false;"' + }); + toolbar += button.run(); + + // Button: diff + button.assign_vars({ + TITLE: $lang.get('editor_btn_diff'), + IMAGE: editor_img_path + '/diff.gif', + SPRITE: gen_sprite_html(editor_img_path + '/sprite.png', 16, 16, 0, 0), + FLAGS: 'href="#" onclick="ajaxEditorShowDiffs(); return false;"' + }); + toolbar += button.run(); + + // Button: cancel + button.assign_vars({ + TITLE: $lang.get('editor_btn_cancel'), + IMAGE: editor_img_path + '/discard.gif', + SPRITE: gen_sprite_html(editor_img_path + '/sprite.png', 16, 16, 0, 16), + FLAGS: 'href="#" onclick="ajaxEditorCancel(); return false;"' + }); + toolbar += button.run(); + + // Separator + label.assign_vars({ + TITLE: ' ' + }); + toolbar += label.run(); + + // Button: Save draft + button.assign_vars({ + TITLE: $lang.get('editor_btn_savedraft'), + IMAGE: editor_img_path + '/savedraft.gif', + SPRITE: false, + FLAGS: 'href="#" onclick="ajaxPerformAutosave(); return false;" id="ajax_edit_savedraft_btn"' + }); + toolbar += button.run(); + + toolbar += tail.run(); + + metatable.appendChild(tr1); + metatable.appendChild(tr2); + if ( captcha_hash ) + { + metatable.appendChild(tr4); + } + // metatable.appendChild(tr3); + } + tblholder.appendChild(metatable); + + // Edit disclaimer/notice + if ( response.edit_notice ) + { + var en_div = document.createElement('div'); + en_div.innerHTML = response.edit_notice; + en_div.className = 'usermessage'; + en_div.style.margin = '10px 0 0 0'; + } + + // Put it all together... + form.appendChild(heading); + if ( allow_wysiwyg ) + form.appendChild(toggler); + + if ( dn ) + form.appendChild(dn); + + if ( oldrev_box ) + form.appendChild(oldrev_box); + + form.appendChild(preview_anchor); + form.appendChild(preview_container); + form.appendChild(ta_wrapper); + if ( !readonly ) + form.appendChild(tblholder); + form.innerHTML += '
' ) ) - { - new MessageBox(MB_OK|MB_ICONSTOP, $lang.get('editor_err_no_text_title'), $lang.get('editor_err_no_text_body')); - ajaxUnSetEditorLoading(); - return false; - } - - if ( is_draft ) - { - // ajaxSetEditorLoading(); - var img = $dynano('ajax_edit_savedraft_btn').object.getElementsByTagName('img')[0]; - var lbl = $dynano('ajax_edit_savedraft_btn').object.getElementsByTagName('span')[0]; - img.src = cdnPath + '/images/loading.gif'; - var d = new Date(); - var m = String(d.getMinutes()); - if ( m.length < 2 ) - m = '0' + m; - var time = d.getHours() + ':' + m; - lbl.innerHTML = $lang.get('editor_msg_draft_saving'); - } - - var edit_summ = $dynano('enano_editor_field_summary').object.value; - if ( !edit_summ ) - edit_summ = ''; - var is_minor = ( $dynano('enano_editor_field_minor').object.checked ) ? 1 : 0; - var timestamp = $dynano('ajaxEditArea').object._edTimestamp; - var used_draft = $dynano('ajaxEditArea').object.used_draft; - - var json_packet = { - src: ta_content, - summary: edit_summ, - minor_edit: is_minor, - time: timestamp, - draft: ( is_draft == true ), - format: ( $dynano('ajaxEditArea').isMCE() ) ? 'xhtml' : 'wikitext', - used_draft: used_draft - }; - - // Do we need to add captcha info? - if ( document.getElementById('enano_editor_field_captcha') && !is_draft ) - { - var captcha_field = document.getElementById('enano_editor_field_captcha'); - if ( captcha_field.value == '' ) - { - new MessageBox(MB_OK|MB_ICONSTOP, $lang.get('editor_err_need_captcha_title'), $lang.get('editor_err_need_captcha_body')); - ajaxUnSetEditorLoading(); - return false; - } - json_packet.captcha_code = captcha_field.value; - json_packet.captcha_id = captcha_field.getAttribute('enano:captcha_hash'); - } - - json_packet = ajaxEscape(toJSONString(json_packet)); - ajaxPost(stdAjaxPrefix + '&_mode=savepage_json', 'r=' + json_packet, function(ajax) - { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - ajaxUnSetEditorLoading(); - var response = String(ajax.responseText + ''); - if ( !check_json_response(response) ) - { - handle_invalid_json(response); - return false; - } - - response = parseJSON(response); - // This will only be used if there was a lower-level error. - if ( response.mode == 'error' ) - { - editor_save_lock = false; - new MessageBox(MB_OK | MB_ICONSTOP, $lang.get('editor_err_server'), response.error); - return false; - } - // This will be used if the PageProcessor generated errors (usually security/permissions related) - if ( response.mode == 'errors' ) - { - editor_save_lock = false; - // This will be true if the user entered a captcha code incorrectly, thus - // invalidating the code and requiring a new image to be generated. - if ( response.new_captcha ) - { - // Generate the new captcha field - var img = document.getElementById('enano_editor_captcha_img'); - var input = document.getElementById('enano_editor_field_captcha'); - if ( img && input ) - { - img._captchaHash = response.new_captcha; - input._captchaHash = response.new_captcha; - img.src = makeUrlNS('Special', 'Captcha/' + response.new_captcha); - input.value = ''; - } - } - var errors = '
- ' + implode('
- ', response.errors) + '
' ) ) + { + new MessageBox(MB_OK|MB_ICONSTOP, $lang.get('editor_err_no_text_title'), $lang.get('editor_err_no_text_body')); + ajaxUnSetEditorLoading(); + return false; + } + + if ( is_draft ) + { + // ajaxSetEditorLoading(); + var img = $dynano('ajax_edit_savedraft_btn').object.getElementsByTagName('img')[0]; + var lbl = $dynano('ajax_edit_savedraft_btn').object.getElementsByTagName('span')[0]; + img.src = cdnPath + '/images/loading.gif'; + var d = new Date(); + var m = String(d.getMinutes()); + if ( m.length < 2 ) + m = '0' + m; + var time = d.getHours() + ':' + m; + lbl.innerHTML = $lang.get('editor_msg_draft_saving'); + } + + var edit_summ = $dynano('enano_editor_field_summary').object.value; + if ( !edit_summ ) + edit_summ = ''; + var is_minor = ( $dynano('enano_editor_field_minor').object.checked ) ? 1 : 0; + var timestamp = $dynano('ajaxEditArea').object._edTimestamp; + var used_draft = $dynano('ajaxEditArea').object.used_draft; + + var json_packet = { + src: ta_content, + summary: edit_summ, + minor_edit: is_minor, + time: timestamp, + draft: ( is_draft == true ), + format: ( $dynano('ajaxEditArea').isMCE() ) ? 'xhtml' : 'wikitext', + used_draft: used_draft + }; + + // Do we need to add captcha info? + if ( document.getElementById('enano_editor_field_captcha') && !is_draft ) + { + var captcha_field = document.getElementById('enano_editor_field_captcha'); + if ( captcha_field.value == '' ) + { + new MessageBox(MB_OK|MB_ICONSTOP, $lang.get('editor_err_need_captcha_title'), $lang.get('editor_err_need_captcha_body')); + ajaxUnSetEditorLoading(); + return false; + } + json_packet.captcha_code = captcha_field.value; + json_packet.captcha_id = captcha_field.getAttribute('enano:captcha_hash'); + } + + json_packet = ajaxEscape(toJSONString(json_packet)); + ajaxPost(stdAjaxPrefix + '&_mode=savepage_json', 'r=' + json_packet, function(ajax) + { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + ajaxUnSetEditorLoading(); + var response = String(ajax.responseText + ''); + if ( !check_json_response(response) ) + { + handle_invalid_json(response); + return false; + } + + response = parseJSON(response); + // This will only be used if there was a lower-level error. + if ( response.mode == 'error' ) + { + editor_save_lock = false; + new MessageBox(MB_OK | MB_ICONSTOP, $lang.get('editor_err_server'), response.error); + return false; + } + // This will be used if the PageProcessor generated errors (usually security/permissions related) + if ( response.mode == 'errors' ) + { + editor_save_lock = false; + // This will be true if the user entered a captcha code incorrectly, thus + // invalidating the code and requiring a new image to be generated. + if ( response.new_captcha ) + { + // Generate the new captcha field + var img = document.getElementById('enano_editor_captcha_img'); + var input = document.getElementById('enano_editor_field_captcha'); + if ( img && input ) + { + img._captchaHash = response.new_captcha; + input._captchaHash = response.new_captcha; + img.src = makeUrlNS('Special', 'Captcha/' + response.new_captcha); + input.value = ''; + } + } + var errors = '
- ' + implode('
- ', response.errors) + '
' ) - { - return false; - } - - ajaxEditorSave(true); + var aed = document.getElementById('ajaxEditArea'); + if ( !aed ) + return false; + var now = unix_time(); + aed.as_last_save = now; + + var ta_content = $dynano('ajaxEditArea').getContent(); + + if ( ta_content == '' || ta_content == '' || ta_content == '
' ) + { + return false; + } + + ajaxEditorSave(true); } window.ajaxEditorUseDraft = function() { - var aed = document.getElementById('ajaxEditArea'); - if ( !aed ) - return false; - ajaxSetEditorLoading(); - ajaxGet(stdAjaxPrefix + '&_mode=getsource&get_draft=1', function(ajax) - { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - ajaxUnSetEditorLoading(); - - var response = String(ajax.responseText + ''); - if ( !check_json_response(response) ) - { - handle_invalid_json(response); - return false; - } - - response = parseJSON(response); - if ( response.mode == 'error' ) - { - unselectAllButtonsMinor(); - new MessageBox(MB_OK | MB_ICONSTOP, $lang.get('editor_err_server'), response.error); - return false; - } - - editor_convert_if_needed(response.page_format); - - $dynano('ajaxEditArea').setContent(response.src); - $dynano('ajaxEditArea').object.used_draft = true; - - var es = document.getElementById('enano_editor_field_summary'); - if ( es.value == '' ) - { - es.value = response.edit_summary; - } - - var dn = $dynano('ajax_edit_draft_notice').object; - dn.parentNode.removeChild(dn); - } - }, true); + var aed = document.getElementById('ajaxEditArea'); + if ( !aed ) + return false; + ajaxSetEditorLoading(); + ajaxGet(stdAjaxPrefix + '&_mode=getsource&get_draft=1', function(ajax) + { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + ajaxUnSetEditorLoading(); + + var response = String(ajax.responseText + ''); + if ( !check_json_response(response) ) + { + handle_invalid_json(response); + return false; + } + + response = parseJSON(response); + if ( response.mode == 'error' ) + { + unselectAllButtonsMinor(); + new MessageBox(MB_OK | MB_ICONSTOP, $lang.get('editor_err_server'), response.error); + return false; + } + + editor_convert_if_needed(response.page_format); + + $dynano('ajaxEditArea').setContent(response.src); + $dynano('ajaxEditArea').object.used_draft = true; + + var es = document.getElementById('enano_editor_field_summary'); + if ( es.value == '' ) + { + es.value = response.edit_summary; + } + + var dn = $dynano('ajax_edit_draft_notice').object; + dn.parentNode.removeChild(dn); + } + }, true); } window.editor_convert_if_needed = function(targetformat, noticetitle, noticebody) { - // Do we need to change the format? - var need_to_mce = ( targetformat == 'xhtml' && !$dynano('ajaxEditArea').isMCE() ); - var need_to_wkt = ( targetformat == 'wikitext' && $dynano('ajaxEditArea').isMCE() ); - if ( need_to_mce ) - { - $dynano('ajaxEditArea').setContent(''); - $dynano('ajaxEditArea').switchToMCE(false); - - // Clear out existing buttons - var span_wiki = $dynano('enano_edit_btn_pt').object; - var span_mce = $dynano('enano_edit_btn_mce').object; - span_wiki.style.display = 'inline'; - span_mce.style.display = 'none'; - } - else if ( need_to_wkt ) - { - $dynano('ajaxEditArea').setContent(''); - $dynano('ajaxEditArea').destroyMCE(false); - - // Clear out existing buttons - var span_wiki = $dynano('enano_edit_btn_pt').object; - var span_mce = $dynano('enano_edit_btn_mce').object; - span_wiki.style.display = 'none'; - span_mce.style.display = 'inline'; - } - if ( need_to_mce || need_to_wkt ) - { - // explain the conversion - if ( !noticetitle ) - noticetitle = 'editor_msg_convert_draft_load_title'; - if ( !noticebody ) - noticebody = 'editor_msg_convert_draft_load_body'; - - miniPromptMessage({ - title: $lang.get(noticetitle), - message: $lang.get(noticebody), - buttons: [ - { - text: $lang.get('etc_ok'), - onclick: function() - { - miniPromptDestroy(this); - return false; - } - } - ] - }); - } + // Do we need to change the format? + var need_to_mce = ( targetformat == 'xhtml' && !$dynano('ajaxEditArea').isMCE() ); + var need_to_wkt = ( targetformat == 'wikitext' && $dynano('ajaxEditArea').isMCE() ); + if ( need_to_mce ) + { + $dynano('ajaxEditArea').setContent(''); + $dynano('ajaxEditArea').switchToMCE(false); + + // Clear out existing buttons + var span_wiki = $dynano('enano_edit_btn_pt').object; + var span_mce = $dynano('enano_edit_btn_mce').object; + span_wiki.style.display = 'inline'; + span_mce.style.display = 'none'; + } + else if ( need_to_wkt ) + { + $dynano('ajaxEditArea').setContent(''); + $dynano('ajaxEditArea').destroyMCE(false); + + // Clear out existing buttons + var span_wiki = $dynano('enano_edit_btn_pt').object; + var span_mce = $dynano('enano_edit_btn_mce').object; + span_wiki.style.display = 'none'; + span_mce.style.display = 'inline'; + } + if ( need_to_mce || need_to_wkt ) + { + // explain the conversion + if ( !noticetitle ) + noticetitle = 'editor_msg_convert_draft_load_title'; + if ( !noticebody ) + noticebody = 'editor_msg_convert_draft_load_body'; + + miniPromptMessage({ + title: $lang.get(noticetitle), + message: $lang.get(noticebody), + buttons: [ + { + text: $lang.get('etc_ok'), + onclick: function() + { + miniPromptDestroy(this); + return false; + } + } + ] + }); + } } diff -r de56132c008d -r bdac73ed481e includes/clientside/static/enano-lib-basic.js --- a/includes/clientside/static/enano-lib-basic.js Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/static/enano-lib-basic.js Sun Mar 28 23:10:46 2010 -0400 @@ -17,26 +17,26 @@ if ( typeof(title) != 'string') { - alert('There was a problem loading the PHP-generated Javascript variables that control parameters for AJAX applets. Most on-page functionality will be very badly broken.\n\nTheme developers, ensure that you are using {JS_DYNAMIC_VARS} *before* you include jsres.php.'); + alert('There was a problem loading the PHP-generated Javascript variables that control parameters for AJAX applets. Most on-page functionality will be very badly broken.\n\nTheme developers, ensure that you are using {JS_DYNAMIC_VARS} *before* you include jsres.php.'); } // placeholder for window.console - used if firebug isn't present // http://getfirebug.com/firebug/firebugx.js if (!window.console || !console.firebug) { - var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml", - "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"]; + var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml", + "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"]; - window.console = {}; - for (var i = 0; i < names.length; ++i) - window.console[names[i]] = function() {} + window.console = {}; + for (var i = 0; i < names.length; ++i) + window.console[names[i]] = function() {} } console.info('Enano::JS runtime: starting system init'); if ( typeof(ENANO_JSRES_COMPRESSED) == undefined ) { - var ENANO_JSRES_COMPRESSED = false; + var ENANO_JSRES_COMPRESSED = false; } // Run-time variables @@ -48,9 +48,9 @@ // Detect whether the user is running the Evil One or not... function checkIt(string) { - place = detect.indexOf(string) + 1; - thestring = string; - return place ? true : false; + place = detect.indexOf(string) + 1; + thestring = string; + return place ? true : false; } var IE = checkIt('msie'); @@ -64,30 +64,30 @@ if ( IE ) { - var version = window.navigator.appVersion; - version = version.substr( ( version.indexOf('MSIE') + 5 ) ); - var rawversion = ''; - for ( var i = 0; i < version.length; i++ ) - { - var chr = version.substr(i, 1); - if ( !chr.match(/[0-9\.]/) ) - { - break; - } - rawversion += chr; - } - rawversion = parseInt(rawversion); - if ( rawversion < 6 ) - { - KILL_SWITCH = true; - } + var version = window.navigator.appVersion; + version = version.substr( ( version.indexOf('MSIE') + 5 ) ); + var rawversion = ''; + for ( var i = 0; i < version.length; i++ ) + { + var chr = version.substr(i, 1); + if ( !chr.match(/[0-9\.]/) ) + { + break; + } + rawversion += chr; + } + rawversion = parseInt(rawversion); + if ( rawversion < 6 ) + { + KILL_SWITCH = true; + } } var tinymce_initted = false; if ( typeof(DISABLE_MCE) == undefined ) { - var DISABLE_MCE = false; + var DISABLE_MCE = false; } is_Safari = checkIt('safari') ? true : false; @@ -156,7 +156,7 @@ // Can be set to true by slow themes (St. Patty) if ( typeof(pref_disable_js_fx) != 'boolean' ) { - var pref_disable_js_fx = false; + var pref_disable_js_fx = false; } var aclDisableTransitionFX = ( is_firefox2 || pref_disable_js_fx ) ? true : false; @@ -167,289 +167,289 @@ var $_REQUEST = new Object(); if ( window.location.hash ) { - var hash = String(window.location.hash); - hash = hash.substr(1); - var reqobj = hash.split(';'); - var a, b; - for ( var i = 0; i < reqobj.length; i++ ) - { - a = reqobj[i].substr(0, reqobj[i].indexOf(':')); - b = reqobj[i].substr( ( reqobj[i].indexOf(':') + 1 ) ); - $_REQUEST[a] = b; - } + var hash = String(window.location.hash); + hash = hash.substr(1); + var reqobj = hash.split(';'); + var a, b; + for ( var i = 0; i < reqobj.length; i++ ) + { + a = reqobj[i].substr(0, reqobj[i].indexOf(':')); + b = reqobj[i].substr( ( reqobj[i].indexOf(':') + 1 ) ); + $_REQUEST[a] = b; + } } if ( !onload_hooks ) - var onload_hooks = new Array(); + var onload_hooks = new Array(); function addOnloadHook(func) { - if ( typeof ( func ) == 'function' ) - { - if ( typeof(onload_hooks.push) == 'function' ) - { - onload_hooks.push(func); - } - else - { - onload_hooks[onload_hooks.length] = func; - } - } + if ( typeof ( func ) == 'function' ) + { + if ( typeof(onload_hooks.push) == 'function' ) + { + onload_hooks.push(func); + } + else + { + onload_hooks[onload_hooks.length] = func; + } + } } function runOnloadHooks(e) { - var _errorTrapper = 0; - for ( var _oLc = 0; _oLc < onload_hooks.length; _oLc++ ) - { - _errorTrapper++; - if ( _errorTrapper >= 1000 ) - break; - var _f = onload_hooks[_oLc]; - if ( typeof(_f) == 'function' ) - { - _f(e); - } - } - onload_hooks = []; + var _errorTrapper = 0; + for ( var _oLc = 0; _oLc < onload_hooks.length; _oLc++ ) + { + _errorTrapper++; + if ( _errorTrapper >= 1000 ) + break; + var _f = onload_hooks[_oLc]; + if ( typeof(_f) == 'function' ) + { + _f(e); + } + } + onload_hooks = []; } var enano_hooks = {}; function setHook(hook_name) { - if ( enano_hooks[hook_name] ) - { - return enano_hooks[hook_name]; - } - return 'void(0);'; + if ( enano_hooks[hook_name] ) + { + return enano_hooks[hook_name]; + } + return 'void(0);'; } function attachHook(hook_name, code) { - if ( !enano_hooks[hook_name] ) - enano_hooks[hook_name] = ''; - - enano_hooks[hook_name] += code; + if ( !enano_hooks[hook_name] ) + enano_hooks[hook_name] = ''; + + enano_hooks[hook_name] += code; } var loaded_components = loaded_components || {}; var _load_component_running = false; function load_component(file) { - var multiple = false; - if ( typeof(file) == 'object' ) - { - if ( ENANO_JSRES_COMPRESSED ) - { - multiple = true; - for ( var i = 0; i < file.length; i++ ) - { - file[i] = (file[i].replace(/\.js$/, '')) + '.js'; - if ( loaded_components[file[i]] ) - { - file[i] = false; - } - } - var file2 = []; - for ( var i = 0; i < file.length; i++ ) - { - if ( file[i] ) - file2.push(file[i]); - } - file = file2; - delete(file2); - if ( file.length < 1 ) - { - return true; - } - var file_flat = implode(',', file); - } - else - { - for ( var i = 0; i < file.length; i++ ) - { - load_component(file[i]); - } - return true; - } - } - _load_component_running = true; - if ( !multiple ) - { - file = file.replace(/\.js$/, ''); - - if ( loaded_components[file + '.js'] ) - { - // already loaded - return true; - } - } - - console.info('Loading component %s via AJAX', ( multiple ? file_flat : file )); - - load_show_win(( multiple ? file_flat : file )); - - // get an XHR instance - var ajax = ajaxMakeXHR(); - - if ( !multiple ) - file = file + '.js'; - var uri = ( ENANO_JSRES_COMPRESSED ) ? scriptPath + '/includes/clientside/jsres.php?f=' + (multiple ? file_flat : file ) + '&' + enano_version : scriptPath + '/includes/clientside/static/' + file + '?' + enano_version; - try - { - ajax.open('GET', uri, false); - ajax.onreadystatechange = function() - { - if ( this.readyState == 4 && this.status != 200 ) - { - alert('There was a problem loading a script from the server. Please check your network connection.'); - load_hide_win(); - throw('load_component(): XHR for component ' + file + ' failed'); - } - } - ajax.send(null); - // async request, so if status != 200 at this point then we're screwed - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - if ( onload_complete ) - onload_hooks = []; - eval_global(ajax.responseText); - if ( window.jQuery && aclDisableTransitionFX ) - if ( window.jQuery.fx ) - window.jQuery.fx.off = true; - load_hide_win(); - if ( onload_complete ) - runOnloadHooks(); - } - } - catch(e) - { - alert('There was a problem loading a script from the server. Please check your network connection.'); - load_hide_win(); - console.info("Component loader exception is shown below."); - console.debug(e); - console.trace(); - throw('load_component(): XHR for component ' + file + ' failed'); - } - - if ( !multiple ) - { - loaded_components[file] = true; - } - _load_component_running = false; - return true; + var multiple = false; + if ( typeof(file) == 'object' ) + { + if ( ENANO_JSRES_COMPRESSED ) + { + multiple = true; + for ( var i = 0; i < file.length; i++ ) + { + file[i] = (file[i].replace(/\.js$/, '')) + '.js'; + if ( loaded_components[file[i]] ) + { + file[i] = false; + } + } + var file2 = []; + for ( var i = 0; i < file.length; i++ ) + { + if ( file[i] ) + file2.push(file[i]); + } + file = file2; + delete(file2); + if ( file.length < 1 ) + { + return true; + } + var file_flat = implode(',', file); + } + else + { + for ( var i = 0; i < file.length; i++ ) + { + load_component(file[i]); + } + return true; + } + } + _load_component_running = true; + if ( !multiple ) + { + file = file.replace(/\.js$/, ''); + + if ( loaded_components[file + '.js'] ) + { + // already loaded + return true; + } + } + + console.info('Loading component %s via AJAX', ( multiple ? file_flat : file )); + + load_show_win(( multiple ? file_flat : file )); + + // get an XHR instance + var ajax = ajaxMakeXHR(); + + if ( !multiple ) + file = file + '.js'; + var uri = ( ENANO_JSRES_COMPRESSED ) ? scriptPath + '/includes/clientside/jsres.php?f=' + (multiple ? file_flat : file ) + '&' + enano_version : scriptPath + '/includes/clientside/static/' + file + '?' + enano_version; + try + { + ajax.open('GET', uri, false); + ajax.onreadystatechange = function() + { + if ( this.readyState == 4 && this.status != 200 ) + { + alert('There was a problem loading a script from the server. Please check your network connection.'); + load_hide_win(); + throw('load_component(): XHR for component ' + file + ' failed'); + } + } + ajax.send(null); + // async request, so if status != 200 at this point then we're screwed + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + if ( onload_complete ) + onload_hooks = []; + eval_global(ajax.responseText); + if ( window.jQuery && aclDisableTransitionFX ) + if ( window.jQuery.fx ) + window.jQuery.fx.off = true; + load_hide_win(); + if ( onload_complete ) + runOnloadHooks(); + } + } + catch(e) + { + alert('There was a problem loading a script from the server. Please check your network connection.'); + load_hide_win(); + console.info("Component loader exception is shown below."); + console.debug(e); + console.trace(); + throw('load_component(): XHR for component ' + file + ' failed'); + } + + if ( !multiple ) + { + loaded_components[file] = true; + } + _load_component_running = false; + return true; } function load_show_win(file) { - var img = '
';
- if ( document.getElementById('_js_load_component') )
- {
- document.getElementById('_js_load_component').innerHTML = img + msg_loading_component.replace('%component%', file);
- return;
- }
- file = file.replace(/\.js$/, '').replace(/\.js,/g, ', ');
- var ld = document.createElement('div');
- ld.style.padding = '10px';
- ld.style.height = '12px';
- ld.style.position = 'fixed';
- ld.style.right = '5px';
- ld.style.bottom = '0px';
- ld.innerHTML = img + msg_loading_component.replace('%component%', file);
- ld.id = '_js_load_component';
-
- // FYI: The base64 encoded image is a 70% opacity 1x1px white PNG.
- ld.style.backgroundImage = 'url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAA1JREFUCNdj+P///xkACcgDypG+nnEAAAAASUVORK5CYII=)';
-
- document.body.appendChild(ld);
- document.body.style.cursor = 'wait';
+ var img = '';
+ if ( document.getElementById('_js_load_component') )
+ {
+ document.getElementById('_js_load_component').innerHTML = img + msg_loading_component.replace('%component%', file);
+ return;
+ }
+ file = file.replace(/\.js$/, '').replace(/\.js,/g, ', ');
+ var ld = document.createElement('div');
+ ld.style.padding = '10px';
+ ld.style.height = '12px';
+ ld.style.position = 'fixed';
+ ld.style.right = '5px';
+ ld.style.bottom = '0px';
+ ld.innerHTML = img + msg_loading_component.replace('%component%', file);
+ ld.id = '_js_load_component';
+
+ // FYI: The base64 encoded image is a 70% opacity 1x1px white PNG.
+ ld.style.backgroundImage = 'url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAA1JREFUCNdj+P///xkACcgDypG+nnEAAAAASUVORK5CYII=)';
+
+ document.body.appendChild(ld);
+ document.body.style.cursor = 'wait';
}
function load_hide_win()
{
- var ld = document.getElementById('_js_load_component');
- if ( !ld )
- return false;
- ld.parentNode.removeChild(ld);
- document.body.style.cursor = 'default';
+ var ld = document.getElementById('_js_load_component');
+ if ( !ld )
+ return false;
+ ld.parentNode.removeChild(ld);
+ document.body.style.cursor = 'default';
}
// evaluate a snippet of code in the global context, used for dynamic component loading
// from: http://dean.edwards.name/weblog/2006/11/sandbox/
function eval_global(_jsString)
{
- if (typeof _jsString != "string")
- {
- return false;
- }
+ if (typeof _jsString != "string")
+ {
+ return false;
+ }
- // Check whether window.eval executes code in the global scope.
- window.eval("var __INCLUDE_TEST_1__ = true;");
- if (typeof window.__INCLUDE_TEST_1__ != "undefined")
- {
- delete window.__INCLUDE_TEST_1__;
- window.eval(_jsString);
- }
- else if (typeof window.execScript != "undefined") // IE only
- {
- window.execScript(_jsString);
- }
- else
- {
- // Test effectiveness of creating a new SCRIPT element and adding it to the document.
- this._insertScriptTag = function (_jsCode) {
- var _script = document.createElement("script");
- _script.type = "text/javascript";
- _script.defer = false;
- _script.text = _jsCode;
- var _headNodeSet = document.getElementsByTagName("head");
- if (_headNodeSet.length)
- {
- _script = _headNodeSet.item(0).appendChild(_script);
- }
- else
- {
- var _head = document.createElement("head");
- _head = document.documentElement.appendChild(_head);
- _script = _head.appendChild(_script);
- }
- return _script;
- }
- var _testScript = this._insertScriptTag("var __INCLUDE_TEST_2__ = true;");
- if (typeof window.__INCLUDE_TEST_2__ == "boolean")
- {
- _testScript.parentNode.removeChild(_testScript);
- this._insertScriptTag(_jsString);
- }
- else
- {
- // Check whether window.setTimeout works in real time.
- window.setTimeout("var __INCLUDE_TEST_3__ = true;", 0);
- if (typeof window.__INCLUDE_TEST_3__ != "undefined")
- {
- delete window.__INCLUDE_TEST_3__;
- window.setTimeout(_jsString, 0);
- }
- }
- }
+ // Check whether window.eval executes code in the global scope.
+ window.eval("var __INCLUDE_TEST_1__ = true;");
+ if (typeof window.__INCLUDE_TEST_1__ != "undefined")
+ {
+ delete window.__INCLUDE_TEST_1__;
+ window.eval(_jsString);
+ }
+ else if (typeof window.execScript != "undefined") // IE only
+ {
+ window.execScript(_jsString);
+ }
+ else
+ {
+ // Test effectiveness of creating a new SCRIPT element and adding it to the document.
+ this._insertScriptTag = function (_jsCode) {
+ var _script = document.createElement("script");
+ _script.type = "text/javascript";
+ _script.defer = false;
+ _script.text = _jsCode;
+ var _headNodeSet = document.getElementsByTagName("head");
+ if (_headNodeSet.length)
+ {
+ _script = _headNodeSet.item(0).appendChild(_script);
+ }
+ else
+ {
+ var _head = document.createElement("head");
+ _head = document.documentElement.appendChild(_head);
+ _script = _head.appendChild(_script);
+ }
+ return _script;
+ }
+ var _testScript = this._insertScriptTag("var __INCLUDE_TEST_2__ = true;");
+ if (typeof window.__INCLUDE_TEST_2__ == "boolean")
+ {
+ _testScript.parentNode.removeChild(_testScript);
+ this._insertScriptTag(_jsString);
+ }
+ else
+ {
+ // Check whether window.setTimeout works in real time.
+ window.setTimeout("var __INCLUDE_TEST_3__ = true;", 0);
+ if (typeof window.__INCLUDE_TEST_3__ != "undefined")
+ {
+ delete window.__INCLUDE_TEST_3__;
+ window.setTimeout(_jsString, 0);
+ }
+ }
+ }
- return true;
+ return true;
}
var autofill_check = function()
{
- var inputs = document.getElementsByTagName('input');
- for ( var i = 0; i < inputs.length; i++ )
- {
- if ( inputs[i].className )
- {
- if ( inputs[i].className.match(/^autofill/) )
- {
- load_component('autofill');
- return;
- }
- }
- }
+ var inputs = document.getElementsByTagName('input');
+ for ( var i = 0; i < inputs.length; i++ )
+ {
+ if ( inputs[i].className )
+ {
+ if ( inputs[i].className.match(/^autofill/) )
+ {
+ load_component('autofill');
+ return;
+ }
+ }
+ }
}
addOnloadHook(autofill_check);
@@ -459,7 +459,7 @@
// safari has window.console but not the .debug() method
if ( is_Safari && !window.console.debug )
{
- window.console.debug = function() {};
+ window.console.debug = function() {};
}
// Do not remove the following comments, they are used by jsres.php.
@@ -468,177 +468,177 @@
// Start loading files
// The string from the [ to the ] needs to be valid JSON, it's parsed by jsres.php.
var thefiles = [
- 'dynano.js',
- 'functions.js',
- 'dropdown.js',
- 'json.js',
- 'sliders.js',
- 'tinymce-init.js',
- 'loader.js'
+ 'dynano.js',
+ 'functions.js',
+ 'dropdown.js',
+ 'json.js',
+ 'sliders.js',
+ 'tinymce-init.js',
+ 'loader.js'
];
for(var f in thefiles)
{
- if ( typeof(thefiles[f]) != 'string' )
- continue;
- var script = document.createElement('script');
- script.type="text/javascript";
- if ( thefiles[f] == 'json.js' && KILL_SWITCH )
- {
- // alert('kill switch and problem script');
- continue;
- }
- script.src=cdnPath+"/includes/clientside/static/"+thefiles[f];
- head.appendChild(script);
+ if ( typeof(thefiles[f]) != 'string' )
+ continue;
+ var script = document.createElement('script');
+ script.type="text/javascript";
+ if ( thefiles[f] == 'json.js' && KILL_SWITCH )
+ {
+ // alert('kill switch and problem script');
+ continue;
+ }
+ script.src=cdnPath+"/includes/clientside/static/"+thefiles[f];
+ head.appendChild(script);
}
// Do not remove the following comment, it is used by jsres.php.
/*!END_INCLUDER*/
addOnloadHook(function() {
- if ( $_REQUEST['auth'] )
- {
- var key = $_REQUEST['auth'];
- var loc = String(window.location);
- loc = loc.replace(/#.+$/, '').replace(/&auth=[0-9a-f]+/, '').replace(/\?auth=[0-9a-f]+(&)?/, '$1');
- if ( key != 'false' )
- {
- var sep = loc.indexOf('?') != -1 ? '&' : '?';
- loc = loc + sep + 'auth=' + key;
- }
- console.debug(loc);
- window.location = loc;
- }
- if ( $_REQUEST['do'] )
- {
- var act = $_REQUEST['do'];
- switch(act)
- {
- case 'comments':
- ajaxComments();
- break;
- case 'edit':
- var revid = ( $_REQUEST['rev'] ) ? parseInt($_REQUEST['rev']) : false;
- ajaxEditor(revid);
- break;
- case 'login':
- ajaxStartLogin();
- break;
- case 'history':
- ajaxHistory();
- break;
- case 'catedit':
- ajaxCatEdit();
- break;
- case 'rename':
- ajaxRename();
- break;
- case 'aclmanager':
- ajaxOpenACLManager();
- break;
- }
- }
+ if ( $_REQUEST['auth'] )
+ {
+ var key = $_REQUEST['auth'];
+ var loc = String(window.location);
+ loc = loc.replace(/#.+$/, '').replace(/&auth=[0-9a-f]+/, '').replace(/\?auth=[0-9a-f]+(&)?/, '$1');
+ if ( key != 'false' )
+ {
+ var sep = loc.indexOf('?') != -1 ? '&' : '?';
+ loc = loc + sep + 'auth=' + key;
+ }
+ console.debug(loc);
+ window.location = loc;
+ }
+ if ( $_REQUEST['do'] )
+ {
+ var act = $_REQUEST['do'];
+ switch(act)
+ {
+ case 'comments':
+ ajaxComments();
+ break;
+ case 'edit':
+ var revid = ( $_REQUEST['rev'] ) ? parseInt($_REQUEST['rev']) : false;
+ ajaxEditor(revid);
+ break;
+ case 'login':
+ ajaxStartLogin();
+ break;
+ case 'history':
+ ajaxHistory();
+ break;
+ case 'catedit':
+ ajaxCatEdit();
+ break;
+ case 'rename':
+ ajaxRename();
+ break;
+ case 'aclmanager':
+ ajaxOpenACLManager();
+ break;
+ }
+ }
});
function Placeholder(funcname, filename)
{
- this.filename = filename;
- this.funcname = funcname;
- this.go = function()
- {
- window[funcname] = null;
- load_component(filename);
- var arglist = [];
- for ( var i = 0; i < arguments.length; i++ )
- {
- arglist[arglist.length] = 'arguments['+i+']';
- }
- arglist = implode(', ', arglist);
- return eval(funcname + '(' + arglist + ');');
- }
+ this.filename = filename;
+ this.funcname = funcname;
+ this.go = function()
+ {
+ window[funcname] = null;
+ load_component(filename);
+ var arglist = [];
+ for ( var i = 0; i < arguments.length; i++ )
+ {
+ arglist[arglist.length] = 'arguments['+i+']';
+ }
+ arglist = implode(', ', arglist);
+ return eval(funcname + '(' + arglist + ');');
+ }
}
// list of public functions that need placeholders that fetch the component
var placeholder_list = {
- ajaxReset: 'ajax.js',
- ajaxComments: 'comments.js',
- ajaxEditor: 'editor.js',
- ajaxHistory: 'ajax.js',
- ajaxRename: 'ajax.js',
- ajaxDelVote: 'ajax.js',
- ajaxProtect: 'ajax.js',
- ajaxClearLogs: 'ajax.js',
- ajaxRollback: 'ajax.js',
- ajaxResetDelVotes: 'ajax.js',
- ajaxDeletePage: 'ajax.js',
- ajaxSetPassword: 'ajax.js',
- ajaxChangeStyle: 'ajax.js',
- ajaxCatToTag: 'ajax.js',
- ajaxCatEdit: 'ajax.js',
- ajaxReverseDNS: 'ajax.js',
- ajaxGzipCheck: 'ajax.js',
- ajaxOpenACLManager: 'acl.js',
- ajaxOpenDirectACLRule: 'acl.js',
- ajaxAdminPage: 'login.js',
- ajaxInitLogout: 'login.js',
- ajaxStartLogin: 'login.js',
- ajaxStartAdminLogin: 'login.js',
- ajaxLoginNavTo: 'login.js',
- ajaxLogonToElev: 'login.js',
- ajaxLoginInit: 'login.js',
- ajaxAdminPage: 'login.js',
- ajaxAdminUser: 'login.js',
- mb_logout: 'login.js',
- selectButtonMajor: 'toolbar.js',
- selectButtonMinor: 'toolbar.js',
- unselectAllButtonsMajor: 'toolbar.js',
- unselectAllButtonsMinor: 'toolbar.js',
- darken: 'fadefilter.js',
- enlighten: 'fadefilter.js',
- password_score: 'pwstrength.js',
- password_score_field: 'pwstrength.js',
- ajaxEditTheme: 'theme-manager.js',
- ajaxToggleSystemThemes: 'theme-manager.js',
- ajaxInstallTheme: 'theme-manager.js',
- ajaxInitRankEdit: 'rank-manager.js',
- ajaxInitRankCreate: 'rank-manager.js',
- autofill_init_element: 'autofill.js',
- autofill_init: 'autofill.js',
- paginator_goto: 'paginate.js'
+ ajaxReset: 'ajax.js',
+ ajaxComments: 'comments.js',
+ ajaxEditor: 'editor.js',
+ ajaxHistory: 'ajax.js',
+ ajaxRename: 'ajax.js',
+ ajaxDelVote: 'ajax.js',
+ ajaxProtect: 'ajax.js',
+ ajaxClearLogs: 'ajax.js',
+ ajaxRollback: 'ajax.js',
+ ajaxResetDelVotes: 'ajax.js',
+ ajaxDeletePage: 'ajax.js',
+ ajaxSetPassword: 'ajax.js',
+ ajaxChangeStyle: 'ajax.js',
+ ajaxCatToTag: 'ajax.js',
+ ajaxCatEdit: 'ajax.js',
+ ajaxReverseDNS: 'ajax.js',
+ ajaxGzipCheck: 'ajax.js',
+ ajaxOpenACLManager: 'acl.js',
+ ajaxOpenDirectACLRule: 'acl.js',
+ ajaxAdminPage: 'login.js',
+ ajaxInitLogout: 'login.js',
+ ajaxStartLogin: 'login.js',
+ ajaxStartAdminLogin: 'login.js',
+ ajaxLoginNavTo: 'login.js',
+ ajaxLogonToElev: 'login.js',
+ ajaxLoginInit: 'login.js',
+ ajaxAdminPage: 'login.js',
+ ajaxAdminUser: 'login.js',
+ mb_logout: 'login.js',
+ selectButtonMajor: 'toolbar.js',
+ selectButtonMinor: 'toolbar.js',
+ unselectAllButtonsMajor: 'toolbar.js',
+ unselectAllButtonsMinor: 'toolbar.js',
+ darken: 'fadefilter.js',
+ enlighten: 'fadefilter.js',
+ password_score: 'pwstrength.js',
+ password_score_field: 'pwstrength.js',
+ ajaxEditTheme: 'theme-manager.js',
+ ajaxToggleSystemThemes: 'theme-manager.js',
+ ajaxInstallTheme: 'theme-manager.js',
+ ajaxInitRankEdit: 'rank-manager.js',
+ ajaxInitRankCreate: 'rank-manager.js',
+ autofill_init_element: 'autofill.js',
+ autofill_init: 'autofill.js',
+ paginator_goto: 'paginate.js'
};
function AutofillUsername(el, p)
{
- p = p || {};
- el.className = 'autofill username';
- el.onkeyup = null;
- autofill_init_element(el, p);
+ p = p || {};
+ el.className = 'autofill username';
+ el.onkeyup = null;
+ autofill_init_element(el, p);
}
function AutofillPage(el, p)
{
- p = p || {};
- el.className = 'autofill page';
- el.onkeyup = null;
- autofill_init_element(el, p);
+ p = p || {};
+ el.className = 'autofill page';
+ el.onkeyup = null;
+ autofill_init_element(el, p);
}
var placeholder_instances = {};
for ( var i in placeholder_list )
{
- var file = placeholder_list[i];
- placeholder_instances[i] = new Placeholder(i, file);
- window[i] = window[i] || placeholder_instances[i].go;
+ var file = placeholder_list[i];
+ placeholder_instances[i] = new Placeholder(i, file);
+ window[i] = window[i] || placeholder_instances[i].go;
}
$lang = window.$lang || {
- get: function(a, b)
- {
- load_component('l10n');
- return $lang.get(a, b);
- },
- placeholder: true
+ get: function(a, b)
+ {
+ load_component('l10n');
+ return $lang.get(a, b);
+ },
+ placeholder: true
}
//*/
diff -r de56132c008d -r bdac73ed481e includes/clientside/static/expander.js
--- a/includes/clientside/static/expander.js Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/clientside/static/expander.js Sun Mar 28 23:10:46 2010 -0400
@@ -4,134 +4,134 @@
var expander_onload = function()
{
- var sets = document.getElementsByTagName('fieldset');
- if ( sets.length < 1 )
- return false;
- var init_us = [];
- for ( var index = 0; index < sets.length; index++ )
- {
- var mode = sets[index].getAttribute('enano:expand');
- if ( mode == 'closed' || mode == 'open' )
- {
- init_us.push(sets[index]);
- }
- }
- for ( var k = 0; k < init_us.length; k++ )
- {
- expander_init_element(init_us[k]);
- }
+ var sets = document.getElementsByTagName('fieldset');
+ if ( sets.length < 1 )
+ return false;
+ var init_us = [];
+ for ( var index = 0; index < sets.length; index++ )
+ {
+ var mode = sets[index].getAttribute('enano:expand');
+ if ( mode == 'closed' || mode == 'open' )
+ {
+ init_us.push(sets[index]);
+ }
+ }
+ for ( var k = 0; k < init_us.length; k++ )
+ {
+ expander_init_element(init_us[k]);
+ }
}
function expander_init_element(el)
{
- // get the legend tag
- var legend = el.getElementsByTagName('legend')[0];
- if ( !legend )
- return false;
- // existing content
- var existing_inner = legend.innerHTML;
- // blank the innerHTML and replace it with a link
- legend.innerHTML = '';
- var button = document.createElement('a');
- button.className = 'expander expander-open';
- button.innerHTML = existing_inner;
- button.href = '#';
-
- legend.appendChild(button);
-
- button.onclick = function()
- {
- try
- {
- expander_handle_click(this);
- }
- catch(e)
- {
- console.debug('Exception caught: ', e);
- }
- return false;
- }
-
- if ( el.getAttribute('enano:expand') == 'closed' )
- {
- expander_close(el);
- }
+ // get the legend tag
+ var legend = el.getElementsByTagName('legend')[0];
+ if ( !legend )
+ return false;
+ // existing content
+ var existing_inner = legend.innerHTML;
+ // blank the innerHTML and replace it with a link
+ legend.innerHTML = '';
+ var button = document.createElement('a');
+ button.className = 'expander expander-open';
+ button.innerHTML = existing_inner;
+ button.href = '#';
+
+ legend.appendChild(button);
+
+ button.onclick = function()
+ {
+ try
+ {
+ expander_handle_click(this);
+ }
+ catch(e)
+ {
+ console.debug('Exception caught: ', e);
+ }
+ return false;
+ }
+
+ if ( el.getAttribute('enano:expand') == 'closed' )
+ {
+ expander_close(el);
+ }
}
function expander_handle_click(el)
{
- if ( el.parentNode.parentNode.tagName != 'FIELDSET' )
- return false;
- var parent = el.parentNode.parentNode;
- if ( parent.getAttribute('enano:expand') == 'closed' )
- {
- expander_open(parent);
- }
- else
- {
- expander_close(parent);
- }
+ if ( el.parentNode.parentNode.tagName != 'FIELDSET' )
+ return false;
+ var parent = el.parentNode.parentNode;
+ if ( parent.getAttribute('enano:expand') == 'closed' )
+ {
+ expander_open(parent);
+ }
+ else
+ {
+ expander_close(parent);
+ }
}
function expander_close(el)
{
- var children = el.childNodes;
- for ( var i = 0; i < children.length; i++ )
- {
- var child = children[i];
- if ( child.tagName == 'LEGEND' )
- {
- var a = child.getElementsByTagName('a')[0];
- $dynano(a).rmClass('expander-open');
- $dynano(a).addClass('expander-closed');
- continue;
- }
- if ( child.style )
- {
- child.expander_meta_old_state = child.style.display;
- child.style.display = 'none';
- }
- }
- el.expander_meta_padbak = el.style.padding;
- el.setAttribute('enano:expand', 'closed');
+ var children = el.childNodes;
+ for ( var i = 0; i < children.length; i++ )
+ {
+ var child = children[i];
+ if ( child.tagName == 'LEGEND' )
+ {
+ var a = child.getElementsByTagName('a')[0];
+ $dynano(a).rmClass('expander-open');
+ $dynano(a).addClass('expander-closed');
+ continue;
+ }
+ if ( child.style )
+ {
+ child.expander_meta_old_state = child.style.display;
+ child.style.display = 'none';
+ }
+ }
+ el.expander_meta_padbak = el.style.padding;
+ el.setAttribute('enano:expand', 'closed');
}
function expander_open(el)
{
- var children = el.childNodes;
- for ( var i = 0; i < children.length; i++ )
- {
- var child = children[i];
- if ( child.tagName == 'LEGEND' )
- {
- var a = child.getElementsByTagName('a')[0];
- $dynano(a).rmClass('expander-closed');
- $dynano(a).addClass('expander-open');
- continue;
- }
- if ( child.expander_meta_old_state && child.style )
- {
- child.style.display = child.expander_meta_old_state;
- child.expander_meta_old_state = null;
- }
- else
- {
- if ( child.style )
- {
- child.style.display = null;
- }
- }
- }
- if ( el.expander_meta_padbak )
- {
- el.style.padding = el.expander_meta_padbak;
- el.expander_meta_padbak = null;
- }
- else
- {
- el.style.padding = null;
- }
- el.setAttribute('enano:expand', 'open');
+ var children = el.childNodes;
+ for ( var i = 0; i < children.length; i++ )
+ {
+ var child = children[i];
+ if ( child.tagName == 'LEGEND' )
+ {
+ var a = child.getElementsByTagName('a')[0];
+ $dynano(a).rmClass('expander-closed');
+ $dynano(a).addClass('expander-open');
+ continue;
+ }
+ if ( child.expander_meta_old_state && child.style )
+ {
+ child.style.display = child.expander_meta_old_state;
+ child.expander_meta_old_state = null;
+ }
+ else
+ {
+ if ( child.style )
+ {
+ child.style.display = null;
+ }
+ }
+ }
+ if ( el.expander_meta_padbak )
+ {
+ el.style.padding = el.expander_meta_padbak;
+ el.expander_meta_padbak = null;
+ }
+ else
+ {
+ el.style.padding = null;
+ }
+ el.setAttribute('enano:expand', 'open');
}
addOnloadHook(expander_onload);
diff -r de56132c008d -r bdac73ed481e includes/clientside/static/fadefilter.js
--- a/includes/clientside/static/fadefilter.js Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/clientside/static/fadefilter.js Sun Mar 28 23:10:46 2010 -0400
@@ -9,88 +9,88 @@
function darken(nofade, opacVal, layerid)
{
- layerid = ( layerid ) ? layerid : 'specialLayer_darkener';
- if(IE)
- nofade = true;
- if ( !opacVal )
- opacVal = 70;
- darkener_index[layerid] = ( typeof(darkener_index[layerid]) == 'number' ) ? darkener_index[layerid] + 1 : 1;
- if(document.getElementById(layerid) && !document.getElementById(layerid).destroying)
- {
- document.getElementById(layerid).style.zIndex = getHighestZ() + 1;
- if(nofade)
- {
- changeOpac(opacVal, layerid);
- document.getElementById(layerid).style.display = 'block';
- document.getElementById(layerid).myOpacVal = opacVal;
- }
- else
- {
- if ( document.getElementById(layerid).style.display != 'none' )
- {
- var currentOpac = document.getElementById(layerid).myOpacVal;
- opacity(layerid, currentOpac, opacVal, FADE_TIME);
- document.getElementById(layerid).myOpacVal = opacVal;
- }
- else
- {
- document.getElementById(layerid).style.display = 'block';
- document.getElementById(layerid).myOpacVal = opacVal;
- opacity(layerid, 0, opacVal, FADE_TIME);
- }
- }
- }
- else if(document.getElementById(layerid) && document.getElementById(layerid).destroying)
- {
- // fade in progress - abort
- console.warn('Aborting fade');
- abortFades();
- changeOpac(opacVal, layerid);
- document.getElementById(layerid).destroying = false;
- return document.getElementById(layerid);
- }
- else
- {
- w = getWidth();
- h = getHeight();
- var thediv = document.createElement('div');
- if(IE)
- thediv.style.position = 'absolute';
- else
- thediv.style.position = 'fixed';
- if ( IE )
- {
- var top = getScrollOffset();
- thediv.style.top = String(top) + 'px';
- }
- else
- {
- thediv.style.top = '0px';
- }
- thediv.style.left = '0px';
- thediv.style.opacity = '0';
- thediv.style.filter = 'alpha(opacity=0)';
- thediv.style.backgroundColor = '#000000';
- thediv.style.width = '100%';
- thediv.style.height = IE ? h + 'px' : '100%';
- thediv.style.zIndex = getHighestZ() + 1;
- thediv.id = layerid;
- thediv.myOpacVal = opacVal;
- if(nofade)
- {
- thediv.style.opacity = ( parseFloat(opacVal) / 100 );
- thediv.style.filter = 'alpha(opacity=' + opacVal + ')';
- body = document.getElementsByTagName('body');
- body = body[0];
- body.appendChild(thediv);
- } else {
- body = document.getElementsByTagName('body');
- body = body[0];
- body.appendChild(thediv);
- opacity(layerid, 0, opacVal, FADE_TIME);
- }
- }
- return document.getElementById(layerid);
+ layerid = ( layerid ) ? layerid : 'specialLayer_darkener';
+ if(IE)
+ nofade = true;
+ if ( !opacVal )
+ opacVal = 70;
+ darkener_index[layerid] = ( typeof(darkener_index[layerid]) == 'number' ) ? darkener_index[layerid] + 1 : 1;
+ if(document.getElementById(layerid) && !document.getElementById(layerid).destroying)
+ {
+ document.getElementById(layerid).style.zIndex = getHighestZ() + 1;
+ if(nofade)
+ {
+ changeOpac(opacVal, layerid);
+ document.getElementById(layerid).style.display = 'block';
+ document.getElementById(layerid).myOpacVal = opacVal;
+ }
+ else
+ {
+ if ( document.getElementById(layerid).style.display != 'none' )
+ {
+ var currentOpac = document.getElementById(layerid).myOpacVal;
+ opacity(layerid, currentOpac, opacVal, FADE_TIME);
+ document.getElementById(layerid).myOpacVal = opacVal;
+ }
+ else
+ {
+ document.getElementById(layerid).style.display = 'block';
+ document.getElementById(layerid).myOpacVal = opacVal;
+ opacity(layerid, 0, opacVal, FADE_TIME);
+ }
+ }
+ }
+ else if(document.getElementById(layerid) && document.getElementById(layerid).destroying)
+ {
+ // fade in progress - abort
+ console.warn('Aborting fade');
+ abortFades();
+ changeOpac(opacVal, layerid);
+ document.getElementById(layerid).destroying = false;
+ return document.getElementById(layerid);
+ }
+ else
+ {
+ w = getWidth();
+ h = getHeight();
+ var thediv = document.createElement('div');
+ if(IE)
+ thediv.style.position = 'absolute';
+ else
+ thediv.style.position = 'fixed';
+ if ( IE )
+ {
+ var top = getScrollOffset();
+ thediv.style.top = String(top) + 'px';
+ }
+ else
+ {
+ thediv.style.top = '0px';
+ }
+ thediv.style.left = '0px';
+ thediv.style.opacity = '0';
+ thediv.style.filter = 'alpha(opacity=0)';
+ thediv.style.backgroundColor = '#000000';
+ thediv.style.width = '100%';
+ thediv.style.height = IE ? h + 'px' : '100%';
+ thediv.style.zIndex = getHighestZ() + 1;
+ thediv.id = layerid;
+ thediv.myOpacVal = opacVal;
+ if(nofade)
+ {
+ thediv.style.opacity = ( parseFloat(opacVal) / 100 );
+ thediv.style.filter = 'alpha(opacity=' + opacVal + ')';
+ body = document.getElementsByTagName('body');
+ body = body[0];
+ body.appendChild(thediv);
+ } else {
+ body = document.getElementsByTagName('body');
+ body = body[0];
+ body.appendChild(thediv);
+ opacity(layerid, 0, opacVal, FADE_TIME);
+ }
+ }
+ return document.getElementById(layerid);
}
/**
@@ -100,26 +100,26 @@
function enlighten(nofade, layerid)
{
- layerid = ( layerid ) ? layerid : 'specialLayer_darkener';
-
- if(IE)
- nofade = true;
- darkener_index[layerid] -= 1;
- if ( darkener_index[layerid] > 0 )
- return false;
- if(document.getElementById(layerid))
- {
- if(nofade)
- {
- document.getElementById(layerid).style.display = 'none';
- }
- else
- {
- document.getElementById(layerid).destroying = true;
- var from = document.getElementById(layerid).myOpacVal;
- opacity(layerid, from, 0, FADE_TIME);
- setTimeout("var l = document.getElementById('" + layerid + "'); var b = document.getElementsByTagName('body')[0]; b.removeChild(l);", 1000);
- }
- }
- return document.getElementById(layerid);
+ layerid = ( layerid ) ? layerid : 'specialLayer_darkener';
+
+ if(IE)
+ nofade = true;
+ darkener_index[layerid] -= 1;
+ if ( darkener_index[layerid] > 0 )
+ return false;
+ if(document.getElementById(layerid))
+ {
+ if(nofade)
+ {
+ document.getElementById(layerid).style.display = 'none';
+ }
+ else
+ {
+ document.getElementById(layerid).destroying = true;
+ var from = document.getElementById(layerid).myOpacVal;
+ opacity(layerid, from, 0, FADE_TIME);
+ setTimeout("var l = document.getElementById('" + layerid + "'); var b = document.getElementsByTagName('body')[0]; b.removeChild(l);", 1000);
+ }
+ }
+ return document.getElementById(layerid);
}
diff -r de56132c008d -r bdac73ed481e includes/clientside/static/fat.js
--- a/includes/clientside/static/fat.js Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/clientside/static/fat.js Sun Mar 28 23:10:46 2010 -0400
@@ -21,7 +21,7 @@
if (r)
{
if (!r[1]) r[1] = "";
- if (!o.id) o.id = 'autofat_'+Math.floor(Math.random() * 100000);
+ if (!o.id) o.id = 'autofat_'+Math.floor(Math.random() * 100000);
if (o.id) Fat.fade_element(o.id,null,null,"#"+r[1]);
}
}
@@ -66,7 +66,7 @@
set_bgcolor : function (id, c)
{
var o = document.getElementById(id);
- if(!o) return;
+ if(!o) return;
o.style.backgroundColor = c;
},
get_bgcolor : function (id)
diff -r de56132c008d -r bdac73ed481e includes/clientside/static/flyin.js
--- a/includes/clientside/static/flyin.js Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/clientside/static/flyin.js Sun Mar 28 23:10:46 2010 -0400
@@ -20,25 +20,25 @@
// Effects code - don't bother changing these formulas
var Back = {
- easeOut: function(t, b, c, d, s)
- {
- if (s == undefined) s = 1.70158;
- return c * ( ( t=t/d-1 ) * t * ( ( s + 1 ) * t + s) + 1) + b;
- },
- easeIn: function (t, b, c, d, s)
- {
- if (s == undefined) s = 1.70158;
- return c * ( t/=d ) * t * ( ( s + 1 ) * t - s) + b;
- },
- easeInOut: function (t, b, c, d, s)
- {
- if (s == undefined) s = 1.70158;
- if ((t /= d/2) < 1)
- {
- return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
- }
- return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
- }
+ easeOut: function(t, b, c, d, s)
+ {
+ if (s == undefined) s = 1.70158;
+ return c * ( ( t=t/d-1 ) * t * ( ( s + 1 ) * t + s) + 1) + b;
+ },
+ easeIn: function (t, b, c, d, s)
+ {
+ if (s == undefined) s = 1.70158;
+ return c * ( t/=d ) * t * ( ( s + 1 ) * t - s) + b;
+ },
+ easeInOut: function (t, b, c, d, s)
+ {
+ if (s == undefined) s = 1.70158;
+ if ((t /= d/2) < 1)
+ {
+ return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
+ }
+ return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
+ }
}
// This should be set to the class name of the effect you want.
@@ -48,146 +48,146 @@
function fly_in_top(element, nofade, height_taken_care_of)
{
- return fly_core(element, nofade, FI_TOP, FI_IN, height_taken_care_of);
+ return fly_core(element, nofade, FI_TOP, FI_IN, height_taken_care_of);
}
function fly_in_bottom(element, nofade, height_taken_care_of)
{
- return fly_core(element, nofade, FI_BOTTOM, FI_IN, height_taken_care_of);
+ return fly_core(element, nofade, FI_BOTTOM, FI_IN, height_taken_care_of);
}
function fly_out_top(element, nofade, height_taken_care_of)
{
- return fly_core(element, nofade, FI_TOP, FI_OUT, height_taken_care_of);
+ return fly_core(element, nofade, FI_TOP, FI_OUT, height_taken_care_of);
}
function fly_out_bottom(element, nofade, height_taken_care_of)
{
- return fly_core(element, nofade, FI_BOTTOM, FI_OUT, height_taken_care_of);
+ return fly_core(element, nofade, FI_BOTTOM, FI_OUT, height_taken_care_of);
}
function fly_core(element, nofade, origin, direction, height_taken_care_of)
{
- if ( !element || typeof(element) != 'object' )
- return false;
-
- // force to array
- if ( !element.length )
- element = [ element ];
-
- // target dimensions
- var top, left;
- // initial dimensions
- var topi, lefti;
- // current dimensions
- var topc, leftc;
- // screen dimensions
- var w = getWidth();
- var h = getHeight();
- var y = parseInt ( getScrollOffset() );
- // temp vars
- var dim, off, diff, dist, ratio, opac_factor;
- // setup element
- for ( var i = 0; i < element.length; i++ )
- element[i].style.position = 'absolute';
-
- dim = [ $dynano(element[0]).Height(), $dynano(element[0]).Width() ];
- off = [ $dynano(element[0]).Top(), $dynano(element[0]).Left() ];
-
- if ( height_taken_care_of )
- {
- top = off[0];
- left = off[1];
- }
- else
- {
- top = Math.round(( h / 2 ) - ( dim[0] / 2 )) + y; // - ( h / 4 ));
- left = Math.round(( w / 2 ) - ( dim[1] / 2 ));
- }
-
- // you can change this around to get it to fly in from corners or be on the left/right side
- lefti = left;
-
- // calculate first frame Y position
- if ( origin == FI_TOP && direction == FI_IN )
- {
- topi = 0 - dim[0] + y;
- }
- else if ( origin == FI_TOP && direction == FI_OUT )
- {
- topi = top;
- top = 0 - dim[0] + y;
- }
- else if ( origin == FI_BOTTOM && direction == FI_IN )
- {
- topi = h + y;
- }
- else if ( origin == FI_BOTTOM && direction == FI_OUT )
- {
- topi = top;
- top = h + y;
- }
-
- var abs_dir = ( ( origin == FI_TOP && direction == FI_IN ) || ( origin == FI_BOTTOM && direction == FI_OUT ) ) ? FI_DOWN : FI_UP;
-
- var diff_top = top - topi;
- var diff_left = left - lefti;
-
- var frames = 100;
- var timeout = 0;
- var timerstep = 8 * FI_MULTIPLIER;
-
- // cache element so it can be changed from within setTimeout()
- var rand_seed = Math.floor(Math.random() * 1000000);
- fly_in_cache[rand_seed] = element;
-
- for ( var i = 0; i < frames; i++ )
- {
- topc = GlideEffect.easeInOut(i, topi, diff_top, frames);
- leftc = GlideEffect.easeInOut(i, lefti, diff_left, frames);
-
- var code = 'var element = fly_in_cache[' + rand_seed + '];' + "\n";
- code += 'for ( var i = 0; i < element.length; i++ )' + "\n";
- code += '{' + "\n";
- code += ' element[i].style.top = "' + topc + 'px";' + "\n";
- if ( !height_taken_care_of )
- code += ' element[i].style.left = "' + leftc + 'px";' + "\n";
- code += '}';
-
- setTimeout(code, timeout);
-
- timeout += timerstep;
-
- var ratio = i / frames;
-
- if ( !nofade )
- {
- // handle fade
- var opac_factor = ratio * 100;
- if ( direction == FI_OUT )
- opac_factor = 100 - opac_factor;
-
- var code = 'var element = fly_in_cache[' + rand_seed + '];' + "\n";
- code += 'for ( var i = 0; i < element.length; i++ )' + "\n";
- code += '{' + "\n";
- code += ' domObjChangeOpac(' + opac_factor + ', element[i]);' + "\n";
- code += '}';
-
- setTimeout(code, timeout);
- }
-
- }
-
- // old framestepper code removed from here in Loch Ness
-
- timeout += timerstep;
- return timeout;
+ if ( !element || typeof(element) != 'object' )
+ return false;
+
+ // force to array
+ if ( !element.length )
+ element = [ element ];
+
+ // target dimensions
+ var top, left;
+ // initial dimensions
+ var topi, lefti;
+ // current dimensions
+ var topc, leftc;
+ // screen dimensions
+ var w = getWidth();
+ var h = getHeight();
+ var y = parseInt ( getScrollOffset() );
+ // temp vars
+ var dim, off, diff, dist, ratio, opac_factor;
+ // setup element
+ for ( var i = 0; i < element.length; i++ )
+ element[i].style.position = 'absolute';
+
+ dim = [ $dynano(element[0]).Height(), $dynano(element[0]).Width() ];
+ off = [ $dynano(element[0]).Top(), $dynano(element[0]).Left() ];
+
+ if ( height_taken_care_of )
+ {
+ top = off[0];
+ left = off[1];
+ }
+ else
+ {
+ top = Math.round(( h / 2 ) - ( dim[0] / 2 )) + y; // - ( h / 4 ));
+ left = Math.round(( w / 2 ) - ( dim[1] / 2 ));
+ }
+
+ // you can change this around to get it to fly in from corners or be on the left/right side
+ lefti = left;
+
+ // calculate first frame Y position
+ if ( origin == FI_TOP && direction == FI_IN )
+ {
+ topi = 0 - dim[0] + y;
+ }
+ else if ( origin == FI_TOP && direction == FI_OUT )
+ {
+ topi = top;
+ top = 0 - dim[0] + y;
+ }
+ else if ( origin == FI_BOTTOM && direction == FI_IN )
+ {
+ topi = h + y;
+ }
+ else if ( origin == FI_BOTTOM && direction == FI_OUT )
+ {
+ topi = top;
+ top = h + y;
+ }
+
+ var abs_dir = ( ( origin == FI_TOP && direction == FI_IN ) || ( origin == FI_BOTTOM && direction == FI_OUT ) ) ? FI_DOWN : FI_UP;
+
+ var diff_top = top - topi;
+ var diff_left = left - lefti;
+
+ var frames = 100;
+ var timeout = 0;
+ var timerstep = 8 * FI_MULTIPLIER;
+
+ // cache element so it can be changed from within setTimeout()
+ var rand_seed = Math.floor(Math.random() * 1000000);
+ fly_in_cache[rand_seed] = element;
+
+ for ( var i = 0; i < frames; i++ )
+ {
+ topc = GlideEffect.easeInOut(i, topi, diff_top, frames);
+ leftc = GlideEffect.easeInOut(i, lefti, diff_left, frames);
+
+ var code = 'var element = fly_in_cache[' + rand_seed + '];' + "\n";
+ code += 'for ( var i = 0; i < element.length; i++ )' + "\n";
+ code += '{' + "\n";
+ code += ' element[i].style.top = "' + topc + 'px";' + "\n";
+ if ( !height_taken_care_of )
+ code += ' element[i].style.left = "' + leftc + 'px";' + "\n";
+ code += '}';
+
+ setTimeout(code, timeout);
+
+ timeout += timerstep;
+
+ var ratio = i / frames;
+
+ if ( !nofade )
+ {
+ // handle fade
+ var opac_factor = ratio * 100;
+ if ( direction == FI_OUT )
+ opac_factor = 100 - opac_factor;
+
+ var code = 'var element = fly_in_cache[' + rand_seed + '];' + "\n";
+ code += 'for ( var i = 0; i < element.length; i++ )' + "\n";
+ code += '{' + "\n";
+ code += ' domObjChangeOpac(' + opac_factor + ', element[i]);' + "\n";
+ code += '}';
+
+ setTimeout(code, timeout);
+ }
+
+ }
+
+ // old framestepper code removed from here in Loch Ness
+
+ timeout += timerstep;
+ return timeout;
}
function abs(i)
{
- if ( isNaN(i) )
- return i;
- return ( i < 0 ) ? ( 0 - i ) : i;
+ if ( isNaN(i) )
+ return i;
+ return ( i < 0 ) ? ( 0 - i ) : i;
}
diff -r de56132c008d -r bdac73ed481e includes/clientside/static/functions.js
--- a/includes/clientside/static/functions.js Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/clientside/static/functions.js Sun Mar 28 23:10:46 2010 -0400
@@ -2,69 +2,69 @@
function makeUrl(page, query, html_friendly)
{
- url = contentPath+page;
- if(url.indexOf('?') > 0) sep = '&';
- else sep = '?';
- if(query)
- {
- url = url + sep + query;
- }
- if(html_friendly)
- {
- url = url.replace('&', '&');
- url = url.replace('<', '<');
- url = url.replace('>', '>');
- }
- return append_sid(url);
+ url = contentPath+page;
+ if(url.indexOf('?') > 0) sep = '&';
+ else sep = '?';
+ if(query)
+ {
+ url = url + sep + query;
+ }
+ if(html_friendly)
+ {
+ url = url.replace('&', '&');
+ url = url.replace('<', '<');
+ url = url.replace('>', '>');
+ }
+ return append_sid(url);
}
function makeUrlNS(namespace, page, query, html_friendly)
{
- var url = contentPath+namespace_list[namespace]+(page.replace(/ /g, '_'));
- if(url.indexOf('?') > 0) sep = '&';
- else sep = '?';
- if(query)
- {
- url = url + sep + query;
- }
- if(html_friendly)
- {
- url = url.replace('&', '&');
- url = url.replace('<', '<');
- url = url.replace('>', '>');
- }
- return append_sid(url);
+ var url = contentPath+namespace_list[namespace]+(page.replace(/ /g, '_'));
+ if(url.indexOf('?') > 0) sep = '&';
+ else sep = '?';
+ if(query)
+ {
+ url = url + sep + query;
+ }
+ if(html_friendly)
+ {
+ url = url.replace('&', '&');
+ url = url.replace('<', '<');
+ url = url.replace('>', '>');
+ }
+ return append_sid(url);
}
function strToPageID(string)
{
- // Convert Special:UploadFile to ['UploadFile', 'Special'], but convert 'Image:Enano.png' to ['Enano.png', 'File']
- for(var i in namespace_list)
- if(namespace_list[i] != '')
- if(namespace_list[i] == string.substr(0, namespace_list[i].length))
- return [string.substr(namespace_list[i].length), i];
- return [string, 'Article'];
+ // Convert Special:UploadFile to ['UploadFile', 'Special'], but convert 'Image:Enano.png' to ['Enano.png', 'File']
+ for(var i in namespace_list)
+ if(namespace_list[i] != '')
+ if(namespace_list[i] == string.substr(0, namespace_list[i].length))
+ return [string.substr(namespace_list[i].length), i];
+ return [string, 'Article'];
}
function append_sid(url)
{
- var match = url.match(/#(.*?)$/);
- url = url.replace(/#(.*?)$/, '');
- sep = ( url.indexOf('?') > 0 ) ? '&' : '?';
- if(ENANO_SID.length > 10)
- {
- url = url + sep + 'auth=' + ENANO_SID;
- sep = '&';
- }
- if ( pagepass.length > 0 )
- {
- url = url + sep + 'pagepass=' + pagepass;
- }
- if ( match )
- {
- url = url + match[0];
- }
- return url;
+ var match = url.match(/#(.*?)$/);
+ url = url.replace(/#(.*?)$/, '');
+ sep = ( url.indexOf('?') > 0 ) ? '&' : '?';
+ if(ENANO_SID.length > 10)
+ {
+ url = url + sep + 'auth=' + ENANO_SID;
+ sep = '&';
+ }
+ if ( pagepass.length > 0 )
+ {
+ url = url + sep + 'pagepass=' + pagepass;
+ }
+ if ( match )
+ {
+ url = url + match[0];
+ }
+ return url;
}
var stdAjaxPrefix = append_sid(scriptPath+'/ajax.php?title='+title);
@@ -75,93 +75,93 @@
function ajaxMakeXHR()
{
- var ajax;
- if (window.XMLHttpRequest) {
- ajax = new XMLHttpRequest();
- } else {
- if (window.ActiveXObject) {
- ajax = new ActiveXObject("Microsoft.XMLHTTP");
- } else {
- alert('Enano client-side runtime error: No AJAX support, unable to continue');
- return;
- }
- }
- return ajax;
+ var ajax;
+ if (window.XMLHttpRequest) {
+ ajax = new XMLHttpRequest();
+ } else {
+ if (window.ActiveXObject) {
+ ajax = new ActiveXObject("Microsoft.XMLHTTP");
+ } else {
+ alert('Enano client-side runtime error: No AJAX support, unable to continue');
+ return;
+ }
+ }
+ return ajax;
}
function ajaxGet(uri, f, call_editor_safe) {
- // Is the editor open?
- if ( editor_open && !call_editor_safe )
- {
- // Make sure the user is willing to close the editor
- var conf = confirm($lang.get('editor_msg_confirm_ajax'));
- if ( !conf )
- {
- // Kill off any "loading" windows, etc. and cancel the request
- unsetAjaxLoading();
- return false;
- }
- // The user allowed the editor to be closed. Reset flags and knock out the on-close confirmation.
- editor_open = false;
- enableUnload();
- // destroy the MCE instance so it can be recreated later
- $dynano('ajaxEditArea').destroyMCE(false);
- }
- var ajax = ajaxMakeXHR();
- if ( !ajax )
- {
- console.error('ajaxMakeXHR() failed');
- return false;
- }
- ajax.onreadystatechange = function()
- {
- f(ajax);
- };
- ajax.open('GET', uri, true);
- ajax.setRequestHeader( "If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT" );
- ajax.send(null);
- window.ajax = ajax;
+ // Is the editor open?
+ if ( editor_open && !call_editor_safe )
+ {
+ // Make sure the user is willing to close the editor
+ var conf = confirm($lang.get('editor_msg_confirm_ajax'));
+ if ( !conf )
+ {
+ // Kill off any "loading" windows, etc. and cancel the request
+ unsetAjaxLoading();
+ return false;
+ }
+ // The user allowed the editor to be closed. Reset flags and knock out the on-close confirmation.
+ editor_open = false;
+ enableUnload();
+ // destroy the MCE instance so it can be recreated later
+ $dynano('ajaxEditArea').destroyMCE(false);
+ }
+ var ajax = ajaxMakeXHR();
+ if ( !ajax )
+ {
+ console.error('ajaxMakeXHR() failed');
+ return false;
+ }
+ ajax.onreadystatechange = function()
+ {
+ f(ajax);
+ };
+ ajax.open('GET', uri, true);
+ ajax.setRequestHeader( "If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT" );
+ ajax.send(null);
+ window.ajax = ajax;
}
function ajaxPost(uri, parms, f, call_editor_safe) {
- // Is the editor open?
- if ( editor_open && !call_editor_safe )
- {
- // Make sure the user is willing to close the editor
- var conf = confirm($lang.get('editor_msg_confirm_ajax'));
- if ( !conf )
- {
- // Kill off any "loading" windows, etc. and cancel the request
- unsetAjaxLoading();
- return false;
- }
- // The user allowed the editor to be closed. Reset flags and knock out the on-close confirmation.
- editor_open = false;
- enableUnload();
- // destroy the MCE instance so it can be recreated later
- $dynano('ajaxEditArea').destroyMCE(false);
- }
- var ajax = ajaxMakeXHR();
- if ( !ajax )
- {
- console.error('ajaxMakeXHR() failed');
- return false;
- }
- ajax.onreadystatechange = function()
- {
- f(ajax);
- };
- ajax.open('POST', uri, true);
- ajax.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
- // Setting Content-length in Safari triggers a warning
- if ( !is_Safari )
- {
- ajax.setRequestHeader("Content-length", parms.length);
- }
- // fails under chrome 2.0
- // ajax.setRequestHeader("Connection", "close");
- ajax.send(parms);
- window.ajax = ajax;
+ // Is the editor open?
+ if ( editor_open && !call_editor_safe )
+ {
+ // Make sure the user is willing to close the editor
+ var conf = confirm($lang.get('editor_msg_confirm_ajax'));
+ if ( !conf )
+ {
+ // Kill off any "loading" windows, etc. and cancel the request
+ unsetAjaxLoading();
+ return false;
+ }
+ // The user allowed the editor to be closed. Reset flags and knock out the on-close confirmation.
+ editor_open = false;
+ enableUnload();
+ // destroy the MCE instance so it can be recreated later
+ $dynano('ajaxEditArea').destroyMCE(false);
+ }
+ var ajax = ajaxMakeXHR();
+ if ( !ajax )
+ {
+ console.error('ajaxMakeXHR() failed');
+ return false;
+ }
+ ajax.onreadystatechange = function()
+ {
+ f(ajax);
+ };
+ ajax.open('POST', uri, true);
+ ajax.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+ // Setting Content-length in Safari triggers a warning
+ if ( !is_Safari )
+ {
+ ajax.setRequestHeader("Content-length", parms.length);
+ }
+ // fails under chrome 2.0
+ // ajax.setRequestHeader("Connection", "close");
+ ajax.send(parms);
+ window.ajax = ajax;
}
/**
@@ -172,196 +172,196 @@
function handle_invalid_json(response, customerror)
{
- load_component(['messagebox', 'jquery', 'jquery-ui', 'fadefilter', 'flyin', 'l10n']);
-
- darken(aclDisableTransitionFX, 70, 'invalidjsondarkener');
-
- var box = document.createElement('div');
- var mainwin = document.createElement('div');
- var panel = document.createElement('div');
-
- //
- // main window
- //
-
- mainwin.style.padding = '10px';
- mainwin.style.width = '580px';
- mainwin.style.height = '360px';
- mainwin.style.clip = 'rect(0px,auto,auto,0px)';
- mainwin.style.overflow = 'auto';
- mainwin.style.backgroundColor = '#ffffff';
-
- // Title
- var h3 = document.createElement('h3');
- var h3_text = ( $lang.placeholder ) ? 'The site encountered an error while processing your request.' : $lang.get('ajax_badjson_title');
- h3.appendChild(document.createTextNode(h3_text));
- mainwin.appendChild(h3);
-
- if ( typeof(customerror) == 'string' )
- {
- var el = document.createElement('p');
- el.appendChild(document.createTextNode(customerror));
- mainwin.appendChild(el);
- }
- else
- {
- var error = 'We unexpectedly received the following response from the server. The response should have been in the JSON ';
- error += 'serialization format, but the response wasn\'t composed only of the JSON response. There are three possible triggers ';
- error += 'for this problem:';
- customerror = ( $lang.placeholder ) ? error : $lang.get('ajax_badjson_body');
- var el = document.createElement('p');
- el.appendChild(document.createTextNode(customerror));
- mainwin.appendChild(el);
- var ul = document.createElement('ul');
- var li1 = document.createElement('li');
- var li2 = document.createElement('li');
- var li3 = document.createElement('li');
- var li1_text = ( $lang.placeholder ) ? 'The server sent back a bad HTTP response code and thus sent an error page instead of running Enano. This indicates a possible problem with your server, and is not likely to be a bug with Enano.' : $lang.get('ajax_badjson_tip1');
- var li2_text = ( $lang.placeholder ) ? 'The server sent back the expected JSON response, but also injected some code into the response that should not be there. Typically this consists of advertisement code. In this case, the administrator of this site will have to contact their web host to have advertisements disabled.' : $lang.get('ajax_badjson_tip2');
- var li3_text = ( $lang.placeholder ) ? 'It\'s possible that Enano triggered a PHP error or warning. In this case, you may be looking at a bug in Enano.' : $lang.get('ajax_badjson_tip3');
- var osc_ex_data = ( $lang.placeholder ) ? 'This is KNOWN to be the case with the OpenSourceCMS.com demo version of Enano.' : $lang.get('ajax_badjson_osc');
- li1.appendChild(document.createTextNode(li1_text));
- var osc_exception = ( window.location.hostname == 'demo.opensourcecms.com' ) ? ' ' + osc_ex_data : '';
- li2.appendChild(document.createTextNode(li2_text + osc_exception));
- li3.appendChild(document.createTextNode(li3_text));
-
- ul.appendChild(li1);
- ul.appendChild(li2);
- ul.appendChild(li3);
- mainwin.appendChild(ul);
- }
-
- var p2 = document.createElement('p');
- var p2_text = ( $lang.placeholder ) ? 'The response received from the server is as follows:' : $lang.get('ajax_badjson_msg_response');
- p2.appendChild(document.createTextNode(p2_text));
- mainwin.appendChild(p2);
-
- var pre = document.createElement('pre');
- pre.appendChild(document.createTextNode(response));
- mainwin.appendChild(pre);
-
- var p3 = document.createElement('p');
- var p3_text = $lang.placeholder ? 'You may also choose to view the response as HTML.' : $lang.get('ajax_badjson_msg_viewashtml');
- p3.appendChild(document.createTextNode(p3_text + ' '));
- var a = document.createElement('a');
- var a_text = $lang.placeholder ? 'View as HTML' : $lang.get('ajax_badjson_btn_viewashtml');
- a.appendChild(document.createTextNode(a_text + '...'));
- a._resp = response;
- a.onclick = function()
- {
- var vah_title = ( $lang.placeholder ) ? 'View the response as HTML?' : $lang.get('ajax_badjson_html_confirm_title');
- var vah_body = ( $lang.placeholder ) ? 'If the server\'s response was modified by an attacker to include malicious code, viewing the response as HTML might allow that malicious code to run. Only continue if you have inspected the response text and verified that it is safe.' : $lang.get('ajax_badjson_html_confirm_body');
- var btn_confirm = $lang.placeholder ? 'View as HTML' : $lang.get('ajax_badjson_btn_viewashtml');
- var btn_cancel = $lang.placeholder ? 'Cancel' : $lang.get('etc_cancel');
- var mp = miniPromptMessage({
- title: vah_title,
- message: vah_body,
- buttons: [
- {
- text: btn_confirm,
- color: 'blue',
- style: {
- fontWeight: 'bold'
- },
- onclick: function() {
- var mp = miniPromptGetParent(this);
- var win = window.open('about:blank', 'invalidjson_htmlwin', 'width=550,height=400,status=no,toolbars=no,toolbar=no,address=no,scroll=yes');
- win.document.write(mp._response);
- win.document.close();
- miniPromptDestroy(this);
- }
- },
- {
- text: btn_cancel,
- onclick: function() {
- miniPromptDestroy(this);
- }
- }
- ]
- });
- mp._response = this._resp;
- return false;
- }
- a.href = '#';
- p3.appendChild(a);
- mainwin.appendChild(p3);
-
- //
- // panel
- //
-
- panel.style.backgroundColor = '#D0D0D0';
- panel.style.textAlign = 'right';
- panel.style.padding = '0 10px';
- panel.style.lineHeight = '40px';
- panel.style.width = '580px';
-
- var closer = document.createElement('input');
- var btn_close = $lang.placeholder ? 'Close' : $lang.get('ajax_badjson_btn_close');
- closer.type = 'button';
- closer.value = btn_close;
- closer.onclick = function()
- {
- var parentdiv = this.parentNode.parentNode;
- if ( aclDisableTransitionFX )
- {
- parentdiv.parentNode.removeChild(parentdiv);
- enlighten(aclDisableTransitionFX, 'invalidjsondarkener');
- }
- else
- {
- $(parentdiv).hide("blind", {}, 1000, function()
- {
- parentdiv.parentNode.removeChild(parentdiv);
- enlighten(aclDisableTransitionFX, 'invalidjsondarkener');
- });
- }
- }
- panel.appendChild(closer);
-
- //
- // put it together
- //
-
- box.appendChild(mainwin);
- box.appendChild(panel);
-
- // add it to the body to allow height/width calculation
-
- box.style.display = 'block';
- box.style.position = 'absolute';
- box.style.zIndex = getHighestZ() + 1;
- domObjChangeOpac(0, box);
-
- var body = document.getElementsByTagName('body')[0];
- body.appendChild(box);
-
-
- // calculate position of the box
- // box should be exactly 640px high, 480px wide
- var top = ( getHeight() / 2 ) - ( $dynano(box).Height() / 2 ) + getScrollOffset();
- var left = ( getWidth() / 2 ) - ( $dynano(box).Width() / 2 );
- console.debug('top = %d, left = %d', top, left);
- box.style.top = top + 'px';
- box.style.left = left + 'px';
-
- // we have width and height, set display to none and reset opacity
- if ( aclDisableTransitionFX )
- {
- domObjChangeOpac(100, box);
- box.style.display = 'block';
- }
- else
- {
- box.style.display = 'none';
- domObjChangeOpac(100, box);
-
- setTimeout(function()
- {
- $(box).show("blind", {}, 1000);
- }, 1000);
- }
- return false;
+ load_component(['messagebox', 'jquery', 'jquery-ui', 'fadefilter', 'flyin', 'l10n']);
+
+ darken(aclDisableTransitionFX, 70, 'invalidjsondarkener');
+
+ var box = document.createElement('div');
+ var mainwin = document.createElement('div');
+ var panel = document.createElement('div');
+
+ //
+ // main window
+ //
+
+ mainwin.style.padding = '10px';
+ mainwin.style.width = '580px';
+ mainwin.style.height = '360px';
+ mainwin.style.clip = 'rect(0px,auto,auto,0px)';
+ mainwin.style.overflow = 'auto';
+ mainwin.style.backgroundColor = '#ffffff';
+
+ // Title
+ var h3 = document.createElement('h3');
+ var h3_text = ( $lang.placeholder ) ? 'The site encountered an error while processing your request.' : $lang.get('ajax_badjson_title');
+ h3.appendChild(document.createTextNode(h3_text));
+ mainwin.appendChild(h3);
+
+ if ( typeof(customerror) == 'string' )
+ {
+ var el = document.createElement('p');
+ el.appendChild(document.createTextNode(customerror));
+ mainwin.appendChild(el);
+ }
+ else
+ {
+ var error = 'We unexpectedly received the following response from the server. The response should have been in the JSON ';
+ error += 'serialization format, but the response wasn\'t composed only of the JSON response. There are three possible triggers ';
+ error += 'for this problem:';
+ customerror = ( $lang.placeholder ) ? error : $lang.get('ajax_badjson_body');
+ var el = document.createElement('p');
+ el.appendChild(document.createTextNode(customerror));
+ mainwin.appendChild(el);
+ var ul = document.createElement('ul');
+ var li1 = document.createElement('li');
+ var li2 = document.createElement('li');
+ var li3 = document.createElement('li');
+ var li1_text = ( $lang.placeholder ) ? 'The server sent back a bad HTTP response code and thus sent an error page instead of running Enano. This indicates a possible problem with your server, and is not likely to be a bug with Enano.' : $lang.get('ajax_badjson_tip1');
+ var li2_text = ( $lang.placeholder ) ? 'The server sent back the expected JSON response, but also injected some code into the response that should not be there. Typically this consists of advertisement code. In this case, the administrator of this site will have to contact their web host to have advertisements disabled.' : $lang.get('ajax_badjson_tip2');
+ var li3_text = ( $lang.placeholder ) ? 'It\'s possible that Enano triggered a PHP error or warning. In this case, you may be looking at a bug in Enano.' : $lang.get('ajax_badjson_tip3');
+ var osc_ex_data = ( $lang.placeholder ) ? 'This is KNOWN to be the case with the OpenSourceCMS.com demo version of Enano.' : $lang.get('ajax_badjson_osc');
+ li1.appendChild(document.createTextNode(li1_text));
+ var osc_exception = ( window.location.hostname == 'demo.opensourcecms.com' ) ? ' ' + osc_ex_data : '';
+ li2.appendChild(document.createTextNode(li2_text + osc_exception));
+ li3.appendChild(document.createTextNode(li3_text));
+
+ ul.appendChild(li1);
+ ul.appendChild(li2);
+ ul.appendChild(li3);
+ mainwin.appendChild(ul);
+ }
+
+ var p2 = document.createElement('p');
+ var p2_text = ( $lang.placeholder ) ? 'The response received from the server is as follows:' : $lang.get('ajax_badjson_msg_response');
+ p2.appendChild(document.createTextNode(p2_text));
+ mainwin.appendChild(p2);
+
+ var pre = document.createElement('pre');
+ pre.appendChild(document.createTextNode(response));
+ mainwin.appendChild(pre);
+
+ var p3 = document.createElement('p');
+ var p3_text = $lang.placeholder ? 'You may also choose to view the response as HTML.' : $lang.get('ajax_badjson_msg_viewashtml');
+ p3.appendChild(document.createTextNode(p3_text + ' '));
+ var a = document.createElement('a');
+ var a_text = $lang.placeholder ? 'View as HTML' : $lang.get('ajax_badjson_btn_viewashtml');
+ a.appendChild(document.createTextNode(a_text + '...'));
+ a._resp = response;
+ a.onclick = function()
+ {
+ var vah_title = ( $lang.placeholder ) ? 'View the response as HTML?' : $lang.get('ajax_badjson_html_confirm_title');
+ var vah_body = ( $lang.placeholder ) ? 'If the server\'s response was modified by an attacker to include malicious code, viewing the response as HTML might allow that malicious code to run. Only continue if you have inspected the response text and verified that it is safe.' : $lang.get('ajax_badjson_html_confirm_body');
+ var btn_confirm = $lang.placeholder ? 'View as HTML' : $lang.get('ajax_badjson_btn_viewashtml');
+ var btn_cancel = $lang.placeholder ? 'Cancel' : $lang.get('etc_cancel');
+ var mp = miniPromptMessage({
+ title: vah_title,
+ message: vah_body,
+ buttons: [
+ {
+ text: btn_confirm,
+ color: 'blue',
+ style: {
+ fontWeight: 'bold'
+ },
+ onclick: function() {
+ var mp = miniPromptGetParent(this);
+ var win = window.open('about:blank', 'invalidjson_htmlwin', 'width=550,height=400,status=no,toolbars=no,toolbar=no,address=no,scroll=yes');
+ win.document.write(mp._response);
+ win.document.close();
+ miniPromptDestroy(this);
+ }
+ },
+ {
+ text: btn_cancel,
+ onclick: function() {
+ miniPromptDestroy(this);
+ }
+ }
+ ]
+ });
+ mp._response = this._resp;
+ return false;
+ }
+ a.href = '#';
+ p3.appendChild(a);
+ mainwin.appendChild(p3);
+
+ //
+ // panel
+ //
+
+ panel.style.backgroundColor = '#D0D0D0';
+ panel.style.textAlign = 'right';
+ panel.style.padding = '0 10px';
+ panel.style.lineHeight = '40px';
+ panel.style.width = '580px';
+
+ var closer = document.createElement('input');
+ var btn_close = $lang.placeholder ? 'Close' : $lang.get('ajax_badjson_btn_close');
+ closer.type = 'button';
+ closer.value = btn_close;
+ closer.onclick = function()
+ {
+ var parentdiv = this.parentNode.parentNode;
+ if ( aclDisableTransitionFX )
+ {
+ parentdiv.parentNode.removeChild(parentdiv);
+ enlighten(aclDisableTransitionFX, 'invalidjsondarkener');
+ }
+ else
+ {
+ $(parentdiv).hide("blind", {}, 1000, function()
+ {
+ parentdiv.parentNode.removeChild(parentdiv);
+ enlighten(aclDisableTransitionFX, 'invalidjsondarkener');
+ });
+ }
+ }
+ panel.appendChild(closer);
+
+ //
+ // put it together
+ //
+
+ box.appendChild(mainwin);
+ box.appendChild(panel);
+
+ // add it to the body to allow height/width calculation
+
+ box.style.display = 'block';
+ box.style.position = 'absolute';
+ box.style.zIndex = getHighestZ() + 1;
+ domObjChangeOpac(0, box);
+
+ var body = document.getElementsByTagName('body')[0];
+ body.appendChild(box);
+
+
+ // calculate position of the box
+ // box should be exactly 640px high, 480px wide
+ var top = ( getHeight() / 2 ) - ( $dynano(box).Height() / 2 ) + getScrollOffset();
+ var left = ( getWidth() / 2 ) - ( $dynano(box).Width() / 2 );
+ console.debug('top = %d, left = %d', top, left);
+ box.style.top = top + 'px';
+ box.style.left = left + 'px';
+
+ // we have width and height, set display to none and reset opacity
+ if ( aclDisableTransitionFX )
+ {
+ domObjChangeOpac(100, box);
+ box.style.display = 'block';
+ }
+ else
+ {
+ box.style.display = 'none';
+ domObjChangeOpac(100, box);
+
+ setTimeout(function()
+ {
+ $(box).show("blind", {}, 1000);
+ }, 1000);
+ }
+ return false;
}
/**
@@ -372,22 +372,22 @@
function check_json_response(response)
{
- response = trim(response);
- if ( response.substr(0, 1) == '{' && response.substr(response.length - 1, 1) == '}' )
- {
- return true;
- }
- return false;
+ response = trim(response);
+ if ( response.substr(0, 1) == '{' && response.substr(response.length - 1, 1) == '}' )
+ {
+ return true;
+ }
+ return false;
}
function ajaxEscape(text)
{
- /*
- text = escape(text);
- text = text.replace(/\+/g, '%2B', text);
- */
- text = window.encodeURIComponent(text);
- return text;
+ /*
+ text = escape(text);
+ text = text.replace(/\+/g, '%2B', text);
+ */
+ text = window.encodeURIComponent(text);
+ return text;
}
/**
@@ -397,60 +397,60 @@
// Equivalent to PHP trim() function
function trim(text)
{
- text = text.replace(/^([\s]+)/, '');
- text = text.replace(/([\s]+)$/, '');
- return text;
+ text = text.replace(/^([\s]+)/, '');
+ text = text.replace(/([\s]+)$/, '');
+ return text;
}
// Equivalent to PHP implode() function
function implode(chr, arr)
{
- if ( typeof ( arr.toJSONString ) == 'function' )
- delete(arr.toJSONString);
-
- var ret = '';
- var c = 0;
- for ( var i in arr )
- {
- if(i=='toJSONString')continue;
- if ( c > 0 )
- ret += chr;
- ret += arr[i];
- c++;
- }
- return ret;
+ if ( typeof ( arr.toJSONString ) == 'function' )
+ delete(arr.toJSONString);
+
+ var ret = '';
+ var c = 0;
+ for ( var i in arr )
+ {
+ if(i=='toJSONString')continue;
+ if ( c > 0 )
+ ret += chr;
+ ret += arr[i];
+ c++;
+ }
+ return ret;
}
function form_fetch_field(form, name)
{
- var fields = form.getElementsByTagName('input');
- if ( fields.length < 1 )
- return false;
- for ( var i = 0; i < fields.length; i++ )
- {
- var field = fields[i];
- if ( field.name == name )
- return field;
- }
- return false;
+ var fields = form.getElementsByTagName('input');
+ if ( fields.length < 1 )
+ return false;
+ for ( var i = 0; i < fields.length; i++ )
+ {
+ var field = fields[i];
+ if ( field.name == name )
+ return field;
+ }
+ return false;
}
function get_parent_form(o)
{
- if ( !o.parentNode )
- return false;
- if ( o.tagName == 'FORM' )
- return o;
- var p = o.parentNode;
- while(true)
- {
- if ( p.tagName == 'FORM' )
- return p;
- else if ( !p )
- return false;
- else
- p = p.parentNode;
- }
+ if ( !o.parentNode )
+ return false;
+ if ( o.tagName == 'FORM' )
+ return o;
+ var p = o.parentNode;
+ while(true)
+ {
+ if ( p.tagName == 'FORM' )
+ return p;
+ else if ( !p )
+ return false;
+ else
+ p = p.parentNode;
+ }
}
/**
@@ -465,17 +465,17 @@
function gen_sprite(path, width, height, xpos, ypos)
{
- var image = document.createElement('img');
- image.src = cdnPath + '/images/spacer.gif';
- image.width = String(width);
- image.height = String(height);
- image.style.backgroundImage = 'url(' + path + ')';
- image.style.backgroundRepeat = 'no-repeat';
- xpos = ( xpos == 0 ) ? '0' : '-' + String(xpos);
- ypos = ( ypos == 0 ) ? '0' : '-' + String(ypos);
- image.style.backgroundPosition = ypos + 'px ' + xpos + 'px';
-
- return image;
+ var image = document.createElement('img');
+ image.src = cdnPath + '/images/spacer.gif';
+ image.width = String(width);
+ image.height = String(height);
+ image.style.backgroundImage = 'url(' + path + ')';
+ image.style.backgroundRepeat = 'no-repeat';
+ xpos = ( xpos == 0 ) ? '0' : '-' + String(xpos);
+ ypos = ( ypos == 0 ) ? '0' : '-' + String(ypos);
+ image.style.backgroundPosition = ypos + 'px ' + xpos + 'px';
+
+ return image;
}
/**
@@ -490,103 +490,103 @@
function gen_sprite_html(path, width, height, xpos, ypos)
{
- var html = '
opacEnd) {
- for(i = opacStart; i >= opacEnd; i--) {
- setTimeout("if ( opacityDOMCache["+uniqid+"] ) { var obj = opacityDOMCache["+uniqid+"]; domObjChangeOpac(" + i + ",obj) }",(timer * speed));
- timer++;
- }
- } else if(opacStart < opacEnd) {
- for(i = opacStart; i <= opacEnd; i++)
- {
- setTimeout("if ( opacityDOMCache["+uniqid+"] ) { var obj = opacityDOMCache["+uniqid+"]; domObjChangeOpac(" + i + ",obj); }",(timer * speed));
- timer++;
- }
- }
- setTimeout("delete(opacityDOMCache["+uniqid+"]);",(timer * speed));
+ //determine the direction for the blending, if start and end are the same nothing happens
+ if(opacStart > opacEnd) {
+ for(i = opacStart; i >= opacEnd; i--) {
+ setTimeout("if ( opacityDOMCache["+uniqid+"] ) { var obj = opacityDOMCache["+uniqid+"]; domObjChangeOpac(" + i + ",obj) }",(timer * speed));
+ timer++;
+ }
+ } else if(opacStart < opacEnd) {
+ for(i = opacStart; i <= opacEnd; i++)
+ {
+ setTimeout("if ( opacityDOMCache["+uniqid+"] ) { var obj = opacityDOMCache["+uniqid+"]; domObjChangeOpac(" + i + ",obj); }",(timer * speed));
+ timer++;
+ }
+ }
+ setTimeout("delete(opacityDOMCache["+uniqid+"]);",(timer * speed));
}
function abortFades()
{
- opacityDOMCache = {};
+ opacityDOMCache = {};
}
// change the opacity for different browsers
function changeOpac(opacity, id)
{
- var object = document.getElementById(id);
- return domObjChangeOpac(opacity, object);
+ var object = document.getElementById(id);
+ return domObjChangeOpac(opacity, object);
}
// draw a white ajax-ey "loading" box over an object
function whiteOutElement(el)
{
- var top = $dynano(el).Top();
- var left = $dynano(el).Left();
- var width = $dynano(el).Width();
- var height = $dynano(el).Height();
-
- var blackout = document.createElement('div');
- // using fixed here allows modal windows to be blacked out
- blackout.style.position = ( el.style.position == 'fixed' ) ? 'fixed' : 'absolute';
- blackout.style.top = top + 'px';
- blackout.style.left = left + 'px';
- blackout.style.width = width + 'px';
- blackout.style.height = height + 'px';
-
- blackout.style.backgroundColor = '#FFFFFF';
- domObjChangeOpac(60, blackout);
- var background = ( $dynano(el).Height() < 48 ) ? 'url(' + scriptPath + '/images/loading.gif)' : 'url(' + scriptPath + '/includes/clientside/tinymce/themes/advanced/skins/default/img/progress.gif)';
- blackout.style.backgroundImage = background;
- blackout.style.backgroundPosition = 'center center';
- blackout.style.backgroundRepeat = 'no-repeat';
- blackout.style.zIndex = getHighestZ() + 2;
-
- var body = document.getElementsByTagName('body')[0];
- body.appendChild(blackout);
-
- return blackout;
+ var top = $dynano(el).Top();
+ var left = $dynano(el).Left();
+ var width = $dynano(el).Width();
+ var height = $dynano(el).Height();
+
+ var blackout = document.createElement('div');
+ // using fixed here allows modal windows to be blacked out
+ blackout.style.position = ( el.style.position == 'fixed' ) ? 'fixed' : 'absolute';
+ blackout.style.top = top + 'px';
+ blackout.style.left = left + 'px';
+ blackout.style.width = width + 'px';
+ blackout.style.height = height + 'px';
+
+ blackout.style.backgroundColor = '#FFFFFF';
+ domObjChangeOpac(60, blackout);
+ var background = ( $dynano(el).Height() < 48 ) ? 'url(' + scriptPath + '/images/loading.gif)' : 'url(' + scriptPath + '/includes/clientside/tinymce/themes/advanced/skins/default/img/progress.gif)';
+ blackout.style.backgroundImage = background;
+ blackout.style.backgroundPosition = 'center center';
+ blackout.style.backgroundRepeat = 'no-repeat';
+ blackout.style.zIndex = getHighestZ() + 2;
+
+ var body = document.getElementsByTagName('body')[0];
+ body.appendChild(blackout);
+
+ return blackout;
}
/**
@@ -674,47 +674,47 @@
function whiteOutReportSuccess(whitey, nodestroy_mp)
{
- whiteOutDestroyWithImage(whitey, cdnPath + '/images/check.png', nodestroy_mp);
+ whiteOutDestroyWithImage(whitey, cdnPath + '/images/check.png', nodestroy_mp);
}
function whiteOutReportFailure(whitey, nodestroy_mp)
{
- if ( typeof(nodestroy_mp) == undefined )
- nodestroy_mp = true;
-
- whiteOutDestroyWithImage(whitey, cdnPath + '/images/checkbad.png', nodestroy_mp);
+ if ( typeof(nodestroy_mp) == undefined )
+ nodestroy_mp = true;
+
+ whiteOutDestroyWithImage(whitey, cdnPath + '/images/checkbad.png', nodestroy_mp);
}
function whiteOutDestroyWithImage(whitey, image, nodestroy_mp)
{
- // fade the status indicator in and then out
- whitey.style.backgroundImage = 'url(' + image + ')';
- if ( whitey.isMiniPrompt && !nodestroy_mp )
- {
- setTimeout(function()
- {
- whiteOutDestroyOnMiniPrompt(whitey);
- }, 500);
- return true;
- }
- if ( aclDisableTransitionFX )
- {
- domObjChangeOpac(80, whitey);
- }
- else
- {
- domOpacity(whitey, 60, 80, 500);
- setTimeout(function()
- {
- domOpacity(whitey, 60, 0, 500);
- }, 750);
- }
- setTimeout(function()
- {
- if ( whitey )
- if ( whitey.parentNode )
- whitey.parentNode.removeChild(whitey);
- }, 1250);
+ // fade the status indicator in and then out
+ whitey.style.backgroundImage = 'url(' + image + ')';
+ if ( whitey.isMiniPrompt && !nodestroy_mp )
+ {
+ setTimeout(function()
+ {
+ whiteOutDestroyOnMiniPrompt(whitey);
+ }, 500);
+ return true;
+ }
+ if ( aclDisableTransitionFX )
+ {
+ domObjChangeOpac(80, whitey);
+ }
+ else
+ {
+ domOpacity(whitey, 60, 80, 500);
+ setTimeout(function()
+ {
+ domOpacity(whitey, 60, 0, 500);
+ }, 750);
+ }
+ setTimeout(function()
+ {
+ if ( whitey )
+ if ( whitey.parentNode )
+ whitey.parentNode.removeChild(whitey);
+ }, 1250);
}
/**
@@ -729,144 +729,144 @@
function whiteOutForm(form)
{
- if ( !form.getElementsByTagName )
- return false;
-
- // disable all buttons
- var buttons = form.getElementsByTagName('input');
- for ( var i = 0; i < buttons.length; i++ )
- {
- if ( buttons[i].type == 'button' || buttons[i].type == 'submit' || buttons[i].type == 'image' )
- {
- buttons[i].disabled = 'disabled';
- // ... but also make a hidden element to preserve any flags
- var clone = buttons[i].cloneNode(true);
- clone.type = 'hidden';
- clone.disabled = false;
- console.debug(clone);
- form.appendChild(clone);
- }
- }
- var buttons = form.getElementsByTagName('button');
- for ( var i = 0; i < buttons.length; i++ )
- {
- buttons[i].disabled = 'disabled';
- // ... but also make a hidden element to preserve any flags
- if ( buttons[i].name )
- {
- var clone = document.createElement('input');
- clone.type = 'hidden';
- clone.name = buttons[i].name;
- clone.value = ( buttons[i].value ) ? buttons[i].value : '';
- form.appendChild(clone);
- }
- }
-
- return whiteOutElement(form);
+ if ( !form.getElementsByTagName )
+ return false;
+
+ // disable all buttons
+ var buttons = form.getElementsByTagName('input');
+ for ( var i = 0; i < buttons.length; i++ )
+ {
+ if ( buttons[i].type == 'button' || buttons[i].type == 'submit' || buttons[i].type == 'image' )
+ {
+ buttons[i].disabled = 'disabled';
+ // ... but also make a hidden element to preserve any flags
+ var clone = buttons[i].cloneNode(true);
+ clone.type = 'hidden';
+ clone.disabled = false;
+ console.debug(clone);
+ form.appendChild(clone);
+ }
+ }
+ var buttons = form.getElementsByTagName('button');
+ for ( var i = 0; i < buttons.length; i++ )
+ {
+ buttons[i].disabled = 'disabled';
+ // ... but also make a hidden element to preserve any flags
+ if ( buttons[i].name )
+ {
+ var clone = document.createElement('input');
+ clone.type = 'hidden';
+ clone.name = buttons[i].name;
+ clone.value = ( buttons[i].value ) ? buttons[i].value : '';
+ form.appendChild(clone);
+ }
+ }
+
+ return whiteOutElement(form);
}
// other DHTML functions
function fetch_offset(obj)
{
- var left_offset = obj.offsetLeft;
- var top_offset = obj.offsetTop;
- while ((obj = obj.offsetParent) != null) {
- left_offset += obj.offsetLeft;
- top_offset += obj.offsetTop;
- }
- return { 'left' : left_offset, 'top' : top_offset };
+ var left_offset = obj.offsetLeft;
+ var top_offset = obj.offsetTop;
+ while ((obj = obj.offsetParent) != null) {
+ left_offset += obj.offsetLeft;
+ top_offset += obj.offsetTop;
+ }
+ return { 'left' : left_offset, 'top' : top_offset };
}
function fetch_dimensions(o) {
- var w = o.offsetWidth;
- var h = o.offsetHeight;
- return { 'w' : w, 'h' : h };
+ var w = o.offsetWidth;
+ var h = o.offsetHeight;
+ return { 'w' : w, 'h' : h };
}
function findParentForm(o)
{
- if ( o.tagName == 'FORM' )
- return o;
- while(true)
- {
- o = o.parentNode;
- if ( !o )
- return false;
- if ( o.tagName == 'FORM' )
- return o;
- }
- return false;
+ if ( o.tagName == 'FORM' )
+ return o;
+ while(true)
+ {
+ o = o.parentNode;
+ if ( !o )
+ return false;
+ if ( o.tagName == 'FORM' )
+ return o;
+ }
+ return false;
}
function bannerOn(text)
{
- darken(true);
- var thediv = document.createElement('div');
- thediv.className = 'mdg-comment';
- thediv.style.padding = '0';
- thediv.style.marginLeft = '0';
- thediv.style.position = 'absolute';
- thediv.style.display = 'none';
- thediv.style.padding = '4px';
- thediv.style.fontSize = '14pt';
- thediv.id = 'mdgDynamic_bannerDiv_'+Math.floor(Math.random() * 1000000);
- thediv.innerHTML = text;
-
- var body = document.getElementsByTagName('body');
- body = body[0];
- body.appendChild(thediv);
- body.style.cursor = 'wait';
-
- thediv.style.display = 'block';
- dim = fetch_dimensions(thediv);
- thediv.style.display = 'none';
- bdim = { 'w' : getWidth(), 'h' : getHeight() };
- so = getScrollOffset();
-
- var left = (bdim['w'] / 2) - ( dim['w'] / 2 );
-
- var top = (bdim['h'] / 2);
- top = top - ( dim['h'] / 2 );
-
- top = top + so;
-
- thediv.style.top = top + 'px';
- thediv.style.left = left + 'px';
-
- thediv.style.display = 'block';
-
- return thediv.id;
+ darken(true);
+ var thediv = document.createElement('div');
+ thediv.className = 'mdg-comment';
+ thediv.style.padding = '0';
+ thediv.style.marginLeft = '0';
+ thediv.style.position = 'absolute';
+ thediv.style.display = 'none';
+ thediv.style.padding = '4px';
+ thediv.style.fontSize = '14pt';
+ thediv.id = 'mdgDynamic_bannerDiv_'+Math.floor(Math.random() * 1000000);
+ thediv.innerHTML = text;
+
+ var body = document.getElementsByTagName('body');
+ body = body[0];
+ body.appendChild(thediv);
+ body.style.cursor = 'wait';
+
+ thediv.style.display = 'block';
+ dim = fetch_dimensions(thediv);
+ thediv.style.display = 'none';
+ bdim = { 'w' : getWidth(), 'h' : getHeight() };
+ so = getScrollOffset();
+
+ var left = (bdim['w'] / 2) - ( dim['w'] / 2 );
+
+ var top = (bdim['h'] / 2);
+ top = top - ( dim['h'] / 2 );
+
+ top = top + so;
+
+ thediv.style.top = top + 'px';
+ thediv.style.left = left + 'px';
+
+ thediv.style.display = 'block';
+
+ return thediv.id;
}
function bannerOff(id)
{
- e = document.getElementById(id);
- if(!e) return;
- e.innerHTML = '';
- e.style.display = 'none';
- var body = document.getElementsByTagName('body');
- body = body[0];
- body.style.cursor = 'default';
- enlighten(true);
+ e = document.getElementById(id);
+ if(!e) return;
+ e.innerHTML = '';
+ e.style.display = 'none';
+ var body = document.getElementsByTagName('body');
+ body = body[0];
+ body.style.cursor = 'default';
+ enlighten(true);
}
function disableUnload(message)
{
- if(typeof message != 'string') message = 'You may want to save your changes first.';
- window._unloadmsg = message;
- window.onbeforeunload = function(e)
- {
- if ( !e )
- e = window.event;
- e.returnValue = window._unloadmsg;
- }
+ if(typeof message != 'string') message = 'You may want to save your changes first.';
+ window._unloadmsg = message;
+ window.onbeforeunload = function(e)
+ {
+ if ( !e )
+ e = window.event;
+ e.returnValue = window._unloadmsg;
+ }
}
function enableUnload()
{
- window._unloadmsg = null;
- window.onbeforeunload = null;
+ window._unloadmsg = null;
+ window.onbeforeunload = null;
}
/**
@@ -875,69 +875,69 @@
*/
function getHighestZ()
{
- z = 0;
- var divs = document.getElementsByTagName('div');
- for(var i = 0; i < divs.length; i++)
- {
- if ( divs[i].style.zIndex > z && divs[i].style.display != 'none' )
- z = divs[i].style.zIndex;
- }
- return parseInt(z);
+ z = 0;
+ var divs = document.getElementsByTagName('div');
+ for(var i = 0; i < divs.length; i++)
+ {
+ if ( divs[i].style.zIndex > z && divs[i].style.display != 'none' )
+ z = divs[i].style.zIndex;
+ }
+ return parseInt(z);
}
var shift = false;
function isKeyPressed(event)
{
- if (event.shiftKey==1)
- {
- shift = true;
- }
- else
- {
- shift = false;
- }
+ if (event.shiftKey==1)
+ {
+ shift = true;
+ }
+ else
+ {
+ shift = false;
+ }
}
function moveDiv(div, newparent)
{
- var backup = div;
- var oldparent = div.parentNode;
- oldparent.removeChild(div);
- newparent.appendChild(backup);
+ var backup = div;
+ var oldparent = div.parentNode;
+ oldparent.removeChild(div);
+ newparent.appendChild(backup);
}
var busyBannerID;
function goBusy(msg)
{
- if(!msg) msg = 'Please wait...';
- body = document.getElementsByTagName('body');
- body = body[0];
- body.style.cursor = 'wait';
- busyBannerID = bannerOn(msg);
+ if(!msg) msg = 'Please wait...';
+ body = document.getElementsByTagName('body');
+ body = body[0];
+ body.style.cursor = 'wait';
+ busyBannerID = bannerOn(msg);
}
function unBusy()
{
- body = document.getElementsByTagName('body');
- body = body[0];
- body.style.cursor = 'default';
- bannerOff(busyBannerID);
+ body = document.getElementsByTagName('body');
+ body = body[0];
+ body.style.cursor = 'default';
+ bannerOff(busyBannerID);
}
function setAjaxLoading()
{
- if ( document.getElementById('ajaxloadicon') )
- {
- document.getElementById('ajaxloadicon').src=ajax_load_icon;
- }
+ if ( document.getElementById('ajaxloadicon') )
+ {
+ document.getElementById('ajaxloadicon').src=ajax_load_icon;
+ }
}
function unsetAjaxLoading()
{
- if ( document.getElementById('ajaxloadicon') )
- {
- document.getElementById('ajaxloadicon').src=cdnPath + '/images/spacer.gif';
- }
+ if ( document.getElementById('ajaxloadicon') )
+ {
+ document.getElementById('ajaxloadicon').src=cdnPath + '/images/spacer.gif';
+ }
}
function readCookie(name) {var nameEQ = name + "=";var ca = document.cookie.split(';');for(var i=0;i < ca.length;i++){var c = ca[i];while (c.charAt(0)==' ') c = c.substring(1,c.length);if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);}return null;}
@@ -952,7 +952,7 @@
// Included only for API-compatibility
function ajaxPromptAdminAuth(call_on_ok, level)
{
- ajaxLoginInit(call_on_ok, level);
+ ajaxLoginInit(call_on_ok, level);
}
/**
@@ -964,22 +964,22 @@
function insertAfter(parent, baby, bigsister)
{
- try
- {
- if ( parent.childNodes[parent.childNodes.length-1] == bigsister )
- parent.appendChild(baby);
- else
- parent.insertBefore(baby, bigsister.nextSibling);
- }
- catch(e)
- {
- alert(e.toString());
- if ( window.console )
- {
- // Firebug support
- window.console.warn(e);
- }
- }
+ try
+ {
+ if ( parent.childNodes[parent.childNodes.length-1] == bigsister )
+ parent.appendChild(baby);
+ else
+ parent.insertBefore(baby, bigsister.nextSibling);
+ }
+ catch(e)
+ {
+ alert(e.toString());
+ if ( window.console )
+ {
+ // Firebug support
+ window.console.warn(e);
+ }
+ }
}
/**
@@ -990,7 +990,7 @@
function validateEmail(email)
{
- return ( email.match(/^(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*@[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*|(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[^()<>@,;:".\\\[\]\x80-\xff\000-\010\012-\037]*(?:(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[^()<>@,;:".\\\[\]\x80-\xff\000-\010\012-\037]*)*<[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:@[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*(?:,[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*@[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*)*:[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)?(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*@[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*>)$/) ) ? true : false;
+ return ( email.match(/^(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*@[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*|(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[^()<>@,;:".\\\[\]\x80-\xff\000-\010\012-\037]*(?:(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[^()<>@,;:".\\\[\]\x80-\xff\000-\010\012-\037]*)*<[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:@[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*(?:,[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*@[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*)*:[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)?(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*@[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*>)$/) ) ? true : false;
}
/**
@@ -1001,8 +1001,8 @@
function validateUsername(username)
{
- var regex = new RegExp('^[^<>&\?\'"%\n\r/]+$', '');
- return ( username.match(regex) ) ? true : false;
+ var regex = new RegExp('^[^<>&\?\'"%\n\r/]+$', '');
+ return ( username.match(regex) ) ? true : false;
}
/*
@@ -1010,29 +1010,29 @@
*/
function getHeight() {
- var myHeight = 0;
- if( typeof( window.innerWidth ) == 'number' ) {
- myHeight = window.innerHeight;
- } else if( document.documentElement &&
- ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
- myHeight = document.documentElement.clientHeight;
- } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
- myHeight = document.body.clientHeight;
- }
- return myHeight;
+ var myHeight = 0;
+ if( typeof( window.innerWidth ) == 'number' ) {
+ myHeight = window.innerHeight;
+ } else if( document.documentElement &&
+ ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
+ myHeight = document.documentElement.clientHeight;
+ } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
+ myHeight = document.body.clientHeight;
+ }
+ return myHeight;
}
function getWidth() {
- var myWidth = 0;
- if( typeof( window.innerWidth ) == 'number' ) {
- myWidth = window.innerWidth;
- } else if( document.documentElement &&
- ( document.documentElement.clientWidth || document.documentElement.clientWidth ) ) {
- myWidth = document.documentElement.clientWidth;
- } else if( document.body && ( document.body.clientWidth || document.body.clientWidth ) ) {
- myWidth = document.body.clientWidth;
- }
- return myWidth;
+ var myWidth = 0;
+ if( typeof( window.innerWidth ) == 'number' ) {
+ myWidth = window.innerWidth;
+ } else if( document.documentElement &&
+ ( document.documentElement.clientWidth || document.documentElement.clientWidth ) ) {
+ myWidth = document.documentElement.clientWidth;
+ } else if( document.body && ( document.body.clientWidth || document.body.clientWidth ) ) {
+ myWidth = document.body.clientWidth;
+ }
+ return myWidth;
}
/**
@@ -1043,45 +1043,45 @@
function sanitize_page_id(page_id)
{
- // Remove character escapes
- page_id = dirtify_page_id(page_id);
+ // Remove character escapes
+ page_id = dirtify_page_id(page_id);
- var regex = new RegExp('[A-Za-z0-9\\[\\]\./:;\(\)@_-]', 'g');
- pid_clean = page_id.replace(regex, 'X');
- var pid_dirty = [];
- for ( var i = 0; i < pid_clean.length; i++ )
- pid_dirty[i] = pid_clean.substr(i, 1);
+ var regex = new RegExp('[A-Za-z0-9\\[\\]\./:;\(\)@_-]', 'g');
+ pid_clean = page_id.replace(regex, 'X');
+ var pid_dirty = [];
+ for ( var i = 0; i < pid_clean.length; i++ )
+ pid_dirty[i] = pid_clean.substr(i, 1);
- for ( var i = 0; i < pid_dirty.length; i++ )
- {
- var chr = pid_dirty[i];
- if ( chr == 'X' )
- continue;
- var cid = chr.charCodeAt(0);
- cid = cid.toString(16).toUpperCase();
- if ( cid.length < 2 )
- {
- cid = '0' + cid;
- }
- pid_dirty[i] = "." + cid;
- }
-
- var pid_chars = [];
- for ( var i = 0; i < page_id.length; i++ )
- pid_chars[i] = page_id.substr(i, 1);
-
- var page_id_cleaned = '';
+ for ( var i = 0; i < pid_dirty.length; i++ )
+ {
+ var chr = pid_dirty[i];
+ if ( chr == 'X' )
+ continue;
+ var cid = chr.charCodeAt(0);
+ cid = cid.toString(16).toUpperCase();
+ if ( cid.length < 2 )
+ {
+ cid = '0' + cid;
+ }
+ pid_dirty[i] = "." + cid;
+ }
+
+ var pid_chars = [];
+ for ( var i = 0; i < page_id.length; i++ )
+ pid_chars[i] = page_id.substr(i, 1);
+
+ var page_id_cleaned = '';
- for ( var id in pid_chars )
- {
- var chr = pid_chars[id];
- if ( pid_dirty[id] == 'X' )
- page_id_cleaned += chr;
- else
- page_id_cleaned += pid_dirty[id];
- }
-
- return page_id_cleaned;
+ for ( var id in pid_chars )
+ {
+ var chr = pid_chars[id];
+ if ( pid_dirty[id] == 'X' )
+ page_id_cleaned += chr;
+ else
+ page_id_cleaned += pid_dirty[id];
+ }
+
+ return page_id_cleaned;
}
/**
@@ -1092,64 +1092,64 @@
function dirtify_page_id(page_id)
{
- // First, replace spaces with underscores
- page_id = page_id.replace(/ /g, '_');
+ // First, replace spaces with underscores
+ page_id = page_id.replace(/ /g, '_');
- var matches = page_id.match(/\.[A-Fa-f0-9][A-Fa-f0-9]/g);
-
- if ( matches != null )
- {
- for ( var i = 0; i < matches.length; i++ )
- {
- var match = matches[i];
- var byt = (match.substr(1)).toUpperCase();
- var code = eval("0x" + byt);
- var regex = new RegExp('\\.' + byt, 'g');
- page_id = page_id.replace(regex, String.fromCharCode(code));
- }
- }
-
- return page_id;
+ var matches = page_id.match(/\.[A-Fa-f0-9][A-Fa-f0-9]/g);
+
+ if ( matches != null )
+ {
+ for ( var i = 0; i < matches.length; i++ )
+ {
+ var match = matches[i];
+ var byt = (match.substr(1)).toUpperCase();
+ var code = eval("0x" + byt);
+ var regex = new RegExp('\\.' + byt, 'g');
+ page_id = page_id.replace(regex, String.fromCharCode(code));
+ }
+ }
+
+ return page_id;
}
/*
- the getElementsByClassName function I pilfered from this guy. It's
- a useful function that'll return any/all tags with a specific css class.
+ the getElementsByClassName function I pilfered from this guy. It's
+ a useful function that'll return any/all tags with a specific css class.
- Written by Jonathan Snook, http://www.snook.ca/jonathan
- Add-ons by Robert Nyman, http://www.robertnyman.com
-
- Modified to match all elements that match the class name plus an integer after the name
- This is used in Enano to allow sliding sidebar widgets that use their own CSS
+ Written by Jonathan Snook, http://www.snook.ca/jonathan
+ Add-ons by Robert Nyman, http://www.robertnyman.com
+
+ Modified to match all elements that match the class name plus an integer after the name
+ This is used in Enano to allow sliding sidebar widgets that use their own CSS
*/
function getElementsByClassName(oElm, strTagName, strClassName)
{
- // first it gets all of the specified tags
- var arrElements = (strTagName == "*" && document.all) ? document.all : oElm.getElementsByTagName(strTagName);
-
- // then it sets up an array that'll hold the results
- var arrReturnElements = new Array();
+ // first it gets all of the specified tags
+ var arrElements = (strTagName == "*" && document.all) ? document.all : oElm.getElementsByTagName(strTagName);
+
+ // then it sets up an array that'll hold the results
+ var arrReturnElements = new Array();
- // some regex stuff you don't need to worry about
- strClassName = strClassName.replace(/\-/g, "\\-");
+ // some regex stuff you don't need to worry about
+ strClassName = strClassName.replace(/\-/g, "\\-");
- var oRegExp = new RegExp("(^|\\s)" + strClassName + "([0-9]*)(\\s|$)");
- var oElement;
-
- // now it iterates through the elements it grabbed above
- for(var i=0; i'; - } - - // Create the form - var form = document.createElement('form'); - form.action = 'javascript:void(ajaxLoginSubmitForm());'; - form.onsubmit = function() - { - ajaxLoginSubmitForm(); - return false; - } - if ( IE ) - { - form.style.marginTop = '-20px'; - } - - // Using tables to wrap form elements because it results in a - // more visually appealing form. Yes, tables suck. I don't really - // care - they make forms look good. - - var table = document.createElement('table'); - table.style.margin = '0 auto'; - - // Field - username - var tr1 = document.createElement('tr'); - var td1_1 = document.createElement('td'); - td1_1.appendChild(document.createTextNode($lang.get('user_login_field_username') + ':')); - tr1.appendChild(td1_1); - var td1_2 = document.createElement('td'); - var f_username = document.createElement('input'); - f_username.id = 'ajax_login_field_username'; - f_username.name = 'ajax_login_field_username'; - f_username.type = 'text'; - f_username.size = '25'; - if ( data.username ) - f_username.value = data.username; - td1_2.appendChild(f_username); - tr1.appendChild(td1_2); - table.appendChild(tr1); - - // Field - password - var tr2 = document.createElement('tr'); - var td2_1 = document.createElement('td'); - td2_1.appendChild(document.createTextNode($lang.get('user_login_field_password') + ':')); - tr2.appendChild(td2_1); - var td2_2 = document.createElement('td'); - var f_password = document.createElement('input'); - f_password.id = 'ajax_login_field_password'; - f_password.name = 'ajax_login_field_username'; - f_password.type = 'password'; - f_password.size = '25'; - if ( !show_captcha ) - { - f_password.onkeyup = function(e) - { - if ( !e ) - e = window.event; - if ( !e && IE ) - return true; - if ( e.keyCode == 13 ) - { - ajaxLoginSubmitForm(); - } - } - } - td2_2.appendChild(f_password); - tr2.appendChild(td2_2); - table.appendChild(tr2); - - // Field - captcha - if ( show_captcha ) - { - var tr3 = document.createElement('tr'); - var td3_1 = document.createElement('td'); - td3_1.appendChild(document.createTextNode($lang.get('user_login_field_captcha') + ':')); - tr3.appendChild(td3_1); - var td3_2 = document.createElement('td'); - var f_captcha = document.createElement('input'); - f_captcha.id = 'ajax_login_field_captcha'; - f_captcha.name = 'ajax_login_field_username'; - f_captcha.type = 'text'; - f_captcha.size = '25'; - f_captcha.onkeyup = function(e) - { - if ( !e ) - e = window.event; - if ( !e.keyCode ) - return true; - if ( e.keyCode == 13 ) - { - ajaxLoginSubmitForm(); - } - } - td3_2.appendChild(f_captcha); - tr3.appendChild(td3_2); - table.appendChild(tr3); - } - - // ok, this is a compatibility hack - data.locked_out = { locked_out: data.lockout.active }; - - // hook for the login form - eval(setHook('login_build_form')); - - delete(data.locked_out); - - // Done building the main part of the form - form.appendChild(table); - - // Checkbox container - var boxen = document.createElement('div'); - boxen.style.textAlign = 'center'; - boxen.style.padding = '7px 0'; - - // Field: remember login - if ( logindata.user_level <= USER_LEVEL_MEMBER ) - { - var lbl_remember = document.createElement('label'); - lbl_remember.style.fontSize = 'smaller'; - lbl_remember.style.textAlign = 'center'; - - // figure out what text to put in the "remember me" checkbox - // infinite session length? - if ( data.extended_time == 0 ) - { - // yes, infinite - var txt_remember = $lang.get('user_login_ajax_check_remember_infinite'); - } - else - { - if ( data.extended_time % 7 == 0 ) - { - // number of days is a multiple of 7 - // use weeks as our unit - var sess_time = data.extended_time / 7; - var unit = 'week'; - } - else - { - // use days as our unit - var sess_time = data.extended_time; - var unit = 'day'; - } - // more than one week or day? - if ( sess_time != 1 ) - unit += 's'; - - // assemble the string - var txt_remember = $lang.get('user_login_ajax_check_remember', { - session_length: sess_time, - length_units: $lang.get('etc_unit_' + unit) - }); - } - var check_remember = document.createElement('input'); - check_remember.type = 'checkbox'; - // this onclick attribute changes the cookie whenever the checkbox or label is clicked - check_remember.setAttribute('onclick', 'var ck = ( this.checked ) ? "enable" : "disable"; createCookie("login_remember", ck, 3650);'); - if ( readCookie('login_remember') != 'disable' ) - check_remember.setAttribute('checked', 'checked'); - check_remember.id = 'ajax_login_field_remember'; - lbl_remember.appendChild(check_remember); - lbl_remember.innerHTML += ' ' + txt_remember; - - boxen.appendChild(lbl_remember); - } - - var bullet = document.createElement('span'); - bullet.innerHTML = ' '; - bullet.style.fontSize = '12pt'; - bullet.style.borderRight = '1px solid #aaa'; - bullet.style.margin = '0 6px 0 4px'; - - // Field: enable Diffie Hellman - if ( ajax_login_prevent_dh ) - { - if ( logindata.user_level <= USER_LEVEL_MEMBER ) - // only show this if both checkboxes are visible - boxen.appendChild(bullet); - - var lbl_dh = document.createElement('span'); - lbl_dh.style.fontSize = 'smaller'; - lbl_dh.style.textAlign = 'center'; - lbl_dh.innerHTML = $lang.get('user_login_ajax_check_dh_ie'); - boxen.appendChild(lbl_dh); - } - else if ( !data.crypto.dh_enable ) - { - // create hidden control - server requested that DiffieHellman be disabled (usually means not supported) - var check_dh = document.createElement('input'); - check_dh.type = 'hidden'; - check_dh.id = 'ajax_login_field_dh'; - boxen.appendChild(check_dh); - } - else - { - if ( logindata.user_level <= USER_LEVEL_MEMBER ) - // only show this if both checkboxes are visible - boxen.appendChild(bullet); - - var lbl_dh = document.createElement('label'); - lbl_dh.style.fontSize = 'smaller'; - lbl_dh.style.textAlign = 'center'; - var check_dh = document.createElement('input'); - check_dh.type = 'checkbox'; - // this onclick attribute changes the cookie whenever the checkbox or label is clicked - check_dh.setAttribute('onclick', 'var ck = ( this.checked ) ? "enable" : "disable"; createCookie("diffiehellman_login", ck, 3650);'); - if ( readCookie('diffiehellman_login') != 'disable' ) - check_dh.setAttribute('checked', 'checked'); - check_dh.id = 'ajax_login_field_dh'; - lbl_dh.appendChild(check_dh); - lbl_dh.innerHTML += ' ' + $lang.get('user_login_ajax_check_dh'); - boxen.appendChild(lbl_dh); - } - - form.appendChild(boxen); - - if ( IE ) - { - div.innerHTML += form.outerHTML; - } - else - { - div.appendChild(form); - } - - // Diagnostic / help links - // (only displayed in login, not in re-auth) - if ( logindata.user_level == USER_LEVEL_MEMBER ) - { - var links = document.createElement('small'); - links.style.display = 'block'; - links.style.textAlign = 'center'; - links.innerHTML = ''; - if ( !show_captcha ) - links.innerHTML += $lang.get('user_login_ajax_link_fullform', { link_full_form: makeUrlNS('Special', 'Login/' + title) }) + ' • '; - // Always shown - links.innerHTML += $lang.get('user_login_ajax_link_forgotpass', { forgotpass_link: makeUrlNS('Special', 'PasswordReset') }) + ' • '; - if ( !show_captcha ) - links.innerHTML += $lang.get('user_login_ajax_createaccount_blurb', { reg_link: makeUrlNS('Special', 'Register') }); - div.appendChild(links); - } - - // Insert the entire form into the login window - logindata.mb_inner.innerHTML = ''; - logindata.mb_inner.appendChild(div); - - // Post operations: field focus - setTimeout( - function() - { - if ( logindata.loggedin_username ) - document.getElementById('ajax_login_field_password').focus(); - else - document.getElementById('ajax_login_field_username').focus(); - }, 750); - - // Post operations: show captcha window - if ( show_captcha ) - { - ajaxShowCaptcha(show_captcha); - } - - // Post operations: stash encryption keys and All That Jazz(TM) - logindata.key_aes = data.crypto.aes_key; - logindata.key_dh = data.crypto.dh_public_key; - logindata.captcha_hash = show_captcha; - logindata.loggedin_username = data.username; - - // If policy is lockout, also disable controls - if ( data.lockout.policy == 'lockout' && data.lockout.active ) - { - f_username.setAttribute('disabled', 'disabled'); - f_password.setAttribute('disabled', 'disabled'); - } + // let's hope this effectively preloads the image... + var _1 = document.createElement('img'); + _1.src = ( ajax_login_successimg_path ) ? ajax_login_successimg_path : scriptPath + '/images/check.png'; + var _2 = document.createElement('img'); + _2.src = ( ajax_login_lockimg_path ) ? ajax_login_lockimg_path : scriptPath + '/images/lock48.png'; + + var div = document.createElement('div'); + div.id = 'ajax_login_form'; + + var show_captcha = ( data.lockout.active && data.lockout.policy == 'captcha' ) ? data.lockout.captcha : false; + + // text displayed on re-auth + if ( logindata.user_level > USER_LEVEL_MEMBER ) + { + div.innerHTML += $lang.get('user_login_ajax_prompt_body_elev') + '
'; + } + + // Create the form + var form = document.createElement('form'); + form.action = 'javascript:void(ajaxLoginSubmitForm());'; + form.onsubmit = function() + { + ajaxLoginSubmitForm(); + return false; + } + if ( IE ) + { + form.style.marginTop = '-20px'; + } + + // Using tables to wrap form elements because it results in a + // more visually appealing form. Yes, tables suck. I don't really + // care - they make forms look good. + + var table = document.createElement('table'); + table.style.margin = '0 auto'; + + // Field - username + var tr1 = document.createElement('tr'); + var td1_1 = document.createElement('td'); + td1_1.appendChild(document.createTextNode($lang.get('user_login_field_username') + ':')); + tr1.appendChild(td1_1); + var td1_2 = document.createElement('td'); + var f_username = document.createElement('input'); + f_username.id = 'ajax_login_field_username'; + f_username.name = 'ajax_login_field_username'; + f_username.type = 'text'; + f_username.size = '25'; + if ( data.username ) + f_username.value = data.username; + td1_2.appendChild(f_username); + tr1.appendChild(td1_2); + table.appendChild(tr1); + + // Field - password + var tr2 = document.createElement('tr'); + var td2_1 = document.createElement('td'); + td2_1.appendChild(document.createTextNode($lang.get('user_login_field_password') + ':')); + tr2.appendChild(td2_1); + var td2_2 = document.createElement('td'); + var f_password = document.createElement('input'); + f_password.id = 'ajax_login_field_password'; + f_password.name = 'ajax_login_field_username'; + f_password.type = 'password'; + f_password.size = '25'; + if ( !show_captcha ) + { + f_password.onkeyup = function(e) + { + if ( !e ) + e = window.event; + if ( !e && IE ) + return true; + if ( e.keyCode == 13 ) + { + ajaxLoginSubmitForm(); + } + } + } + td2_2.appendChild(f_password); + tr2.appendChild(td2_2); + table.appendChild(tr2); + + // Field - captcha + if ( show_captcha ) + { + var tr3 = document.createElement('tr'); + var td3_1 = document.createElement('td'); + td3_1.appendChild(document.createTextNode($lang.get('user_login_field_captcha') + ':')); + tr3.appendChild(td3_1); + var td3_2 = document.createElement('td'); + var f_captcha = document.createElement('input'); + f_captcha.id = 'ajax_login_field_captcha'; + f_captcha.name = 'ajax_login_field_username'; + f_captcha.type = 'text'; + f_captcha.size = '25'; + f_captcha.onkeyup = function(e) + { + if ( !e ) + e = window.event; + if ( !e.keyCode ) + return true; + if ( e.keyCode == 13 ) + { + ajaxLoginSubmitForm(); + } + } + td3_2.appendChild(f_captcha); + tr3.appendChild(td3_2); + table.appendChild(tr3); + } + + // ok, this is a compatibility hack + data.locked_out = { locked_out: data.lockout.active }; + + // hook for the login form + eval(setHook('login_build_form')); + + delete(data.locked_out); + + // Done building the main part of the form + form.appendChild(table); + + // Checkbox container + var boxen = document.createElement('div'); + boxen.style.textAlign = 'center'; + boxen.style.padding = '7px 0'; + + // Field: remember login + if ( logindata.user_level <= USER_LEVEL_MEMBER ) + { + var lbl_remember = document.createElement('label'); + lbl_remember.style.fontSize = 'smaller'; + lbl_remember.style.textAlign = 'center'; + + // figure out what text to put in the "remember me" checkbox + // infinite session length? + if ( data.extended_time == 0 ) + { + // yes, infinite + var txt_remember = $lang.get('user_login_ajax_check_remember_infinite'); + } + else + { + if ( data.extended_time % 7 == 0 ) + { + // number of days is a multiple of 7 + // use weeks as our unit + var sess_time = data.extended_time / 7; + var unit = 'week'; + } + else + { + // use days as our unit + var sess_time = data.extended_time; + var unit = 'day'; + } + // more than one week or day? + if ( sess_time != 1 ) + unit += 's'; + + // assemble the string + var txt_remember = $lang.get('user_login_ajax_check_remember', { + session_length: sess_time, + length_units: $lang.get('etc_unit_' + unit) + }); + } + var check_remember = document.createElement('input'); + check_remember.type = 'checkbox'; + // this onclick attribute changes the cookie whenever the checkbox or label is clicked + check_remember.setAttribute('onclick', 'var ck = ( this.checked ) ? "enable" : "disable"; createCookie("login_remember", ck, 3650);'); + if ( readCookie('login_remember') != 'disable' ) + check_remember.setAttribute('checked', 'checked'); + check_remember.id = 'ajax_login_field_remember'; + lbl_remember.appendChild(check_remember); + lbl_remember.innerHTML += ' ' + txt_remember; + + boxen.appendChild(lbl_remember); + } + + var bullet = document.createElement('span'); + bullet.innerHTML = ' '; + bullet.style.fontSize = '12pt'; + bullet.style.borderRight = '1px solid #aaa'; + bullet.style.margin = '0 6px 0 4px'; + + // Field: enable Diffie Hellman + if ( ajax_login_prevent_dh ) + { + if ( logindata.user_level <= USER_LEVEL_MEMBER ) + // only show this if both checkboxes are visible + boxen.appendChild(bullet); + + var lbl_dh = document.createElement('span'); + lbl_dh.style.fontSize = 'smaller'; + lbl_dh.style.textAlign = 'center'; + lbl_dh.innerHTML = $lang.get('user_login_ajax_check_dh_ie'); + boxen.appendChild(lbl_dh); + } + else if ( !data.crypto.dh_enable ) + { + // create hidden control - server requested that DiffieHellman be disabled (usually means not supported) + var check_dh = document.createElement('input'); + check_dh.type = 'hidden'; + check_dh.id = 'ajax_login_field_dh'; + boxen.appendChild(check_dh); + } + else + { + if ( logindata.user_level <= USER_LEVEL_MEMBER ) + // only show this if both checkboxes are visible + boxen.appendChild(bullet); + + var lbl_dh = document.createElement('label'); + lbl_dh.style.fontSize = 'smaller'; + lbl_dh.style.textAlign = 'center'; + var check_dh = document.createElement('input'); + check_dh.type = 'checkbox'; + // this onclick attribute changes the cookie whenever the checkbox or label is clicked + check_dh.setAttribute('onclick', 'var ck = ( this.checked ) ? "enable" : "disable"; createCookie("diffiehellman_login", ck, 3650);'); + if ( readCookie('diffiehellman_login') != 'disable' ) + check_dh.setAttribute('checked', 'checked'); + check_dh.id = 'ajax_login_field_dh'; + lbl_dh.appendChild(check_dh); + lbl_dh.innerHTML += ' ' + $lang.get('user_login_ajax_check_dh'); + boxen.appendChild(lbl_dh); + } + + form.appendChild(boxen); + + if ( IE ) + { + div.innerHTML += form.outerHTML; + } + else + { + div.appendChild(form); + } + + // Diagnostic / help links + // (only displayed in login, not in re-auth) + if ( logindata.user_level == USER_LEVEL_MEMBER ) + { + var links = document.createElement('small'); + links.style.display = 'block'; + links.style.textAlign = 'center'; + links.innerHTML = ''; + if ( !show_captcha ) + links.innerHTML += $lang.get('user_login_ajax_link_fullform', { link_full_form: makeUrlNS('Special', 'Login/' + title) }) + ' • '; + // Always shown + links.innerHTML += $lang.get('user_login_ajax_link_forgotpass', { forgotpass_link: makeUrlNS('Special', 'PasswordReset') }) + ' • '; + if ( !show_captcha ) + links.innerHTML += $lang.get('user_login_ajax_createaccount_blurb', { reg_link: makeUrlNS('Special', 'Register') }); + div.appendChild(links); + } + + // Insert the entire form into the login window + logindata.mb_inner.innerHTML = ''; + logindata.mb_inner.appendChild(div); + + // Post operations: field focus + setTimeout( + function() + { + if ( logindata.loggedin_username ) + document.getElementById('ajax_login_field_password').focus(); + else + document.getElementById('ajax_login_field_username').focus(); + }, 750); + + // Post operations: show captcha window + if ( show_captcha ) + { + ajaxShowCaptcha(show_captcha); + } + + // Post operations: stash encryption keys and All That Jazz(TM) + logindata.key_aes = data.crypto.aes_key; + logindata.key_dh = data.crypto.dh_public_key; + logindata.captcha_hash = show_captcha; + logindata.loggedin_username = data.username; + + // If policy is lockout, also disable controls + if ( data.lockout.policy == 'lockout' && data.lockout.active ) + { + f_username.setAttribute('disabled', 'disabled'); + f_password.setAttribute('disabled', 'disabled'); + } } window.ajaxLoginSubmitForm = function(real, username, password, captcha, remember) { - // Perform AES test to make sure it's all working - if ( !aes_self_test() ) - { - alert('BUG: AES self-test failed'); - login_cache.mb_object.destroy(); - return false; - } - // Hide the error message and captcha - if ( document.getElementById('ajax_login_error_box') ) - { - document.getElementById('ajax_login_error_box').parentNode.removeChild(document.getElementById('ajax_login_error_box')); - } - if ( document.getElementById('autoCaptcha') ) - { - var to = fly_out_top(document.getElementById('autoCaptcha'), false, true); - setTimeout(function() { - var d = document.getElementById('autoCaptcha'); - d.parentNode.removeChild(d); - }, to); - } - // "Remember session" switch - if ( typeof(remember) == 'boolean' ) - { - var remember_session = remember; - } - else - { - if ( document.getElementById('ajax_login_field_remember') ) - { - var remember_session = ( document.getElementById('ajax_login_field_remember').checked ) ? true : false; - } - else - { - var remember_session = false; - } - } - // Encryption: preprocessor - if ( real ) - { - var do_dh = true; - } - else if ( document.getElementById('ajax_login_field_dh') ) - { - var do_dh = document.getElementById('ajax_login_field_dh').checked; - } - else - { - if ( ajax_login_prevent_dh ) - { - // IE/MobileSafari doesn't have this control, continue silently IF the rest - // of the login form is there - if ( !document.getElementById('ajax_login_field_username') ) - { - return false; - } - } - else - { - // The user probably clicked ok when the form wasn't in there. - return false; - } - } - - if ( typeof(username) != 'string' ) - { - var username = document.getElementById('ajax_login_field_username').value; - } - if ( typeof(password) != 'string' ) - { - var password = document.getElementById('ajax_login_field_password').value; - } - if ( !captcha && document.getElementById('ajax_login_field_captcha') ) - { - var captcha = document.getElementById('ajax_login_field_captcha').value; - } - - // Only run early submit hook once - if ( !window.logindata.early_submit_run ) - eval(setHook('login_submit_early')); - - window.logindata.early_submit_run = true; - - try - { - - if ( do_dh ) - { - ajaxLoginSetStatus(AJAX_STATUS_GENERATING_KEY); - if ( !real ) - { - // Wait while the browser updates the login window - setTimeout(function() - { - ajaxLoginSubmitForm(true, username, password, captcha, remember_session); - }, 20); - return true; - } - var dh_start = (new Date()).getTime(); - // Perform Diffie Hellman stuff - var dh_priv = dh_gen_private(); - var dh_pub = dh_gen_public(dh_priv); - var secret = dh_gen_shared_secret(dh_priv, logindata.key_dh); - // secret_hash is used to verify that the server guesses the correct secret - var secret_hash = hex_sha1(secret); - // crypt_key is the actual AES key - var crypt_key = (hex_sha256(secret)).substr(0, (keySizeInBits / 4)); - var dh_time = (new Date()).getTime() - dh_start; - console.debug("DH: complete, time = %dms", dh_time); - } - else - { - var crypt_key = logindata.key_aes; - } - - ajaxLoginSetStatus(AJAX_STATUS_LOGGING_IN); - - // Encrypt the password and username - var userinfo = { - username: username, - password: password - }; - - eval(setHook('login_build_userinfo')); - - userinfo = toJSONString(userinfo); - var crypt_key_ba = hexToByteArray(crypt_key); - userinfo = stringToByteArray(userinfo); - - userinfo = rijndaelEncrypt(userinfo, crypt_key_ba, 'ECB'); - userinfo = byteArrayToHex(userinfo); - // Encrypted username and password (serialized with JSON) are now in the userinfo string - - // Collect other needed information - if ( logindata.captcha_hash ) - { - var captcha_hash = logindata.captcha_hash; - var captcha_code = captcha; - } - else - { - var captcha_hash = false; - var captcha_code = false; - } - - // Ship it across the 'net - if ( do_dh ) - { - var json_packet = { - mode: 'login_dh', - userinfo: userinfo, - captcha_code: captcha_code, - captcha_hash: captcha_hash, - dh_public_key: logindata.key_dh, - dh_client_key: dh_pub, - dh_secret_hash: secret_hash, - level: logindata.user_level, - remember: remember_session - } - } - else - { - var json_packet = { - mode: 'login_aes', - userinfo: userinfo, - captcha_code: captcha_code, - captcha_hash: captcha_hash, - key_aes: hex_md5(crypt_key), - level: logindata.user_level, - remember: remember_session - } - } - } - catch(e) - { - ajaxLoginSetStatus(AJAX_STATUS_ERROR); - console.error('Exception caught in login process; backtrace follows'); - console.debug(e); - return false; - } - // reset this... - window.logindata.early_submit_run = false; - ajaxLoginPerformRequest(json_packet); + // Perform AES test to make sure it's all working + if ( !aes_self_test() ) + { + alert('BUG: AES self-test failed'); + login_cache.mb_object.destroy(); + return false; + } + // Hide the error message and captcha + if ( document.getElementById('ajax_login_error_box') ) + { + document.getElementById('ajax_login_error_box').parentNode.removeChild(document.getElementById('ajax_login_error_box')); + } + if ( document.getElementById('autoCaptcha') ) + { + var to = fly_out_top(document.getElementById('autoCaptcha'), false, true); + setTimeout(function() { + var d = document.getElementById('autoCaptcha'); + d.parentNode.removeChild(d); + }, to); + } + // "Remember session" switch + if ( typeof(remember) == 'boolean' ) + { + var remember_session = remember; + } + else + { + if ( document.getElementById('ajax_login_field_remember') ) + { + var remember_session = ( document.getElementById('ajax_login_field_remember').checked ) ? true : false; + } + else + { + var remember_session = false; + } + } + // Encryption: preprocessor + if ( real ) + { + var do_dh = true; + } + else if ( document.getElementById('ajax_login_field_dh') ) + { + var do_dh = document.getElementById('ajax_login_field_dh').checked; + } + else + { + if ( ajax_login_prevent_dh ) + { + // IE/MobileSafari doesn't have this control, continue silently IF the rest + // of the login form is there + if ( !document.getElementById('ajax_login_field_username') ) + { + return false; + } + } + else + { + // The user probably clicked ok when the form wasn't in there. + return false; + } + } + + if ( typeof(username) != 'string' ) + { + var username = document.getElementById('ajax_login_field_username').value; + } + if ( typeof(password) != 'string' ) + { + var password = document.getElementById('ajax_login_field_password').value; + } + if ( !captcha && document.getElementById('ajax_login_field_captcha') ) + { + var captcha = document.getElementById('ajax_login_field_captcha').value; + } + + // Only run early submit hook once + if ( !window.logindata.early_submit_run ) + eval(setHook('login_submit_early')); + + window.logindata.early_submit_run = true; + + try + { + + if ( do_dh ) + { + ajaxLoginSetStatus(AJAX_STATUS_GENERATING_KEY); + if ( !real ) + { + // Wait while the browser updates the login window + setTimeout(function() + { + ajaxLoginSubmitForm(true, username, password, captcha, remember_session); + }, 20); + return true; + } + var dh_start = (new Date()).getTime(); + // Perform Diffie Hellman stuff + var dh_priv = dh_gen_private(); + var dh_pub = dh_gen_public(dh_priv); + var secret = dh_gen_shared_secret(dh_priv, logindata.key_dh); + // secret_hash is used to verify that the server guesses the correct secret + var secret_hash = hex_sha1(secret); + // crypt_key is the actual AES key + var crypt_key = (hex_sha256(secret)).substr(0, (keySizeInBits / 4)); + var dh_time = (new Date()).getTime() - dh_start; + console.debug("DH: complete, time = %dms", dh_time); + } + else + { + var crypt_key = logindata.key_aes; + } + + ajaxLoginSetStatus(AJAX_STATUS_LOGGING_IN); + + // Encrypt the password and username + var userinfo = { + username: username, + password: password + }; + + eval(setHook('login_build_userinfo')); + + userinfo = toJSONString(userinfo); + var crypt_key_ba = hexToByteArray(crypt_key); + userinfo = stringToByteArray(userinfo); + + userinfo = rijndaelEncrypt(userinfo, crypt_key_ba, 'ECB'); + userinfo = byteArrayToHex(userinfo); + // Encrypted username and password (serialized with JSON) are now in the userinfo string + + // Collect other needed information + if ( logindata.captcha_hash ) + { + var captcha_hash = logindata.captcha_hash; + var captcha_code = captcha; + } + else + { + var captcha_hash = false; + var captcha_code = false; + } + + // Ship it across the 'net + if ( do_dh ) + { + var json_packet = { + mode: 'login_dh', + userinfo: userinfo, + captcha_code: captcha_code, + captcha_hash: captcha_hash, + dh_public_key: logindata.key_dh, + dh_client_key: dh_pub, + dh_secret_hash: secret_hash, + level: logindata.user_level, + remember: remember_session + } + } + else + { + var json_packet = { + mode: 'login_aes', + userinfo: userinfo, + captcha_code: captcha_code, + captcha_hash: captcha_hash, + key_aes: hex_md5(crypt_key), + level: logindata.user_level, + remember: remember_session + } + } + } + catch(e) + { + ajaxLoginSetStatus(AJAX_STATUS_ERROR); + console.error('Exception caught in login process; backtrace follows'); + console.debug(e); + return false; + } + // reset this... + window.logindata.early_submit_run = false; + ajaxLoginPerformRequest(json_packet); } window.ajaxLoginShowFriendlyError = function(response) { - var text = ajaxLoginGetErrorText(response); - if ( text == false ) - return true; - - if ( document.getElementById('ajax_login_error_box') ) - { - // console.info('Reusing existing error-box'); - document.getElementById('ajax_login_error_box').innerHTML = text; - return true; - } - - // console.info('Drawing new error-box'); - - // calculate position for the top of the box - var mb_bottom = $dynano('messageBoxButtons').Top() + $dynano('messageBoxButtons').Height(); - // if the box isn't done flying in yet, just estimate - if ( mb_bottom < ( getHeight() / 2 ) ) - { - mb_bottom = ( getHeight() / 2 ) + 120; - } - var win_bottom = getHeight() + getScrollOffset(); - var top = mb_bottom + ( ( win_bottom - mb_bottom ) / 2 ) - 32; - // left position = 0.2 * window_width, seeing as the box is 60% width this works hackishly but nice and quick - var left = getWidth() * 0.2; - - // create the div - var errbox = document.createElement('div'); - errbox.className = 'error-box-mini'; - errbox.style.position = 'absolute'; - errbox.style.width = '60%'; - errbox.style.top = top + 'px'; - errbox.style.left = left + 'px'; - errbox.style.zIndex = getHighestZ(); - errbox.innerHTML = text; - errbox.id = 'ajax_login_error_box'; - - var body = document.getElementsByTagName('body')[0]; - body.appendChild(errbox); + var text = ajaxLoginGetErrorText(response); + if ( text == false ) + return true; + + if ( document.getElementById('ajax_login_error_box') ) + { + // console.info('Reusing existing error-box'); + document.getElementById('ajax_login_error_box').innerHTML = text; + return true; + } + + // console.info('Drawing new error-box'); + + // calculate position for the top of the box + var mb_bottom = $dynano('messageBoxButtons').Top() + $dynano('messageBoxButtons').Height(); + // if the box isn't done flying in yet, just estimate + if ( mb_bottom < ( getHeight() / 2 ) ) + { + mb_bottom = ( getHeight() / 2 ) + 120; + } + var win_bottom = getHeight() + getScrollOffset(); + var top = mb_bottom + ( ( win_bottom - mb_bottom ) / 2 ) - 32; + // left position = 0.2 * window_width, seeing as the box is 60% width this works hackishly but nice and quick + var left = getWidth() * 0.2; + + // create the div + var errbox = document.createElement('div'); + errbox.className = 'error-box-mini'; + errbox.style.position = 'absolute'; + errbox.style.width = '60%'; + errbox.style.top = top + 'px'; + errbox.style.left = left + 'px'; + errbox.style.zIndex = getHighestZ(); + errbox.innerHTML = text; + errbox.id = 'ajax_login_error_box'; + + var body = document.getElementsByTagName('body')[0]; + body.appendChild(errbox); } window.ajaxLoginGetErrorText = function(response) { - if ( response.lockout ) - { - // set this pluralality thing - response.lockout.plural = response.lockout.time_rem == 1 ? '' : $lang.get('meta_plural'); - } - - if ( response.mode == 'initial' ) - { - // Just showing the box for the first time. If there's an error now, it's based on a preexisting lockout. - if ( response.lockout.active ) - { - return $lang.get('user_err_locked_out_initial_' + response.lockout.policy, response.lockout); - } - return false; - } - else - { - // An attempt was made. - switch(response.mode) - { - case 'login_failure': - // Generic login user error. - var error = '', x; - if ( (x = $lang.get(response.error)) != response.error || ! (/^[a-z0-9_]+/).test(response.error) ) - error = x; - else - error = $lang.get('user_err_' + response.error); - if ( response.lockout.active && response.lockout.policy == 'lockout' ) - { - // Lockout enforcement was just activated. - return $lang.get('user_err_locked_out_initial_' + response.lockout.policy, response.lockout); - } - else if ( response.lockout.policy != 'disable' && !response.lockout.active && response.lockout.fails > 0 ) - { - // Lockout is in a warning state. - error += ' ' + $lang.get('user_err_invalid_credentials_' + response.lockout.policy, response.lockout); - } - return error; - break; - case 'api_error': - // Error in the API. - return $lang.get('user_err_login_generic_title') + ': ' + $lang.get('user_' + response.error.toLowerCase()); - break; - } - } - - return typeof(response.error) == 'string' ? response.error : false; + if ( response.lockout ) + { + // set this pluralality thing + response.lockout.plural = response.lockout.time_rem == 1 ? '' : $lang.get('meta_plural'); + } + + if ( response.mode == 'initial' ) + { + // Just showing the box for the first time. If there's an error now, it's based on a preexisting lockout. + if ( response.lockout.active ) + { + return $lang.get('user_err_locked_out_initial_' + response.lockout.policy, response.lockout); + } + return false; + } + else + { + // An attempt was made. + switch(response.mode) + { + case 'login_failure': + // Generic login user error. + var error = '', x; + if ( (x = $lang.get(response.error)) != response.error || ! (/^[a-z0-9_]+/).test(response.error) ) + error = x; + else + error = $lang.get('user_err_' + response.error); + if ( response.lockout.active && response.lockout.policy == 'lockout' ) + { + // Lockout enforcement was just activated. + return $lang.get('user_err_locked_out_initial_' + response.lockout.policy, response.lockout); + } + else if ( response.lockout.policy != 'disable' && !response.lockout.active && response.lockout.fails > 0 ) + { + // Lockout is in a warning state. + error += ' ' + $lang.get('user_err_invalid_credentials_' + response.lockout.policy, response.lockout); + } + return error; + break; + case 'api_error': + // Error in the API. + return $lang.get('user_err_login_generic_title') + ': ' + $lang.get('user_' + response.error.toLowerCase()); + break; + } + } + + return typeof(response.error) == 'string' ? response.error : false; } window.ajaxShowCaptcha = function(code) { - var mydiv = document.createElement('div'); - mydiv.style.backgroundColor = '#FFFFFF'; - mydiv.style.padding = '10px'; - mydiv.style.position = 'absolute'; - mydiv.style.top = '0px'; - mydiv.id = 'autoCaptcha'; - mydiv.style.zIndex = String( getHighestZ() + 1 ); - var img = document.createElement('img'); - img.onload = function() - { - if ( this.loaded ) - return true; - var mydiv = document.getElementById('autoCaptcha'); - var width = getWidth(); - var divw = $dynano(mydiv).Width(); - var left = ( width / 2 ) - ( divw / 2 ); - mydiv.style.left = left + 'px'; - fly_in_top(mydiv, false, true); - this.loaded = true; - }; - img.src = makeUrlNS('Special', 'Captcha/' + code); - img.onclick = function() { this.src = this.src + '/a'; }; - img.style.cursor = 'pointer'; - mydiv.appendChild(img); - domObjChangeOpac(0, mydiv); - var body = document.getElementsByTagName('body')[0]; - body.appendChild(mydiv); + var mydiv = document.createElement('div'); + mydiv.style.backgroundColor = '#FFFFFF'; + mydiv.style.padding = '10px'; + mydiv.style.position = 'absolute'; + mydiv.style.top = '0px'; + mydiv.id = 'autoCaptcha'; + mydiv.style.zIndex = String( getHighestZ() + 1 ); + var img = document.createElement('img'); + img.onload = function() + { + if ( this.loaded ) + return true; + var mydiv = document.getElementById('autoCaptcha'); + var width = getWidth(); + var divw = $dynano(mydiv).Width(); + var left = ( width / 2 ) - ( divw / 2 ); + mydiv.style.left = left + 'px'; + fly_in_top(mydiv, false, true); + this.loaded = true; + }; + img.src = makeUrlNS('Special', 'Captcha/' + code); + img.onclick = function() { this.src = this.src + '/a'; }; + img.style.cursor = 'pointer'; + mydiv.appendChild(img); + domObjChangeOpac(0, mydiv); + var body = document.getElementsByTagName('body')[0]; + body.appendChild(mydiv); } window.ajaxInitLogout = function() { - load_component(['messagebox', 'l10n', 'flyin', 'fadefilter', 'jquery', 'jquery-ui']); - - var title = $lang.get('user_logout_confirm_title'); - var message = ( auth_level > USER_LEVEL_MEMBER ) ? $lang.get('user_logout_confirm_body_nelev') : $lang.get('user_logout_confirm_body_normal'); - var buttons = []; - buttons.push({ - text: $lang.get('user_logout_confirm_btn_logout'), - color: 'red', - style: { - fontWeight: 'bold' - }, - onclick: function() - { - miniPromptDestroy(this); - window.location = makeUrlNS('Special', 'Logout/' + csrf_token + '/' + window.title); - return false; - } - }); - if ( auth_level > USER_LEVEL_MEMBER ) - { - buttons.push({ - text: $lang.get('user_logout_confirm_btn_deauth'), - color: 'blue', - onclick: function() - { - var mp = miniPromptGetParent(this); - var whitey = whiteOutMiniPrompt(mp); - - ajaxLoginPerformRequest({ - mode: 'logout', - level: auth_level, - csrf_token: csrf_token - }, function(response) - { - whiteOutReportSuccess(whitey); - }); - return false; - } - }); - } - buttons.push({ - text: $lang.get('etc_cancel'), - onclick: function() - { - miniPromptDestroy(this); - return false; - } - }); - - miniPromptMessage({ - title: title, - message: message, - buttons: buttons - }); + load_component(['messagebox', 'l10n', 'flyin', 'fadefilter', 'jquery', 'jquery-ui']); + + var title = $lang.get('user_logout_confirm_title'); + var message = ( auth_level > USER_LEVEL_MEMBER ) ? $lang.get('user_logout_confirm_body_nelev') : $lang.get('user_logout_confirm_body_normal'); + var buttons = []; + buttons.push({ + text: $lang.get('user_logout_confirm_btn_logout'), + color: 'red', + style: { + fontWeight: 'bold' + }, + onclick: function() + { + miniPromptDestroy(this); + window.location = makeUrlNS('Special', 'Logout/' + csrf_token + '/' + window.title); + return false; + } + }); + if ( auth_level > USER_LEVEL_MEMBER ) + { + buttons.push({ + text: $lang.get('user_logout_confirm_btn_deauth'), + color: 'blue', + onclick: function() + { + var mp = miniPromptGetParent(this); + var whitey = whiteOutMiniPrompt(mp); + + ajaxLoginPerformRequest({ + mode: 'logout', + level: auth_level, + csrf_token: csrf_token + }, function(response) + { + whiteOutReportSuccess(whitey); + }); + return false; + } + }); + } + buttons.push({ + text: $lang.get('etc_cancel'), + onclick: function() + { + miniPromptDestroy(this); + return false; + } + }); + + miniPromptMessage({ + title: title, + message: message, + buttons: buttons + }); } window.mb_logout = function() { - ajaxInitLogout(); + ajaxInitLogout(); } window.ajaxStartLogin = function() { - ajaxLogonToMember(); + ajaxLogonToMember(); } window.ajaxStartAdminLogin = function() { - // IE <6 pseudo-compatibility - if ( KILL_SWITCH ) - return true; - if ( auth_level < USER_LEVEL_ADMIN ) - { - ajaxLoginInit(function(k) { - ENANO_SID = k; - auth_level = USER_LEVEL_ADMIN; - var loc = makeUrlNS('Special', 'Administration'); - if ( (ENANO_SID + ' ').length > 1 ) - window.location = loc; - }, USER_LEVEL_ADMIN); - return false; - } - var loc = makeUrlNS('Special', 'Administration'); - window.location = loc; + // IE <6 pseudo-compatibility + if ( KILL_SWITCH ) + return true; + if ( auth_level < USER_LEVEL_ADMIN ) + { + ajaxLoginInit(function(k) { + ENANO_SID = k; + auth_level = USER_LEVEL_ADMIN; + var loc = makeUrlNS('Special', 'Administration'); + if ( (ENANO_SID + ' ').length > 1 ) + window.location = loc; + }, USER_LEVEL_ADMIN); + return false; + } + var loc = makeUrlNS('Special', 'Administration'); + window.location = loc; } window.ajaxAdminPage = function() { - // IE <6 pseudo-compatibility - if ( KILL_SWITCH ) - return true; - if ( auth_level < USER_LEVEL_ADMIN ) - { - ajaxPromptAdminAuth(function(k) { - ENANO_SID = k; - auth_level = USER_LEVEL_ADMIN; - var loc = String(window.location + ''); - window.location = append_sid(loc); - var loc = makeUrlNS('Special', 'Administration', 'module=' + namespace_list['Admin'] + 'PageManager&source=ajax&page_id=' + ajaxEscape(title)); - if ( (ENANO_SID + ' ').length > 1 ) - window.location = loc; - }, 9); - return false; - } - var loc = makeUrlNS('Special', 'Administration', 'module=' + namespace_list['Admin'] + 'PageManager&source=ajax&page_id=' + ajaxEscape(title)); - window.location = loc; + // IE <6 pseudo-compatibility + if ( KILL_SWITCH ) + return true; + if ( auth_level < USER_LEVEL_ADMIN ) + { + ajaxPromptAdminAuth(function(k) { + ENANO_SID = k; + auth_level = USER_LEVEL_ADMIN; + var loc = String(window.location + ''); + window.location = append_sid(loc); + var loc = makeUrlNS('Special', 'Administration', 'module=' + namespace_list['Admin'] + 'PageManager&source=ajax&page_id=' + ajaxEscape(title)); + if ( (ENANO_SID + ' ').length > 1 ) + window.location = loc; + }, 9); + return false; + } + var loc = makeUrlNS('Special', 'Administration', 'module=' + namespace_list['Admin'] + 'PageManager&source=ajax&page_id=' + ajaxEscape(title)); + window.location = loc; } window.ajaxLoginNavTo = function(namespace, page_id, min_level, get) { - // IE <6 pseudo-compatibility - if ( KILL_SWITCH ) - return true; - void(namespace); - void(page_id); - get = get || false; - if ( auth_level < min_level ) - { - ajaxPromptAdminAuth(function(k) { - ENANO_SID = k; - auth_level = min_level; - var loc = makeUrlNS(namespace, page_id, get); - if ( (ENANO_SID + ' ').length > 1 ) - window.location = loc; - }, min_level); - return false; - } - var loc = makeUrlNS(namespace, page_id, get); - window.location = loc; + // IE <6 pseudo-compatibility + if ( KILL_SWITCH ) + return true; + void(namespace); + void(page_id); + get = get || false; + if ( auth_level < min_level ) + { + ajaxPromptAdminAuth(function(k) { + ENANO_SID = k; + auth_level = min_level; + var loc = makeUrlNS(namespace, page_id, get); + if ( (ENANO_SID + ' ').length > 1 ) + window.location = loc; + }, min_level); + return false; + } + var loc = makeUrlNS(namespace, page_id, get); + window.location = loc; } window.ajaxAdminUser = function(username) { - // IE <6 pseudo-compatibility - if ( KILL_SWITCH ) - return true; - if ( auth_level < USER_LEVEL_ADMIN ) - { - ajaxPromptAdminAuth(function(k) { - ENANO_SID = k; - auth_level = USER_LEVEL_ADMIN; - var loc = String(window.location + ''); - window.location = append_sid(loc); - var loc = makeUrlNS('Special', 'Administration', 'module=' + namespace_list['Admin'] + 'UserManager&src=get&user=' + ajaxEscape(username)); - if ( (ENANO_SID + ' ').length > 1 ) - window.location = loc; - }, 9); - return false; - } - var loc = makeUrlNS('Special', 'Administration', 'module=' + namespace_list['Admin'] + 'UserManager&src=get&user=' + ajaxEscape(username)); - window.location = loc; + // IE <6 pseudo-compatibility + if ( KILL_SWITCH ) + return true; + if ( auth_level < USER_LEVEL_ADMIN ) + { + ajaxPromptAdminAuth(function(k) { + ENANO_SID = k; + auth_level = USER_LEVEL_ADMIN; + var loc = String(window.location + ''); + window.location = append_sid(loc); + var loc = makeUrlNS('Special', 'Administration', 'module=' + namespace_list['Admin'] + 'UserManager&src=get&user=' + ajaxEscape(username)); + if ( (ENANO_SID + ' ').length > 1 ) + window.location = loc; + }, 9); + return false; + } + var loc = makeUrlNS('Special', 'Administration', 'module=' + namespace_list['Admin'] + 'UserManager&src=get&user=' + ajaxEscape(username)); + window.location = loc; } window.ajaxDynamicReauth = function(adminpage, level) { - if ( auth_level < USER_LEVEL_MEMBER ) - { - ajaxStartLogin(); - return false; - } - - var old_sid = ENANO_SID; - var targetpage = adminpage; - if ( !level ) - { - level = USER_LEVEL_ADMIN; - } - - ajaxLogonInit(function(k, response) - { - ajaxLoginReplaceSIDInline(k, old_sid, level); - window.user_id = response.user_id; - window.user_level = response.user_level; - mb_current_obj.destroy(); - if ( typeof(targetpage) == 'string' ) - { - ajaxPage(targetpage); - } - else if ( typeof(targetpage) == 'function' ) - { - targetpage(k); - } - }, level); - if ( typeof(adminpage) == 'string' ) - { - ajaxLoginShowFriendlyError({ - error_code: 'admin_session_timed_out', - respawn_info: {} - }); - } + if ( auth_level < USER_LEVEL_MEMBER ) + { + ajaxStartLogin(); + return false; + } + + var old_sid = ENANO_SID; + var targetpage = adminpage; + if ( !level ) + { + level = USER_LEVEL_ADMIN; + } + + ajaxLogonInit(function(k, response) + { + ajaxLoginReplaceSIDInline(k, old_sid, level); + window.user_id = response.user_id; + window.user_level = response.user_level; + mb_current_obj.destroy(); + if ( typeof(targetpage) == 'string' ) + { + ajaxPage(targetpage); + } + else if ( typeof(targetpage) == 'function' ) + { + targetpage(k); + } + }, level); + if ( typeof(adminpage) == 'string' ) + { + ajaxLoginShowFriendlyError({ + error_code: 'admin_session_timed_out', + respawn_info: {} + }); + } } window.ajaxRenewSession = function() { - ajaxDynamicReauth(false); + ajaxDynamicReauth(false); } window.ajaxTrashElevSession = function() { - load_component(['messagebox', 'fadefilter', 'l10n', 'flyin', 'jquery', 'jquery-ui']); - miniPromptMessage({ - title: $lang.get('user_logout_confirm_title_elev'), - message: $lang.get('user_logout_confirm_body_elev'), - buttons: [ - { - text: $lang.get('user_logout_confirm_btn_logout'), - color: 'red', - style: { - fontWeight: 'bold' - }, - onclick: function() - { - ajaxLoginPerformRequest({ - mode: 'logout', - level: auth_level, - csrf_token: csrf_token - }); - miniPromptDestroy(this); - } - }, - { - text: $lang.get('etc_cancel'), - onclick: function() - { - miniPromptDestroy(this); - } - } - ] - }); + load_component(['messagebox', 'fadefilter', 'l10n', 'flyin', 'jquery', 'jquery-ui']); + miniPromptMessage({ + title: $lang.get('user_logout_confirm_title_elev'), + message: $lang.get('user_logout_confirm_body_elev'), + buttons: [ + { + text: $lang.get('user_logout_confirm_btn_logout'), + color: 'red', + style: { + fontWeight: 'bold' + }, + onclick: function() + { + ajaxLoginPerformRequest({ + mode: 'logout', + level: auth_level, + csrf_token: csrf_token + }); + miniPromptDestroy(this); + } + }, + { + text: $lang.get('etc_cancel'), + onclick: function() + { + miniPromptDestroy(this); + } + } + ] + }); } /** @@ -1337,84 +1337,84 @@ window.ajaxLoginReplaceSIDInline = function(key, oldkey, level) { - var host = String(window.location.hostname); - var exp = new RegExp('^https?://' + host.replace('.', '\.') + contentPath.replace('.', '\.'), 'g'); - var rexp = new RegExp('^https?://' + host.replace('.', '\.'), 'g'); - - if ( key ) - { - if ( oldkey ) - { - var body = document.getElementsByTagName('body')[0]; - var replace = new RegExp(oldkey, 'g'); - body.innerHTML = body.innerHTML.replace(replace, key); - ENANO_SID = key; - } - else - { - // append SID to all internal links - ENANO_SID = key; - - var links = document.getElementsByTagName('a'); - for ( var i = 0; i < links.length; i++ ) - { - if ( links[i].href.match(exp, links[i]) && links[i].href.indexOf('#') == -1 ) - { - var newurl = (String(append_sid(links[i].href))).replace(rexp, ''); - links[i].href = newurl; - } - } - - var forms = document.getElementsByTagName('form'); - for ( var i = 0; i < forms.length; i++ ) - { - if ( forms[i].method.toLowerCase() == 'post' ) - { - if ( forms[i].action.match(exp, links[i]) ) - { - var newurl = (String(append_sid(forms[i].action))).replace(rexp, ''); - forms[i].action = newurl; - } - } - else - { - if ( !forms[i].auth ) - { - var auth = document.createElement('input'); - auth.type = 'hidden'; - auth.name = 'auth'; - auth.value = key; - forms[i].appendChild(auth); - } - else - { - forms[i].auth.value = key; - } - } - } - } - if ( level ) - { - auth_level = level; - } - window.location.hash = '#auth:' + key; - } - else - { - auth_level = USER_LEVEL_MEMBER; - ENANO_SID = false; - if ( oldkey ) - { - var links = document.getElementsByTagName('a'); - for ( var i = 0; i < links.length; i++ ) - { - if ( links[i].href.match(exp, links[i]) && links[i].href.indexOf('#') == -1 ) - { - links[i].href = links[i].href.replace(/\?auth=([a-f0-9]+)(&|#|$)/, '$2').replace(/&auth=([a-f0-9]+)/, '').replace(rexp, ''); - } - } - } - window.location.hash = '#auth:false'; - } - window.stdAjaxPrefix = append_sid(scriptPath + '/ajax.php?title=' + title); + var host = String(window.location.hostname); + var exp = new RegExp('^https?://' + host.replace('.', '\.') + contentPath.replace('.', '\.'), 'g'); + var rexp = new RegExp('^https?://' + host.replace('.', '\.'), 'g'); + + if ( key ) + { + if ( oldkey ) + { + var body = document.getElementsByTagName('body')[0]; + var replace = new RegExp(oldkey, 'g'); + body.innerHTML = body.innerHTML.replace(replace, key); + ENANO_SID = key; + } + else + { + // append SID to all internal links + ENANO_SID = key; + + var links = document.getElementsByTagName('a'); + for ( var i = 0; i < links.length; i++ ) + { + if ( links[i].href.match(exp, links[i]) && links[i].href.indexOf('#') == -1 ) + { + var newurl = (String(append_sid(links[i].href))).replace(rexp, ''); + links[i].href = newurl; + } + } + + var forms = document.getElementsByTagName('form'); + for ( var i = 0; i < forms.length; i++ ) + { + if ( forms[i].method.toLowerCase() == 'post' ) + { + if ( forms[i].action.match(exp, links[i]) ) + { + var newurl = (String(append_sid(forms[i].action))).replace(rexp, ''); + forms[i].action = newurl; + } + } + else + { + if ( !forms[i].auth ) + { + var auth = document.createElement('input'); + auth.type = 'hidden'; + auth.name = 'auth'; + auth.value = key; + forms[i].appendChild(auth); + } + else + { + forms[i].auth.value = key; + } + } + } + } + if ( level ) + { + auth_level = level; + } + window.location.hash = '#auth:' + key; + } + else + { + auth_level = USER_LEVEL_MEMBER; + ENANO_SID = false; + if ( oldkey ) + { + var links = document.getElementsByTagName('a'); + for ( var i = 0; i < links.length; i++ ) + { + if ( links[i].href.match(exp, links[i]) && links[i].href.indexOf('#') == -1 ) + { + links[i].href = links[i].href.replace(/\?auth=([a-f0-9]+)(&|#|$)/, '$2').replace(/&auth=([a-f0-9]+)/, '').replace(rexp, ''); + } + } + } + window.location.hash = '#auth:false'; + } + window.stdAjaxPrefix = append_sid(scriptPath + '/ajax.php?title=' + title); } diff -r de56132c008d -r bdac73ed481e includes/clientside/static/messagebox.js --- a/includes/clientside/static/messagebox.js Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/static/messagebox.js Sun Mar 28 23:10:46 2010 -0400 @@ -29,287 +29,287 @@ function MessageBox(type, title, message) { - if ( !aclDisableTransitionFX ) - { - load_component('flyin'); - } - - var y = getScrollOffset(); - - // Prevent multiple instances - if ( document.getElementById('messageBox') ) - return; - - if ( document.getElementById('specialLayer_darkener') ) - if ( document.getElementById('specialLayer_darkener').style.display == 'block' ) - mb_previously_had_darkener = true; - if ( !mb_previously_had_darkener ) - darken(true); - if ( aclDisableTransitionFX ) - { - document.getElementById('specialLayer_darkener').style.zIndex = '5'; - } - var master_div = document.createElement('div'); - master_div.style.zIndex = getHighestZ() + 1; - var mydiv = document.createElement('div'); - mydiv.style.height = '200px'; - w = getWidth(); - h = getHeight(); - if ( aclDisableTransitionFX ) - { - master_div.style.left = ((w / 2) - 200)+'px'; - master_div.style.top = ((h / 2) + y - 120)+'px'; - master_div.style.position = 'absolute'; - } - else - { - master_div.style.top = '-10000px'; - master_div.style.position = ( IE ) ? 'absolute' : 'fixed'; - } - z = ( aclDisableTransitionFX ) ? document.getElementById('specialLayer_darkener').style.zIndex + 1: getHighestZ() + 1; - mydiv.style.backgroundColor = '#FFFFFF'; - mydiv.style.padding = '10px'; - mydiv.style.marginBottom = '1px'; - mydiv.id = 'messageBox'; - mydiv.style.overflow = 'auto'; - - var buttondiv = document.createElement('div'); - - mydiv.style.width = '400px'; - buttondiv.style.width = '400px'; - - w = getWidth(); - h = getHeight(); - if ( aclDisableTransitionFX ) - { - //buttondiv.style.left = ((w / 2) - 200)+'px'; - //buttondiv.style.top = ((h / 2) + y + 101)+'px'; - } - //buttondiv.style.position = ( IE ) ? 'absolute' : 'fixed'; - z = ( aclDisableTransitionFX ) ? document.getElementById('specialLayer_darkener').style.zIndex : getHighestZ(); - buttondiv.style.backgroundColor = '#C0C0C0'; - buttondiv.style.padding = '10px'; - buttondiv.style.textAlign = 'right'; - buttondiv.style.verticalAlign = 'middle'; - buttondiv.id = 'messageBoxButtons'; - - this.clickHandler = function() { messagebox_click(this, mb_current_obj); }; - - if( ( type & MB_ICONINFORMATION || type & MB_ICONSTOP || type & MB_ICONQUESTION || type & MB_ICONEXCLAMATION ) && !(type & MB_ICONLOCK) ) - { - mydiv.style.paddingLeft = '50px'; - mydiv.style.width = '360px'; - mydiv.style.backgroundRepeat = 'no-repeat'; - mydiv.style.backgroundPosition = '8px 8px'; - } - else if ( type & MB_ICONLOCK ) - { - mydiv.style.paddingLeft = '50px'; - mydiv.style.width = '360px'; - mydiv.style.backgroundRepeat = 'no-repeat'; - } - - if(type & MB_ICONINFORMATION) - { - mydiv.style.backgroundImage = 'url(\''+scriptPath+'/images/info.png\')'; - } - - if(type & MB_ICONQUESTION) - { - mydiv.style.backgroundImage = 'url(\''+scriptPath+'/images/question.png\')'; - } - - if(type & MB_ICONSTOP) - { - mydiv.style.backgroundImage = 'url(\''+scriptPath+'/images/error.png\')'; - } - - if(type & MB_ICONEXCLAMATION) - { - mydiv.style.backgroundImage = 'url(\''+scriptPath+'/images/warning.png\')'; - } - - if(type & MB_ICONLOCK) - { - mydiv.style.backgroundImage = 'url(\''+scriptPath+'/images/lock.png\')'; - } - - if(type & MB_OK) - { - btn = document.createElement('input'); - btn.type = 'button'; - btn.value = $lang.get('etc_ok'); - btn._GenericName = 'OK'; - btn.onclick = this.clickHandler; - btn.style.margin = '0 3px'; - buttondiv.appendChild(btn); - } - - if(type & MB_OKCANCEL) - { - btn = document.createElement('input'); - btn.type = 'button'; - btn.value = $lang.get('etc_ok'); - btn._GenericName = 'OK'; - btn.onclick = this.clickHandler; - btn.style.margin = '0 3px'; - buttondiv.appendChild(btn); - - btn = document.createElement('input'); - btn.type = 'button'; - btn.value = $lang.get('etc_cancel'); - btn._GenericName = 'Cancel'; - btn.onclick = this.clickHandler; - btn.style.margin = '0 3px'; - buttondiv.appendChild(btn); - } - - if(type & MB_YESNO) - { - btn = document.createElement('input'); - btn.type = 'button'; - btn.value = $lang.get('etc_yes'); - btn._GenericName = 'Yes'; - btn.onclick = this.clickHandler; - btn.style.margin = '0 3px'; - buttondiv.appendChild(btn); - - btn = document.createElement('input'); - btn.type = 'button'; - btn.value = $lang.get('etc_no'); - btn._GenericName = 'No'; - btn.onclick = this.clickHandler; - btn.style.margin = '0 3px'; - buttondiv.appendChild(btn); - } - - if(type & MB_YESNOCANCEL) - { - btn = document.createElement('input'); - btn.type = 'button'; - btn.value = $lang.get('etc_yes'); - btn._GenericName = 'Yes'; - btn.onclick = this.clickHandler; - btn.style.margin = '0 3px'; - buttondiv.appendChild(btn); - - btn = document.createElement('input'); - btn.type = 'button'; - btn.value = $lang.get('etc_no'); - btn._GenericName = 'No'; - btn.onclick = this.clickHandler; - btn.style.margin = '0 3px'; - buttondiv.appendChild(btn); - - btn = document.createElement('input'); - btn.type = 'button'; - btn.value = $lang.get('etc_cancel'); - btn._GenericName = 'Cancel'; - btn.onclick = this.clickHandler; - btn.style.margin = '0 3px'; - buttondiv.appendChild(btn); - } - - heading = document.createElement('h2'); - heading.innerHTML = title; - heading.style.color = '#50A0D0'; - heading.style.fontFamily = 'trebuchet ms, verdana, arial, helvetica, sans-serif'; - heading.style.fontSize = '12pt'; - heading.style.fontWeight = 'lighter'; - heading.style.textTransform = 'lowercase'; - heading.style.marginTop = '0'; - mydiv.appendChild(heading); - - var text = document.createElement('div'); - text.innerHTML = String(message); - this.text_area = text; - mydiv.appendChild(text); - - this.updateContent = function(text) - { - this.text_area.innerHTML = text; - }; - - this.destroy = function() - { - var mbdiv = document.getElementById('messageBox'); - mbdiv.parentNode.parentNode.removeChild(mbdiv.parentNode); - if ( !mb_previously_had_darkener ) - enlighten(true); - }; - - //domObjChangeOpac(0, mydiv); - //domObjChangeOpac(0, master_div); - - body = document.getElementsByTagName('body'); - body = body[0]; - master_div.appendChild(mydiv); - master_div.appendChild(buttondiv); - - body.appendChild(master_div); - - if ( !aclDisableTransitionFX ) - setTimeout('mb_runFlyIn();', 100); - - this.onclick = new Array(); - this.onbeforeclick = new Array(); - mb_current_obj = this; + if ( !aclDisableTransitionFX ) + { + load_component('flyin'); + } + + var y = getScrollOffset(); + + // Prevent multiple instances + if ( document.getElementById('messageBox') ) + return; + + if ( document.getElementById('specialLayer_darkener') ) + if ( document.getElementById('specialLayer_darkener').style.display == 'block' ) + mb_previously_had_darkener = true; + if ( !mb_previously_had_darkener ) + darken(true); + if ( aclDisableTransitionFX ) + { + document.getElementById('specialLayer_darkener').style.zIndex = '5'; + } + var master_div = document.createElement('div'); + master_div.style.zIndex = getHighestZ() + 1; + var mydiv = document.createElement('div'); + mydiv.style.height = '200px'; + w = getWidth(); + h = getHeight(); + if ( aclDisableTransitionFX ) + { + master_div.style.left = ((w / 2) - 200)+'px'; + master_div.style.top = ((h / 2) + y - 120)+'px'; + master_div.style.position = 'absolute'; + } + else + { + master_div.style.top = '-10000px'; + master_div.style.position = ( IE ) ? 'absolute' : 'fixed'; + } + z = ( aclDisableTransitionFX ) ? document.getElementById('specialLayer_darkener').style.zIndex + 1: getHighestZ() + 1; + mydiv.style.backgroundColor = '#FFFFFF'; + mydiv.style.padding = '10px'; + mydiv.style.marginBottom = '1px'; + mydiv.id = 'messageBox'; + mydiv.style.overflow = 'auto'; + + var buttondiv = document.createElement('div'); + + mydiv.style.width = '400px'; + buttondiv.style.width = '400px'; + + w = getWidth(); + h = getHeight(); + if ( aclDisableTransitionFX ) + { + //buttondiv.style.left = ((w / 2) - 200)+'px'; + //buttondiv.style.top = ((h / 2) + y + 101)+'px'; + } + //buttondiv.style.position = ( IE ) ? 'absolute' : 'fixed'; + z = ( aclDisableTransitionFX ) ? document.getElementById('specialLayer_darkener').style.zIndex : getHighestZ(); + buttondiv.style.backgroundColor = '#C0C0C0'; + buttondiv.style.padding = '10px'; + buttondiv.style.textAlign = 'right'; + buttondiv.style.verticalAlign = 'middle'; + buttondiv.id = 'messageBoxButtons'; + + this.clickHandler = function() { messagebox_click(this, mb_current_obj); }; + + if( ( type & MB_ICONINFORMATION || type & MB_ICONSTOP || type & MB_ICONQUESTION || type & MB_ICONEXCLAMATION ) && !(type & MB_ICONLOCK) ) + { + mydiv.style.paddingLeft = '50px'; + mydiv.style.width = '360px'; + mydiv.style.backgroundRepeat = 'no-repeat'; + mydiv.style.backgroundPosition = '8px 8px'; + } + else if ( type & MB_ICONLOCK ) + { + mydiv.style.paddingLeft = '50px'; + mydiv.style.width = '360px'; + mydiv.style.backgroundRepeat = 'no-repeat'; + } + + if(type & MB_ICONINFORMATION) + { + mydiv.style.backgroundImage = 'url(\''+scriptPath+'/images/info.png\')'; + } + + if(type & MB_ICONQUESTION) + { + mydiv.style.backgroundImage = 'url(\''+scriptPath+'/images/question.png\')'; + } + + if(type & MB_ICONSTOP) + { + mydiv.style.backgroundImage = 'url(\''+scriptPath+'/images/error.png\')'; + } + + if(type & MB_ICONEXCLAMATION) + { + mydiv.style.backgroundImage = 'url(\''+scriptPath+'/images/warning.png\')'; + } + + if(type & MB_ICONLOCK) + { + mydiv.style.backgroundImage = 'url(\''+scriptPath+'/images/lock.png\')'; + } + + if(type & MB_OK) + { + btn = document.createElement('input'); + btn.type = 'button'; + btn.value = $lang.get('etc_ok'); + btn._GenericName = 'OK'; + btn.onclick = this.clickHandler; + btn.style.margin = '0 3px'; + buttondiv.appendChild(btn); + } + + if(type & MB_OKCANCEL) + { + btn = document.createElement('input'); + btn.type = 'button'; + btn.value = $lang.get('etc_ok'); + btn._GenericName = 'OK'; + btn.onclick = this.clickHandler; + btn.style.margin = '0 3px'; + buttondiv.appendChild(btn); + + btn = document.createElement('input'); + btn.type = 'button'; + btn.value = $lang.get('etc_cancel'); + btn._GenericName = 'Cancel'; + btn.onclick = this.clickHandler; + btn.style.margin = '0 3px'; + buttondiv.appendChild(btn); + } + + if(type & MB_YESNO) + { + btn = document.createElement('input'); + btn.type = 'button'; + btn.value = $lang.get('etc_yes'); + btn._GenericName = 'Yes'; + btn.onclick = this.clickHandler; + btn.style.margin = '0 3px'; + buttondiv.appendChild(btn); + + btn = document.createElement('input'); + btn.type = 'button'; + btn.value = $lang.get('etc_no'); + btn._GenericName = 'No'; + btn.onclick = this.clickHandler; + btn.style.margin = '0 3px'; + buttondiv.appendChild(btn); + } + + if(type & MB_YESNOCANCEL) + { + btn = document.createElement('input'); + btn.type = 'button'; + btn.value = $lang.get('etc_yes'); + btn._GenericName = 'Yes'; + btn.onclick = this.clickHandler; + btn.style.margin = '0 3px'; + buttondiv.appendChild(btn); + + btn = document.createElement('input'); + btn.type = 'button'; + btn.value = $lang.get('etc_no'); + btn._GenericName = 'No'; + btn.onclick = this.clickHandler; + btn.style.margin = '0 3px'; + buttondiv.appendChild(btn); + + btn = document.createElement('input'); + btn.type = 'button'; + btn.value = $lang.get('etc_cancel'); + btn._GenericName = 'Cancel'; + btn.onclick = this.clickHandler; + btn.style.margin = '0 3px'; + buttondiv.appendChild(btn); + } + + heading = document.createElement('h2'); + heading.innerHTML = title; + heading.style.color = '#50A0D0'; + heading.style.fontFamily = 'trebuchet ms, verdana, arial, helvetica, sans-serif'; + heading.style.fontSize = '12pt'; + heading.style.fontWeight = 'lighter'; + heading.style.textTransform = 'lowercase'; + heading.style.marginTop = '0'; + mydiv.appendChild(heading); + + var text = document.createElement('div'); + text.innerHTML = String(message); + this.text_area = text; + mydiv.appendChild(text); + + this.updateContent = function(text) + { + this.text_area.innerHTML = text; + }; + + this.destroy = function() + { + var mbdiv = document.getElementById('messageBox'); + mbdiv.parentNode.parentNode.removeChild(mbdiv.parentNode); + if ( !mb_previously_had_darkener ) + enlighten(true); + }; + + //domObjChangeOpac(0, mydiv); + //domObjChangeOpac(0, master_div); + + body = document.getElementsByTagName('body'); + body = body[0]; + master_div.appendChild(mydiv); + master_div.appendChild(buttondiv); + + body.appendChild(master_div); + + if ( !aclDisableTransitionFX ) + setTimeout('mb_runFlyIn();', 100); + + this.onclick = new Array(); + this.onbeforeclick = new Array(); + mb_current_obj = this; } var messagebox = MessageBox; function mb_runFlyIn() { - var mydiv = document.getElementById('messageBox'); - var maindiv = mydiv.parentNode; - fly_in_top(maindiv, true, false); + var mydiv = document.getElementById('messageBox'); + var maindiv = mydiv.parentNode; + fly_in_top(maindiv, true, false); } function messagebox_click(obj, mb) { - val = ( typeof ( obj._GenericName ) == 'string' ) ? obj._GenericName : obj.value; - if(typeof mb.onbeforeclick[val] == 'function') - { - var o = mb.onbeforeclick[val]; - var resp = o(); - if ( resp ) - return false; - o = false; - } - - var mydiv = document.getElementById('messageBox'); - var maindiv = mydiv.parentNode; - - if ( aclDisableTransitionFX ) - { - var mbdiv = document.getElementById('messageBox'); - mbdiv.parentNode.removeChild(mbdiv.nextSibling); - mbdiv.parentNode.removeChild(mbdiv); - if ( !mb_previously_had_darkener ) - enlighten(true); - } - else - { - var to = fly_out_top(maindiv, true, false); - setTimeout("var mbdiv = document.getElementById('messageBox'); mbdiv.parentNode.parentNode.removeChild(mbdiv.parentNode); if ( !mb_previously_had_darkener ) enlighten(true);", to); - } - if(typeof mb.onclick[val] == 'function') - { - (mb.onclick[val])(); - } + val = ( typeof ( obj._GenericName ) == 'string' ) ? obj._GenericName : obj.value; + if(typeof mb.onbeforeclick[val] == 'function') + { + var o = mb.onbeforeclick[val]; + var resp = o(); + if ( resp ) + return false; + o = false; + } + + var mydiv = document.getElementById('messageBox'); + var maindiv = mydiv.parentNode; + + if ( aclDisableTransitionFX ) + { + var mbdiv = document.getElementById('messageBox'); + mbdiv.parentNode.removeChild(mbdiv.nextSibling); + mbdiv.parentNode.removeChild(mbdiv); + if ( !mb_previously_had_darkener ) + enlighten(true); + } + else + { + var to = fly_out_top(maindiv, true, false); + setTimeout("var mbdiv = document.getElementById('messageBox'); mbdiv.parentNode.parentNode.removeChild(mbdiv.parentNode); if ( !mb_previously_had_darkener ) enlighten(true);", to); + } + if(typeof mb.onclick[val] == 'function') + { + (mb.onclick[val])(); + } } function testMessageBox() { - mb = new MessageBox(MB_OKCANCEL|MB_ICONINFORMATION, 'Javascripted dynamic message boxes', 'This is soooooo coool, now if only document.createElement() worked in IE!
this is some more text
this is some more text
this is some more text
this is some more text
this is some more text
this is some more text
this is some more text
this is some more text'); - mb.onclick['OK'] = function() - { - alert('You clicked OK!'); - } - mb.onbeforeclick['Cancel'] = function() - { - alert('You clicked Cancel!'); - } + mb = new MessageBox(MB_OKCANCEL|MB_ICONINFORMATION, 'Javascripted dynamic message boxes', 'This is soooooo coool, now if only document.createElement() worked in IE!
this is some more text
this is some more text
this is some more text
this is some more text
this is some more text
this is some more text
this is some more text
this is some more text'); + mb.onclick['OK'] = function() + { + alert('You clicked OK!'); + } + mb.onbeforeclick['Cancel'] = function() + { + alert('You clicked Cancel!'); + } } /** @@ -319,64 +319,64 @@ function miniPrompt(call_on_create) { - if ( !aclDisableTransitionFX ) - { - load_component(['flyin', 'jquery', 'jquery-ui', 'fadefilter']); - } - else - { - load_component(['fadefilter']); - } - var darkener = darken(aclDisableTransitionFX, 40, 'miniprompt_darkener'); - - var wrapper = document.createElement('div'); - wrapper.className = 'miniprompt'; - var top = document.createElement('div'); - top.className = 'mp-top'; - var body = document.createElement('div'); - body.className = 'mp-body'; - var bottom = document.createElement('div'); - bottom.className = 'mp-bottom'; - if ( typeof(call_on_create) == 'function' ) - { - call_on_create(body); - } - wrapper.appendChild(top); - wrapper.appendChild(body); - wrapper.appendChild(bottom); - var left = ( getWidth() / 2 ) - ( 388 / 2 ); - wrapper.style.left = left + 'px'; - var top = getScrollOffset() - 27; - wrapper.style.top = top + 'px'; - domObjChangeOpac(0, wrapper); - var realbody = document.getElementsByTagName('body')[0]; - realbody.appendChild(wrapper); - - if ( aclDisableTransitionFX ) - { - domObjChangeOpac(100, wrapper); - } - else - { - fly_in_top(wrapper, true, true); - - setTimeout(function() - { - domObjChangeOpac(100, wrapper); - }, 40); - } - - // set the darkener's onclick to refocus/shake the miniprompt - darkener.miniprompt = wrapper; - darkener.onclick = function() - { - if ( !aclDisableTransitionFX ) - { - $(this.miniprompt).effect("pulsate", { times: 2 }, 200); - } - } - - return wrapper; + if ( !aclDisableTransitionFX ) + { + load_component(['flyin', 'jquery', 'jquery-ui', 'fadefilter']); + } + else + { + load_component(['fadefilter']); + } + var darkener = darken(aclDisableTransitionFX, 40, 'miniprompt_darkener'); + + var wrapper = document.createElement('div'); + wrapper.className = 'miniprompt'; + var top = document.createElement('div'); + top.className = 'mp-top'; + var body = document.createElement('div'); + body.className = 'mp-body'; + var bottom = document.createElement('div'); + bottom.className = 'mp-bottom'; + if ( typeof(call_on_create) == 'function' ) + { + call_on_create(body); + } + wrapper.appendChild(top); + wrapper.appendChild(body); + wrapper.appendChild(bottom); + var left = ( getWidth() / 2 ) - ( 388 / 2 ); + wrapper.style.left = left + 'px'; + var top = getScrollOffset() - 27; + wrapper.style.top = top + 'px'; + domObjChangeOpac(0, wrapper); + var realbody = document.getElementsByTagName('body')[0]; + realbody.appendChild(wrapper); + + if ( aclDisableTransitionFX ) + { + domObjChangeOpac(100, wrapper); + } + else + { + fly_in_top(wrapper, true, true); + + setTimeout(function() + { + domObjChangeOpac(100, wrapper); + }, 40); + } + + // set the darkener's onclick to refocus/shake the miniprompt + darkener.miniprompt = wrapper; + darkener.onclick = function() + { + if ( !aclDisableTransitionFX ) + { + $(this.miniprompt).effect("pulsate", { times: 2 }, 200); + } + } + + return wrapper; } /** @@ -387,19 +387,19 @@ function miniPromptGetParent(obj) { - while ( true ) - { - // prevent infinite loops - if ( !obj || obj.tagName == 'BODY' ) - return false; - - if ( $dynano(obj).hasClass('miniprompt') ) - { - return obj; - } - obj = obj.parentNode; - } - return false; + while ( true ) + { + // prevent infinite loops + if ( !obj || obj.tagName == 'BODY' ) + return false; + + if ( $dynano(obj).hasClass('miniprompt') ) + { + return obj; + } + obj = obj.parentNode; + } + return false; } /** @@ -411,27 +411,27 @@ function miniPromptDestroy(obj, nofade) { - obj = miniPromptGetParent(obj); - if ( !obj ) - return false; - - // found it - var parent = obj.parentNode; - // if ( !nofade ) - // enlighten(aclDisableTransitionFX); - enlighten((aclDisableTransitionFX || nofade), 'miniprompt_darkener'); - if ( aclDisableTransitionFX || nofade ) - { - parent.removeChild(obj); - } - else - { - var timeout = fly_out_top(obj, true, true); - setTimeout(function() - { - parent.removeChild(obj); - }, timeout); - } + obj = miniPromptGetParent(obj); + if ( !obj ) + return false; + + // found it + var parent = obj.parentNode; + // if ( !nofade ) + // enlighten(aclDisableTransitionFX); + enlighten((aclDisableTransitionFX || nofade), 'miniprompt_darkener'); + if ( aclDisableTransitionFX || nofade ) + { + parent.removeChild(obj); + } + else + { + var timeout = fly_out_top(obj, true, true); + setTimeout(function() + { + parent.removeChild(obj); + }, timeout); + } } /** @@ -440,7 +440,7 @@ function miniPromptTest() { - miniPrompt(function(div) { div.innerHTML = 'hello world! destroy me'; }); + miniPrompt(function(div) { div.innerHTML = 'hello world! destroy me'; }); } /** @@ -448,127 +448,127 @@ * @example
miniPromptMessage({
- title: 'Delete page',
- message: 'Do you really want to delete this page? This is reversible unless you clear the page logs.',
- buttons: [
- {
- text: 'Delete',
- color: 'red',
- style: {
- fontWeight: 'bold'
- },
- onclick: function() {
- ajaxDeletePage();
- miniPromptDestroy(this);
- }
- },
- {
- text: 'cancel',
- onclick: function() {
- miniPromptDestroy(this);
- }
- }
- ]
+ title: 'Delete page',
+ message: 'Do you really want to delete this page? This is reversible unless you clear the page logs.',
+ buttons: [
+ {
+ text: 'Delete',
+ color: 'red',
+ style: {
+ fontWeight: 'bold'
+ },
+ onclick: function() {
+ ajaxDeletePage();
+ miniPromptDestroy(this);
+ }
+ },
+ {
+ text: 'cancel',
+ onclick: function() {
+ miniPromptDestroy(this);
+ }
+ }
+ ]
});
*/
function miniPromptMessage(parms)
{
- if ( ( !parms.title && !parms.message ) || !parms.buttons )
- return false;
-
- return miniPrompt(function(parent)
- {
- try
- {
- if ( parms.title )
- {
- var h3 = document.createElement('h3');
- h3.appendChild(document.createTextNode(parms.title));
- }
- if ( parms.message )
- {
- var body = document.createElement('p');
- var message = parms.message.split(unescape('%0A'));
- for ( var i = 0; i < message.length; i++ )
- {
- body.appendChild(document.createTextNode(message[i]));
- if ( i + 1 < message.length )
- body.appendChild(document.createElement('br'));
- }
- }
-
- parent.style.textAlign = 'center';
-
- if ( parms.title )
- parent.appendChild(h3);
- if ( parms.message )
- parent.appendChild(body);
- parent.appendChild(document.createElement('br'));
-
- // construct buttons
- for ( var i = 0; i < parms.buttons.length; i++ )
- {
- var button = parms.buttons[i];
- button.input = document.createElement('a');
- button.input.href = '#';
- button.input.clickAction = button.onclick;
- button.input.className = 'abutton';
- if ( button.color )
- {
- button.input.className += ' abutton_' + button.color;
- }
- button.input.appendChild(document.createTextNode(button.text));
- if ( button.style )
- {
- for ( var j in button.style )
- {
- button.input.style[j] = button.style[j];
- }
- }
- if ( button.sprite )
- {
- var sprite = gen_sprite(button.sprite[0], button.sprite[1], button.sprite[2], button.sprite[3], button.sprite[4]);
- sprite.style.position = 'relative';
- sprite.style.top = '3px';
- button.input.insertBefore(sprite, button.input.firstChild);
- insertAfter(button.input, document.createTextNode(' '), sprite);
- }
- else if ( button.image )
- {
- button.input.className += ' icon';
- button.input.style.backgroundImage = 'url(' + button.image + ')';
- }
- button.input.onclick = function(e)
- {
- try
- {
- this.clickAction(e);
- }
- catch(e)
- {
- console.error(e);
- }
- return false;
- }
- parent.appendChild(button.input);
- }
- // don't focus this in opera - it looks kinda ugly
- if ( parms.buttons[0] && !window.opera )
- {
- var timeout = ( aclDisableTransitionFX ) ? 10 : 1000;
- setTimeout(function()
- {
- parms.buttons[0].input.focus();
- }, timeout);
- }
- }
- catch ( e )
- {
- console.error(e);
- }
- });
+ if ( ( !parms.title && !parms.message ) || !parms.buttons )
+ return false;
+
+ return miniPrompt(function(parent)
+ {
+ try
+ {
+ if ( parms.title )
+ {
+ var h3 = document.createElement('h3');
+ h3.appendChild(document.createTextNode(parms.title));
+ }
+ if ( parms.message )
+ {
+ var body = document.createElement('p');
+ var message = parms.message.split(unescape('%0A'));
+ for ( var i = 0; i < message.length; i++ )
+ {
+ body.appendChild(document.createTextNode(message[i]));
+ if ( i + 1 < message.length )
+ body.appendChild(document.createElement('br'));
+ }
+ }
+
+ parent.style.textAlign = 'center';
+
+ if ( parms.title )
+ parent.appendChild(h3);
+ if ( parms.message )
+ parent.appendChild(body);
+ parent.appendChild(document.createElement('br'));
+
+ // construct buttons
+ for ( var i = 0; i < parms.buttons.length; i++ )
+ {
+ var button = parms.buttons[i];
+ button.input = document.createElement('a');
+ button.input.href = '#';
+ button.input.clickAction = button.onclick;
+ button.input.className = 'abutton';
+ if ( button.color )
+ {
+ button.input.className += ' abutton_' + button.color;
+ }
+ button.input.appendChild(document.createTextNode(button.text));
+ if ( button.style )
+ {
+ for ( var j in button.style )
+ {
+ button.input.style[j] = button.style[j];
+ }
+ }
+ if ( button.sprite )
+ {
+ var sprite = gen_sprite(button.sprite[0], button.sprite[1], button.sprite[2], button.sprite[3], button.sprite[4]);
+ sprite.style.position = 'relative';
+ sprite.style.top = '3px';
+ button.input.insertBefore(sprite, button.input.firstChild);
+ insertAfter(button.input, document.createTextNode(' '), sprite);
+ }
+ else if ( button.image )
+ {
+ button.input.className += ' icon';
+ button.input.style.backgroundImage = 'url(' + button.image + ')';
+ }
+ button.input.onclick = function(e)
+ {
+ try
+ {
+ this.clickAction(e);
+ }
+ catch(e)
+ {
+ console.error(e);
+ }
+ return false;
+ }
+ parent.appendChild(button.input);
+ }
+ // don't focus this in opera - it looks kinda ugly
+ if ( parms.buttons[0] && !window.opera )
+ {
+ var timeout = ( aclDisableTransitionFX ) ? 10 : 1000;
+ setTimeout(function()
+ {
+ parms.buttons[0].input.focus();
+ }, timeout);
+ }
+ }
+ catch ( e )
+ {
+ console.error(e);
+ }
+ });
}
/**
@@ -577,105 +577,105 @@
function whiteOutMiniPrompt(el)
{
- el = miniPromptGetParent(el);
- var width = 320;
- var height = $dynano(el).Height() - 58;
- var topoffset = 27;
-
- var container = document.createElement('div');
- container.style.padding = topoffset + 'px 0 0 0';
+ el = miniPromptGetParent(el);
+ var width = 320;
+ var height = $dynano(el).Height() - 58;
+ var topoffset = 27;
+
+ var container = document.createElement('div');
+ container.style.padding = topoffset + 'px 0 0 0';
- var top = getScrollOffset();
- var left = getWidth() / 2 - width / 2;
-
- // using fixed here allows modal windows to be blacked out
- container.style.position = 'absolute';
- container.style.top = ( top - topoffset ) + 'px';
- container.style.left = left + 'px';
- container.style.zIndex = 1000;
-
- var blackout = document.createElement('div');
- blackout.style.backgroundColor = '#ffffff';
- blackout.style.width = width + 'px';
- blackout.style.height = height + 'px';
- domObjChangeOpac(60, blackout);
- var background = ( $dynano(el).Height() < 48 ) ? 'url(' + scriptPath + '/images/loading.gif)' : 'url(' + scriptPath + '/includes/clientside/tinymce/themes/advanced/skins/default/img/progress.gif)';
- blackout.style.backgroundImage = background;
- blackout.style.backgroundPosition = 'center center';
- blackout.style.backgroundRepeat = 'no-repeat';
- blackout.isMiniPrompt = true;
- blackout.miniPromptObj = el;
-
- container.appendChild(blackout);
- var body = document.getElementsByTagName('body')[0];
- body.appendChild(container);
-
- return blackout;
+ var top = getScrollOffset();
+ var left = getWidth() / 2 - width / 2;
+
+ // using fixed here allows modal windows to be blacked out
+ container.style.position = 'absolute';
+ container.style.top = ( top - topoffset ) + 'px';
+ container.style.left = left + 'px';
+ container.style.zIndex = 1000;
+
+ var blackout = document.createElement('div');
+ blackout.style.backgroundColor = '#ffffff';
+ blackout.style.width = width + 'px';
+ blackout.style.height = height + 'px';
+ domObjChangeOpac(60, blackout);
+ var background = ( $dynano(el).Height() < 48 ) ? 'url(' + scriptPath + '/images/loading.gif)' : 'url(' + scriptPath + '/includes/clientside/tinymce/themes/advanced/skins/default/img/progress.gif)';
+ blackout.style.backgroundImage = background;
+ blackout.style.backgroundPosition = 'center center';
+ blackout.style.backgroundRepeat = 'no-repeat';
+ blackout.isMiniPrompt = true;
+ blackout.miniPromptObj = el;
+
+ container.appendChild(blackout);
+ var body = document.getElementsByTagName('body')[0];
+ body.appendChild(container);
+
+ return blackout;
}
function whiteOutDestroyOnMiniPrompt(whitey)
{
- var body = document.getElementsByTagName('body')[0];
- var parent = whitey.miniPromptObj;
- fly_out_top([parent, whitey.parentNode], true, true);
- setTimeout(function()
- {
- body.removeChild(parent);
- body.removeChild(whitey.parentNode);
- }, 1000 * FI_MULTIPLIER);
- enlighten(true, 'miniprompt_darkener');
+ var body = document.getElementsByTagName('body')[0];
+ var parent = whitey.miniPromptObj;
+ fly_out_top([parent, whitey.parentNode], true, true);
+ setTimeout(function()
+ {
+ body.removeChild(parent);
+ body.removeChild(whitey.parentNode);
+ }, 1000 * FI_MULTIPLIER);
+ enlighten(true, 'miniprompt_darkener');
}
function testMPMessageBox()
{
- miniPromptMessage({
- title: 'The Game of LIFE question #73',
- message: 'You just got your girlfriend pregnant. Please select an option:',
- buttons: [
- {
- text: 'Abort',
- color: 'red',
- style: {
- fontWeight: 'bold'
- },
- sprite: [ cdnPath + '/images/icons/abortretryignore-sprite.png', 16, 16, 0, 0 ],
- onclick: function() {
- var w = whiteOutMiniPrompt(this);
- var me = this;
- setTimeout(function()
- {
- whiteOutReportSuccess(w, true);
- void(me);
- setTimeout(function()
- {
- miniPromptDestroy(me);
- }, 1250);
- }, 500);
- return false;
- }
- },
- {
- text: 'Retry',
- color: 'blue',
- sprite: [ cdnPath + '/images/icons/abortretryignore-sprite.png', 16, 16, 0, 16 ],
- onclick: function() {
- var w = whiteOutMiniPrompt(this);
- setTimeout(function()
- {
- whiteOutReportSuccess(w);
- }, 1500);
- return false;
- }
- },
- {
- text: 'Ignore',
- color: 'green',
- sprite: [ cdnPath + '/images/icons/abortretryignore-sprite.png', 16, 16, 0, 32 ],
- onclick: function() {
- miniPromptDestroy(this);
- }
- }
- ]
- });
+ miniPromptMessage({
+ title: 'The Game of LIFE question #73',
+ message: 'You just got your girlfriend pregnant. Please select an option:',
+ buttons: [
+ {
+ text: 'Abort',
+ color: 'red',
+ style: {
+ fontWeight: 'bold'
+ },
+ sprite: [ cdnPath + '/images/icons/abortretryignore-sprite.png', 16, 16, 0, 0 ],
+ onclick: function() {
+ var w = whiteOutMiniPrompt(this);
+ var me = this;
+ setTimeout(function()
+ {
+ whiteOutReportSuccess(w, true);
+ void(me);
+ setTimeout(function()
+ {
+ miniPromptDestroy(me);
+ }, 1250);
+ }, 500);
+ return false;
+ }
+ },
+ {
+ text: 'Retry',
+ color: 'blue',
+ sprite: [ cdnPath + '/images/icons/abortretryignore-sprite.png', 16, 16, 0, 16 ],
+ onclick: function() {
+ var w = whiteOutMiniPrompt(this);
+ setTimeout(function()
+ {
+ whiteOutReportSuccess(w);
+ }, 1500);
+ return false;
+ }
+ },
+ {
+ text: 'Ignore',
+ color: 'green',
+ sprite: [ cdnPath + '/images/icons/abortretryignore-sprite.png', 16, 16, 0, 32 ],
+ onclick: function() {
+ miniPromptDestroy(this);
+ }
+ }
+ ]
+ });
}
diff -r de56132c008d -r bdac73ed481e includes/clientside/static/paginate.js
--- a/includes/clientside/static/paginate.js Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/clientside/static/paginate.js Sun Mar 28 23:10:46 2010 -0400
@@ -13,69 +13,69 @@
window.paginator = function(data, callback, offset, perpage, passer, ov_num_pages, ov_flip_func)
{
- load_component('flyin');
- if ( !perpage || typeof(perpage) != 'number' || ( typeof(perpage) == 'number' && perpage < 1 ) )
- {
- this.perpage = 10;
- }
- else
- {
- this.perpage = perpage;
- }
- if ( typeof(offset) != 'number' )
- this.offset = 0;
- else
- this.offset = offset;
- if ( typeof(passer) != 'undefined' )
- this.passer = passer;
- else
- this.passer = false;
- if ( ov_num_pages )
- {
- this.num_pages = ov_num_pages;
- this.flip_func = ov_flip_func;
- }
- else
- {
- this.num_pages = Math.ceil(data.length / perpage);
- this.flip_func = false;
- }
- this.random_id = 'autopagin_' + Math.floor(Math.random() * 1000000);
- this._build_control = _build_paginator;
- this.set_page = function(number)
- {
- this.offset = number * this.perpage;
- var html = this._build_control(number);
- var elements = getElementsByClassName(document.body, 'div', this.random_id + '_control');
- for ( var i = 0; i < elements.length; i++ )
- elements[i].innerHTML = html;
- }
- if ( this.num_pages > 1 )
- {
- var pg_control = '| ' + $lang.get('paginate_lbl_page') + ' | '; - var block = '{LINK} | '; - var end = '
|---|
| ' + $lang.get('paginate_lbl_page') + ' | '; + var block = '{LINK} | '; + var end = '
|---|
» ×'; - - var body = document.getElementsByTagName('body')[0]; - domObjChangeOpac(0, div); - - body.appendChild(div); - - document.getElementById(vtmp).onkeypress = function(e) - { - if ( e.keyCode == 13 ) - this.nextSibling.nextSibling.onclick(); - }; - document.getElementById(vtmp).focus(); - - // fade the div - /* - if(!div.id) div.id = 'autofade_'+Math.floor(Math.random() * 100000); - var from = '#33FF33'; - Fat.fade_element(div.id,30,2000,from,Fat.get_bgcolor(div.id)); - */ - - fly_in_bottom(div, false, true); - - var divh = $dynano(div).Width(); - left_pos = left_pos - divh; - div.style.left = left_pos + 'px'; + load_component('flyin'); + + var height = $dynano(parentobj).Height(); + var width = $dynano(parentobj).Width(); + var left = $dynano(parentobj).Left(); + var top = $dynano(parentobj).Top(); + var left_pos = left + width ; + var top_pos = height + top; + var div = document.createElement('div'); + div.style.position = 'absolute'; + div.style.top = top_pos + 'px'; + div.className = 'question-box'; + div.style.margin = '1px 0 0 2px'; + var vtmp = 'input_' + Math.floor(Math.random() * 1000000); + var regex = new RegExp('\"', 'g'); + var submit_target = ( typeof(url_string) == 'object' ) ? ( toJSONString(url_string) ).replace(regex, '\'') : 'unescape(\'' + escape(url_string) + '\')'; + var onclick = 'paginator_submit(this, '+num_pages+', '+perpage+', '+additive+', '+submit_target+'); return false;'; + div.innerHTML = $lang.get('paginate_lbl_goto_page') + '
» ×'; + + var body = document.getElementsByTagName('body')[0]; + domObjChangeOpac(0, div); + + body.appendChild(div); + + document.getElementById(vtmp).onkeypress = function(e) + { + if ( e.keyCode == 13 ) + this.nextSibling.nextSibling.onclick(); + }; + document.getElementById(vtmp).focus(); + + // fade the div + /* + if(!div.id) div.id = 'autofade_'+Math.floor(Math.random() * 100000); + var from = '#33FF33'; + Fat.fade_element(div.id,30,2000,from,Fat.get_bgcolor(div.id)); + */ + + fly_in_bottom(div, false, true); + + var divh = $dynano(div).Width(); + left_pos = left_pos - divh; + div.style.left = left_pos + 'px'; } window.paginator_submit = function(obj, max, perpage, additive, formatstring) { - var userinput = obj.previousSibling.previousSibling.value; - userinput = parseInt(userinput); - var offset = (( userinput - 1 ) * perpage) + additive; - if ( userinput > max || isNaN(userinput) || userinput < 1 ) - { - load_component(['messagebox', 'fadefilter', 'flyin']); - new MessageBox(MB_OK|MB_ICONSTOP, $lang.get('paginate_err_bad_page_title'), $lang.get('paginate_err_bad_page_body', { max: max })); - return false; - } - if ( typeof(formatstring) == 'object' ) - { - fly_out_top(obj.parentNode, false, true); - jspaginator_goto(formatstring.random_id, ( offset / perpage )); - } - else - { - var url = sprintf(formatstring, String(offset)); - fly_out_top(obj.parentNode, false, true); - window.location = url; - } + var userinput = obj.previousSibling.previousSibling.value; + userinput = parseInt(userinput); + var offset = (( userinput - 1 ) * perpage) + additive; + if ( userinput > max || isNaN(userinput) || userinput < 1 ) + { + load_component(['messagebox', 'fadefilter', 'flyin']); + new MessageBox(MB_OK|MB_ICONSTOP, $lang.get('paginate_err_bad_page_title'), $lang.get('paginate_err_bad_page_body', { max: max })); + return false; + } + if ( typeof(formatstring) == 'object' ) + { + fly_out_top(obj.parentNode, false, true); + jspaginator_goto(formatstring.random_id, ( offset / perpage )); + } + else + { + var url = sprintf(formatstring, String(offset)); + fly_out_top(obj.parentNode, false, true); + window.location = url; + } } // This code is in the public domain. Feel free to link back to http://jan.moesen.nu/ function sprintf() { - if (!arguments || arguments.length < 1 || !RegExp) - { - return; - } - var str = arguments[0]; - var re = /([^%]*)%('.|0|\x20)?(-)?(\d+)?(\.\d+)?(%|b|c|d|u|f|o|s|x|X)(.*)/; - var a = b = [], numSubstitutions = 0, numMatches = 0; - while (a = re.exec(str)) - { - var leftpart = a[1], pPad = a[2], pJustify = a[3], pMinLength = a[4]; - var pPrecision = a[5], pType = a[6], rightPart = a[7]; - - //alert(a + '\n' + [a[0], leftpart, pPad, pJustify, pMinLength, pPrecision); + if (!arguments || arguments.length < 1 || !RegExp) + { + return; + } + var str = arguments[0]; + var re = /([^%]*)%('.|0|\x20)?(-)?(\d+)?(\.\d+)?(%|b|c|d|u|f|o|s|x|X)(.*)/; + var a = b = [], numSubstitutions = 0, numMatches = 0; + while (a = re.exec(str)) + { + var leftpart = a[1], pPad = a[2], pJustify = a[3], pMinLength = a[4]; + var pPrecision = a[5], pType = a[6], rightPart = a[7]; + + //alert(a + '\n' + [a[0], leftpart, pPad, pJustify, pMinLength, pPrecision); - numMatches++; - if (pType == '%') - { - subst = '%'; - } - else - { - numSubstitutions++; - if (numSubstitutions >= arguments.length) - { - alert('Error! Not enough function arguments (' + (arguments.length - 1) + ', excluding the string)\nfor the number of substitution parameters in string (' + numSubstitutions + ' so far).'); - } - var param = arguments[numSubstitutions]; - var pad = ''; - if (pPad && pPad.substr(0,1) == "'") pad = leftpart.substr(1,1); - else if (pPad) pad = pPad; - var justifyRight = true; - if (pJustify && pJustify === "-") justifyRight = false; - var minLength = -1; - if (pMinLength) minLength = parseInt(pMinLength); - var precision = -1; - if (pPrecision && pType == 'f') precision = parseInt(pPrecision.substring(1)); - var subst = param; - if (pType == 'b') subst = parseInt(param).toString(2); - else if (pType == 'c') subst = String.fromCharCode(parseInt(param)); - else if (pType == 'd') subst = parseInt(param) ? parseInt(param) : 0; - else if (pType == 'u') subst = Math.abs(param); - else if (pType == 'f') subst = (precision > -1) ? Math.round(parseFloat(param) * Math.pow(10, precision)) / Math.pow(10, precision): parseFloat(param); - else if (pType == 'o') subst = parseInt(param).toString(8); - else if (pType == 's') subst = param; - else if (pType == 'x') subst = ('' + parseInt(param).toString(16)).toLowerCase(); - else if (pType == 'X') subst = ('' + parseInt(param).toString(16)).toUpperCase(); - } - str = leftpart + subst + rightPart; - } - return str; + numMatches++; + if (pType == '%') + { + subst = '%'; + } + else + { + numSubstitutions++; + if (numSubstitutions >= arguments.length) + { + alert('Error! Not enough function arguments (' + (arguments.length - 1) + ', excluding the string)\nfor the number of substitution parameters in string (' + numSubstitutions + ' so far).'); + } + var param = arguments[numSubstitutions]; + var pad = ''; + if (pPad && pPad.substr(0,1) == "'") pad = leftpart.substr(1,1); + else if (pPad) pad = pPad; + var justifyRight = true; + if (pJustify && pJustify === "-") justifyRight = false; + var minLength = -1; + if (pMinLength) minLength = parseInt(pMinLength); + var precision = -1; + if (pPrecision && pType == 'f') precision = parseInt(pPrecision.substring(1)); + var subst = param; + if (pType == 'b') subst = parseInt(param).toString(2); + else if (pType == 'c') subst = String.fromCharCode(parseInt(param)); + else if (pType == 'd') subst = parseInt(param) ? parseInt(param) : 0; + else if (pType == 'u') subst = Math.abs(param); + else if (pType == 'f') subst = (precision > -1) ? Math.round(parseFloat(param) * Math.pow(10, precision)) / Math.pow(10, precision): parseFloat(param); + else if (pType == 'o') subst = parseInt(param).toString(8); + else if (pType == 's') subst = param; + else if (pType == 'x') subst = ('' + parseInt(param).toString(16)).toLowerCase(); + else if (pType == 'X') subst = ('' + parseInt(param).toString(16)).toUpperCase(); + } + str = leftpart + subst + rightPart; + } + return str; } diff -r de56132c008d -r bdac73ed481e includes/clientside/static/pwstrength.js --- a/includes/clientside/static/pwstrength.js Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/static/pwstrength.js Sun Mar 28 23:10:46 2010 -0400 @@ -12,281 +12,281 @@ function password_score_len(password) { - if ( typeof(password) != "string" ) - { - return -10; - } - var len = password.length; - var score = len - 7; - return score; + if ( typeof(password) != "string" ) + { + return -10; + } + var len = password.length; + var score = len - 7; + return score; } function password_score(password) { - if ( typeof(password) != "string" ) - { - return -10; - } - var score = 0; - var debug = []; - // length check - var lenscore = password_score_len(password); - - debug.push(''+lenscore+' points for length'); - - score += lenscore; - - var has_upper_lower = false; - var has_symbols = false; - var has_numbers = false; - - // contains uppercase and lowercase - if ( password.match(/[A-z]+/) && password.toLowerCase() != password ) - { - score += 1; - has_upper_lower = true; - debug.push('1 point for having uppercase and lowercase'); - } - - // contains symbols - if ( password.match(/[^A-z0-9]+/) ) - { - score += 1; - has_symbols = true; - debug.push('1 point for having nonalphanumeric characters (matching /[^A-z0-9]+/)'); - } - - // contains numbers - if ( password.match(/[0-9]+/) ) - { - score += 1; - has_numbers = true; - debug.push('1 point for having numbers'); - } - - if ( has_upper_lower && has_symbols && has_numbers && password.length >= 9 ) - { - // if it has uppercase and lowercase letters, symbols, and numbers, and is of considerable length, add some serious points - score += 4; - debug.push('4 points for having uppercase and lowercase, numbers, and nonalphanumeric and being more than 8 characters'); - } - else if ( has_upper_lower && has_symbols && has_numbers && password.length >= 6 ) - { - // still give some points for passing complexity check - score += 2; - debug.push('2 points for having uppercase and lowercase, numbers, and nonalphanumeric'); - } - else if(( ( has_upper_lower && has_symbols ) || - ( has_upper_lower && has_numbers ) || - ( has_symbols && has_numbers ) ) && password.length >= 6 ) - { - // if 2 of the three main complexity checks passed, add a point - score += 1; - debug.push('1 point for having 2 of 3 complexity checks'); - } - else if ( ( !has_upper_lower && !has_numbers && has_symbols ) || - ( !has_upper_lower && !has_symbols && has_numbers ) || - ( !has_numbers && !has_symbols && has_upper_lower ) ) - { - score += -2; - debug.push('-2 points for only meeting 1 complexity check'); - } - else if ( password.match(/^[0-9]*?([a-z]+)[0-9]?$/) ) - { - // password is something like magnum1 which will be cracked in seconds - score += -4; - debug.push('-4 points for being of the form [number][word][number], which is easily cracked'); - } - else if ( !has_upper_lower && !has_numbers && !has_symbols ) - { - // this is if somehow the user inputs a password that doesn't match the rule above, but still doesn't contain upper and lowercase, numbers, or symbols - debug.push('-3 points for not meeting any complexity checks'); - score += -3; - } - - // - // Repetition - // Example: foobar12345 should be deducted points, where f1o2o3b4a5r should be given points - // None of the positive ones kick in unless the length is at least 8 - // - - if ( password.match(/([A-Z][A-Z][A-Z][A-Z]|[a-z][a-z][a-z][a-z])/) ) - { - debug.push('-2 points for having more than 4 letters of the same case in a row'); - score += -2; - } - else if ( password.match(/([A-Z][A-Z][A-Z]|[a-z][a-z][a-z])/) ) - { - debug.push('-1 points for having more than 3 letters of the same case in a row'); - score += -1; - } - else if ( password.match(/[A-z]/) && !password.match(/([A-Z][A-Z][A-Z]|[a-z][a-z][a-z])/) && password.length >= 8 ) - { - debug.push('1 point for never having more than 2 letters of the same case in a row'); - score += 1; - } - - if ( password.match(/[0-9][0-9][0-9][0-9]/) ) - { - debug.push('-2 points for having 4 or more numbers in a row'); - score += -2; - } - else if ( password.match(/[0-9][0-9][0-9]/) ) - { - debug.push('-1 points for having 3 or more numbers in a row'); - score += -1; - } - else if ( has_numbers && !password.match(/[0-9][0-9][0-9]/) && password.length >= 8 ) - { - debug.push('1 point for never more than 2 numbers in a row'); - score += -1; - } - - // make passwords like fooooooooooooooooooooooooooooooooooooo totally die by subtracting a point for each character repeated at least 3 times in a row - var prev_char = ''; - var warn = false; - var loss = 0; - for ( var i = 0; i < password.length; i++ ) - { - var chr = password.substr(i, 1); - if ( chr == prev_char && warn ) - { - loss += -1; - } - else if ( chr == prev_char && !warn ) - { - warn = true; - } - else if ( chr != prev_char && warn ) - { - warn = false; - } - prev_char = chr; - } - if ( loss < 0 ) - { - debug.push(''+loss+' points for immediate character repetition'); - score += loss; - // this can bring the score below -10 sometimes - if ( score < -10 ) - { - debug.push('Score set to -10 because it went below that floor'); - score = -10; - } - } - - var debug_txt = "How this score was calculated\nYour score was tallied up based on an extensive algorithm which outputted\nthe following scores based on traits of your password. Above you can see the\ncomposite score; your individual scores based on certain tests are below.\n\nThe scale is open-ended, with a minimum score of -10. 10 is very strong, 4\nis strong, 1 is good and -3 is fair. Below -3 scores \"Weak.\"\n\n"; - for ( var i = 0; i < debug.length; i++ ) - { - debug_txt += debug[i] + "\n"; - } - - // For users that really want to know why their password sucks. - // Not localized because the feature is really only used for debugging the algorithm. - if ( document.getElementById('passdebug') ) - document.getElementById('passdebug').innerHTML = debug_txt; - - return score; + if ( typeof(password) != "string" ) + { + return -10; + } + var score = 0; + var debug = []; + // length check + var lenscore = password_score_len(password); + + debug.push(''+lenscore+' points for length'); + + score += lenscore; + + var has_upper_lower = false; + var has_symbols = false; + var has_numbers = false; + + // contains uppercase and lowercase + if ( password.match(/[A-z]+/) && password.toLowerCase() != password ) + { + score += 1; + has_upper_lower = true; + debug.push('1 point for having uppercase and lowercase'); + } + + // contains symbols + if ( password.match(/[^A-z0-9]+/) ) + { + score += 1; + has_symbols = true; + debug.push('1 point for having nonalphanumeric characters (matching /[^A-z0-9]+/)'); + } + + // contains numbers + if ( password.match(/[0-9]+/) ) + { + score += 1; + has_numbers = true; + debug.push('1 point for having numbers'); + } + + if ( has_upper_lower && has_symbols && has_numbers && password.length >= 9 ) + { + // if it has uppercase and lowercase letters, symbols, and numbers, and is of considerable length, add some serious points + score += 4; + debug.push('4 points for having uppercase and lowercase, numbers, and nonalphanumeric and being more than 8 characters'); + } + else if ( has_upper_lower && has_symbols && has_numbers && password.length >= 6 ) + { + // still give some points for passing complexity check + score += 2; + debug.push('2 points for having uppercase and lowercase, numbers, and nonalphanumeric'); + } + else if(( ( has_upper_lower && has_symbols ) || + ( has_upper_lower && has_numbers ) || + ( has_symbols && has_numbers ) ) && password.length >= 6 ) + { + // if 2 of the three main complexity checks passed, add a point + score += 1; + debug.push('1 point for having 2 of 3 complexity checks'); + } + else if ( ( !has_upper_lower && !has_numbers && has_symbols ) || + ( !has_upper_lower && !has_symbols && has_numbers ) || + ( !has_numbers && !has_symbols && has_upper_lower ) ) + { + score += -2; + debug.push('-2 points for only meeting 1 complexity check'); + } + else if ( password.match(/^[0-9]*?([a-z]+)[0-9]?$/) ) + { + // password is something like magnum1 which will be cracked in seconds + score += -4; + debug.push('-4 points for being of the form [number][word][number], which is easily cracked'); + } + else if ( !has_upper_lower && !has_numbers && !has_symbols ) + { + // this is if somehow the user inputs a password that doesn't match the rule above, but still doesn't contain upper and lowercase, numbers, or symbols + debug.push('-3 points for not meeting any complexity checks'); + score += -3; + } + + // + // Repetition + // Example: foobar12345 should be deducted points, where f1o2o3b4a5r should be given points + // None of the positive ones kick in unless the length is at least 8 + // + + if ( password.match(/([A-Z][A-Z][A-Z][A-Z]|[a-z][a-z][a-z][a-z])/) ) + { + debug.push('-2 points for having more than 4 letters of the same case in a row'); + score += -2; + } + else if ( password.match(/([A-Z][A-Z][A-Z]|[a-z][a-z][a-z])/) ) + { + debug.push('-1 points for having more than 3 letters of the same case in a row'); + score += -1; + } + else if ( password.match(/[A-z]/) && !password.match(/([A-Z][A-Z][A-Z]|[a-z][a-z][a-z])/) && password.length >= 8 ) + { + debug.push('1 point for never having more than 2 letters of the same case in a row'); + score += 1; + } + + if ( password.match(/[0-9][0-9][0-9][0-9]/) ) + { + debug.push('-2 points for having 4 or more numbers in a row'); + score += -2; + } + else if ( password.match(/[0-9][0-9][0-9]/) ) + { + debug.push('-1 points for having 3 or more numbers in a row'); + score += -1; + } + else if ( has_numbers && !password.match(/[0-9][0-9][0-9]/) && password.length >= 8 ) + { + debug.push('1 point for never more than 2 numbers in a row'); + score += -1; + } + + // make passwords like fooooooooooooooooooooooooooooooooooooo totally die by subtracting a point for each character repeated at least 3 times in a row + var prev_char = ''; + var warn = false; + var loss = 0; + for ( var i = 0; i < password.length; i++ ) + { + var chr = password.substr(i, 1); + if ( chr == prev_char && warn ) + { + loss += -1; + } + else if ( chr == prev_char && !warn ) + { + warn = true; + } + else if ( chr != prev_char && warn ) + { + warn = false; + } + prev_char = chr; + } + if ( loss < 0 ) + { + debug.push(''+loss+' points for immediate character repetition'); + score += loss; + // this can bring the score below -10 sometimes + if ( score < -10 ) + { + debug.push('Score set to -10 because it went below that floor'); + score = -10; + } + } + + var debug_txt = "How this score was calculated\nYour score was tallied up based on an extensive algorithm which outputted\nthe following scores based on traits of your password. Above you can see the\ncomposite score; your individual scores based on certain tests are below.\n\nThe scale is open-ended, with a minimum score of -10. 10 is very strong, 4\nis strong, 1 is good and -3 is fair. Below -3 scores \"Weak.\"\n\n"; + for ( var i = 0; i < debug.length; i++ ) + { + debug_txt += debug[i] + "\n"; + } + + // For users that really want to know why their password sucks. + // Not localized because the feature is really only used for debugging the algorithm. + if ( document.getElementById('passdebug') ) + document.getElementById('passdebug').innerHTML = debug_txt; + + return score; } function password_score_draw(score) { - if ( !$lang ) - { - // $lang isn't initted yet, this happens sometimes on the usercp/emailpassword form. - // Try to init it if we have ENANO_LANG_ID and enano_lang; if not, report an error. - load_component('l10n'); - if ( typeof(enano_lang) == 'object' && typeof(ENANO_LANG_ID) == 'number' ) - { - language_onload(); - } - else - { - return { - 'color' : '#000000', - 'fgcolor' : '#666666', - 'str' : 'Language init failed' - }; - } - } - // some colors are from the Gmail sign-up form - if ( score >= 10 ) - { - var color = '#010101'; - var fgcolor = '#666666'; - var str = $lang.get('usercp_pwstrength_score_verystrong', { score: score }); - } - else if ( score > 3 ) - { - var color = '#008000'; - var fgcolor = '#004000'; - var str = $lang.get('usercp_pwstrength_score_strong', { score: score }); - } - else if ( score >= 1 ) - { - var color = '#6699cc'; - var fgcolor = '#4477aa'; - var str = $lang.get('usercp_pwstrength_score_good', { score: score }); - } - else if ( score >= -3 ) - { - var color = '#f5ac00'; - var fgcolor = '#ffcc33'; - var str = $lang.get('usercp_pwstrength_score_fair', { score: score }); - } - else - { - var color = '#aa0033'; - var fgcolor = '#FF6060'; - var str = $lang.get('usercp_pwstrength_score_weak', { score: score }); - } - var ret = { - color: color, - fgcolor: fgcolor, - str: str - }; - return ret; + if ( !$lang ) + { + // $lang isn't initted yet, this happens sometimes on the usercp/emailpassword form. + // Try to init it if we have ENANO_LANG_ID and enano_lang; if not, report an error. + load_component('l10n'); + if ( typeof(enano_lang) == 'object' && typeof(ENANO_LANG_ID) == 'number' ) + { + language_onload(); + } + else + { + return { + 'color' : '#000000', + 'fgcolor' : '#666666', + 'str' : 'Language init failed' + }; + } + } + // some colors are from the Gmail sign-up form + if ( score >= 10 ) + { + var color = '#010101'; + var fgcolor = '#666666'; + var str = $lang.get('usercp_pwstrength_score_verystrong', { score: score }); + } + else if ( score > 3 ) + { + var color = '#008000'; + var fgcolor = '#004000'; + var str = $lang.get('usercp_pwstrength_score_strong', { score: score }); + } + else if ( score >= 1 ) + { + var color = '#6699cc'; + var fgcolor = '#4477aa'; + var str = $lang.get('usercp_pwstrength_score_good', { score: score }); + } + else if ( score >= -3 ) + { + var color = '#f5ac00'; + var fgcolor = '#ffcc33'; + var str = $lang.get('usercp_pwstrength_score_fair', { score: score }); + } + else + { + var color = '#aa0033'; + var fgcolor = '#FF6060'; + var str = $lang.get('usercp_pwstrength_score_weak', { score: score }); + } + var ret = { + color: color, + fgcolor: fgcolor, + str: str + }; + return ret; } function password_score_field(field) { - var indicator = false; - if ( field.nextSibling ) - { - if ( field.nextSibling.className == 'password-checker' ) - { - indicator = field.nextSibling; - } - } - if ( !indicator ) - { - var indicator = document.createElement('span'); - indicator.className = 'password-checker'; - if ( field.nextSibling ) - { - field.parentNode.insertBefore(indicator, field.nextSibling); - } - else - { - field.parentNode.appendChild(indicator); - } - } - var score = password_score(field.value); - var data = password_score_draw(score); - indicator.style.color = data.color; - indicator.style.fontWeight = 'bold'; - indicator.innerHTML = ' ' + data.str; - - if ( document.getElementById('pwmeter') ) - { - var div = document.getElementById('pwmeter'); - div.style.width = '250px'; - score += 10; - if ( score > 25 ) - score = 25; - div.style.backgroundColor = data.color; - var width = Math.round( score * (250 / 25) ); - div.innerHTML = ''; - } + var indicator = false; + if ( field.nextSibling ) + { + if ( field.nextSibling.className == 'password-checker' ) + { + indicator = field.nextSibling; + } + } + if ( !indicator ) + { + var indicator = document.createElement('span'); + indicator.className = 'password-checker'; + if ( field.nextSibling ) + { + field.parentNode.insertBefore(indicator, field.nextSibling); + } + else + { + field.parentNode.appendChild(indicator); + } + } + var score = password_score(field.value); + var data = password_score_draw(score); + indicator.style.color = data.color; + indicator.style.fontWeight = 'bold'; + indicator.innerHTML = ' ' + data.str; + + if ( document.getElementById('pwmeter') ) + { + var div = document.getElementById('pwmeter'); + div.style.width = '250px'; + score += 10; + if ( score > 25 ) + score = 25; + div.style.backgroundColor = data.color; + var width = Math.round( score * (250 / 25) ); + div.innerHTML = ''; + } } diff -r de56132c008d -r bdac73ed481e includes/clientside/static/rank-manager.js --- a/includes/clientside/static/rank-manager.js Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/static/rank-manager.js Sun Mar 28 23:10:46 2010 -0400 @@ -4,477 +4,477 @@ var RankEditorControl = function(rankdata) { - this.rankdata = ( typeof(rankdata) == 'object' ) ? rankdata : {}; - if ( !this.rankdata.rank_style ) - { - this.rankdata.rank_style = ''; - } - - // have the browser parse CSS for us and use an anchor to be as close - // as possible in calculating CSS - - // this is kind of a hack as it relies on setAttribute/getAttribute in - // order to obtain stringified versions of CSS data - var cssobj = document.createElement('a'); - cssobj.setAttribute('style', this.rankdata.rank_style); - - this.style_sim_obj = cssobj; - - // figure out if we're editing or creating - this.editing = ( typeof(this.rankdata.rank_id) == 'number' ); - - this.render = function() - { - var editor = document.createElement('div'); - editor.className = 'tblholder'; - // stash this editor instance in the parent div for later function calls - editor.editor = this; - this.wrapperdiv = editor; - editor.style.width = '100%'; - - // tables suck. - var table = document.createElement('table'); - table.setAttribute('cellspacing', '1'); - table.setAttribute('cellpadding', '4'); - table.setAttribute('width', '100%'); - - // heading: "Edit rank: foo" or "Create a new rank" - var tr_head = document.createElement('tr'); - var th_head = document.createElement('th'); - th_head.setAttribute('colspan', '2'); - if ( this.editing ) - { - var th_head_string = 'acpur_th_edit_rank'; - var th_head_data = { rank_title: $lang.get(this.rankdata.rank_title) }; - } - else - { - var th_head_string = 'acpur_th_create_rank'; - var th_head_data = { }; - } - th_head.appendChild(document.createTextNode($lang.get(th_head_string, th_head_data))); - tr_head.appendChild(th_head); - this.th_head = th_head; - table.appendChild(tr_head); - - // row: rank title - var tr_title = document.createElement('tr'); - var td_title_l = document.createElement('td'); - var td_title_f = document.createElement('td'); - - td_title_l.className = td_title_f.className = 'row1'; - - td_title_l.appendChild(document.createTextNode($lang.get('acpur_field_rank_title'))); - - // field: rank title - var f_rank_title = document.createElement('input'); - f_rank_title.type = 'text'; - f_rank_title.size = '30'; - f_rank_title.value = ( this.editing ) ? this.rankdata.rank_title : ''; - f_rank_title.editor = this; - f_rank_title.onkeyup = function() - { - this.editor.renderPreview(); - } - this.f_rank_title = f_rank_title; - td_title_f.appendChild(f_rank_title); - - tr_title.appendChild(td_title_l); - tr_title.appendChild(td_title_f); - table.appendChild(tr_title); - - // row: basic style options - var tr_basic = document.createElement('tr'); - var td_basic_l = document.createElement('td'); - var td_basic_f = document.createElement('td'); - - td_basic_l.className = td_basic_f.className = 'row2'; - - td_basic_l.appendChild(document.createTextNode($lang.get('acpur_field_style_basic'))); - - // fieldset: basic style options - // field: bold - var l_basic_bold = document.createElement('label'); - var f_basic_bold = document.createElement('input'); - f_basic_bold.type = 'checkbox'; - f_basic_bold.checked = ( this.style_sim_obj.style.fontWeight == 'bold' ) ? true : false; - f_basic_bold.editor = this; - f_basic_bold.onclick = function() - { - this.editor.style_sim_obj.style.fontWeight = ( this.checked ) ? 'bold' : null; - this.editor.renderPreview(); - } - l_basic_bold.style.fontWeight = 'bold'; - l_basic_bold.appendChild(f_basic_bold); - l_basic_bold.appendChild(document.createTextNode(' ')); - l_basic_bold.appendChild(document.createTextNode($lang.get('acpur_field_style_basic_bold'))); - - // field: italic - var l_basic_italic = document.createElement('label'); - var f_basic_italic = document.createElement('input'); - f_basic_italic.type = 'checkbox'; - f_basic_italic.checked = ( this.style_sim_obj.style.fontStyle == 'italic' ) ? true : false; - f_basic_italic.editor = this; - f_basic_italic.onclick = function() - { - this.editor.style_sim_obj.style.fontStyle = ( this.checked ) ? 'italic' : null; - this.editor.renderPreview(); - } - l_basic_italic.style.fontStyle = 'italic'; - l_basic_italic.appendChild(f_basic_italic); - l_basic_italic.appendChild(document.createTextNode(' ')); - l_basic_italic.appendChild(document.createTextNode($lang.get('acpur_field_style_basic_italic'))); - - // field: underline - var l_basic_underline = document.createElement('label'); - var f_basic_underline = document.createElement('input'); - f_basic_underline.type = 'checkbox'; - f_basic_underline.checked = ( this.style_sim_obj.style.textDecoration == 'underline' ) ? true : false; - f_basic_underline.editor = this; - f_basic_underline.onclick = function() - { - this.editor.style_sim_obj.style.textDecoration = ( this.checked ) ? 'underline' : null; - this.editor.renderPreview(); - } - l_basic_underline.style.textDecoration = 'underline'; - l_basic_underline.appendChild(f_basic_underline); - l_basic_underline.appendChild(document.createTextNode(' ')); - l_basic_underline.appendChild(document.createTextNode($lang.get('acpur_field_style_basic_underline'))); - - // finish up formatting row#1 - td_basic_f.appendChild(l_basic_bold); - td_basic_f.appendChild(document.createTextNode(' ')); - td_basic_f.appendChild(l_basic_italic); - td_basic_f.appendChild(document.createTextNode(' ')); - td_basic_f.appendChild(l_basic_underline); - - tr_basic.appendChild(td_basic_l); - tr_basic.appendChild(td_basic_f); - table.appendChild(tr_basic); - - // row: rank color - var tr_color = document.createElement('tr'); - var td_color_l = document.createElement('td'); - var td_color_f = document.createElement('td'); - - td_color_l.className = td_color_f.className = 'row1'; - - td_color_l.appendChild(document.createTextNode($lang.get('acpur_field_style_color'))); - - // field: rank color - var f_rank_color = document.createElement('input'); - f_rank_color.type = 'text'; - f_rank_color.size = '7'; - f_rank_color.value = ( this.editing ) ? this.rgb2hex(this.style_sim_obj.style.color) : ''; - f_rank_color.style.backgroundColor = this.style_sim_obj.style.color; - f_rank_color.editor = this; - this.f_rank_color = f_rank_color; - f_rank_color.onkeyup = function(e) - { - if ( !e.keyCode ) - e = window.event; - if ( !e ) - return false; - var chr = (String.fromCharCode(e.keyCode)).toLowerCase(); - this.value = this.value.replace(/[^a-fA-F0-9]/g, ''); - if ( this.value.length > 6 ) - { - this.value = this.value.substr(0, 6); - } - if ( this.value.length == 6 || this.value.length == 3 ) - { - this.style.backgroundColor = '#' + this.value; - this.editor.style_sim_obj.style.color = '#' + this.value; - this.style.color = '#' + this.editor.determineLightness(this.value); - this.editor.renderPreview(); - } - else if ( this.value.length == 0 ) - { - this.style.backgroundColor = null; - this.editor.style_sim_obj.style.color = null; - this.editor.renderPreview(); - } - } - td_color_f.appendChild(f_rank_color); - - tr_color.appendChild(td_color_l); - tr_color.appendChild(td_color_f); - table.appendChild(tr_color); - - // field: additional CSS - var tr_css = document.createElement('tr'); - - var td_css_l = document.createElement('td'); - td_css_l.className = 'row2'; - td_css_l.appendChild(document.createTextNode($lang.get('acpur_field_style_css'))); - tr_css.appendChild(td_css_l); - - var td_css_f = document.createElement('td'); - td_css_f.className = 'row2'; - var f_css = document.createElement('input'); - f_css.type = 'text'; - f_css.value = this.stripBasicCSSAttributes(this.rankdata.rank_style); - f_css.style.width = '98%'; - f_css.editor = this; - f_css.onkeyup = function() - { - if ( !(trim(this.value)).match(/^((([a-z-]+):(.+?);)+)?$/) ) - return; - var newcss = this.editor.stripExtendedCSSAttributes(String(this.editor.style_sim_obj.getAttribute('style'))) + ' ' + this.value; - this.editor.preview_div.setAttribute('style', 'font-size: x-large; ' + newcss); - this.editor.style_sim_obj.setAttribute('style', newcss); - } - this.f_css = f_css; - td_css_f.appendChild(f_css); - tr_css.appendChild(td_css_f); - table.appendChild(tr_css); - - // "field": preview - var tr_preview = document.createElement('tr'); - var td_preview_l = document.createElement('td'); - td_preview_l.className = 'row1'; - td_preview_l.appendChild(document.createTextNode($lang.get('acpur_field_preview'))); - tr_preview.appendChild(td_preview_l); - - var td_preview_f = document.createElement('td'); - td_preview_f.className = 'row1'; - var div_preview = document.createElement('a'); - this.preview_div = div_preview; - div_preview.style.fontSize = 'x-large'; - div_preview.appendChild(document.createTextNode('')); - div_preview.firstChild.nodeValue = ( this.editing ) ? this.rankdata.rank_title : ''; - td_preview_f.appendChild(div_preview); - tr_preview.appendChild(td_preview_f); - - table.appendChild(tr_preview); - - // submit button - var tr_submit = document.createElement('tr'); - var th_submit = document.createElement('th'); - th_submit.className = 'subhead'; - th_submit.setAttribute('colspan', '2'); - var btn_submit = document.createElement('input'); - btn_submit.type = 'submit'; - btn_submit.value = ( this.editing ) ? $lang.get('acpur_btn_save') : $lang.get('acpur_btn_create_submit'); - btn_submit.editor = this; - btn_submit.style.fontWeight = 'bold'; - btn_submit.onclick = function(e) - { - this.editor.submitEvent(e); - } - this.btn_submit = btn_submit; - th_submit.appendChild(btn_submit); - - // delete button - if ( this.editing ) - { - var btn_delete = document.createElement('input'); - btn_delete.type = 'button'; - btn_delete.value = $lang.get('acpur_btn_delete'); - btn_delete.editor = this; - btn_delete.onclick = function(e) - { - this.editor.deleteEvent(e); - } - th_submit.appendChild(document.createTextNode(' ')); - th_submit.appendChild(btn_delete); - } - - tr_submit.appendChild(th_submit); - - table.appendChild(tr_submit); - - // render preview - this.renderPreview(); - - // finalize the editor table - editor.appendChild(table); - - // stash rendered editor - this.editordiv = editor; - - // send output - return editor; - } - - /** - * Takes the existing editor div and transforms the necessary elements so that it goes from "create" mode to "edit" mode - * @param object Edit data - same format as the rankdata parameter to the constructor, but we should only need rank_id - */ - - this.transformToEditor = function(rankdata) - { - // we need a rank ID - if ( typeof(rankdata.rank_id) != 'number' ) - return false; - - if ( this.editing ) - return false; - - this.editing = true; - - this.rankdata = rankdata; - this.rankdata.rank_title = this.f_rank_title.value; - this.rankdata.rank_style = this.getCSS(); - - // transform various controls - this.th_head.firstChild.nodeValue = $lang.get('acpur_th_edit_rank', { - rank_title: $lang.get(this.rankdata.rank_title) - }); - this.btn_submit.value = $lang.get('acpur_btn_save'); - - // add the delete button - var th_submit = this.btn_submit.parentNode; - - var btn_delete = document.createElement('input'); - btn_delete.type = 'button'; - btn_delete.value = $lang.get('acpur_btn_delete'); - btn_delete.editor = this; - btn_delete.onclick = function(e) - { - this.editor.deleteEvent(e); - } - th_submit.appendChild(document.createTextNode(' ')); - th_submit.appendChild(btn_delete); - - return true; - } - - /** - * Takes a hex color, averages the three channels, and returns either 'ffffff' or '000000' depending on the luminosity of the color. - * @param string - * @return string - */ - - this.determineLightness = function(hexval) - { - var rgb = this.hex2rgb(hexval); - var lumin = ( rgb[0] + rgb[1] + rgb[2] ) / 3; - return ( lumin > 60 ) ? '000000' : 'ffffff'; - } - - /** - * Strips out basic CSS attributes (color, font-weight, font-style, text-decoration) from a snippet of CSS. - * @param string - * @return string - */ - - this.stripBasicCSSAttributes = function(css) - { - return trim(css.replace(/(color|font-weight|font-style|text-decoration): ?([A-z0-9# ,\(\)]+);/g, '')); - } - - /** - * Strips out all but basic CSS attributes. - * @param string - * @return string - */ - - this.stripExtendedCSSAttributes = function(css) - { - var match; - var final_css = ''; - var basics = ['color', 'font-weight', 'font-style', 'text-decoration']; - while ( match = css.match(/([a-z-]+):(.+?);/) ) - { - if ( in_array(match[1], basics) ) - { - final_css += ' ' + match[0] + ' '; - } - css = css.replace(match[0], ''); - } - final_css = trim(final_css); - return final_css; - } - - this.getCSS = function() - { - return this.style_sim_obj.getAttribute('style'); - } - - this.renderPreview = function() - { - if ( !this.preview_div ) - return false; - var color = ( this.style_sim_obj.style.color ) ? '#' + this.rgb2hex(this.style_sim_obj.style.color) : null; - this.preview_div.style.color = color; - this.preview_div.style.fontWeight = this.style_sim_obj.style.fontWeight; - this.preview_div.style.fontStyle = this.style_sim_obj.style.fontStyle; - this.preview_div.style.textDecoration = this.style_sim_obj.style.textDecoration; - this.preview_div.firstChild.nodeValue = $lang.get(this.f_rank_title.value); - } - - this.submitEvent = function(e) - { - if ( this.onsubmit ) - { - this.onsubmit(e); - } - else - { - window.console.error('RankEditorControl: no onsubmit event specified'); - } - } - - this.deleteEvent = function(e) - { - if ( this.ondelete ) - { - this.ondelete(e); - } - else - { - window.console.error('RankEditorControl: no ondelete event specified'); - } - } - - /** - * Converts a parenthetical color specification (rgb(x, y, z)) to hex form (xxyyzz) - * @param string - * @return string - */ - - this.rgb2hex = function(rgb) - { - var p = rgb.match(/^rgb\(([0-9]+), ([0-9]+), ([0-9]+)\)$/); - if ( !p ) - return rgb.replace(/^#/, ''); - - var r = parseInt(p[1]).toString(16), g = parseInt(p[2]).toString(16), b = parseInt(p[3]).toString(16); - if ( r.length < 2 ) - r = '0' + r; - if ( g.length < 2 ) - g = '0' + g; - if ( b.length < 2 ) - b = '0' + b; - - return r + g + b; - } - - /** - * Get red, green, and blue values for the given hex color - * @param string - * @return array (numbered, e.g. not an object - */ - - this.hex2rgb = function(hex) - { - hex = hex.replace(/^#/, ''); - if ( hex.length != 3 && hex.length != 6 ) - { - return hex; - } - if ( hex.length == 3 ) - { - // is there a better way to do this? - hex = hex.charAt(0) + hex.charAt(0) + hex.charAt(1) + hex.charAt(1) + hex.charAt(2) + hex.charAt(2); - } - hex = [ hex.substr(0, 2), hex.substr(2, 2), hex.substr(4, 2) ]; - var red = parseInt(hex[0], 16); - var green = parseInt(hex[1], 16); - var blue = parseInt(hex[2], 16); - return [red, green, blue]; - } + this.rankdata = ( typeof(rankdata) == 'object' ) ? rankdata : {}; + if ( !this.rankdata.rank_style ) + { + this.rankdata.rank_style = ''; + } + + // have the browser parse CSS for us and use an anchor to be as close + // as possible in calculating CSS + + // this is kind of a hack as it relies on setAttribute/getAttribute in + // order to obtain stringified versions of CSS data + var cssobj = document.createElement('a'); + cssobj.setAttribute('style', this.rankdata.rank_style); + + this.style_sim_obj = cssobj; + + // figure out if we're editing or creating + this.editing = ( typeof(this.rankdata.rank_id) == 'number' ); + + this.render = function() + { + var editor = document.createElement('div'); + editor.className = 'tblholder'; + // stash this editor instance in the parent div for later function calls + editor.editor = this; + this.wrapperdiv = editor; + editor.style.width = '100%'; + + // tables suck. + var table = document.createElement('table'); + table.setAttribute('cellspacing', '1'); + table.setAttribute('cellpadding', '4'); + table.setAttribute('width', '100%'); + + // heading: "Edit rank: foo" or "Create a new rank" + var tr_head = document.createElement('tr'); + var th_head = document.createElement('th'); + th_head.setAttribute('colspan', '2'); + if ( this.editing ) + { + var th_head_string = 'acpur_th_edit_rank'; + var th_head_data = { rank_title: $lang.get(this.rankdata.rank_title) }; + } + else + { + var th_head_string = 'acpur_th_create_rank'; + var th_head_data = { }; + } + th_head.appendChild(document.createTextNode($lang.get(th_head_string, th_head_data))); + tr_head.appendChild(th_head); + this.th_head = th_head; + table.appendChild(tr_head); + + // row: rank title + var tr_title = document.createElement('tr'); + var td_title_l = document.createElement('td'); + var td_title_f = document.createElement('td'); + + td_title_l.className = td_title_f.className = 'row1'; + + td_title_l.appendChild(document.createTextNode($lang.get('acpur_field_rank_title'))); + + // field: rank title + var f_rank_title = document.createElement('input'); + f_rank_title.type = 'text'; + f_rank_title.size = '30'; + f_rank_title.value = ( this.editing ) ? this.rankdata.rank_title : ''; + f_rank_title.editor = this; + f_rank_title.onkeyup = function() + { + this.editor.renderPreview(); + } + this.f_rank_title = f_rank_title; + td_title_f.appendChild(f_rank_title); + + tr_title.appendChild(td_title_l); + tr_title.appendChild(td_title_f); + table.appendChild(tr_title); + + // row: basic style options + var tr_basic = document.createElement('tr'); + var td_basic_l = document.createElement('td'); + var td_basic_f = document.createElement('td'); + + td_basic_l.className = td_basic_f.className = 'row2'; + + td_basic_l.appendChild(document.createTextNode($lang.get('acpur_field_style_basic'))); + + // fieldset: basic style options + // field: bold + var l_basic_bold = document.createElement('label'); + var f_basic_bold = document.createElement('input'); + f_basic_bold.type = 'checkbox'; + f_basic_bold.checked = ( this.style_sim_obj.style.fontWeight == 'bold' ) ? true : false; + f_basic_bold.editor = this; + f_basic_bold.onclick = function() + { + this.editor.style_sim_obj.style.fontWeight = ( this.checked ) ? 'bold' : null; + this.editor.renderPreview(); + } + l_basic_bold.style.fontWeight = 'bold'; + l_basic_bold.appendChild(f_basic_bold); + l_basic_bold.appendChild(document.createTextNode(' ')); + l_basic_bold.appendChild(document.createTextNode($lang.get('acpur_field_style_basic_bold'))); + + // field: italic + var l_basic_italic = document.createElement('label'); + var f_basic_italic = document.createElement('input'); + f_basic_italic.type = 'checkbox'; + f_basic_italic.checked = ( this.style_sim_obj.style.fontStyle == 'italic' ) ? true : false; + f_basic_italic.editor = this; + f_basic_italic.onclick = function() + { + this.editor.style_sim_obj.style.fontStyle = ( this.checked ) ? 'italic' : null; + this.editor.renderPreview(); + } + l_basic_italic.style.fontStyle = 'italic'; + l_basic_italic.appendChild(f_basic_italic); + l_basic_italic.appendChild(document.createTextNode(' ')); + l_basic_italic.appendChild(document.createTextNode($lang.get('acpur_field_style_basic_italic'))); + + // field: underline + var l_basic_underline = document.createElement('label'); + var f_basic_underline = document.createElement('input'); + f_basic_underline.type = 'checkbox'; + f_basic_underline.checked = ( this.style_sim_obj.style.textDecoration == 'underline' ) ? true : false; + f_basic_underline.editor = this; + f_basic_underline.onclick = function() + { + this.editor.style_sim_obj.style.textDecoration = ( this.checked ) ? 'underline' : null; + this.editor.renderPreview(); + } + l_basic_underline.style.textDecoration = 'underline'; + l_basic_underline.appendChild(f_basic_underline); + l_basic_underline.appendChild(document.createTextNode(' ')); + l_basic_underline.appendChild(document.createTextNode($lang.get('acpur_field_style_basic_underline'))); + + // finish up formatting row#1 + td_basic_f.appendChild(l_basic_bold); + td_basic_f.appendChild(document.createTextNode(' ')); + td_basic_f.appendChild(l_basic_italic); + td_basic_f.appendChild(document.createTextNode(' ')); + td_basic_f.appendChild(l_basic_underline); + + tr_basic.appendChild(td_basic_l); + tr_basic.appendChild(td_basic_f); + table.appendChild(tr_basic); + + // row: rank color + var tr_color = document.createElement('tr'); + var td_color_l = document.createElement('td'); + var td_color_f = document.createElement('td'); + + td_color_l.className = td_color_f.className = 'row1'; + + td_color_l.appendChild(document.createTextNode($lang.get('acpur_field_style_color'))); + + // field: rank color + var f_rank_color = document.createElement('input'); + f_rank_color.type = 'text'; + f_rank_color.size = '7'; + f_rank_color.value = ( this.editing ) ? this.rgb2hex(this.style_sim_obj.style.color) : ''; + f_rank_color.style.backgroundColor = this.style_sim_obj.style.color; + f_rank_color.editor = this; + this.f_rank_color = f_rank_color; + f_rank_color.onkeyup = function(e) + { + if ( !e.keyCode ) + e = window.event; + if ( !e ) + return false; + var chr = (String.fromCharCode(e.keyCode)).toLowerCase(); + this.value = this.value.replace(/[^a-fA-F0-9]/g, ''); + if ( this.value.length > 6 ) + { + this.value = this.value.substr(0, 6); + } + if ( this.value.length == 6 || this.value.length == 3 ) + { + this.style.backgroundColor = '#' + this.value; + this.editor.style_sim_obj.style.color = '#' + this.value; + this.style.color = '#' + this.editor.determineLightness(this.value); + this.editor.renderPreview(); + } + else if ( this.value.length == 0 ) + { + this.style.backgroundColor = null; + this.editor.style_sim_obj.style.color = null; + this.editor.renderPreview(); + } + } + td_color_f.appendChild(f_rank_color); + + tr_color.appendChild(td_color_l); + tr_color.appendChild(td_color_f); + table.appendChild(tr_color); + + // field: additional CSS + var tr_css = document.createElement('tr'); + + var td_css_l = document.createElement('td'); + td_css_l.className = 'row2'; + td_css_l.appendChild(document.createTextNode($lang.get('acpur_field_style_css'))); + tr_css.appendChild(td_css_l); + + var td_css_f = document.createElement('td'); + td_css_f.className = 'row2'; + var f_css = document.createElement('input'); + f_css.type = 'text'; + f_css.value = this.stripBasicCSSAttributes(this.rankdata.rank_style); + f_css.style.width = '98%'; + f_css.editor = this; + f_css.onkeyup = function() + { + if ( !(trim(this.value)).match(/^((([a-z-]+):(.+?);)+)?$/) ) + return; + var newcss = this.editor.stripExtendedCSSAttributes(String(this.editor.style_sim_obj.getAttribute('style'))) + ' ' + this.value; + this.editor.preview_div.setAttribute('style', 'font-size: x-large; ' + newcss); + this.editor.style_sim_obj.setAttribute('style', newcss); + } + this.f_css = f_css; + td_css_f.appendChild(f_css); + tr_css.appendChild(td_css_f); + table.appendChild(tr_css); + + // "field": preview + var tr_preview = document.createElement('tr'); + var td_preview_l = document.createElement('td'); + td_preview_l.className = 'row1'; + td_preview_l.appendChild(document.createTextNode($lang.get('acpur_field_preview'))); + tr_preview.appendChild(td_preview_l); + + var td_preview_f = document.createElement('td'); + td_preview_f.className = 'row1'; + var div_preview = document.createElement('a'); + this.preview_div = div_preview; + div_preview.style.fontSize = 'x-large'; + div_preview.appendChild(document.createTextNode('')); + div_preview.firstChild.nodeValue = ( this.editing ) ? this.rankdata.rank_title : ''; + td_preview_f.appendChild(div_preview); + tr_preview.appendChild(td_preview_f); + + table.appendChild(tr_preview); + + // submit button + var tr_submit = document.createElement('tr'); + var th_submit = document.createElement('th'); + th_submit.className = 'subhead'; + th_submit.setAttribute('colspan', '2'); + var btn_submit = document.createElement('input'); + btn_submit.type = 'submit'; + btn_submit.value = ( this.editing ) ? $lang.get('acpur_btn_save') : $lang.get('acpur_btn_create_submit'); + btn_submit.editor = this; + btn_submit.style.fontWeight = 'bold'; + btn_submit.onclick = function(e) + { + this.editor.submitEvent(e); + } + this.btn_submit = btn_submit; + th_submit.appendChild(btn_submit); + + // delete button + if ( this.editing ) + { + var btn_delete = document.createElement('input'); + btn_delete.type = 'button'; + btn_delete.value = $lang.get('acpur_btn_delete'); + btn_delete.editor = this; + btn_delete.onclick = function(e) + { + this.editor.deleteEvent(e); + } + th_submit.appendChild(document.createTextNode(' ')); + th_submit.appendChild(btn_delete); + } + + tr_submit.appendChild(th_submit); + + table.appendChild(tr_submit); + + // render preview + this.renderPreview(); + + // finalize the editor table + editor.appendChild(table); + + // stash rendered editor + this.editordiv = editor; + + // send output + return editor; + } + + /** + * Takes the existing editor div and transforms the necessary elements so that it goes from "create" mode to "edit" mode + * @param object Edit data - same format as the rankdata parameter to the constructor, but we should only need rank_id + */ + + this.transformToEditor = function(rankdata) + { + // we need a rank ID + if ( typeof(rankdata.rank_id) != 'number' ) + return false; + + if ( this.editing ) + return false; + + this.editing = true; + + this.rankdata = rankdata; + this.rankdata.rank_title = this.f_rank_title.value; + this.rankdata.rank_style = this.getCSS(); + + // transform various controls + this.th_head.firstChild.nodeValue = $lang.get('acpur_th_edit_rank', { + rank_title: $lang.get(this.rankdata.rank_title) + }); + this.btn_submit.value = $lang.get('acpur_btn_save'); + + // add the delete button + var th_submit = this.btn_submit.parentNode; + + var btn_delete = document.createElement('input'); + btn_delete.type = 'button'; + btn_delete.value = $lang.get('acpur_btn_delete'); + btn_delete.editor = this; + btn_delete.onclick = function(e) + { + this.editor.deleteEvent(e); + } + th_submit.appendChild(document.createTextNode(' ')); + th_submit.appendChild(btn_delete); + + return true; + } + + /** + * Takes a hex color, averages the three channels, and returns either 'ffffff' or '000000' depending on the luminosity of the color. + * @param string + * @return string + */ + + this.determineLightness = function(hexval) + { + var rgb = this.hex2rgb(hexval); + var lumin = ( rgb[0] + rgb[1] + rgb[2] ) / 3; + return ( lumin > 60 ) ? '000000' : 'ffffff'; + } + + /** + * Strips out basic CSS attributes (color, font-weight, font-style, text-decoration) from a snippet of CSS. + * @param string + * @return string + */ + + this.stripBasicCSSAttributes = function(css) + { + return trim(css.replace(/(color|font-weight|font-style|text-decoration): ?([A-z0-9# ,\(\)]+);/g, '')); + } + + /** + * Strips out all but basic CSS attributes. + * @param string + * @return string + */ + + this.stripExtendedCSSAttributes = function(css) + { + var match; + var final_css = ''; + var basics = ['color', 'font-weight', 'font-style', 'text-decoration']; + while ( match = css.match(/([a-z-]+):(.+?);/) ) + { + if ( in_array(match[1], basics) ) + { + final_css += ' ' + match[0] + ' '; + } + css = css.replace(match[0], ''); + } + final_css = trim(final_css); + return final_css; + } + + this.getCSS = function() + { + return this.style_sim_obj.getAttribute('style'); + } + + this.renderPreview = function() + { + if ( !this.preview_div ) + return false; + var color = ( this.style_sim_obj.style.color ) ? '#' + this.rgb2hex(this.style_sim_obj.style.color) : null; + this.preview_div.style.color = color; + this.preview_div.style.fontWeight = this.style_sim_obj.style.fontWeight; + this.preview_div.style.fontStyle = this.style_sim_obj.style.fontStyle; + this.preview_div.style.textDecoration = this.style_sim_obj.style.textDecoration; + this.preview_div.firstChild.nodeValue = $lang.get(this.f_rank_title.value); + } + + this.submitEvent = function(e) + { + if ( this.onsubmit ) + { + this.onsubmit(e); + } + else + { + window.console.error('RankEditorControl: no onsubmit event specified'); + } + } + + this.deleteEvent = function(e) + { + if ( this.ondelete ) + { + this.ondelete(e); + } + else + { + window.console.error('RankEditorControl: no ondelete event specified'); + } + } + + /** + * Converts a parenthetical color specification (rgb(x, y, z)) to hex form (xxyyzz) + * @param string + * @return string + */ + + this.rgb2hex = function(rgb) + { + var p = rgb.match(/^rgb\(([0-9]+), ([0-9]+), ([0-9]+)\)$/); + if ( !p ) + return rgb.replace(/^#/, ''); + + var r = parseInt(p[1]).toString(16), g = parseInt(p[2]).toString(16), b = parseInt(p[3]).toString(16); + if ( r.length < 2 ) + r = '0' + r; + if ( g.length < 2 ) + g = '0' + g; + if ( b.length < 2 ) + b = '0' + b; + + return r + g + b; + } + + /** + * Get red, green, and blue values for the given hex color + * @param string + * @return array (numbered, e.g. not an object + */ + + this.hex2rgb = function(hex) + { + hex = hex.replace(/^#/, ''); + if ( hex.length != 3 && hex.length != 6 ) + { + return hex; + } + if ( hex.length == 3 ) + { + // is there a better way to do this? + hex = hex.charAt(0) + hex.charAt(0) + hex.charAt(1) + hex.charAt(1) + hex.charAt(2) + hex.charAt(2); + } + hex = [ hex.substr(0, 2), hex.substr(2, 2), hex.substr(4, 2) ]; + var red = parseInt(hex[0], 16); + var green = parseInt(hex[1], 16); + var blue = parseInt(hex[2], 16); + return [red, green, blue]; + } } /** @@ -483,313 +483,313 @@ function ajaxInitRankEdit(rank_id) { - load_component('messagebox'); - var json_packet = { - mode: 'get_rank', - rank_id: rank_id - }; - json_packet = ajaxEscape(toJSONString(json_packet)); - ajaxPost(makeUrlNS('Admin', 'UserRanks/action.json'), 'r=' + json_packet, function(ajax) - { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - var response = String(ajax.responseText + ''); - if ( !check_json_response(response) ) - { - handle_invalid_json(ajax.responseText); - return false; - } - try - { - var response = parseJSON(ajax.responseText); - } - catch(e) - { - handle_invalid_json(ajax.responseText); - } - if ( response.error ) - { - if ( response.error == 'need_auth_to_admin' ) - { - load_component('login'); - var rid = rank_id; - ajaxDynamicReauth(function() - { - ajaxInitRankEdit(rid); - }); - } - else - { - alert(response.error); - } - return false; - } - var editor = new RankEditorControl(response); - editor.onsubmit = ajaxRankEditHandleSaveExisting; - editor.ondelete = ajaxRankEditHandleDelete; - var container = document.getElementById('admin_ranks_container_right'); - container.innerHTML = ''; - container.appendChild(editor.render()); - } - }, true); + load_component('messagebox'); + var json_packet = { + mode: 'get_rank', + rank_id: rank_id + }; + json_packet = ajaxEscape(toJSONString(json_packet)); + ajaxPost(makeUrlNS('Admin', 'UserRanks/action.json'), 'r=' + json_packet, function(ajax) + { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + var response = String(ajax.responseText + ''); + if ( !check_json_response(response) ) + { + handle_invalid_json(ajax.responseText); + return false; + } + try + { + var response = parseJSON(ajax.responseText); + } + catch(e) + { + handle_invalid_json(ajax.responseText); + } + if ( response.error ) + { + if ( response.error == 'need_auth_to_admin' ) + { + load_component('login'); + var rid = rank_id; + ajaxDynamicReauth(function() + { + ajaxInitRankEdit(rid); + }); + } + else + { + alert(response.error); + } + return false; + } + var editor = new RankEditorControl(response); + editor.onsubmit = ajaxRankEditHandleSaveExisting; + editor.ondelete = ajaxRankEditHandleDelete; + var container = document.getElementById('admin_ranks_container_right'); + container.innerHTML = ''; + container.appendChild(editor.render()); + } + }, true); } function ajaxInitRankCreate() { - load_component('messagebox'); - var editor = new RankEditorControl(); - editor.onsubmit = ajaxRankEditHandleSaveNew; - var container = document.getElementById('admin_ranks_container_right'); - container.innerHTML = ''; - container.appendChild(editor.render()); + load_component('messagebox'); + var editor = new RankEditorControl(); + editor.onsubmit = ajaxRankEditHandleSaveNew; + var container = document.getElementById('admin_ranks_container_right'); + container.innerHTML = ''; + container.appendChild(editor.render()); } function ajaxRankEditHandleSave(editor, switch_new) { - var whitey = whiteOutElement(editor.wrapperdiv); - - // pack it up, ... - var json_packet = { - mode: ( switch_new ) ? 'create_rank' : 'save_rank', - rank_title: editor.f_rank_title.value, - rank_style: editor.getCSS() - } - if ( !switch_new ) - { - json_packet.rank_id = editor.rankdata.rank_id; - } - /// ... pack it in - var json_packet = ajaxEscape(toJSONString(json_packet)); - - ajaxPost(makeUrlNS('Admin', 'UserRanks/action.json'), 'r=' + json_packet, function(ajax) - { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - var response = String(ajax.responseText + ''); - if ( !check_json_response(response) ) - { - handle_invalid_json(ajax.responseText); - return false; - } - try - { - var response = parseJSON(ajax.responseText); - } - catch(e) - { - handle_invalid_json(ajax.responseText); - } - if ( response.mode == 'success' ) - { - whiteOutReportSuccess(whitey); - if ( switch_new ) - { - // - // we have a few more things to do with a newly created rank. - // - - // 1. transform editor - editor.transformToEditor(response); - editor.onsubmit = ajaxRankEditHandleSaveExisting; - editor.ondelete = ajaxRankEditHandleDelete; - - // 2. append the new rank to the list - var create_link = document.getElementById('rankadmin_createlink'); - if ( create_link ) - { - var parent = create_link.parentNode; - var edit_link = document.createElement('a'); - edit_link.href = '#rank_edit:' + response.rank_id; - edit_link.className = 'rankadmin-editlink'; - edit_link.setAttribute('style', editor.getCSS()); - edit_link.id = 'rankadmin_editlink_' + response.rank_id; - edit_link.rank_id = response.rank_id; - edit_link.appendChild(document.createTextNode($lang.get(editor.f_rank_title.value))); - parent.insertBefore(edit_link, create_link); - edit_link.onclick = function() - { - ajaxInitRankEdit(this.rank_id); - } - } - } - else - { - // update the rank title on the left - var edit_link = document.getElementById('rankadmin_editlink_' + editor.rankdata.rank_id); - if ( edit_link ) - { - edit_link.firstChild.nodeValue = $lang.get(editor.f_rank_title.value); - edit_link.setAttribute('style', editor.getCSS()); - } - } - } - else - { - whitey.parentNode.removeChild(whitey); - if ( response.error == 'need_auth_to_admin' ) - { - load_component('login'); - ajaxDynamicReauth(function() - { - ajaxRankEditHandleSave(editor, switch_new); - }); - } - else - { - miniPromptMessage({ - title: $lang.get('acpur_err_save_failed_title'), - message: response.error, - buttons: [ - { - text: $lang.get('etc_ok'), - color: 'red', - style: { - fontWeight: 'bold' - }, - onclick: function() - { - miniPromptDestroy(this); - } - } - ] - }); - } - } - } - }, true); + var whitey = whiteOutElement(editor.wrapperdiv); + + // pack it up, ... + var json_packet = { + mode: ( switch_new ) ? 'create_rank' : 'save_rank', + rank_title: editor.f_rank_title.value, + rank_style: editor.getCSS() + } + if ( !switch_new ) + { + json_packet.rank_id = editor.rankdata.rank_id; + } + /// ... pack it in + var json_packet = ajaxEscape(toJSONString(json_packet)); + + ajaxPost(makeUrlNS('Admin', 'UserRanks/action.json'), 'r=' + json_packet, function(ajax) + { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + var response = String(ajax.responseText + ''); + if ( !check_json_response(response) ) + { + handle_invalid_json(ajax.responseText); + return false; + } + try + { + var response = parseJSON(ajax.responseText); + } + catch(e) + { + handle_invalid_json(ajax.responseText); + } + if ( response.mode == 'success' ) + { + whiteOutReportSuccess(whitey); + if ( switch_new ) + { + // + // we have a few more things to do with a newly created rank. + // + + // 1. transform editor + editor.transformToEditor(response); + editor.onsubmit = ajaxRankEditHandleSaveExisting; + editor.ondelete = ajaxRankEditHandleDelete; + + // 2. append the new rank to the list + var create_link = document.getElementById('rankadmin_createlink'); + if ( create_link ) + { + var parent = create_link.parentNode; + var edit_link = document.createElement('a'); + edit_link.href = '#rank_edit:' + response.rank_id; + edit_link.className = 'rankadmin-editlink'; + edit_link.setAttribute('style', editor.getCSS()); + edit_link.id = 'rankadmin_editlink_' + response.rank_id; + edit_link.rank_id = response.rank_id; + edit_link.appendChild(document.createTextNode($lang.get(editor.f_rank_title.value))); + parent.insertBefore(edit_link, create_link); + edit_link.onclick = function() + { + ajaxInitRankEdit(this.rank_id); + } + } + } + else + { + // update the rank title on the left + var edit_link = document.getElementById('rankadmin_editlink_' + editor.rankdata.rank_id); + if ( edit_link ) + { + edit_link.firstChild.nodeValue = $lang.get(editor.f_rank_title.value); + edit_link.setAttribute('style', editor.getCSS()); + } + } + } + else + { + whitey.parentNode.removeChild(whitey); + if ( response.error == 'need_auth_to_admin' ) + { + load_component('login'); + ajaxDynamicReauth(function() + { + ajaxRankEditHandleSave(editor, switch_new); + }); + } + else + { + miniPromptMessage({ + title: $lang.get('acpur_err_save_failed_title'), + message: response.error, + buttons: [ + { + text: $lang.get('etc_ok'), + color: 'red', + style: { + fontWeight: 'bold' + }, + onclick: function() + { + miniPromptDestroy(this); + } + } + ] + }); + } + } + } + }, true); } var ajaxRankEditHandleSaveExisting = function() { - ajaxRankEditHandleSave(this, false); + ajaxRankEditHandleSave(this, false); } var ajaxRankEditHandleSaveNew = function() { - ajaxRankEditHandleSave(this, true); + ajaxRankEditHandleSave(this, true); } var ajaxRankEditHandleDelete = function() { - var mp = miniPromptMessage({ - title: $lang.get('acpur_msg_rank_delete_confirm_title'), - message: $lang.get('acpur_msg_rank_delete_confirm_body'), - buttons: [ - { - text: $lang.get('acpur_btn_delete'), - color: 'red', - style: { - fontWeight: 'bold' - }, - onclick: function() - { - var parent = miniPromptGetParent(this); - var editor = parent.editor; - setTimeout(function() - { - ajaxRankEditDeleteConfirmed(editor); - }, 1000); - miniPromptDestroy(parent); - } - }, - { - text: $lang.get('etc_cancel'), - onclick: function() - { - miniPromptDestroy(this); - } - } - ] - }); - console.debug(mp); - mp.editor = this; + var mp = miniPromptMessage({ + title: $lang.get('acpur_msg_rank_delete_confirm_title'), + message: $lang.get('acpur_msg_rank_delete_confirm_body'), + buttons: [ + { + text: $lang.get('acpur_btn_delete'), + color: 'red', + style: { + fontWeight: 'bold' + }, + onclick: function() + { + var parent = miniPromptGetParent(this); + var editor = parent.editor; + setTimeout(function() + { + ajaxRankEditDeleteConfirmed(editor); + }, 1000); + miniPromptDestroy(parent); + } + }, + { + text: $lang.get('etc_cancel'), + onclick: function() + { + miniPromptDestroy(this); + } + } + ] + }); + console.debug(mp); + mp.editor = this; } function ajaxRankEditDeleteConfirmed(editor) { - var whitey = whiteOutElement(editor.wrapperdiv); - - load_component(['jquery', 'jquery-ui']); - - var json_packet = { - mode: 'delete_rank', - rank_id: editor.rankdata.rank_id - }; - var rank_id = editor.rankdata.rank_id; - - json_packet = ajaxEscape(toJSONString(json_packet)); - ajaxPost(makeUrlNS('Admin', 'UserRanks/action.json'), 'r=' + json_packet, function(ajax) - { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - var response = String(ajax.responseText + ''); - if ( !check_json_response(response) ) - { - handle_invalid_json(ajax.responseText); - return false; - } - try - { - var response = parseJSON(ajax.responseText); - } - catch(e) - { - handle_invalid_json(ajax.responseText); - } - if ( response.mode == 'success' ) - { - // the deletion was successful, report success and kill off the editor - whiteOutReportSuccess(whitey); - setTimeout(function() - { - // nuke the rank title on the left - var edit_link = document.getElementById('rankadmin_editlink_' + editor.rankdata.rank_id); - if ( edit_link ) - { - edit_link.parentNode.removeChild(edit_link); - } - // collapse and destroy the editor - $(editor.wrapperdiv).hide("blind", {}, 500, function() - { - // when the animation finishes, nuke the whole thing - var container = document.getElementById('admin_ranks_container_right'); - container.innerHTML = $lang.get('acpur_msg_select_rank'); - } - ); - }, 1500); - } - else - { - whitey.parentNode.removeChild(whitey); - if ( response.error == 'need_auth_to_admin' ) - { - load_component('login'); - ajaxDynamicReauth(function() - { - ajaxRankEditDeleteConfirmed(editor); - }); - } - else - { - miniPromptMessage({ - title: $lang.get('acpur_err_delete_failed_title'), - message: response.error, - buttons: [ - { - text: $lang.get('etc_ok'), - color: 'red', - style: { - fontWeight: 'bold' - }, - onclick: function() - { - miniPromptDestroy(this); - } - } - ] - }); - } - } - } - }, true); + var whitey = whiteOutElement(editor.wrapperdiv); + + load_component(['jquery', 'jquery-ui']); + + var json_packet = { + mode: 'delete_rank', + rank_id: editor.rankdata.rank_id + }; + var rank_id = editor.rankdata.rank_id; + + json_packet = ajaxEscape(toJSONString(json_packet)); + ajaxPost(makeUrlNS('Admin', 'UserRanks/action.json'), 'r=' + json_packet, function(ajax) + { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + var response = String(ajax.responseText + ''); + if ( !check_json_response(response) ) + { + handle_invalid_json(ajax.responseText); + return false; + } + try + { + var response = parseJSON(ajax.responseText); + } + catch(e) + { + handle_invalid_json(ajax.responseText); + } + if ( response.mode == 'success' ) + { + // the deletion was successful, report success and kill off the editor + whiteOutReportSuccess(whitey); + setTimeout(function() + { + // nuke the rank title on the left + var edit_link = document.getElementById('rankadmin_editlink_' + editor.rankdata.rank_id); + if ( edit_link ) + { + edit_link.parentNode.removeChild(edit_link); + } + // collapse and destroy the editor + $(editor.wrapperdiv).hide("blind", {}, 500, function() + { + // when the animation finishes, nuke the whole thing + var container = document.getElementById('admin_ranks_container_right'); + container.innerHTML = $lang.get('acpur_msg_select_rank'); + } + ); + }, 1500); + } + else + { + whitey.parentNode.removeChild(whitey); + if ( response.error == 'need_auth_to_admin' ) + { + load_component('login'); + ajaxDynamicReauth(function() + { + ajaxRankEditDeleteConfirmed(editor); + }); + } + else + { + miniPromptMessage({ + title: $lang.get('acpur_err_delete_failed_title'), + message: response.error, + buttons: [ + { + text: $lang.get('etc_ok'), + color: 'red', + style: { + fontWeight: 'bold' + }, + onclick: function() + { + miniPromptDestroy(this); + } + } + ] + }); + } + } + } + }, true); } diff -r de56132c008d -r bdac73ed481e includes/clientside/static/sliders.js --- a/includes/clientside/static/sliders.js Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/static/sliders.js Sun Mar 28 23:10:46 2010 -0400 @@ -5,92 +5,92 @@ /* pseudocode: - oninit(): - i = 0 - for every div with class "slideblock", do - if ( cookie['mdgSliderState_' || i] == 'closed' ) - div.hide() - - div.trigger.addEvent onclick(): - if ( div.hidden ) - div.show() - cookie['mdgSliderState_' || i] = 'open' - else - div.hide() - cookie['mdgSliderState_' || i] = 'closed - - i++ - + oninit(): + i = 0 + for every div with class "slideblock", do + if ( cookie['mdgSliderState_' || i] == 'closed' ) + div.hide() + + div.trigger.addEvent onclick(): + if ( div.hidden ) + div.show() + cookie['mdgSliderState_' || i] = 'open' + else + div.hide() + cookie['mdgSliderState_' || i] = 'closed + + i++ + */ var sliders_initted = false; - + var initSliders = function() { - if ( KILL_SWITCH || IE ) - return false; - - var divs = getElementsByClassName(document, "div", "slideblock"); - var divs2 = getElementsByClassName(document, "div", "slideblock2"); - for ( var i = 0; i < divs2.length; i++ ) - { - divs.push(divs2[i]); - } - delete divs2; - - if ( divs.length < 1 ) - return false; - - for ( var i = 0; i < divs.length; i++ ) - { - var div = divs[i]; - // set a unique id for this slider - div.metaid = i; - - var cookiename = 'mdgSliderState_' + i; - if ( readCookie(cookiename) == 'closed' ) - { - div.style.display = 'none'; - } - - var el = div.previousSibling; - if ( !el ) - continue; - while ( el.tagName == undefined ) - { - el = el.previousSibling; - if ( !el ) - break; - } - if ( !el ) - continue; - var toggler = el.getElementsByTagName('a')[0]; - if ( !toggler ) - continue; - toggler.onclick = function() - { - load_component(['jquery', 'jquery-ui']); - - var mydiv = this.parentNode.nextSibling; - while ( mydiv.tagName != 'DIV' ) - mydiv = mydiv.nextSibling; - if ( mydiv.style.display == 'none' ) - { - $(mydiv).show('blind'); - var cookiename = 'mdgSliderState_' + mydiv.metaid; - createCookie(cookiename, 'open', 365); - } - else - { - $(mydiv).hide('blind'); - var cookiename = 'mdgSliderState_' + mydiv.metaid; - createCookie(cookiename, 'closed', 365); - } - - return false; - } - } + if ( KILL_SWITCH || IE ) + return false; + + var divs = getElementsByClassName(document, "div", "slideblock"); + var divs2 = getElementsByClassName(document, "div", "slideblock2"); + for ( var i = 0; i < divs2.length; i++ ) + { + divs.push(divs2[i]); + } + delete divs2; + + if ( divs.length < 1 ) + return false; + + for ( var i = 0; i < divs.length; i++ ) + { + var div = divs[i]; + // set a unique id for this slider + div.metaid = i; + + var cookiename = 'mdgSliderState_' + i; + if ( readCookie(cookiename) == 'closed' ) + { + div.style.display = 'none'; + } + + var el = div.previousSibling; + if ( !el ) + continue; + while ( el.tagName == undefined ) + { + el = el.previousSibling; + if ( !el ) + break; + } + if ( !el ) + continue; + var toggler = el.getElementsByTagName('a')[0]; + if ( !toggler ) + continue; + toggler.onclick = function() + { + load_component(['jquery', 'jquery-ui']); + + var mydiv = this.parentNode.nextSibling; + while ( mydiv.tagName != 'DIV' ) + mydiv = mydiv.nextSibling; + if ( mydiv.style.display == 'none' ) + { + $(mydiv).show('blind'); + var cookiename = 'mdgSliderState_' + mydiv.metaid; + createCookie(cookiename, 'open', 365); + } + else + { + $(mydiv).hide('blind'); + var cookiename = 'mdgSliderState_' + mydiv.metaid; + createCookie(cookiename, 'closed', 365); + } + + return false; + } + } } addOnloadHook(initSliders); diff -r de56132c008d -r bdac73ed481e includes/clientside/static/template-compiler.js --- a/includes/clientside/static/template-compiler.js Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/static/template-compiler.js Sun Mar 28 23:10:46 2010 -0400 @@ -3,79 +3,79 @@ window.templateParser = function(text) { - this.tpl_code = text; - this.tpl_strings = new Object(); - this.tpl_bool = new Object(); - this.assign_vars = __tpAssignVars; - this.assign_bool = __tpAssignBool; - this.run = __tpRun; + this.tpl_code = text; + this.tpl_strings = new Object(); + this.tpl_bool = new Object(); + this.assign_vars = __tpAssignVars; + this.assign_bool = __tpAssignBool; + this.run = __tpRun; } window.__tpAssignVars = function(vars) { - for(var i in vars) - { - this.tpl_strings[i] = vars[i]; - } + for(var i in vars) + { + this.tpl_strings[i] = vars[i]; + } } window.__tpAssignBool = function(vars) { - for(var i in vars) - { - this.tpl_bool[i] = ( vars[i] ) ? true : false; - } + for(var i in vars) + { + this.tpl_bool[i] = ( vars[i] ) ? true : false; + } } window.__tpRun = function() { - if(typeof(this.tpl_code) == 'string') - { - tpl_code = __tpCompileTemplate(this.tpl_code); - try { - compiled = eval(tpl_code); - } - catch(e) - { - alert(e); - aclDebug(tpl_code); - } - return compiled; - } - return false; + if(typeof(this.tpl_code) == 'string') + { + tpl_code = __tpCompileTemplate(this.tpl_code); + try { + compiled = eval(tpl_code); + } + catch(e) + { + alert(e); + aclDebug(tpl_code); + } + return compiled; + } + return false; } window.__tpCompileTemplate = function(code) { - // Compile plaintext/template code to javascript code - code = code.replace(/\\/g, "\\\\"); - code = code.replace(/\'/g, "\\'"); - code = code.replace(/\"/g, '\\"'); - code = code.replace(new RegExp(unescape('%0A'), 'g'), '\\n'); - code = "'" + code + "'"; - code = code.replace(/\{([A-z0-9_-]+)\}/ig, "' + this.tpl_strings['$1'] + '"); - code = code.replace(/\{lang:([a-z0-9_]+)\}/g, "' + $lang.get('$1') + '"); - code = code.replace(/\/g); - code2 = ''; - for(var i in code) - if(typeof(code[i]) == 'string') - code2 = code2 + code[i]; - code = code2.replace(/\/g, "'$1' : \"$2\","); - code = '( { ' + code + ' "________null________" : false } )'; - vars = eval(code); - return vars; + code = code.replace('\\', "\\\\"); + code = code.replace("'", "\\'"); + code = code.replace('"', '\\"'); + code = code.replace(new RegExp(unescape('%0A'), 'g'), "\\n"); + code = code.match(/\/g); + code2 = ''; + for(var i in code) + if(typeof(code[i]) == 'string') + code2 = code2 + code[i]; + code = code2.replace(/\/g, "'$1' : \"$2\","); + code = '( { ' + code + ' "________null________" : false } )'; + vars = eval(code); + return vars; } diff -r de56132c008d -r bdac73ed481e includes/clientside/static/theme-manager.js --- a/includes/clientside/static/theme-manager.js Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/static/theme-manager.js Sun Mar 28 23:10:46 2010 -0400 @@ -1,661 +1,661 @@ function ajaxToggleSystemThemes() { - var theme_list = document.getElementById('theme_list_edit'); - var mode = ( theme_list.sys_shown ) ? 'hide' : 'show'; - for ( var i = 0; i < theme_list.childNodes.length; i++ ) - { - var child = theme_list.childNodes[i]; - if ( child.tagName == 'DIV' ) - { - if ( $dynano(child).hasClass('themebutton_theme_system') ) - { - if ( $dynano(child).hasClass('themebutton_theme_disabled') ) - { - $dynano(child).rmClass('themebutton_theme_disabled') - } - if ( mode == 'show' ) - { - domObjChangeOpac(0, child); - child.style.display = 'block'; - domOpacity(child, 0, 100, 1000); - } - else - { - domOpacity(child, 100, 0, 1000); - setTimeout("document.getElementById('" + child.id + "').style.display = 'none';", 1050); - } - } - } - } - theme_list.sys_shown = ( mode == 'show' ); - document.getElementById('systheme_toggler').innerHTML = ( mode == 'hide' ) ? $lang.get('acptm_btn_system_themes_show') : $lang.get('acptm_btn_system_themes_hide'); + var theme_list = document.getElementById('theme_list_edit'); + var mode = ( theme_list.sys_shown ) ? 'hide' : 'show'; + for ( var i = 0; i < theme_list.childNodes.length; i++ ) + { + var child = theme_list.childNodes[i]; + if ( child.tagName == 'DIV' ) + { + if ( $dynano(child).hasClass('themebutton_theme_system') ) + { + if ( $dynano(child).hasClass('themebutton_theme_disabled') ) + { + $dynano(child).rmClass('themebutton_theme_disabled') + } + if ( mode == 'show' ) + { + domObjChangeOpac(0, child); + child.style.display = 'block'; + domOpacity(child, 0, 100, 1000); + } + else + { + domOpacity(child, 100, 0, 1000); + setTimeout("document.getElementById('" + child.id + "').style.display = 'none';", 1050); + } + } + } + } + theme_list.sys_shown = ( mode == 'show' ); + document.getElementById('systheme_toggler').innerHTML = ( mode == 'hide' ) ? $lang.get('acptm_btn_system_themes_show') : $lang.get('acptm_btn_system_themes_hide'); } function ajaxInstallTheme(theme_id) { - var thediv = document.getElementById('themebtn_install_' + theme_id); - if ( !thediv ) - return false; - thediv.removeChild(thediv.getElementsByTagName('a')[0]); - var status = document.createElement('div'); - status.className = 'status'; - thediv.appendChild(status); - - var req = toJSONString({ - mode: 'install', - theme_id: theme_id - }); - // we've finished nukeing the existing interface, request editor data - ajaxPost(makeUrlNS('Admin', 'ThemeManager/action.json'), 'r=' + ajaxEscape(req), function(ajax) - { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - var response = String(ajax.responseText + ''); - if ( response.substr(0, 1) == '{' ) - { - response = parseJSON(response); - if ( response.mode == 'error' ) - { - alert(response.error); - return false; - } - } - - var theme_list = document.getElementById('theme_list_edit'); - - var btn = document.createElement('div'); - btn.className = 'themebutton'; - btn.style.backgroundImage = thediv.style.backgroundImage; - btn.id = 'themebtn_edit_' + theme_id; - - var a = document.createElement('a'); - a.className = 'tb-inner'; - a.appendChild(document.createTextNode($lang.get('acptm_btn_theme_edit'))); - a.appendChild(document.createTextNode("\n")); - a.theme_id = theme_id; - a.onclick = function() - { - ajaxEditTheme(this.theme_id); - return false; - } - a.href = '#'; - var span = document.createElement('span'); - span.className = 'themename'; - span.appendChild(document.createTextNode(thediv.getAttribute('enano:themename'))); - a.appendChild(span); - btn.appendChild(a); - btn.setAttribute('enano:themename', thediv.getAttribute('enano:themename')); - theme_list.appendChild(btn); - - thediv.parentNode.removeChild(thediv); - } - }); + var thediv = document.getElementById('themebtn_install_' + theme_id); + if ( !thediv ) + return false; + thediv.removeChild(thediv.getElementsByTagName('a')[0]); + var status = document.createElement('div'); + status.className = 'status'; + thediv.appendChild(status); + + var req = toJSONString({ + mode: 'install', + theme_id: theme_id + }); + // we've finished nukeing the existing interface, request editor data + ajaxPost(makeUrlNS('Admin', 'ThemeManager/action.json'), 'r=' + ajaxEscape(req), function(ajax) + { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + var response = String(ajax.responseText + ''); + if ( response.substr(0, 1) == '{' ) + { + response = parseJSON(response); + if ( response.mode == 'error' ) + { + alert(response.error); + return false; + } + } + + var theme_list = document.getElementById('theme_list_edit'); + + var btn = document.createElement('div'); + btn.className = 'themebutton'; + btn.style.backgroundImage = thediv.style.backgroundImage; + btn.id = 'themebtn_edit_' + theme_id; + + var a = document.createElement('a'); + a.className = 'tb-inner'; + a.appendChild(document.createTextNode($lang.get('acptm_btn_theme_edit'))); + a.appendChild(document.createTextNode("\n")); + a.theme_id = theme_id; + a.onclick = function() + { + ajaxEditTheme(this.theme_id); + return false; + } + a.href = '#'; + var span = document.createElement('span'); + span.className = 'themename'; + span.appendChild(document.createTextNode(thediv.getAttribute('enano:themename'))); + a.appendChild(span); + btn.appendChild(a); + btn.setAttribute('enano:themename', thediv.getAttribute('enano:themename')); + theme_list.appendChild(btn); + + thediv.parentNode.removeChild(thediv); + } + }); } function ajaxEditTheme(theme_id) { - // Fade out and subsequently destroy the entire list, then make an - // ajax request to the theme manager for the theme info via JSON - var theme_list = document.getElementById('theme_list_edit').parentNode; - var backgroundImage = document.getElementById('themebtn_edit_' + theme_id).style.backgroundImage; - /* - for ( var i = 0; i < theme_list.childNodes.length; i++ ) - { - var el = theme_list.childNodes[i]; - if ( el.tagName ) - domOpacity(el, 100, 0, 1000); - } - */ - var thediv = document.getElementById('themebtn_edit_' + theme_id); - if ( !thediv ) - return false; - thediv.removeChild(thediv.getElementsByTagName('a')[0]); - var status = document.createElement('div'); - status.className = 'status'; - thediv.appendChild(status); - - setTimeout(function() - { - var req = toJSONString({ - mode: 'fetch_theme', - theme_id: theme_id - }); - // we've finished nukeing the existing interface, request editor data - ajaxPost(makeUrlNS('Admin', 'ThemeManager/action.json'), 'r=' + ajaxEscape(req), function(ajax) - { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - theme_list.innerHTML = ''; - var response = String(ajax.responseText + ''); - if ( !check_json_response(response) ) - { - alert(response); - return false; - } - response = parseJSON(response); - if ( response.mode == 'error' ) - { - alert(response.error); - return false; - } - response.background_image = backgroundImage; - ajaxBuildThemeEditor(response, theme_list); - } - }); - }, 200); + // Fade out and subsequently destroy the entire list, then make an + // ajax request to the theme manager for the theme info via JSON + var theme_list = document.getElementById('theme_list_edit').parentNode; + var backgroundImage = document.getElementById('themebtn_edit_' + theme_id).style.backgroundImage; + /* + for ( var i = 0; i < theme_list.childNodes.length; i++ ) + { + var el = theme_list.childNodes[i]; + if ( el.tagName ) + domOpacity(el, 100, 0, 1000); + } + */ + var thediv = document.getElementById('themebtn_edit_' + theme_id); + if ( !thediv ) + return false; + thediv.removeChild(thediv.getElementsByTagName('a')[0]); + var status = document.createElement('div'); + status.className = 'status'; + thediv.appendChild(status); + + setTimeout(function() + { + var req = toJSONString({ + mode: 'fetch_theme', + theme_id: theme_id + }); + // we've finished nukeing the existing interface, request editor data + ajaxPost(makeUrlNS('Admin', 'ThemeManager/action.json'), 'r=' + ajaxEscape(req), function(ajax) + { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + theme_list.innerHTML = ''; + var response = String(ajax.responseText + ''); + if ( !check_json_response(response) ) + { + alert(response); + return false; + } + response = parseJSON(response); + if ( response.mode == 'error' ) + { + alert(response.error); + return false; + } + response.background_image = backgroundImage; + ajaxBuildThemeEditor(response, theme_list); + } + }); + }, 200); } function ajaxBuildThemeEditor(data, target) { - // Build the theme editor interface - // Init opacity - domObjChangeOpac(0, target); - - // Theme preview - var preview = document.createElement('div'); - preview.style.border = '1px solid #F0F0F0'; - preview.style.padding = '5px'; - preview.style.width = '216px'; - preview.style.height = '150px'; - preview.style.backgroundImage = data.background_image; - preview.style.backgroundRepeat = 'no-repeat'; - preview.style.backgroundPosition = 'center center'; - preview.style.cssFloat = 'right'; - preview.style.styleFloat = 'right'; - - target.appendChild(preview); - - // Heading - var h3 = document.createElement('h3'); - h3.appendChild(document.createTextNode($lang.get('acptm_heading_theme_edit', { theme_name: data.theme_name }))); - target.appendChild(h3); - - // Field: Theme name - var l_name = document.createElement('label'); - l_name.appendChild(document.createTextNode($lang.get('acptm_field_theme_name') + ' ')); - var f_name = document.createElement('input'); - f_name.type = 'text'; - f_name.id = 'themeed_field_name'; - f_name.value = data.theme_name; - f_name.size = '40'; - l_name.appendChild(f_name); - target.appendChild(l_name); - - target.appendChild(document.createElement('br')); - target.appendChild(document.createElement('br')); - - // Field: default style - var l_style = document.createElement('label'); - l_style.appendChild(document.createTextNode($lang.get('acptm_field_default_style') + ' ')); - var f_style = document.createElement('select'); - f_style.id = 'themeed_field_style'; - var opts = []; - for ( var i = 0; i < data.css.length; i++ ) - { - if ( data.css[i] == '_printable' ) - continue; - - opts[i] = document.createElement('option'); - opts[i].value = data.css[i]; - opts[i].appendChild(document.createTextNode(data.css[i])); - if ( data.default_style == data.css[i] ) - { - opts[i].selected = true; - } - f_style.appendChild(opts[i]); - } - l_style.appendChild(f_style); - target.appendChild(l_style); - - target.appendChild(document.createElement('br')); - target.appendChild(document.createElement('br')); - - // Default theme - target.appendChild(document.createTextNode($lang.get('acptm_field_default_theme') + ' ')); - if ( data.is_default ) - { - var l_default = document.createElement('b'); - l_default.appendChild(document.createTextNode($lang.get('acptm_field_default_msg_current'))); - } - else - { - var l_default = document.createElement('label'); - var f_default = document.createElement('input'); - f_default.type = 'checkbox'; - f_default.id = 'themeed_field_default'; - l_default.appendChild(f_default); - l_default.appendChild(document.createTextNode($lang.get('acptm_field_default_btn_make_default'))); - } - target.appendChild(l_default); - - target.appendChild(document.createElement('br')); - target.appendChild(document.createElement('br')); - - // Disable theme - var disable_span = document.createElement('span'); - disable_span.appendChild(document.createTextNode($lang.get('acptm_field_disable_title') + ' ')); - target.appendChild(disable_span); - var l_disable = document.createElement('label'); - var f_disable = document.createElement('input'); - f_disable.type = 'checkbox'; - f_disable.id = 'themeed_field_disable'; - if ( !data.enabled ) - f_disable.setAttribute('checked', 'checked'); - l_disable.style.fontWeight = 'bold'; - l_disable.appendChild(f_disable); - l_disable.appendChild(document.createTextNode($lang.get('acptm_field_disable'))); - target.appendChild(l_disable); - - // Availability policy - var h3 = document.createElement('h3'); - h3.appendChild(document.createTextNode($lang.get('acptm_heading_theme_groups'))); - target.appendChild(h3); - - // Label for the whole field - var p_d_policy = document.createElement('p'); - p_d_policy.style.fontWeight = 'bold'; - p_d_policy.appendChild(document.createTextNode($lang.get('acptm_field_policy'))); - target.appendChild(p_d_policy); - - // Wrapper for options - var p_f_policy = document.createElement('p'); - - // Option: allow all - var l_policy_allow_all = document.createElement('label'); - var f_policy_allow_all = document.createElement('input'); - f_policy_allow_all.type = 'radio'; - f_policy_allow_all.id = 'themeed_field_policy_allow_all'; - f_policy_allow_all.name = 'themeed_field_policy'; - f_policy_allow_all.value = 'allow_all'; - l_policy_allow_all.appendChild(f_policy_allow_all); - l_policy_allow_all.appendChild(document.createTextNode(' ' + $lang.get('acptm_field_policy_allow_all'))); - if ( data.group_policy == 'allow_all' ) - { - f_policy_allow_all.setAttribute('checked', 'checked'); - } - - // Option: whitelist - var l_policy_whitelist = document.createElement('label'); - var f_policy_whitelist = document.createElement('input'); - f_policy_whitelist.type = 'radio'; - f_policy_whitelist.id = 'themeed_field_policy_whitelist'; - f_policy_whitelist.name = 'themeed_field_policy'; - f_policy_whitelist.value = 'whitelist'; - l_policy_whitelist.appendChild(f_policy_whitelist); - l_policy_whitelist.appendChild(document.createTextNode(' ' + $lang.get('acptm_field_policy_whitelist'))); - if ( data.group_policy == 'whitelist' ) - { - f_policy_whitelist.setAttribute('checked', 'checked'); - } - - // Option: blacklist - var l_policy_blacklist = document.createElement('label'); - var f_policy_blacklist = document.createElement('input'); - f_policy_blacklist.type = 'radio'; - f_policy_blacklist.id = 'themeed_field_policy_blacklist'; - f_policy_blacklist.name = 'themeed_field_policy'; - f_policy_blacklist.value = 'blacklist'; - l_policy_blacklist.appendChild(f_policy_blacklist); - l_policy_blacklist.appendChild(document.createTextNode(' ' + $lang.get('acptm_field_policy_blacklist'))); - if ( data.group_policy == 'blacklist' ) - { - f_policy_blacklist.setAttribute('checked', 'checked'); - } - f_policy_allow_all.onclick = ajaxThemeManagerHandlePolicyClick; - f_policy_whitelist.onclick = ajaxThemeManagerHandlePolicyClick; - f_policy_blacklist.onclick = ajaxThemeManagerHandlePolicyClick; - - p_f_policy.appendChild(l_policy_allow_all); - p_f_policy.appendChild(document.createElement('br')); - p_f_policy.appendChild(l_policy_whitelist); - p_f_policy.appendChild(document.createElement('br')); - p_f_policy.appendChild(l_policy_blacklist); - - target.appendChild(p_d_policy); - target.appendChild(p_f_policy); - - var div_acl = document.createElement('div'); - div_acl.id = 'themeed_acl_box'; - div_acl.style.margin = '0 0 10px 30px'; - - var h3_g = document.createElement('h3'); - h3_g.appendChild(document.createTextNode($lang.get('acptm_field_acl_heading_groups'))); - div_acl.appendChild(h3_g); - - var div_groups = document.createElement('div'); - div_groups.style.border = '1px solid #E8E8E8'; - div_groups.id = 'themeed_group_list'; - - // Group list - for ( var i in data.group_names ) - { - var g_name = data.group_names[i]; - var check = document.createElement('input'); - check.type = 'checkbox'; - if ( in_array("g:" + i, data.group_list) ) - { - check.setAttribute('checked', 'checked'); - } - check.group_id = parseInt(i); - var lbl_g_acl = document.createElement('label'); - lbl_g_acl.appendChild(check); - var str = 'groupcp_grp_' + g_name.toLowerCase(); - var g_name_l10n = ( $lang.get(str) != str ) ? $lang.get(str) : g_name; - lbl_g_acl.appendChild(document.createTextNode(g_name_l10n)); - div_groups.appendChild(lbl_g_acl); - div_groups.appendChild(document.createElement('br')); - } - div_acl.appendChild(div_groups); - - var h3_u = document.createElement('h3'); - h3_u.appendChild(document.createTextNode($lang.get('acptm_field_acl_heading_users'))); - div_acl.appendChild(h3_u); - - // User addition field - var frm = document.createElement('form'); - frm.action = 'javascript:ajaxThemeManagerHandleUserAdd();'; - frm.appendChild(document.createTextNode($lang.get('acptm_field_acl_add_user'))); - var f_useradd = document.createElement('input'); - f_useradd.type = 'text'; - f_useradd.id = 'themeed_field_adduser'; - f_useradd.onkeyup = function(e) - { - new AutofillUsername(this, e, false); - } - - frm.appendChild(f_useradd); - div_acl.appendChild(frm); - - div_acl.appendChild(document.createElement('br')); - - // User list - var div_users = document.createElement('div'); - div_users.style.border = '1px solid #E8E8E8'; - div_users.style.padding = '4px'; - div_users.id = 'themeed_user_list'; - for ( var i = 0; i < data.group_list.length; i++ ) - { - var id = data.group_list[i]; - if ( id.substr(0, 2) != 'u:' ) - continue; - var uid = id.substr(2); - var username = data.usernames[uid]; - - var useritem = document.createElement('span'); - useritem.appendChild(document.createTextNode(username + ' ')); - useritem.userid = parseInt(uid); - var deleter = document.createElement('a'); - deleter.href = '#'; - deleter.onclick = function() - { - ajaxThemeManagerHandleUserRemoval(this); - return false; - } - deleter.appendChild(document.createTextNode('[X]')); - useritem.appendChild(deleter); - div_users.appendChild(useritem); - div_users.appendChild(document.createElement('br')); - } - div_acl.appendChild(div_users); - - target.appendChild(div_acl); - - ajaxThemeManagerHandlePolicyClick(); - - var clearer = document.createElement('span'); - clearer.className = 'menuclear'; - target.appendChild(clearer); - - // Theme ID - var tid = document.createElement('input'); - tid.type = 'hidden'; - tid.id = 'themeed_theme_id'; - tid.value = data.theme_id; - target.appendChild(tid); - - // Save button - var raquo = unescape('%BB'); - var savebtn = document.createElement('input'); - savebtn.type = 'button'; - savebtn.style.fontWeight = 'bold'; - savebtn.value = $lang.get('etc_save_changes') + ' ' + raquo; - savebtn.onclick = function() - { - ajaxThemeManagerHandleSaveRequest(); - } - target.appendChild(savebtn); - - target.appendChild(document.createTextNode(' ')); - - // Cancel button - var savebtn = document.createElement('input'); - savebtn.type = 'button'; - savebtn.value = $lang.get('etc_cancel'); - savebtn.onclick = function() - { - ajaxPage(namespace_list['Admin'] + 'ThemeManager'); - } - target.appendChild(savebtn); - - target.appendChild(document.createTextNode(' ')); - - // Uninstall button - var savebtn = document.createElement('input'); - savebtn.type = 'button'; - savebtn.value = $lang.get('acptm_btn_uninstall_theme'); - savebtn.style.color = '#D84308'; - savebtn.onclick = function() - { - if ( !confirm($lang.get('acptm_msg_uninstall_confirm')) ) - return false; - ajaxThemeManagerHandleUninstallClick(); - } - target.appendChild(savebtn); - - // Fade it all in - domOpacity(target, 0, 100, 500); - f_name.focus(); + // Build the theme editor interface + // Init opacity + domObjChangeOpac(0, target); + + // Theme preview + var preview = document.createElement('div'); + preview.style.border = '1px solid #F0F0F0'; + preview.style.padding = '5px'; + preview.style.width = '216px'; + preview.style.height = '150px'; + preview.style.backgroundImage = data.background_image; + preview.style.backgroundRepeat = 'no-repeat'; + preview.style.backgroundPosition = 'center center'; + preview.style.cssFloat = 'right'; + preview.style.styleFloat = 'right'; + + target.appendChild(preview); + + // Heading + var h3 = document.createElement('h3'); + h3.appendChild(document.createTextNode($lang.get('acptm_heading_theme_edit', { theme_name: data.theme_name }))); + target.appendChild(h3); + + // Field: Theme name + var l_name = document.createElement('label'); + l_name.appendChild(document.createTextNode($lang.get('acptm_field_theme_name') + ' ')); + var f_name = document.createElement('input'); + f_name.type = 'text'; + f_name.id = 'themeed_field_name'; + f_name.value = data.theme_name; + f_name.size = '40'; + l_name.appendChild(f_name); + target.appendChild(l_name); + + target.appendChild(document.createElement('br')); + target.appendChild(document.createElement('br')); + + // Field: default style + var l_style = document.createElement('label'); + l_style.appendChild(document.createTextNode($lang.get('acptm_field_default_style') + ' ')); + var f_style = document.createElement('select'); + f_style.id = 'themeed_field_style'; + var opts = []; + for ( var i = 0; i < data.css.length; i++ ) + { + if ( data.css[i] == '_printable' ) + continue; + + opts[i] = document.createElement('option'); + opts[i].value = data.css[i]; + opts[i].appendChild(document.createTextNode(data.css[i])); + if ( data.default_style == data.css[i] ) + { + opts[i].selected = true; + } + f_style.appendChild(opts[i]); + } + l_style.appendChild(f_style); + target.appendChild(l_style); + + target.appendChild(document.createElement('br')); + target.appendChild(document.createElement('br')); + + // Default theme + target.appendChild(document.createTextNode($lang.get('acptm_field_default_theme') + ' ')); + if ( data.is_default ) + { + var l_default = document.createElement('b'); + l_default.appendChild(document.createTextNode($lang.get('acptm_field_default_msg_current'))); + } + else + { + var l_default = document.createElement('label'); + var f_default = document.createElement('input'); + f_default.type = 'checkbox'; + f_default.id = 'themeed_field_default'; + l_default.appendChild(f_default); + l_default.appendChild(document.createTextNode($lang.get('acptm_field_default_btn_make_default'))); + } + target.appendChild(l_default); + + target.appendChild(document.createElement('br')); + target.appendChild(document.createElement('br')); + + // Disable theme + var disable_span = document.createElement('span'); + disable_span.appendChild(document.createTextNode($lang.get('acptm_field_disable_title') + ' ')); + target.appendChild(disable_span); + var l_disable = document.createElement('label'); + var f_disable = document.createElement('input'); + f_disable.type = 'checkbox'; + f_disable.id = 'themeed_field_disable'; + if ( !data.enabled ) + f_disable.setAttribute('checked', 'checked'); + l_disable.style.fontWeight = 'bold'; + l_disable.appendChild(f_disable); + l_disable.appendChild(document.createTextNode($lang.get('acptm_field_disable'))); + target.appendChild(l_disable); + + // Availability policy + var h3 = document.createElement('h3'); + h3.appendChild(document.createTextNode($lang.get('acptm_heading_theme_groups'))); + target.appendChild(h3); + + // Label for the whole field + var p_d_policy = document.createElement('p'); + p_d_policy.style.fontWeight = 'bold'; + p_d_policy.appendChild(document.createTextNode($lang.get('acptm_field_policy'))); + target.appendChild(p_d_policy); + + // Wrapper for options + var p_f_policy = document.createElement('p'); + + // Option: allow all + var l_policy_allow_all = document.createElement('label'); + var f_policy_allow_all = document.createElement('input'); + f_policy_allow_all.type = 'radio'; + f_policy_allow_all.id = 'themeed_field_policy_allow_all'; + f_policy_allow_all.name = 'themeed_field_policy'; + f_policy_allow_all.value = 'allow_all'; + l_policy_allow_all.appendChild(f_policy_allow_all); + l_policy_allow_all.appendChild(document.createTextNode(' ' + $lang.get('acptm_field_policy_allow_all'))); + if ( data.group_policy == 'allow_all' ) + { + f_policy_allow_all.setAttribute('checked', 'checked'); + } + + // Option: whitelist + var l_policy_whitelist = document.createElement('label'); + var f_policy_whitelist = document.createElement('input'); + f_policy_whitelist.type = 'radio'; + f_policy_whitelist.id = 'themeed_field_policy_whitelist'; + f_policy_whitelist.name = 'themeed_field_policy'; + f_policy_whitelist.value = 'whitelist'; + l_policy_whitelist.appendChild(f_policy_whitelist); + l_policy_whitelist.appendChild(document.createTextNode(' ' + $lang.get('acptm_field_policy_whitelist'))); + if ( data.group_policy == 'whitelist' ) + { + f_policy_whitelist.setAttribute('checked', 'checked'); + } + + // Option: blacklist + var l_policy_blacklist = document.createElement('label'); + var f_policy_blacklist = document.createElement('input'); + f_policy_blacklist.type = 'radio'; + f_policy_blacklist.id = 'themeed_field_policy_blacklist'; + f_policy_blacklist.name = 'themeed_field_policy'; + f_policy_blacklist.value = 'blacklist'; + l_policy_blacklist.appendChild(f_policy_blacklist); + l_policy_blacklist.appendChild(document.createTextNode(' ' + $lang.get('acptm_field_policy_blacklist'))); + if ( data.group_policy == 'blacklist' ) + { + f_policy_blacklist.setAttribute('checked', 'checked'); + } + f_policy_allow_all.onclick = ajaxThemeManagerHandlePolicyClick; + f_policy_whitelist.onclick = ajaxThemeManagerHandlePolicyClick; + f_policy_blacklist.onclick = ajaxThemeManagerHandlePolicyClick; + + p_f_policy.appendChild(l_policy_allow_all); + p_f_policy.appendChild(document.createElement('br')); + p_f_policy.appendChild(l_policy_whitelist); + p_f_policy.appendChild(document.createElement('br')); + p_f_policy.appendChild(l_policy_blacklist); + + target.appendChild(p_d_policy); + target.appendChild(p_f_policy); + + var div_acl = document.createElement('div'); + div_acl.id = 'themeed_acl_box'; + div_acl.style.margin = '0 0 10px 30px'; + + var h3_g = document.createElement('h3'); + h3_g.appendChild(document.createTextNode($lang.get('acptm_field_acl_heading_groups'))); + div_acl.appendChild(h3_g); + + var div_groups = document.createElement('div'); + div_groups.style.border = '1px solid #E8E8E8'; + div_groups.id = 'themeed_group_list'; + + // Group list + for ( var i in data.group_names ) + { + var g_name = data.group_names[i]; + var check = document.createElement('input'); + check.type = 'checkbox'; + if ( in_array("g:" + i, data.group_list) ) + { + check.setAttribute('checked', 'checked'); + } + check.group_id = parseInt(i); + var lbl_g_acl = document.createElement('label'); + lbl_g_acl.appendChild(check); + var str = 'groupcp_grp_' + g_name.toLowerCase(); + var g_name_l10n = ( $lang.get(str) != str ) ? $lang.get(str) : g_name; + lbl_g_acl.appendChild(document.createTextNode(g_name_l10n)); + div_groups.appendChild(lbl_g_acl); + div_groups.appendChild(document.createElement('br')); + } + div_acl.appendChild(div_groups); + + var h3_u = document.createElement('h3'); + h3_u.appendChild(document.createTextNode($lang.get('acptm_field_acl_heading_users'))); + div_acl.appendChild(h3_u); + + // User addition field + var frm = document.createElement('form'); + frm.action = 'javascript:ajaxThemeManagerHandleUserAdd();'; + frm.appendChild(document.createTextNode($lang.get('acptm_field_acl_add_user'))); + var f_useradd = document.createElement('input'); + f_useradd.type = 'text'; + f_useradd.id = 'themeed_field_adduser'; + f_useradd.onkeyup = function(e) + { + new AutofillUsername(this, e, false); + } + + frm.appendChild(f_useradd); + div_acl.appendChild(frm); + + div_acl.appendChild(document.createElement('br')); + + // User list + var div_users = document.createElement('div'); + div_users.style.border = '1px solid #E8E8E8'; + div_users.style.padding = '4px'; + div_users.id = 'themeed_user_list'; + for ( var i = 0; i < data.group_list.length; i++ ) + { + var id = data.group_list[i]; + if ( id.substr(0, 2) != 'u:' ) + continue; + var uid = id.substr(2); + var username = data.usernames[uid]; + + var useritem = document.createElement('span'); + useritem.appendChild(document.createTextNode(username + ' ')); + useritem.userid = parseInt(uid); + var deleter = document.createElement('a'); + deleter.href = '#'; + deleter.onclick = function() + { + ajaxThemeManagerHandleUserRemoval(this); + return false; + } + deleter.appendChild(document.createTextNode('[X]')); + useritem.appendChild(deleter); + div_users.appendChild(useritem); + div_users.appendChild(document.createElement('br')); + } + div_acl.appendChild(div_users); + + target.appendChild(div_acl); + + ajaxThemeManagerHandlePolicyClick(); + + var clearer = document.createElement('span'); + clearer.className = 'menuclear'; + target.appendChild(clearer); + + // Theme ID + var tid = document.createElement('input'); + tid.type = 'hidden'; + tid.id = 'themeed_theme_id'; + tid.value = data.theme_id; + target.appendChild(tid); + + // Save button + var raquo = unescape('%BB'); + var savebtn = document.createElement('input'); + savebtn.type = 'button'; + savebtn.style.fontWeight = 'bold'; + savebtn.value = $lang.get('etc_save_changes') + ' ' + raquo; + savebtn.onclick = function() + { + ajaxThemeManagerHandleSaveRequest(); + } + target.appendChild(savebtn); + + target.appendChild(document.createTextNode(' ')); + + // Cancel button + var savebtn = document.createElement('input'); + savebtn.type = 'button'; + savebtn.value = $lang.get('etc_cancel'); + savebtn.onclick = function() + { + ajaxPage(namespace_list['Admin'] + 'ThemeManager'); + } + target.appendChild(savebtn); + + target.appendChild(document.createTextNode(' ')); + + // Uninstall button + var savebtn = document.createElement('input'); + savebtn.type = 'button'; + savebtn.value = $lang.get('acptm_btn_uninstall_theme'); + savebtn.style.color = '#D84308'; + savebtn.onclick = function() + { + if ( !confirm($lang.get('acptm_msg_uninstall_confirm')) ) + return false; + ajaxThemeManagerHandleUninstallClick(); + } + target.appendChild(savebtn); + + // Fade it all in + domOpacity(target, 0, 100, 500); + f_name.focus(); } function ajaxThemeManagerHandlePolicyClick() { - if ( document.getElementById('themeed_field_policy_allow_all').checked ) - { - document.getElementById('themeed_acl_box').style.display = 'none'; - } - else if ( document.getElementById('themeed_field_policy_whitelist').checked || document.getElementById('themeed_field_policy_blacklist').checked ) - { - document.getElementById('themeed_acl_box').style.display = 'block'; - } + if ( document.getElementById('themeed_field_policy_allow_all').checked ) + { + document.getElementById('themeed_acl_box').style.display = 'none'; + } + else if ( document.getElementById('themeed_field_policy_whitelist').checked || document.getElementById('themeed_field_policy_blacklist').checked ) + { + document.getElementById('themeed_acl_box').style.display = 'block'; + } } function ajaxThemeManagerHandleUserAdd() { - var f_useradd = document.getElementById('themeed_field_adduser'); - f_useradd.setAttribute('disabled', 'disabled'); - var parent = f_useradd.parentNode; - var img = document.createElement('img'); - img.src = ajax_load_icon; - img.id = 'themeed_useradd_status'; - img.style.marginLeft = '10px'; - insertAfter(parent, img, f_useradd); - - var req = toJSONString({ - mode: 'uid_lookup', - username: f_useradd.value - }); - ajaxPost(makeUrlNS('Admin', 'ThemeManager/action.json'), 'r=' + ajaxEscape(req), function(ajax) - { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - var img = document.getElementById('themeed_useradd_status'); - var f_useradd = document.getElementById('themeed_field_adduser'); - - f_useradd.disabled = null; - img.parentNode.removeChild(img); - - // process response - var response = String(ajax.responseText + ''); - if ( !check_json_response(response) ) - { - alert(response); - return false; - } - response = parseJSON(response); - if ( response.mode == 'error' ) - { - alert(response.error); - return false; - } - - var uid = parseInt(response.uid); - var username = response.username; - - // Loop through the list of users and remove any existing ones with the same uid - var div_users = document.getElementById('themeed_user_list'); - var children = div_users.getElementsByTagName('span'); - for ( var i = 0; i < children.length; i++ ) - { - var child = children[i]; - if ( child.userid == uid ) - { - // the sister is the br element next to the span with the checkbox/text - var sister = child.nextSibling; - div_users.removeChild(child); - div_users.removeChild(sister); - break; - } - } - - var useritem = document.createElement('span'); - useritem.appendChild(document.createTextNode(username + ' ')); - useritem.userid = parseInt(uid); - var deleter = document.createElement('a'); - deleter.href = '#'; - deleter.onclick = function() - { - ajaxThemeManagerHandleUserRemoval(this); - return false; - } - deleter.appendChild(document.createTextNode('[X]')); - useritem.appendChild(deleter); - div_users.appendChild(useritem); - div_users.appendChild(document.createElement('br')); - } - }); + var f_useradd = document.getElementById('themeed_field_adduser'); + f_useradd.setAttribute('disabled', 'disabled'); + var parent = f_useradd.parentNode; + var img = document.createElement('img'); + img.src = ajax_load_icon; + img.id = 'themeed_useradd_status'; + img.style.marginLeft = '10px'; + insertAfter(parent, img, f_useradd); + + var req = toJSONString({ + mode: 'uid_lookup', + username: f_useradd.value + }); + ajaxPost(makeUrlNS('Admin', 'ThemeManager/action.json'), 'r=' + ajaxEscape(req), function(ajax) + { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + var img = document.getElementById('themeed_useradd_status'); + var f_useradd = document.getElementById('themeed_field_adduser'); + + f_useradd.disabled = null; + img.parentNode.removeChild(img); + + // process response + var response = String(ajax.responseText + ''); + if ( !check_json_response(response) ) + { + alert(response); + return false; + } + response = parseJSON(response); + if ( response.mode == 'error' ) + { + alert(response.error); + return false; + } + + var uid = parseInt(response.uid); + var username = response.username; + + // Loop through the list of users and remove any existing ones with the same uid + var div_users = document.getElementById('themeed_user_list'); + var children = div_users.getElementsByTagName('span'); + for ( var i = 0; i < children.length; i++ ) + { + var child = children[i]; + if ( child.userid == uid ) + { + // the sister is the br element next to the span with the checkbox/text + var sister = child.nextSibling; + div_users.removeChild(child); + div_users.removeChild(sister); + break; + } + } + + var useritem = document.createElement('span'); + useritem.appendChild(document.createTextNode(username + ' ')); + useritem.userid = parseInt(uid); + var deleter = document.createElement('a'); + deleter.href = '#'; + deleter.onclick = function() + { + ajaxThemeManagerHandleUserRemoval(this); + return false; + } + deleter.appendChild(document.createTextNode('[X]')); + useritem.appendChild(deleter); + div_users.appendChild(useritem); + div_users.appendChild(document.createElement('br')); + } + }); } function ajaxThemeManagerHandleUserRemoval(el) { - var parent = el.parentNode; - var uid = parent.userid; - - var grandparent = parent.parentNode; - var sister = parent.nextSibling; - grandparent.removeChild(parent); - grandparent.removeChild(sister); + var parent = el.parentNode; + var uid = parent.userid; + + var grandparent = parent.parentNode; + var sister = parent.nextSibling; + grandparent.removeChild(parent); + grandparent.removeChild(sister); } function ajaxThemeManagerHandleSaveRequest() { - // Build a JSON condensed request - var md = false; - if ( document.getElementById('themeed_field_default') ) - { - if ( document.getElementById('themeed_field_default').checked ) - { - md = true; - } - } - var policy = 'allow_all'; - if ( document.getElementById('themeed_field_policy_whitelist').checked ) - policy = 'whitelist'; - else if ( document.getElementById('themeed_field_policy_blacklist').checked ) - policy = 'blacklist'; - var json_packet = { - theme_id: document.getElementById('themeed_theme_id').value, - theme_name: document.getElementById('themeed_field_name').value, - default_style: document.getElementById('themeed_field_style').value, - make_default: md, - group_policy: policy, - enabled: ( document.getElementById('themeed_field_disable').checked ? false : true ) - }; - var acl_list = []; - var checks = document.getElementById('themeed_group_list').getElementsByTagName('input'); - for ( var i = 0; i < checks.length; i++ ) - { - if ( checks[i].checked ) - acl_list.push('g:' + checks[i].group_id); - } - var spans = document.getElementById('themeed_user_list').getElementsByTagName('span'); - for ( var i = 0; i < spans.length; i++ ) - { - if ( spans[i].userid ) - acl_list.push('u:' + spans[i].userid); - } - json_packet.group_list = acl_list; - - var json_send = { - mode: 'save_theme', - theme_data: json_packet - }; - - json_send = ajaxEscape(toJSONString(json_send)); - - // Request the save - var parent = document.getElementById('ajaxPageContainer'); - ajaxPost(makeUrlNS('Admin', 'ThemeManager/action.json'), 'r=' + json_send, function(ajax) - { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - // process response - var response = String(ajax.responseText + ''); - if ( !check_json_response(response) ) - { - // For this we actually *expect* an HTML response. - parent.innerHTML = response; - return false; - } - response = parseJSON(response); - if ( response.mode == 'error' ) - { - alert(response.error); - return false; - } - } - }); + // Build a JSON condensed request + var md = false; + if ( document.getElementById('themeed_field_default') ) + { + if ( document.getElementById('themeed_field_default').checked ) + { + md = true; + } + } + var policy = 'allow_all'; + if ( document.getElementById('themeed_field_policy_whitelist').checked ) + policy = 'whitelist'; + else if ( document.getElementById('themeed_field_policy_blacklist').checked ) + policy = 'blacklist'; + var json_packet = { + theme_id: document.getElementById('themeed_theme_id').value, + theme_name: document.getElementById('themeed_field_name').value, + default_style: document.getElementById('themeed_field_style').value, + make_default: md, + group_policy: policy, + enabled: ( document.getElementById('themeed_field_disable').checked ? false : true ) + }; + var acl_list = []; + var checks = document.getElementById('themeed_group_list').getElementsByTagName('input'); + for ( var i = 0; i < checks.length; i++ ) + { + if ( checks[i].checked ) + acl_list.push('g:' + checks[i].group_id); + } + var spans = document.getElementById('themeed_user_list').getElementsByTagName('span'); + for ( var i = 0; i < spans.length; i++ ) + { + if ( spans[i].userid ) + acl_list.push('u:' + spans[i].userid); + } + json_packet.group_list = acl_list; + + var json_send = { + mode: 'save_theme', + theme_data: json_packet + }; + + json_send = ajaxEscape(toJSONString(json_send)); + + // Request the save + var parent = document.getElementById('ajaxPageContainer'); + ajaxPost(makeUrlNS('Admin', 'ThemeManager/action.json'), 'r=' + json_send, function(ajax) + { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + // process response + var response = String(ajax.responseText + ''); + if ( !check_json_response(response) ) + { + // For this we actually *expect* an HTML response. + parent.innerHTML = response; + return false; + } + response = parseJSON(response); + if ( response.mode == 'error' ) + { + alert(response.error); + return false; + } + } + }); } function ajaxThemeManagerHandleUninstallClick() { - var theme_id = document.getElementById('themeed_theme_id').value; - var json_send = { - mode: 'uninstall', - theme_id: theme_id - }; - - json_send = ajaxEscape(toJSONString(json_send)); - - // Request the action - var parent = document.getElementById('ajaxPageContainer'); - ajaxPost(makeUrlNS('Admin', 'ThemeManager/action.json'), 'r=' + json_send, function(ajax) - { - if ( ajax.readyState == 4 && ajax.status == 200 ) - { - // process response - var response = String(ajax.responseText + ''); - if ( !check_json_response(response) ) - { - // For this we actually *expect* an HTML response. - parent.innerHTML = response; - return false; - } - response = parseJSON(response); - if ( response.mode == 'error' ) - { - alert(response.error); - return false; - } - } - }); + var theme_id = document.getElementById('themeed_theme_id').value; + var json_send = { + mode: 'uninstall', + theme_id: theme_id + }; + + json_send = ajaxEscape(toJSONString(json_send)); + + // Request the action + var parent = document.getElementById('ajaxPageContainer'); + ajaxPost(makeUrlNS('Admin', 'ThemeManager/action.json'), 'r=' + json_send, function(ajax) + { + if ( ajax.readyState == 4 && ajax.status == 200 ) + { + // process response + var response = String(ajax.responseText + ''); + if ( !check_json_response(response) ) + { + // For this we actually *expect* an HTML response. + parent.innerHTML = response; + return false; + } + response = parseJSON(response); + if ( response.mode == 'error' ) + { + alert(response.error); + return false; + } + } + }); } diff -r de56132c008d -r bdac73ed481e includes/clientside/static/tinymce-init.js --- a/includes/clientside/static/tinymce-init.js Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/static/tinymce-init.js Sun Mar 28 23:10:46 2010 -0400 @@ -5,27 +5,27 @@ // Check tinyMCE to make sure its init is finished var initTinyMCE = function(e) { - if ( typeof(tinyMCE_GZ) == 'object' ) - { - if ( !KILL_SWITCH && !DISABLE_MCE ) - { - tinyMCE_GZ.init(enano_tinymce_gz_options, function() - { - tinyMCE.init(enano_tinymce_options); - }); - tinymce_initted = true; - } - } + if ( typeof(tinyMCE_GZ) == 'object' ) + { + if ( !KILL_SWITCH && !DISABLE_MCE ) + { + tinyMCE_GZ.init(enano_tinymce_gz_options, function() + { + tinyMCE.init(enano_tinymce_options); + }); + tinymce_initted = true; + } + } }; // editor options if ( document.getElementById('mdgCss') ) { - var css_url = document.getElementById('mdgCss').href; + var css_url = document.getElementById('mdgCss').href; } else { - var css_url = scriptPath + '/includes/clientside/css/enano_shared.css'; + var css_url = scriptPath + '/includes/clientside/css/enano_shared.css'; } var do_popups = ( is_Safari ) ? '' : ',inlinepopups'; @@ -33,21 +33,21 @@ var tinymce_initted = false; var enano_tinymce_options = { - mode : "none", - plugins : 'table,save,safari,pagebreak,style,layer,advhr,insertdatetime,searchreplace,spellchecker,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,wordcount' + do_popups, - theme : 'advanced', - skin : _skin, - theme_advanced_resize_horizontal : false, - theme_advanced_resizing : true, - theme_advanced_toolbar_location : "top", - theme_advanced_toolbar_align : "left", - theme_advanced_buttons1 : "save,|,bold,italic,underline,strikethrough,|,spellchecker,|,justifyleft,justifycenter,justifyright,justifyfull,|,forecolor,backcolor,|,formatselect,|,fontselect,fontsizeselect", - theme_advanced_buttons3_add_before : "tablecontrols,separator", - theme_advanced_buttons3_add_after : "|,fullscreen", - theme_advanced_statusbar_location : 'bottom', - noneditable_noneditable_class : 'mce_readonly', - content_css : css_url, - spellchecker_rpc_url : scriptPath + '/includes/clientside/tinymce/plugins/spellchecker/rpc.php' + mode : "none", + plugins : 'table,save,safari,pagebreak,style,layer,advhr,insertdatetime,searchreplace,spellchecker,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,wordcount' + do_popups, + theme : 'advanced', + skin : _skin, + theme_advanced_resize_horizontal : false, + theme_advanced_resizing : true, + theme_advanced_toolbar_location : "top", + theme_advanced_toolbar_align : "left", + theme_advanced_buttons1 : "save,|,bold,italic,underline,strikethrough,|,spellchecker,|,justifyleft,justifycenter,justifyright,justifyfull,|,forecolor,backcolor,|,formatselect,|,fontselect,fontsizeselect", + theme_advanced_buttons3_add_before : "tablecontrols,separator", + theme_advanced_buttons3_add_after : "|,fullscreen", + theme_advanced_statusbar_location : 'bottom', + noneditable_noneditable_class : 'mce_readonly', + content_css : css_url, + spellchecker_rpc_url : scriptPath + '/includes/clientside/tinymce/plugins/spellchecker/rpc.php' }; var enano_tinymce_gz_options = { @@ -62,10 +62,10 @@ if ( !KILL_SWITCH && !DISABLE_MCE ) { - var uri = scriptPath + '/includes/clientside/tinymce/tiny_mce_gzip.js?327'; - var sc = document.createElement('script'); - sc.src = uri; - sc.type = 'text/javascript'; - var head = document.getElementsByTagName('head')[0]; - head.appendChild(sc); + var uri = scriptPath + '/includes/clientside/tinymce/tiny_mce_gzip.js?327'; + var sc = document.createElement('script'); + sc.src = uri; + sc.type = 'text/javascript'; + var head = document.getElementsByTagName('head')[0]; + head.appendChild(sc); } diff -r de56132c008d -r bdac73ed481e includes/clientside/static/toolbar.js --- a/includes/clientside/static/toolbar.js Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/static/toolbar.js Sun Mar 28 23:10:46 2010 -0400 @@ -2,62 +2,62 @@ window.unselectAllButtonsMajor = function() { - if ( !document.getElementById('pagebar_main') ) - return false; - obj = document.getElementById('pagebar_main').firstChild; - while(obj) - { - if(obj.id == 'mdgToolbar_article' || obj.id == 'mdgToolbar_discussion') - { - $dynano(obj).rmClass('selected'); - } - obj = obj.nextSibling; - } + if ( !document.getElementById('pagebar_main') ) + return false; + obj = document.getElementById('pagebar_main').firstChild; + while(obj) + { + if(obj.id == 'mdgToolbar_article' || obj.id == 'mdgToolbar_discussion') + { + $dynano(obj).rmClass('selected'); + } + obj = obj.nextSibling; + } } window.unselectAllButtonsMinor = function() { - if ( !document.getElementById('pagebar_main') ) - return false; - obj = document.getElementById('pagebar_main').firstChild.nextSibling; - while(obj) - { - if ( !$dynano(obj).hasClass('selected') ) - { - obj = obj.nextSibling; - continue; - } - if(obj.id != 'mdgToolbar_article' && obj.id != 'mdgToolbar_discussion') - { - if ( obj.className ) - $dynano(obj).rmClass('selected'); - } - obj = obj.nextSibling; - } + if ( !document.getElementById('pagebar_main') ) + return false; + obj = document.getElementById('pagebar_main').firstChild.nextSibling; + while(obj) + { + if ( !$dynano(obj).hasClass('selected') ) + { + obj = obj.nextSibling; + continue; + } + if(obj.id != 'mdgToolbar_article' && obj.id != 'mdgToolbar_discussion') + { + if ( obj.className ) + $dynano(obj).rmClass('selected'); + } + obj = obj.nextSibling; + } } window.selectButtonMajor = function(which) { - if ( !document.getElementById('pagebar_main') ) - return false; - var dom = document.getElementById('mdgToolbar_'+which); - if ( !dom ) - return false; - if(typeof(dom) == 'object') - { - unselectAllButtonsMajor(); - $dynano('mdgToolbar_'+which).addClass('selected'); - } + if ( !document.getElementById('pagebar_main') ) + return false; + var dom = document.getElementById('mdgToolbar_'+which); + if ( !dom ) + return false; + if(typeof(dom) == 'object') + { + unselectAllButtonsMajor(); + $dynano('mdgToolbar_'+which).addClass('selected'); + } } window.selectButtonMinor = function(which) { - if ( !document.getElementById('pagebar_main') ) - return false; - if(typeof(document.getElementById('mdgToolbar_'+which)) == 'object') - { - unselectAllButtonsMinor(); - $dynano('mdgToolbar_'+which).addClass('selected'); - } + if ( !document.getElementById('pagebar_main') ) + return false; + if(typeof(document.getElementById('mdgToolbar_'+which)) == 'object') + { + unselectAllButtonsMinor(); + $dynano('mdgToolbar_'+which).addClass('selected'); + } } diff -r de56132c008d -r bdac73ed481e includes/clientside/static/userpage.js --- a/includes/clientside/static/userpage.js Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/static/userpage.js Sun Mar 28 23:10:46 2010 -0400 @@ -4,58 +4,58 @@ var userpage_onload = function() { - var wrapper = document.getElementById('userpage_wrap'); - var links = document.getElementById('userpage_links'); - - if ( !wrapper ) - return false; - - wrapper.className = 'userpage_wrap'; - links.className = 'userpage_links'; - - var blocks = wrapper.getElementsByTagName('div'); - var first_block = false; - for ( var i = 0; i < blocks.length; i++ ) - { - var block = blocks[i]; - if ( /^tab:/.test(block.id) ) - { - $dynano(block).addClass('userpage_block'); - var block_id = block.id.substr(4); - userpage_blocks.push(block_id); - if ( !first_block ) - { - // this is the first block on the page, memorize it - first_block = block_id; - } - } - } - // init links - var as = links.getElementsByTagName('a'); - for ( var i = 0; i < as.length; i++ ) - { - var a = as[i]; - if ( a.href.indexOf('#') > -1 ) - { - var hash = a.href.substr(a.href.indexOf('#')); - var blockid = hash.substr(5); - a.blockid = blockid; - a.onclick = function() - { - userpage_select_block(this.blockid); - return false; - } - a.id = 'userpage_blocklink_' + blockid; - } - } - if ( $_REQUEST['tab'] ) - { - userpage_select_block($_REQUEST['tab'], true); - } - else - { - userpage_select_block(first_block, true); - } + var wrapper = document.getElementById('userpage_wrap'); + var links = document.getElementById('userpage_links'); + + if ( !wrapper ) + return false; + + wrapper.className = 'userpage_wrap'; + links.className = 'userpage_links'; + + var blocks = wrapper.getElementsByTagName('div'); + var first_block = false; + for ( var i = 0; i < blocks.length; i++ ) + { + var block = blocks[i]; + if ( /^tab:/.test(block.id) ) + { + $dynano(block).addClass('userpage_block'); + var block_id = block.id.substr(4); + userpage_blocks.push(block_id); + if ( !first_block ) + { + // this is the first block on the page, memorize it + first_block = block_id; + } + } + } + // init links + var as = links.getElementsByTagName('a'); + for ( var i = 0; i < as.length; i++ ) + { + var a = as[i]; + if ( a.href.indexOf('#') > -1 ) + { + var hash = a.href.substr(a.href.indexOf('#')); + var blockid = hash.substr(5); + a.blockid = blockid; + a.onclick = function() + { + userpage_select_block(this.blockid); + return false; + } + a.id = 'userpage_blocklink_' + blockid; + } + } + if ( $_REQUEST['tab'] ) + { + userpage_select_block($_REQUEST['tab'], true); + } + else + { + userpage_select_block(first_block, true); + } } addOnloadHook(userpage_onload); @@ -68,53 +68,53 @@ function userpage_select_block(block, nofade) { - // memorize existing scroll position, reset the hash, then scroll back to where we were - // a little hackish and might cause a flash, but it's better than hiding the tabs on each click - var currentScroll = getScrollOffset(); - - var current_block = false; - nofade = true; - for ( var i = 0; i < userpage_blocks.length; i++ ) - { - var div = document.getElementById('tab:' + userpage_blocks[i]); - if ( div ) - { - if ( div.style.display != 'none' ) - { - current_block = userpage_blocks[i]; - if ( nofade || aclDisableTransitionFX ) - { - div.style.display = 'none'; - } - } - } - var a = document.getElementById('userpage_blocklink_' + userpage_blocks[i]); - if ( a ) - { - if ( $dynano(a.parentNode).hasClass('userpage_tab_active') ) - { - $dynano(a.parentNode).rmClass('userpage_tab_active'); - } - } - } - if ( nofade || !current_block || aclDisableTransitionFX ) - { - var div = document.getElementById('tab:' + block); - div.style.display = 'block'; - } - else - { - // DISABLED: see "nofade = true;" above. - // do this in a slightly fancier fashion - load_component(['jquery', 'jquery-ui']); - $('#tab:' + current_block).hide("blind", {}, 500, function() - { - $('#tab:' + block).show("blind", {}, 500); - }); - } - var a = document.getElementById('userpage_blocklink_' + block); - $dynano(a.parentNode).addClass('userpage_tab_active'); - - window.location.hash = 'tab:' + block; - setScrollOffset(currentScroll); + // memorize existing scroll position, reset the hash, then scroll back to where we were + // a little hackish and might cause a flash, but it's better than hiding the tabs on each click + var currentScroll = getScrollOffset(); + + var current_block = false; + nofade = true; + for ( var i = 0; i < userpage_blocks.length; i++ ) + { + var div = document.getElementById('tab:' + userpage_blocks[i]); + if ( div ) + { + if ( div.style.display != 'none' ) + { + current_block = userpage_blocks[i]; + if ( nofade || aclDisableTransitionFX ) + { + div.style.display = 'none'; + } + } + } + var a = document.getElementById('userpage_blocklink_' + userpage_blocks[i]); + if ( a ) + { + if ( $dynano(a.parentNode).hasClass('userpage_tab_active') ) + { + $dynano(a.parentNode).rmClass('userpage_tab_active'); + } + } + } + if ( nofade || !current_block || aclDisableTransitionFX ) + { + var div = document.getElementById('tab:' + block); + div.style.display = 'block'; + } + else + { + // DISABLED: see "nofade = true;" above. + // do this in a slightly fancier fashion + load_component(['jquery', 'jquery-ui']); + $('#tab:' + current_block).hide("blind", {}, 500, function() + { + $('#tab:' + block).show("blind", {}, 500); + }); + } + var a = document.getElementById('userpage_blocklink_' + block); + $dynano(a.parentNode).addClass('userpage_tab_active'); + + window.location.hash = 'tab:' + block; + setScrollOffset(currentScroll); } diff -r de56132c008d -r bdac73ed481e includes/clientside/static/windows.js --- a/includes/clientside/static/windows.js Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/static/windows.js Sun Mar 28 23:10:46 2010 -0400 @@ -5,131 +5,131 @@ * Yes, it's part of Enano, so it's GPL */ - var position; - position = getScrollOffset(); - - var jws = { - position : position, - obj : null, - startup : function() { - jws.debug('jws.startup()'); - var divs = document.getElementsByTagName('div'); - if(IE) { position = document.body.scrollTop; } - else { position = window.pageYOffset; } - for(i=0;i
' . $lang->get('comment_msg_foe_comment_hidden') . ' ' . $lang->get('comment_btn_display_foe_comment') . '
- '; - $row['comment_data'] = $wrapper; - } - - // Format date - $row['time'] = enano_date(ED_DATE | ED_TIME, $row['time']); - - // Format signature - $row['signature'] = ( !empty($row['signature']) ) ? RenderMan::render($row['signature']) : ''; - - // Do we have the IP? - $row['have_ip'] = ( $row['have_ip'] == 1 ); - - // Avatar URL - $row['avatar_path'] = make_avatar_url($row['user_id'], $row['avatar_type'], $row['email']); - - // Add the comment to the list - $ret['comments'][] = $row; - - } while ( $row = $db->fetchrow($q) ); - } - $db->free_result(); - $ret['count_appr'] = $counts['approved']; - $ret['count_total'] = $counts['total']; - $ret['count_visible'] = $this->perms->get_permissions('mod_comments') ? $counts['total'] : $counts['approved']; - $ret['count_unappr'] = $counts['unapproved']; - $ret['auth_mod_comments'] = $this->perms->get_permissions('mod_comments'); - $ret['auth_post_comments'] = $this->perms->get_permissions('post_comments'); - $ret['auth_edit_comments'] = $this->perms->get_permissions('edit_comments'); - $ret['auth_edit_wysiwyg'] = $this->perms->get_permissions('edit_wysiwyg'); - $ret['user_id'] = $session->user_id; - $ret['username'] = $session->username; - $ret['logged_in'] = $session->user_logged_in; - - $ret['user_level'] = Array(); - $ret['user_level']['guest'] = USER_LEVEL_GUEST; - $ret['user_level']['member'] = USER_LEVEL_MEMBER; - $ret['user_level']['mod'] = USER_LEVEL_MOD; - $ret['user_level']['admin'] = USER_LEVEL_ADMIN; - - $ret['approval_needed'] = ( getConfig('approve_comments', '0') == '1' ); - $ret['guest_posting'] = getConfig('comments_need_login'); - - if ( $ret['guest_posting'] == '1' && !$session->user_logged_in ) - { - $session->kill_captcha(); - $ret['captcha'] = $session->make_captcha(); - } - break; - case 'edit': - $cid = (string)$data['id']; - if ( !ctype_digit($cid) || intval($cid) < 1 ) - { - echo '{"mode":"error","error":"HACKING ATTEMPT"}'; - return false; - } - $cid = intval($cid); - $q = $db->sql_query('SELECT c.user_id,c.approved FROM '.table_prefix.'comments c LEFT JOIN '.table_prefix.'users u ON (u.user_id=c.user_id) WHERE comment_id='.$cid.';'); - if(!$q) - $db->die_json(); - $row = $db->fetchrow(); - $uid = intval($row['user_id']); - $can_edit = ( ( $uid == $session->user_id && $uid != 1 && $this->perms->get_permissions('edit_comments') ) || ( $this->perms->get_permissions('mod_comments') ) ); - if(!$can_edit) - { - echo '{"mode":"error","error":"HACKING ATTEMPT"}'; - return false; - } - $data['data'] = str_replace("\r", '', $data['data']); // Windows compatibility - $text = RenderMan::preprocess_text($data['data'], true, false); - $text2 = $db->escape($text); - $subj = $db->escape(htmlspecialchars($data['subj'])); - $q = $db->sql_query('UPDATE '.table_prefix.'comments SET subject=\'' . $subj . '\',comment_data=\'' . $text2 . '\' WHERE comment_id=' . $cid . ';'); - if(!$q) - $db->die_json(); - $ret = Array( - 'mode' => 'redraw', - 'id' => $data['local_id'], - 'subj' => htmlspecialchars($data['subj']), - 'text' => RenderMan::render($text), - 'src' => $text, - 'approved' => $row['approved'] - ); - break; - case 'delete': - $cid = (string)$data['id']; - if ( !ctype_digit($cid) || intval($cid) < 1 ) - { - echo '{"mode":"error","error":"HACKING ATTEMPT"}'; - return false; - } - $cid = intval($cid); - $q = $db->sql_query('SELECT c.user_id FROM '.table_prefix.'comments c LEFT JOIN '.table_prefix.'users u ON (u.user_id=c.user_id) WHERE comment_id='.$cid.';'); - if(!$q) - $db->die_json(); - $row = $db->fetchrow(); - $uid = intval($row['user_id']); - $can_edit = ( ( $uid == $session->user_id && $uid != 1 && $this->perms->get_permissions('edit_comments') ) || ( $this->perms->get_permissions('mod_comments') ) ); - if(!$can_edit) - { - echo '{"mode":"error","error":"HACKING ATTEMPT"}'; - return false; - } - $q = $db->sql_query('DELETE FROM '.table_prefix.'comments WHERE comment_id='.$cid.';'); - if(!$q) - $db->die_json(); - $ret = Array( - 'mode' => 'annihilate', - 'id' => $data['local_id'] - ); - break; - case 'submit': - - // Now for a huge round of security checks... - - $errors = Array(); - - // Authorization - // Like the rest of the ACL system, this call is a one-stop check for ALL ACL entries. - if ( !$this->perms->get_permissions('post_comments') ) - $errors[] = 'The site security policy prevents your user account from posting comments;'; - - // Guest authorization - if ( getConfig('comments_need_login') == '2' && !$session->user_logged_in ) - $errors[] = $lang->get('comment_err_need_login'); - - // CAPTCHA code - if ( getConfig('comments_need_login') == '1' && !$session->user_logged_in ) - { - $real_code = $session->get_captcha($data['captcha_id']); - if ( strtolower($real_code) !== strtolower($data['captcha_code']) ) - $errors[] = $lang->get('comment_err_captcha_wrong'); - $session->kill_captcha(); - } - - // Spam check - $spam_policy = getConfig('comment_spam_policy', 'moderate'); - $sc_name = ( $session->user_logged_in ) ? $session->username : $data['name']; - $sc_mail = ( $session->user_logged_in ) ? $session->email : false; - $sc_url = ( $session->user_logged_in ) ? @$session->user_extra['user_homepage'] : false; - $spamcheck = $spam_policy === 'accept' ? true : spamalyze($data['text'], $sc_name, $sc_mail, $sc_url); - if ( !$spamcheck && $spam_policy === 'reject' ) - { - $errors[] = $lang->get('comment_err_spamcheck_failed_rejected'); - } - - if ( count($errors) > 0 ) - { - $ret = Array( - 'mode' => 'error', - 'error' => implode("\n", $errors) - ); - } - else - { - // We're authorized! - - // Preprocess - $name = ( $session->user_logged_in ) ? htmlspecialchars($session->username) : htmlspecialchars($data['name']); - $subj = htmlspecialchars($data['subj']); - $text = RenderMan::preprocess_text($data['text'], true, false); - $src = $text; - $sql_subj = $db->escape($subj); - $sql_text = $db->escape($text); - $text = RenderMan::render($text); - $appr = ( getConfig('approve_comments', '0') == '1' ) ? COMMENT_UNAPPROVED : COMMENT_APPROVED; - if ( $spam_policy === 'moderate' && !$spamcheck ) - $appr = COMMENT_SPAM; - $time = time(); - $date = enano_date(ED_DATE | ED_TIME, $time); - $ip = $_SERVER['REMOTE_ADDR']; - if ( !is_valid_ip($ip) ) - die('Hacking attempt'); - - // Send it to the database - $q = $db->sql_query('INSERT INTO '.table_prefix.'comments(page_id,namespace,name,subject,comment_data,approved, time, user_id, ip_address) VALUES' . "\n " . - "('$this->page_id', '$this->namespace', '$name', '$sql_subj', '$sql_text', $appr, $time, {$session->user_id}, '$ip');"); - if(!$q) - $db->die_json(); - - // Re-fetch - $q = $db->sql_query('SELECT c.comment_id,c.name,c.subject,c.comment_data,c.time,c.approved,u.user_level,u.user_id,u.email,u.signature,u.user_has_avatar,u.avatar_type FROM '.table_prefix.'comments AS c - LEFT JOIN '.table_prefix.'users AS u - ON (u.user_id=c.user_id) - WHERE page_id=\'' . $this->page_id . '\' - AND namespace=\'' . $this->namespace . '\' - AND time='.$time.' ORDER BY comment_id DESC LIMIT 1;'); - if(!$q) - $db->die_json(); - - $row = $db->fetchrow(); - $db->free_result(); - $row['time'] = $date; - $row['comment_data'] = $text; - $row['comment_source'] = $src; - $ret = Array( - 'mode' => 'materialize' - ); - $ret = enano_safe_array_merge($ret, $row); - - $ret['auth_mod_comments'] = $this->perms->get_permissions('mod_comments'); - $ret['auth_post_comments'] = $this->perms->get_permissions('post_comments'); - $ret['auth_edit_comments'] = $this->perms->get_permissions('edit_comments'); - $ret['user_id'] = $session->user_id; - $ret['rank_data'] = $session->get_user_rank($session->user_id); - $ret['username'] = $session->username; - $ret['logged_in'] = $session->user_logged_in; - $ret['signature'] = RenderMan::render($row['signature']); - - $ret['user_level_list'] = Array(); - $ret['user_level_list']['guest'] = USER_LEVEL_GUEST; - $ret['user_level_list']['member'] = USER_LEVEL_MEMBER; - $ret['user_level_list']['mod'] = USER_LEVEL_MOD; - $ret['user_level_list']['admin'] = USER_LEVEL_ADMIN; - $ret['avatar_path'] = make_avatar_url($row['user_id'], $row['avatar_type'], $row['email']); - } - - break; - case 'approve': - if ( !$this->perms->get_permissions('mod_comments') ) - { - $ret = Array( - 'mode' => 'error', - 'error' => 'You are not authorized to moderate comments.' - ); - echo enano_json_encode($ret); - return $ret; - } - - $cid = (string)$data['id']; - if ( !ctype_digit($cid) || intval($cid) < 1 ) - { - echo '{"mode":"error","error":"HACKING ATTEMPT"}'; - return false; - } - $cid = intval($cid); - $q = $db->sql_query('SELECT subject,approved FROM '.table_prefix.'comments WHERE comment_id='.$cid.';'); - if(!$q || $db->numrows() < 1) - $db->die_json(); - $row = $db->fetchrow(); - $db->free_result(); - $appr = ( $row['approved'] == '1' ) ? '0' : '1'; - $q = $db->sql_query('UPDATE '.table_prefix."comments SET approved=$appr WHERE comment_id=$cid;"); - if (!$q) - $db->die_json(); - - $ret = Array( - 'mode' => 'redraw', - 'approved' => $appr, - 'subj' => $row['subject'], - 'id' => $data['local_id'], - 'approve_updated' => 'yes' - ); - - break; - case 'view_ip': - if ( !$session->get_permissions('mod_comments') ) - { - return array( - 'mode' => 'error', - 'error' => 'Unauthorized' - ); - } - // fetch comment info - if ( !is_int($data['id']) ) - { - return array( - 'mode' => 'error', - 'error' => 'Unauthorized' - ); - } - $id =& $data['id']; - $q = $db->sql_query('SELECT ip_address, name FROM ' . table_prefix . 'comments WHERE comment_id = ' . $id . ';'); - if ( !$q || $db->numrows() < 1 ) - { - $db->die_json(); - } - list($ip_addr, $name) = $db->fetchrow_num($q); - $db->free_result(); - $name = $db->escape($name); - $username = $db->escape($session->username); - // log this action - $q = $db->sql_query('INSERT INTO ' . table_prefix . "logs(time_id, log_type, action, page_text, author, author_uid, edit_summary) VALUES\n " - . "( " . time() . ", 'security', 'view_comment_ip', '$name', '$username', $session->user_id, '{$_SERVER['REMOTE_ADDR']}' );"); - if ( !$q ) - $db->die_json(); - - // send packet - $ret = array( - 'mode' => 'redraw', - 'ip_addr' => $ip_addr, - 'local_id' => $data['local_id'] - ); - break; - default: - $ret = Array( - 'mode' => 'error', - 'error' => $data['mode'] . ' is not a valid request mode' - ); - break; - } - if ( $is_json ) - echo enano_json_encode($ret); - - return $ret; - } - + # + # VARIABLES + # + + /** + * Current list of comments. + * @var array + */ + + var $comments = Array(); + + /** + * Object to track permissions. + * @var object + */ + + var $perms; + + # + # METHODS + # + + /** + * Constructor. + * @param string Page ID of the page to load comments for + * @param string Namespace of the page to load comments for + */ + + function __construct($page_id, $namespace) + { + global $db, $session, $paths, $template, $plugins; // Common objects + + // Initialize permissions + if ( $page_id == $paths->page_id && $namespace == $paths->namespace ) + $this->perms =& $GLOBALS['session']; + else + $this->perms = $session->fetch_page_acl($page_id, $namespace); + + $this->page_id = $db->escape($page_id); + $this->namespace = $db->escape($namespace); + } + + /** + * Processes a command in JSON format. + * @param mixed Either the JSON-encoded input string, probably something sent from the Javascript/AJAX frontend, or an equivalent array + */ + + function process_json($json) + { + global $db, $session, $paths, $template, $plugins; // Common objects + global $lang; + + $is_json = !is_array($json); + + if ( $is_json ) + { + $data = enano_json_decode($json); + $data = decode_unicode_array($data); + } + else + { + $data =& $json; + } + if ( !isset($data['mode']) ) + { + $ret = Array('mode'=>'error','error'=>'No mode defined!'); + echo enano_json_encode($ret); + return $ret; + } + if ( getConfig('enable_comments', '1') == '0' ) + { + $ret = Array('mode'=>'error','error'=>'Comments are not enabled on this site.'); + echo enano_json_encode($ret); + return $ret; + } + $ret = Array(); + $ret['mode'] = $data['mode']; + if ( isset($data['passback']) ) + $ret['passback'] = $data['passback']; + switch ( $data['mode'] ) + { + case 'fetch': + if ( !$template->theme_loaded ) + $template->load_theme(); + if ( !isset($data['have_template']) ) + { + $ret['template'] = file_get_contents(ENANO_ROOT . '/themes/' . $template->theme . '/comment.tpl'); + } + $approve_clause = $this->perms->get_permissions('mod_comments') ? '' : " AND approved = " . COMMENT_APPROVED; + // Get totals + $q = $db->sql_query('SELECT approved FROM ' . table_prefix . "comments WHERE page_id = '$this->page_id' AND namespace = '$this->namespace'{$approve_clause};"); + if ( !$q ) + $db->die_json(); + $counts = array('total' => 0, 'approved' => 0, 'unapproved' => 0, 'spam' => 0); + while ( $row = $db->fetchrow() ) + { + $counts['total']++; + switch($row['approved']): + case COMMENT_APPROVED: $counts['approved']++; break; + case COMMENT_UNAPPROVED: $counts['unapproved']++; break; + case COMMENT_SPAM: $counts['spam']++; break; + endswitch; + } + $counts['unapproved'] = $counts['total'] - $counts['approved']; + $data['counts'] = $counts; + // FIXME, this should be a user preference eventually + $ret['per_page'] = $per_page = getConfig('comments_per_page', 10); + $page = ( !empty($data['pagenum']) ) ? intval($data['pagenum']) : 0; + if ( $page > 0 ) + { + $ret['mode'] = 'refetch'; + } + $limit_clause = "LIMIT $per_page OFFSET " . ($page * $per_page); + $q = $db->sql_query('SELECT c.comment_id,c.name,c.subject,c.comment_data,c.time,c.approved,( c.ip_address IS NOT NULL ) AS have_ip,u.user_level,u.user_id,u.email,u.signature,u.user_has_avatar,u.avatar_type, b.buddy_id IS NOT NULL AS is_buddy, ( b.is_friend IS NOT NULL AND b.is_friend=1 ) AS is_friend FROM '.table_prefix.'comments AS c + LEFT JOIN '.table_prefix.'users AS u + ON (u.user_id=c.user_id) + LEFT JOIN '.table_prefix.'buddies AS b + ON ( ( b.user_id=' . $session->user_id.' AND b.buddy_user_id=c.user_id ) OR b.user_id IS NULL) + LEFT JOIN '.table_prefix.'ranks AS r + ON ( ( u.user_rank = r.rank_id ) ) + WHERE page_id=\'' . $this->page_id . '\' + AND namespace=\'' . $this->namespace . '\' + ' . $approve_clause . ' + GROUP BY c.comment_id,c.name,c.subject,c.comment_data,c.time,c.approved,c.ip_address,u.user_level,u.user_id,u.email,u.signature,u.user_has_avatar,u.avatar_type,b.buddy_id,b.is_friend + ORDER BY c.time ASC + ' . $limit_clause . ';'); + $ret['comments'] = Array(); + if (!$q) + $db->die_json(); + if ( $row = $db->fetchrow($q) ) + { + do { + + if ( !$this->perms->get_permissions('mod_comments') && $row['approved'] != COMMENT_APPROVED ) + continue; + + // Localize the rank + $row = array_merge($row, $session->get_user_rank(intval($row['user_id']))); + + // Send the source + $row['comment_source'] = $row['comment_data']; + + // Format text + $row['comment_data'] = RenderMan::render($row['comment_data']); + + // Hide it if it's a post from a foe + if ( $row['is_buddy'] == 1 && $row['is_friend'] == 0 ) + { + $seed = md5(sha1(mt_rand() . microtime())); + $wrapper = ' + +' . $lang->get('comment_msg_foe_comment_hidden') . ' ' . $lang->get('comment_btn_display_foe_comment') . '
+ '; + $row['comment_data'] = $wrapper; + } + + // Format date + $row['time'] = enano_date(ED_DATE | ED_TIME, $row['time']); + + // Format signature + $row['signature'] = ( !empty($row['signature']) ) ? RenderMan::render($row['signature']) : ''; + + // Do we have the IP? + $row['have_ip'] = ( $row['have_ip'] == 1 ); + + // Avatar URL + $row['avatar_path'] = make_avatar_url($row['user_id'], $row['avatar_type'], $row['email']); + + // Add the comment to the list + $ret['comments'][] = $row; + + } while ( $row = $db->fetchrow($q) ); + } + $db->free_result(); + $ret['count_appr'] = $counts['approved']; + $ret['count_total'] = $counts['total']; + $ret['count_visible'] = $this->perms->get_permissions('mod_comments') ? $counts['total'] : $counts['approved']; + $ret['count_unappr'] = $counts['unapproved']; + $ret['auth_mod_comments'] = $this->perms->get_permissions('mod_comments'); + $ret['auth_post_comments'] = $this->perms->get_permissions('post_comments'); + $ret['auth_edit_comments'] = $this->perms->get_permissions('edit_comments'); + $ret['auth_edit_wysiwyg'] = $this->perms->get_permissions('edit_wysiwyg'); + $ret['user_id'] = $session->user_id; + $ret['username'] = $session->username; + $ret['logged_in'] = $session->user_logged_in; + + $ret['user_level'] = Array(); + $ret['user_level']['guest'] = USER_LEVEL_GUEST; + $ret['user_level']['member'] = USER_LEVEL_MEMBER; + $ret['user_level']['mod'] = USER_LEVEL_MOD; + $ret['user_level']['admin'] = USER_LEVEL_ADMIN; + + $ret['approval_needed'] = ( getConfig('approve_comments', '0') == '1' ); + $ret['guest_posting'] = getConfig('comments_need_login'); + + if ( $ret['guest_posting'] == '1' && !$session->user_logged_in ) + { + $session->kill_captcha(); + $ret['captcha'] = $session->make_captcha(); + } + break; + case 'edit': + $cid = (string)$data['id']; + if ( !ctype_digit($cid) || intval($cid) < 1 ) + { + echo '{"mode":"error","error":"HACKING ATTEMPT"}'; + return false; + } + $cid = intval($cid); + $q = $db->sql_query('SELECT c.user_id,c.approved FROM '.table_prefix.'comments c LEFT JOIN '.table_prefix.'users u ON (u.user_id=c.user_id) WHERE comment_id='.$cid.';'); + if(!$q) + $db->die_json(); + $row = $db->fetchrow(); + $uid = intval($row['user_id']); + $can_edit = ( ( $uid == $session->user_id && $uid != 1 && $this->perms->get_permissions('edit_comments') ) || ( $this->perms->get_permissions('mod_comments') ) ); + if(!$can_edit) + { + echo '{"mode":"error","error":"HACKING ATTEMPT"}'; + return false; + } + $data['data'] = str_replace("\r", '', $data['data']); // Windows compatibility + $text = RenderMan::preprocess_text($data['data'], true, false); + $text2 = $db->escape($text); + $subj = $db->escape(htmlspecialchars($data['subj'])); + $q = $db->sql_query('UPDATE '.table_prefix.'comments SET subject=\'' . $subj . '\',comment_data=\'' . $text2 . '\' WHERE comment_id=' . $cid . ';'); + if(!$q) + $db->die_json(); + $ret = Array( + 'mode' => 'redraw', + 'id' => $data['local_id'], + 'subj' => htmlspecialchars($data['subj']), + 'text' => RenderMan::render($text), + 'src' => $text, + 'approved' => $row['approved'] + ); + break; + case 'delete': + $cid = (string)$data['id']; + if ( !ctype_digit($cid) || intval($cid) < 1 ) + { + echo '{"mode":"error","error":"HACKING ATTEMPT"}'; + return false; + } + $cid = intval($cid); + $q = $db->sql_query('SELECT c.user_id FROM '.table_prefix.'comments c LEFT JOIN '.table_prefix.'users u ON (u.user_id=c.user_id) WHERE comment_id='.$cid.';'); + if(!$q) + $db->die_json(); + $row = $db->fetchrow(); + $uid = intval($row['user_id']); + $can_edit = ( ( $uid == $session->user_id && $uid != 1 && $this->perms->get_permissions('edit_comments') ) || ( $this->perms->get_permissions('mod_comments') ) ); + if(!$can_edit) + { + echo '{"mode":"error","error":"HACKING ATTEMPT"}'; + return false; + } + $q = $db->sql_query('DELETE FROM '.table_prefix.'comments WHERE comment_id='.$cid.';'); + if(!$q) + $db->die_json(); + $ret = Array( + 'mode' => 'annihilate', + 'id' => $data['local_id'] + ); + break; + case 'submit': + + // Now for a huge round of security checks... + + $errors = Array(); + + // Authorization + // Like the rest of the ACL system, this call is a one-stop check for ALL ACL entries. + if ( !$this->perms->get_permissions('post_comments') ) + $errors[] = 'The site security policy prevents your user account from posting comments;'; + + // Guest authorization + if ( getConfig('comments_need_login') == '2' && !$session->user_logged_in ) + $errors[] = $lang->get('comment_err_need_login'); + + // CAPTCHA code + if ( getConfig('comments_need_login') == '1' && !$session->user_logged_in ) + { + $real_code = $session->get_captcha($data['captcha_id']); + if ( strtolower($real_code) !== strtolower($data['captcha_code']) ) + $errors[] = $lang->get('comment_err_captcha_wrong'); + $session->kill_captcha(); + } + + // Spam check + $spam_policy = getConfig('comment_spam_policy', 'moderate'); + $sc_name = ( $session->user_logged_in ) ? $session->username : $data['name']; + $sc_mail = ( $session->user_logged_in ) ? $session->email : false; + $sc_url = ( $session->user_logged_in ) ? @$session->user_extra['user_homepage'] : false; + $spamcheck = $spam_policy === 'accept' ? true : spamalyze($data['text'], $sc_name, $sc_mail, $sc_url); + if ( !$spamcheck && $spam_policy === 'reject' ) + { + $errors[] = $lang->get('comment_err_spamcheck_failed_rejected'); + } + + if ( count($errors) > 0 ) + { + $ret = Array( + 'mode' => 'error', + 'error' => implode("\n", $errors) + ); + } + else + { + // We're authorized! + + // Preprocess + $name = ( $session->user_logged_in ) ? htmlspecialchars($session->username) : htmlspecialchars($data['name']); + $subj = htmlspecialchars($data['subj']); + $text = RenderMan::preprocess_text($data['text'], true, false); + $src = $text; + $sql_subj = $db->escape($subj); + $sql_text = $db->escape($text); + $text = RenderMan::render($text); + $appr = ( getConfig('approve_comments', '0') == '1' ) ? COMMENT_UNAPPROVED : COMMENT_APPROVED; + if ( $spam_policy === 'moderate' && !$spamcheck ) + $appr = COMMENT_SPAM; + $time = time(); + $date = enano_date(ED_DATE | ED_TIME, $time); + $ip = $_SERVER['REMOTE_ADDR']; + if ( !is_valid_ip($ip) ) + die('Hacking attempt'); + + // Send it to the database + $q = $db->sql_query('INSERT INTO '.table_prefix.'comments(page_id,namespace,name,subject,comment_data,approved, time, user_id, ip_address) VALUES' . "\n " . + "('$this->page_id', '$this->namespace', '$name', '$sql_subj', '$sql_text', $appr, $time, {$session->user_id}, '$ip');"); + if(!$q) + $db->die_json(); + + // Re-fetch + $q = $db->sql_query('SELECT c.comment_id,c.name,c.subject,c.comment_data,c.time,c.approved,u.user_level,u.user_id,u.email,u.signature,u.user_has_avatar,u.avatar_type FROM '.table_prefix.'comments AS c + LEFT JOIN '.table_prefix.'users AS u + ON (u.user_id=c.user_id) + WHERE page_id=\'' . $this->page_id . '\' + AND namespace=\'' . $this->namespace . '\' + AND time='.$time.' ORDER BY comment_id DESC LIMIT 1;'); + if(!$q) + $db->die_json(); + + $row = $db->fetchrow(); + $db->free_result(); + $row['time'] = $date; + $row['comment_data'] = $text; + $row['comment_source'] = $src; + $ret = Array( + 'mode' => 'materialize' + ); + $ret = enano_safe_array_merge($ret, $row); + + $ret['auth_mod_comments'] = $this->perms->get_permissions('mod_comments'); + $ret['auth_post_comments'] = $this->perms->get_permissions('post_comments'); + $ret['auth_edit_comments'] = $this->perms->get_permissions('edit_comments'); + $ret['user_id'] = $session->user_id; + $ret['rank_data'] = $session->get_user_rank($session->user_id); + $ret['username'] = $session->username; + $ret['logged_in'] = $session->user_logged_in; + $ret['signature'] = RenderMan::render($row['signature']); + + $ret['user_level_list'] = Array(); + $ret['user_level_list']['guest'] = USER_LEVEL_GUEST; + $ret['user_level_list']['member'] = USER_LEVEL_MEMBER; + $ret['user_level_list']['mod'] = USER_LEVEL_MOD; + $ret['user_level_list']['admin'] = USER_LEVEL_ADMIN; + $ret['avatar_path'] = make_avatar_url($row['user_id'], $row['avatar_type'], $row['email']); + } + + break; + case 'approve': + if ( !$this->perms->get_permissions('mod_comments') ) + { + $ret = Array( + 'mode' => 'error', + 'error' => 'You are not authorized to moderate comments.' + ); + echo enano_json_encode($ret); + return $ret; + } + + $cid = (string)$data['id']; + if ( !ctype_digit($cid) || intval($cid) < 1 ) + { + echo '{"mode":"error","error":"HACKING ATTEMPT"}'; + return false; + } + $cid = intval($cid); + $q = $db->sql_query('SELECT subject,approved FROM '.table_prefix.'comments WHERE comment_id='.$cid.';'); + if(!$q || $db->numrows() < 1) + $db->die_json(); + $row = $db->fetchrow(); + $db->free_result(); + $appr = ( $row['approved'] == '1' ) ? '0' : '1'; + $q = $db->sql_query('UPDATE '.table_prefix."comments SET approved=$appr WHERE comment_id=$cid;"); + if (!$q) + $db->die_json(); + + $ret = Array( + 'mode' => 'redraw', + 'approved' => $appr, + 'subj' => $row['subject'], + 'id' => $data['local_id'], + 'approve_updated' => 'yes' + ); + + break; + case 'view_ip': + if ( !$session->get_permissions('mod_comments') ) + { + return array( + 'mode' => 'error', + 'error' => 'Unauthorized' + ); + } + // fetch comment info + if ( !is_int($data['id']) ) + { + return array( + 'mode' => 'error', + 'error' => 'Unauthorized' + ); + } + $id =& $data['id']; + $q = $db->sql_query('SELECT ip_address, name FROM ' . table_prefix . 'comments WHERE comment_id = ' . $id . ';'); + if ( !$q || $db->numrows() < 1 ) + { + $db->die_json(); + } + list($ip_addr, $name) = $db->fetchrow_num($q); + $db->free_result(); + $name = $db->escape($name); + $username = $db->escape($session->username); + // log this action + $q = $db->sql_query('INSERT INTO ' . table_prefix . "logs(time_id, log_type, action, page_text, author, author_uid, edit_summary) VALUES\n " + . "( " . time() . ", 'security', 'view_comment_ip', '$name', '$username', $session->user_id, '{$_SERVER['REMOTE_ADDR']}' );"); + if ( !$q ) + $db->die_json(); + + // send packet + $ret = array( + 'mode' => 'redraw', + 'ip_addr' => $ip_addr, + 'local_id' => $data['local_id'] + ); + break; + default: + $ret = Array( + 'mode' => 'error', + 'error' => $data['mode'] . ' is not a valid request mode' + ); + break; + } + if ( $is_json ) + echo enano_json_encode($ret); + + return $ret; + } + } // class Comments diff -r de56132c008d -r bdac73ed481e includes/common.php --- a/includes/common.php Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/common.php Sun Mar 28 23:10:46 2010 -0400 @@ -22,13 +22,13 @@ // Make sure we don't have an attempt to inject globals (register_globals on) if ( isset($_REQUEST['GLOBALS']) ) { - ?> -Hacking attempt using PHP $GLOBALS overwrite vulnerability detected, reported to admin
You're worse than this guy! Unless you are this guy...
You been f***ed by Enano | valid XHTML 1.1
- +Hacking attempt using PHP $GLOBALS overwrite vulnerability detected, reported to admin
You're worse than this guy! Unless you are this guy...
You been f***ed by Enano | valid XHTML 1.1
+ Your web browser did not provide the HTTP Host: field. This site requires a modern browser that supports the HTTP 1.1 standard.'); + grinding_halt('Cannot get hostname', 'Your web browser did not provide the HTTP Host: field. This site requires a modern browser that supports the HTTP 1.1 standard.
'); // // END BACKGROUND AND ENVIRONMENT CHECKS @@ -212,7 +212,7 @@ @include(ENANO_ROOT . $config_file); unset($dbuser, $dbpasswd); if ( !isset($dbdriver) ) - $dbdriver = 'mysql'; + $dbdriver = 'mysql'; $db = new $dbdriver(); $db->connect(); @@ -229,18 +229,18 @@ // Build the list of system tables (this is mostly done in constants.php, but that's before table_prefix is known) if ( defined('table_prefix') && !defined('ENANO_TABLELIST_PREFIXED') ) { - define('ENANO_TABLELIST_PREFIXED', 1); - foreach ( $system_table_list as $i => $_ ) - { - $system_table_list[$i] = table_prefix . $system_table_list[$i]; - } + define('ENANO_TABLELIST_PREFIXED', 1); + foreach ( $system_table_list as $i => $_ ) + { + $system_table_list[$i] = table_prefix . $system_table_list[$i]; + } } // Select and fetch the site configuration $e = $db->sql_query('SELECT config_name, config_value FROM '.table_prefix.'config;'); if ( !$e ) { - $db->_die('Some critical configuration information could not be selected.'); + $db->_die('Some critical configuration information could not be selected.'); } // Used in die_semicritical to figure out whether to call getConfig() or not define('ENANO_CONFIG_FETCHED', ''); @@ -249,7 +249,7 @@ $enano_config = Array(); while($r = $db->fetchrow()) { - $enano_config[$r['config_name']] = $r['config_value']; + $enano_config[$r['config_name']] = $r['config_value']; } $db->free_result(); @@ -258,22 +258,22 @@ if ( defined('ENANO_EXIT_AFTER_CONFIG') ) { - return true; + return true; } // Now that we have the config, check the Enano version. if ( enano_version(false, true) != $version && !defined('IN_ENANO_UPGRADE') ) { - grinding_halt('Version mismatch', 'It seems that the Enano release we\'re trying to run ('.$version.') is different from the version specified in your database ('.enano_version().'). Perhaps you need to upgrade?
'); + grinding_halt('Version mismatch', 'It seems that the Enano release we\'re trying to run ('.$version.') is different from the version specified in your database ('.enano_version().'). Perhaps you need to upgrade?
'); } // Set our CDN path if ( !defined('cdnPath') ) { - $cdnpath = getConfig('cdn_path', scriptPath); - if ( empty($cdnpath) ) - $cdnpath = scriptPath; - define('cdnPath', $cdnpath); + $cdnpath = getConfig('cdn_path', scriptPath); + if ( empty($cdnpath) ) + $cdnpath = scriptPath; + define('cdnPath', $cdnpath); } // @@ -283,47 +283,47 @@ // If the AES key size has been changed, bail out and fast if ( !getConfig('aes_key_size') ) { - setConfig('aes_key_size', AES_BITS); + setConfig('aes_key_size', AES_BITS); } else if ( $ks = getConfig('aes_key_size') ) { - if ( intval($ks) != AES_BITS ) - { - grinding_halt('AES key size changed', 'Enano has detected that the AES key size in constants.php has been changed. This change cannot be performed after installation, otherwise the private key would have to be re-generated and all passwords would have to be re-encrypted.
Please change the key size back to ' . $ks . ' bits and reload this page.
'); - } + if ( intval($ks) != AES_BITS ) + { + grinding_halt('AES key size changed', 'Enano has detected that the AES key size in constants.php has been changed. This change cannot be performed after installation, otherwise the private key would have to be re-generated and all passwords would have to be re-encrypted.
Please change the key size back to ' . $ks . ' bits and reload this page.
'); + } } // Same for AES block size if ( !getConfig('aes_block_size') ) { - setConfig('aes_block_size', AES_BLOCKSIZE); + setConfig('aes_block_size', AES_BLOCKSIZE); } else if ( $ks = getConfig('aes_block_size') ) { - if ( intval($ks) != AES_BLOCKSIZE ) - { - grinding_halt('AES block size changed', 'Enano has detected that the AES block size in constants.php has been changed. This change cannot be performed after installation, otherwise all passwords would have to be re-encrypted.
Please change the block size back to ' . $ks . ' bits and reload this page.
'); - } + if ( intval($ks) != AES_BLOCKSIZE ) + { + grinding_halt('AES block size changed', 'Enano has detected that the AES block size in constants.php has been changed. This change cannot be performed after installation, otherwise all passwords would have to be re-encrypted.
Please change the block size back to ' . $ks . ' bits and reload this page.
'); + } } // Is there no default language? if ( getConfig('default_language') === false && !defined('IN_ENANO_MIGRATION') ) { - $q = $db->sql_query('SELECT lang_id FROM '.table_prefix.'language LIMIT 1;'); - if ( !$q ) - $db->_die('common.php - setting default language'); - if ( $db->numrows() < 1 && !defined('ENANO_ALLOW_LOAD_NOLANG') ) - { - grinding_halt('No languages', 'There are no languages installed on this site.
-If you are the website administrator, you may install a language by writing and executing a simple PHP script to install it:
-
+ $q = $db->sql_query('SELECT lang_id FROM '.table_prefix.'language LIMIT 1;');
+ if ( !$q )
+ $db->_die('common.php - setting default language');
+ if ( $db->numrows() < 1 && !defined('ENANO_ALLOW_LOAD_NOLANG') )
+ {
+ grinding_halt('No languages', 'There are no languages installed on this site.
+ If you are the website administrator, you may install a language by writing and executing a simple PHP script to install it:
+
<?php
define("ENANO_ALLOW_LOAD_NOLANG", 1);
require("includes/common.php");
install_language("eng", "English", "English", ENANO_ROOT . "/language/english/enano.json");');
- }
- $row = $db->fetchrow();
- setConfig('default_language', $row['lang_id']);
+ }
+ $row = $db->fetchrow();
+ setConfig('default_language', $row['lang_id']);
}
profiler_log('Ran checks');
@@ -348,8 +348,8 @@
// Load plugins from common because we can't give plugins full abilities in object context
foreach ( $plugins->load_list as $f )
{
- if ( file_exists(ENANO_ROOT . '/plugins/' . $f) )
- include_once ENANO_ROOT . '/plugins/' . $f;
+ if ( file_exists(ENANO_ROOT . '/plugins/' . $f) )
+ include_once ENANO_ROOT . '/plugins/' . $f;
}
profiler_log('Loaded plugins');
@@ -371,125 +371,125 @@
// script though, because that will make the DBAL look in the wrong place for the config file.
if ( !defined('IN_ENANO_INSTALL') )
{
- // And here you have it, the de facto way to place a hook. Plugins can place hooks and hook
- // into other plugins. You just never know.
- $code = $plugins->setHook('base_classes_initted');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- profiler_log('Finished base_classes_initted hook');
-
- // One quick security check...
- if ( !is_valid_ip($_SERVER['REMOTE_ADDR']) )
- {
- die('SECURITY: spoofed IP address: ' . htmlspecialchars($_SERVER['REMOTE_ADDR']));
- }
-
- // For special and administration pages, sometimes there is a "preloader" function that must be run
- // before the session manager and/or path manager get the init signal. Call it here.
- $urlname = get_title(true);
- list($page_id, $namespace) = RenderMan::strToPageID($urlname);
- list($page_id_top) = explode('/', $page_id);
- $fname = "page_{$namespace}_{$page_id_top}_preloader";
- if( ( $namespace == 'Admin' || $namespace == 'Special' ) && function_exists($fname))
- {
- call_user_func($fname);
- }
-
- profiler_log('Checked for (and ran, if applicable) preloader');
-
- // Add all of our built in special pages
- foreach ( array('SpecialUserFuncs', 'SpecialPageFuncs', 'SpecialAdmin', 'SpecialCSS', 'SpecialUpDownload', 'SpecialSearch', 'PrivateMessages', 'SpecialGroups', 'SpecialLog') as $plugin )
- {
- $funcname = "{$plugin}_paths_init";
- if ( function_exists($funcname) )
- {
- $funcname();
- }
- }
- profiler_log('Added special pages');
-
- // All checks passed! Start the main components up.
- $session->start();
-
- // This is where plugins will want to add pages from 1.1.x on out. You can still add
- // pages at base_classes_initted but the titles won't be localized. This is because
- // the session manager has to be started before localization will work in the user's
- // preferred language.
- $code = $plugins->setHook('session_started');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- profiler_log('Ran session_started hook');
-
- $paths->init($urlname);
-
- // setup output format
- if ( defined('ENANO_OUTPUT_FORMAT') )
- $class = 'Output_' . ENANO_OUTPUT_FORMAT;
- else
- $class = ( isset($_GET['noheaders']) ) ? 'Output_Naked' : 'Output_HTML';
-
- $output = new $class();
-
- // Are we running from the API? If so, did the page set a title?
- if ( !defined('ENANO_INTERFACE_INDEX') && !defined('ENANO_INTERFACE_AJAX') && isset($title) )
- {
- $output->set_title($title);
- }
-
- // We're ready for whatever life throws us now, at least from an API point of view.
- define('ENANO_MAINSTREAM', '');
-
- // If the site is disabled, bail out, unless we're trying to log in or administer the site
- if(getConfig('site_disabled') == '1' && $session->user_level < USER_LEVEL_ADMIN)
- {
- // is this one of the more critical special pages?
- if ( $paths->namespace == 'Admin' || ( $paths->namespace == 'Special' && ( $paths->page_id == 'CSS' || $paths->page_id == 'Administration' || $paths->page_id == 'Login' ) ) )
- {
- // yeah, we need to keep this page available. do nothing; allow execution to continue
- }
- else
- {
- if(!$n = getConfig('site_disabled_notice'))
- {
- $n = 'The administrator has disabled the site. Please check back later.';
- }
-
- $text = RenderMan::render($n) . '
-
- If you have an administrative account, you may log in to the site.
- ';
- $paths->wiki_mode = 0;
- die_semicritical('Site disabled', $text);
- }
- }
- else if ( getConfig('site_disabled') == '1' && $session->user_level >= USER_LEVEL_ADMIN )
- {
- // If the site is disabled but the user has admin rights, allow browsing
- // and stuff, but display the orange box notifying the admin.
- $template->site_disabled = true;
- }
-
- // At this point all of Enano is fully initialized and running and you're ready to do whatever you want.
- $code = $plugins->setHook('common_post');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- profiler_log('Ran disabled-site checks and common_post');
-
- load_rank_data();
-
- profiler_log('Loaded user rank data');
-
- if ( isset($_GET['noheaders']) )
- $template->no_headers = true;
+ // And here you have it, the de facto way to place a hook. Plugins can place hooks and hook
+ // into other plugins. You just never know.
+ $code = $plugins->setHook('base_classes_initted');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ profiler_log('Finished base_classes_initted hook');
+
+ // One quick security check...
+ if ( !is_valid_ip($_SERVER['REMOTE_ADDR']) )
+ {
+ die('SECURITY: spoofed IP address: ' . htmlspecialchars($_SERVER['REMOTE_ADDR']));
+ }
+
+ // For special and administration pages, sometimes there is a "preloader" function that must be run
+ // before the session manager and/or path manager get the init signal. Call it here.
+ $urlname = get_title(true);
+ list($page_id, $namespace) = RenderMan::strToPageID($urlname);
+ list($page_id_top) = explode('/', $page_id);
+ $fname = "page_{$namespace}_{$page_id_top}_preloader";
+ if( ( $namespace == 'Admin' || $namespace == 'Special' ) && function_exists($fname))
+ {
+ call_user_func($fname);
+ }
+
+ profiler_log('Checked for (and ran, if applicable) preloader');
+
+ // Add all of our built in special pages
+ foreach ( array('SpecialUserFuncs', 'SpecialPageFuncs', 'SpecialAdmin', 'SpecialCSS', 'SpecialUpDownload', 'SpecialSearch', 'PrivateMessages', 'SpecialGroups', 'SpecialLog') as $plugin )
+ {
+ $funcname = "{$plugin}_paths_init";
+ if ( function_exists($funcname) )
+ {
+ $funcname();
+ }
+ }
+ profiler_log('Added special pages');
+
+ // All checks passed! Start the main components up.
+ $session->start();
+
+ // This is where plugins will want to add pages from 1.1.x on out. You can still add
+ // pages at base_classes_initted but the titles won't be localized. This is because
+ // the session manager has to be started before localization will work in the user's
+ // preferred language.
+ $code = $plugins->setHook('session_started');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ profiler_log('Ran session_started hook');
+
+ $paths->init($urlname);
+
+ // setup output format
+ if ( defined('ENANO_OUTPUT_FORMAT') )
+ $class = 'Output_' . ENANO_OUTPUT_FORMAT;
+ else
+ $class = ( isset($_GET['noheaders']) ) ? 'Output_Naked' : 'Output_HTML';
+
+ $output = new $class();
+
+ // Are we running from the API? If so, did the page set a title?
+ if ( !defined('ENANO_INTERFACE_INDEX') && !defined('ENANO_INTERFACE_AJAX') && isset($title) )
+ {
+ $output->set_title($title);
+ }
+
+ // We're ready for whatever life throws us now, at least from an API point of view.
+ define('ENANO_MAINSTREAM', '');
+
+ // If the site is disabled, bail out, unless we're trying to log in or administer the site
+ if(getConfig('site_disabled') == '1' && $session->user_level < USER_LEVEL_ADMIN)
+ {
+ // is this one of the more critical special pages?
+ if ( $paths->namespace == 'Admin' || ( $paths->namespace == 'Special' && ( $paths->page_id == 'CSS' || $paths->page_id == 'Administration' || $paths->page_id == 'Login' ) ) )
+ {
+ // yeah, we need to keep this page available. do nothing; allow execution to continue
+ }
+ else
+ {
+ if(!$n = getConfig('site_disabled_notice'))
+ {
+ $n = 'The administrator has disabled the site. Please check back later.';
+ }
+
+ $text = RenderMan::render($n) . '
+
+ If you have an administrative account, you may log in to the site.
+ ';
+ $paths->wiki_mode = 0;
+ die_semicritical('Site disabled', $text);
+ }
+ }
+ else if ( getConfig('site_disabled') == '1' && $session->user_level >= USER_LEVEL_ADMIN )
+ {
+ // If the site is disabled but the user has admin rights, allow browsing
+ // and stuff, but display the orange box notifying the admin.
+ $template->site_disabled = true;
+ }
+
+ // At this point all of Enano is fully initialized and running and you're ready to do whatever you want.
+ $code = $plugins->setHook('common_post');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ profiler_log('Ran disabled-site checks and common_post');
+
+ load_rank_data();
+
+ profiler_log('Loaded user rank data');
+
+ if ( isset($_GET['noheaders']) )
+ $template->no_headers = true;
}
profiler_log('common finished');
diff -r de56132c008d -r bdac73ed481e includes/common_cli.php
--- a/includes/common_cli.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/common_cli.php Sun Mar 28 23:10:46 2010 -0400
@@ -34,7 +34,7 @@
@include(ENANO_ROOT . $config_file);
unset($dbuser, $dbpasswd);
if ( !isset($dbdriver) )
- $dbdriver = 'mysql';
+ $dbdriver = 'mysql';
$db = new $dbdriver();
$db->connect();
@@ -52,7 +52,7 @@
$e = $db->sql_query('SELECT config_name, config_value FROM '.table_prefix.'config;');
if ( !$e )
{
- $db->_die('Some critical configuration information could not be selected.');
+ $db->_die('Some critical configuration information could not be selected.');
}
// Used in die_semicritical to figure out whether to call getConfig() or not
define('ENANO_CONFIG_FETCHED', '');
@@ -61,7 +61,7 @@
$enano_config = Array();
while($r = $db->fetchrow())
{
- $enano_config[$r['config_name']] = $r['config_value'];
+ $enano_config[$r['config_name']] = $r['config_value'];
}
$db->free_result();
@@ -71,12 +71,12 @@
// Now that we have the config, check the Enano version.
if ( enano_version(false, true) != $version && !defined('IN_ENANO_UPGRADE') )
{
- grinding_halt('Version mismatch', 'Trying to run Enano version '.$version.' on database version '.enano_version().', you might need to upgrade.');
+ grinding_halt('Version mismatch', 'Trying to run Enano version '.$version.' on database version '.enano_version().', you might need to upgrade.');
}
// Set our CDN path
if ( !defined('cdnPath') )
- define('cdnPath', getConfig('cdn_path', scriptPath));
+ define('cdnPath', getConfig('cdn_path', scriptPath));
//
// Low level maintenance
@@ -85,41 +85,41 @@
// If the AES key size has been changed, bail out and fast
if ( !getConfig('aes_key_size') )
{
- setConfig('aes_key_size', AES_BITS);
+ setConfig('aes_key_size', AES_BITS);
}
else if ( $ks = getConfig('aes_key_size') )
{
- if ( intval($ks) != AES_BITS )
- {
- grinding_halt('AES key size changed', 'Enano has detected that the AES key size in constants.php has been changed. This change cannot be performed after installation, otherwise the private key would have to be re-generated and all passwords would have to be re-encrypted.' . "\n\n" . 'Please change the key size back to ' . $ks . ' bits and rerun this script.');
- }
+ if ( intval($ks) != AES_BITS )
+ {
+ grinding_halt('AES key size changed', 'Enano has detected that the AES key size in constants.php has been changed. This change cannot be performed after installation, otherwise the private key would have to be re-generated and all passwords would have to be re-encrypted.' . "\n\n" . 'Please change the key size back to ' . $ks . ' bits and rerun this script.');
+ }
}
// Same for AES block size
if ( !getConfig('aes_block_size') )
{
- setConfig('aes_block_size', AES_BLOCKSIZE);
+ setConfig('aes_block_size', AES_BLOCKSIZE);
}
else if ( $ks = getConfig('aes_block_size') )
{
- if ( intval($ks) != AES_BLOCKSIZE )
- {
- grinding_halt('AES block size changed', "Enano has detected that the AES block size in constants.php has been changed. This change cannot be performed after installation, otherwise all passwords would have to be re-encrypted.\n\nPlease change the block size back to $ks bits and rerun this script.");
- }
+ if ( intval($ks) != AES_BLOCKSIZE )
+ {
+ grinding_halt('AES block size changed', "Enano has detected that the AES block size in constants.php has been changed. This change cannot be performed after installation, otherwise all passwords would have to be re-encrypted.\n\nPlease change the block size back to $ks bits and rerun this script.");
+ }
}
// Is there no default language?
if ( getConfig('default_language') === false && !defined('IN_ENANO_MIGRATION') )
{
- $q = $db->sql_query('SELECT lang_id FROM '.table_prefix.'language LIMIT 1;');
- if ( !$q )
- $db->_die('common.php - setting default language');
- if ( $db->numrows() < 1 && !defined('ENANO_ALLOW_LOAD_NOLANG') )
- {
- grinding_halt('No languages', 'No languages are installed on the site, load from web interface for instructions on how to fix this.');
- }
- $row = $db->fetchrow();
- setConfig('default_language', $row['lang_id']);
+ $q = $db->sql_query('SELECT lang_id FROM '.table_prefix.'language LIMIT 1;');
+ if ( !$q )
+ $db->_die('common.php - setting default language');
+ if ( $db->numrows() < 1 && !defined('ENANO_ALLOW_LOAD_NOLANG') )
+ {
+ grinding_halt('No languages', 'No languages are installed on the site, load from web interface for instructions on how to fix this.');
+ }
+ $row = $db->fetchrow();
+ setConfig('default_language', $row['lang_id']);
}
profiler_log('Ran checks');
@@ -144,11 +144,11 @@
// Load plugins from common because we can't give plugins full abilities in object context
if ( !defined('ENANO_NO_PLUGINS') )
{
- foreach ( $plugins->load_list as $f )
- {
- if ( file_exists(ENANO_ROOT . '/plugins/' . $f) )
- include_once ENANO_ROOT . '/plugins/' . $f;
- }
+ foreach ( $plugins->load_list as $f )
+ {
+ if ( file_exists(ENANO_ROOT . '/plugins/' . $f) )
+ include_once ENANO_ROOT . '/plugins/' . $f;
+ }
}
profiler_log('Loaded plugins');
@@ -170,87 +170,87 @@
// script though, because that will make the DBAL look in the wrong place for the config file.
if ( !defined('IN_ENANO_INSTALL') )
{
- // And here you have it, the de facto way to place a hook. Plugins can place hooks and hook
- // into other plugins. You just never know.
- $code = $plugins->setHook('base_classes_initted');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- profiler_log('Finished base_classes_initted hook');
-
- // One quick security check...
- if ( isset($_SERVER['REMOTE_ADDR']) )
- {
- grinding_halt('REMOTE_ADDR detected', 'Detected a REMOTE_ADDR, this should not happen in CLI mode.');
- }
- $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+ // And here you have it, the de facto way to place a hook. Plugins can place hooks and hook
+ // into other plugins. You just never know.
+ $code = $plugins->setHook('base_classes_initted');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ profiler_log('Finished base_classes_initted hook');
+
+ // One quick security check...
+ if ( isset($_SERVER['REMOTE_ADDR']) )
+ {
+ grinding_halt('REMOTE_ADDR detected', 'Detected a REMOTE_ADDR, this should not happen in CLI mode.');
+ }
+ $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
- // All checks passed! Start the main components up.
- $session->start();
-
- // This is where plugins will want to add pages from 1.1.x on out. You can still add
- // pages at base_classes_initted but the titles won't be localized. This is because
- // the session manager has to be started before localization will work in the user's
- // preferred language.
- $code = $plugins->setHook('session_started');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- profiler_log('Ran session_started hook');
-
- $paths->init($paths->nslist['System'] . 'API');
-
- // We're ready for whatever life throws us now.
- define('ENANO_MAINSTREAM', '');
-
- // If the site is disabled, bail out, unless we're trying to log in or administer the site
- if(getConfig('site_disabled') == '1' && $session->user_level < USER_LEVEL_ADMIN)
- {
- if ( $paths->namespace == 'Admin' || ( $paths->namespace == 'Special' && ( $paths->page_id == 'CSS' || $paths->page_id == 'Administration' || $paths->page_id == 'Login' ) ) )
- {
- // do nothing; allow execution to continue
- }
- else
- {
- if(!$n = getConfig('site_disabled_notice'))
- {
- $n = 'The administrator has disabled the site. Please check back later.';
- }
-
- $text = RenderMan::render($n) . '
-
- If you have an administrative account, you may log in to the site.
- ';
- $paths->wiki_mode = 0;
- die_semicritical('Site disabled', $text);
- }
- }
- else if ( getConfig('site_disabled') == '1' && $session->user_level >= USER_LEVEL_ADMIN )
- {
- // If the site is disabled but the user has admin rights, allow browsing
- // and stuff, but display the orange box notifying the admin.
- $template->site_disabled = true;
- }
-
- // At this point all of Enano is fully initialized and running and you're ready to do whatever you want.
- $code = $plugins->setHook('common_post');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- profiler_log('Ran disabled-site checks and common_post');
-
- load_rank_data();
-
- profiler_log('Loaded user rank data');
-
- if ( isset($_GET['noheaders']) )
- $template->no_headers = true;
+ // All checks passed! Start the main components up.
+ $session->start();
+
+ // This is where plugins will want to add pages from 1.1.x on out. You can still add
+ // pages at base_classes_initted but the titles won't be localized. This is because
+ // the session manager has to be started before localization will work in the user's
+ // preferred language.
+ $code = $plugins->setHook('session_started');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ profiler_log('Ran session_started hook');
+
+ $paths->init($paths->nslist['System'] . 'API');
+
+ // We're ready for whatever life throws us now.
+ define('ENANO_MAINSTREAM', '');
+
+ // If the site is disabled, bail out, unless we're trying to log in or administer the site
+ if(getConfig('site_disabled') == '1' && $session->user_level < USER_LEVEL_ADMIN)
+ {
+ if ( $paths->namespace == 'Admin' || ( $paths->namespace == 'Special' && ( $paths->page_id == 'CSS' || $paths->page_id == 'Administration' || $paths->page_id == 'Login' ) ) )
+ {
+ // do nothing; allow execution to continue
+ }
+ else
+ {
+ if(!$n = getConfig('site_disabled_notice'))
+ {
+ $n = 'The administrator has disabled the site. Please check back later.';
+ }
+
+ $text = RenderMan::render($n) . '
+
+ If you have an administrative account, you may log in to the site.
+ ';
+ $paths->wiki_mode = 0;
+ die_semicritical('Site disabled', $text);
+ }
+ }
+ else if ( getConfig('site_disabled') == '1' && $session->user_level >= USER_LEVEL_ADMIN )
+ {
+ // If the site is disabled but the user has admin rights, allow browsing
+ // and stuff, but display the orange box notifying the admin.
+ $template->site_disabled = true;
+ }
+
+ // At this point all of Enano is fully initialized and running and you're ready to do whatever you want.
+ $code = $plugins->setHook('common_post');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ profiler_log('Ran disabled-site checks and common_post');
+
+ load_rank_data();
+
+ profiler_log('Loaded user rank data');
+
+ if ( isset($_GET['noheaders']) )
+ $template->no_headers = true;
}
profiler_log('common finished');
diff -r de56132c008d -r bdac73ed481e includes/constants.php
--- a/includes/constants.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/constants.php Sun Mar 28 23:10:46 2010 -0400
@@ -276,45 +276,45 @@
// Our list of tables included in Enano
$system_table_list = Array(
- 'categories',
- 'comments',
- 'config',
- 'logs',
- 'page_text',
- 'session_keys',
- 'pages',
- 'users',
- 'users_extra',
- 'themes',
- 'buddies',
- 'banlist',
- 'files',
- 'privmsgs',
- 'sidebar',
- 'hits',
- 'groups',
- 'group_members',
- 'acl',
- 'page_groups',
- 'page_group_members',
- 'tags',
- 'language',
- 'language_strings',
- 'lockout',
- 'search_index',
- 'captcha',
- 'diffiehellman',
- 'plugins',
- 'ranks'
- );
+ 'categories',
+ 'comments',
+ 'config',
+ 'logs',
+ 'page_text',
+ 'session_keys',
+ 'pages',
+ 'users',
+ 'users_extra',
+ 'themes',
+ 'buddies',
+ 'banlist',
+ 'files',
+ 'privmsgs',
+ 'sidebar',
+ 'hits',
+ 'groups',
+ 'group_members',
+ 'acl',
+ 'page_groups',
+ 'page_group_members',
+ 'tags',
+ 'language',
+ 'language_strings',
+ 'lockout',
+ 'search_index',
+ 'captcha',
+ 'diffiehellman',
+ 'plugins',
+ 'ranks'
+ );
if ( defined('table_prefix') && !defined('ENANO_TABLELIST_PREFIXED') )
{
- define('ENANO_TABLELIST_PREFIXED', 1);
- foreach ( $system_table_list as $i => $_ )
- {
- $system_table_list[$i] = table_prefix . $system_table_list[$i];
- }
+ define('ENANO_TABLELIST_PREFIXED', 1);
+ foreach ( $system_table_list as $i => $_ )
+ {
+ $system_table_list[$i] = table_prefix . $system_table_list[$i];
+ }
}
/*
@@ -328,335 +328,335 @@
// IMPORTANT: this array can NEVER have items removed from it or key indexes changed
$mime_types = Array (
- 'ai' => 'application/postscript',
- 'aif' => 'audio/x-aiff',
- 'aifc' => 'audio/x-aiff',
- 'aiff' => 'audio/x-aiff',
- 'au' => 'audio/basic',
- 'avi' => 'video/x-msvideo',
- 'bcpio' => 'application/x-bcpio',
- 'bin' => 'application/octet-stream',
- 'bmp' => 'image/bmp',
- 'bz2' => 'application/x-bzip',
- 'cdf' => 'application/x-netcdf',
- 'cgm' => 'image/cgm',
- 'class' => 'application/octet-stream',
- 'cpio' => 'application/x-cpio',
- 'cpt' => 'application/mac-compactpro',
- 'csh' => 'application/x-csh',
- 'css' => 'text/css',
- 'dcr' => 'application/x-director',
- 'dir' => 'application/x-director',
- 'djv' => 'image/vnd.djvu',
- 'djvu' => 'image/vnd.djvu',
- 'dll' => 'application/octet-stream',
- 'dms' => 'application/octet-stream',
- 'doc' => 'application/msword',
- 'dtd' => 'application/xml-dtd',
- 'dvi' => 'application/x-dvi',
- 'dxr' => 'application/x-director',
- 'eps' => 'application/postscript',
- 'etx' => 'text/x-setext',
- 'exe' => 'application/octet-stream',
- 'ez' => 'application/andrew-inset',
- 'gif' => 'image/gif',
- 'gram' => 'application/srgs',
- 'grxml' => 'application/srgs+xml',
- 'gtar' => 'application/x-gtar',
- 'gz' => 'application/x-gzip',
- 'hdf' => 'application/x-hdf',
- 'hqx' => 'application/mac-binhex40',
- 'htm' => 'text/html',
- 'html' => 'text/html',
- 'ice' => 'x-conference/x-cooltalk',
- 'ico' => 'image/x-icon',
- 'ics' => 'text/calendar',
- 'ief' => 'image/ief',
- 'ifb' => 'text/calendar',
- 'iges' => 'model/iges',
- 'igs' => 'model/iges',
- 'jar' => 'application/zip',
- 'jpe' => 'image/jpeg',
- 'jpeg' => 'image/jpeg',
- 'jpg' => 'image/jpeg',
- 'js' => 'application/x-javascript',
- 'kar' => 'audio/midi',
- 'latex' => 'application/x-latex',
- 'lha' => 'application/octet-stream',
- 'lzh' => 'application/octet-stream',
- 'm3u' => 'audio/x-mpegurl',
- 'man' => 'application/x-troff-man',
- 'mathml' => 'application/mathml+xml',
- 'me' => 'application/x-troff-me',
- 'mesh' => 'model/mesh',
- 'mid' => 'audio/midi',
- 'midi' => 'audio/midi',
- 'mif' => 'application/vnd.mif',
- 'mov' => 'video/quicktime',
- 'movie' => 'video/x-sgi-movie',
- 'mp2' => 'audio/mpeg',
- 'mp3' => 'audio/mpeg',
- 'mpe' => 'video/mpeg',
- 'mpeg' => 'video/mpeg',
- 'mpg' => 'video/mpeg',
- 'mpga' => 'audio/mpeg',
- 'ms' => 'application/x-troff-ms',
- 'msh' => 'model/mesh',
- 'mxu' => 'video/vnd.mpegurl',
- 'nc' => 'application/x-netcdf',
- 'oda' => 'application/oda',
- 'ogg' => 'application/ogg',
- 'ogm' => 'application/ogg',
- 'pbm' => 'image/x-portable-bitmap',
- 'pdb' => 'chemical/x-pdb',
- 'pdf' => 'application/pdf',
- 'pgm' => 'image/x-portable-graymap',
- 'pgn' => 'application/x-chess-pgn',
- 'png' => 'image/png',
- 'pnm' => 'image/x-portable-anymap',
- 'ppm' => 'image/x-portable-pixmap',
- 'ppt' => 'application/vnd.ms-powerpoint',
- 'ps' => 'application/postscript',
- 'psd' => 'image/x-photoshop',
- 'qt' => 'video/quicktime',
- 'ra' => 'audio/x-realaudio',
- 'ram' => 'audio/x-pn-realaudio',
- 'ras' => 'image/x-cmu-raster',
- 'rdf' => 'text/xml',
- 'rgb' => 'image/x-rgb',
- 'rm' => 'audio/x-pn-realaudio',
- 'roff' => 'application/x-troff',
- 'rpm' => 'audio/x-pn-realaudio-plugin',
- 'rss' => 'text/xml',
- 'rtf' => 'text/rtf',
- 'rtx' => 'text/richtext',
- 'sgm' => 'text/sgml',
- 'sgml' => 'text/sgml',
- 'sh' => 'application/x-sh',
- 'shar' => 'application/x-shar',
- 'silo' => 'model/mesh',
- 'sit' => 'application/x-stuffit',
- 'skd' => 'application/x-koan',
- 'skm' => 'application/x-koan',
- 'skp' => 'application/x-koan',
- 'skt' => 'application/x-koan',
- 'smi' => 'application/smil',
- 'smil' => 'application/smil',
- 'snd' => 'audio/basic',
- 'so' => 'application/octet-stream',
- 'spl' => 'application/x-futuresplash',
- 'src' => 'application/x-wais-source',
- 'stc' => 'application/zip',
- 'std' => 'application/zip',
- 'sti' => 'application/zip',
- 'stm' => 'application/zip',
- 'stw' => 'application/zip',
- 'sv4cpio' => 'application/x-sv4cpio',
- 'sv4crc' => 'application/x-sv4crc',
- 'svg' => 'image/svg+xml',
- 'swf' => 'application/x-shockwave-flash',
- 'sxc' => 'application/zip',
- 'sxd' => 'application/zip',
- 'sxi' => 'application/zip',
- 'sxm' => 'application/zip',
- 'sxw' => 'application/zip',
- 't' => 'application/x-troff',
- 'tar' => 'application/x-tar',
- 'tcl' => 'application/x-tcl',
- 'tex' => 'application/x-tex',
- 'texi' => 'application/x-texinfo',
- 'texinfo' => 'application/x-texinfo',
- 'tif' => 'image/tiff',
- 'tiff' => 'image/tiff',
- 'tr' => 'application/x-troff',
- 'tsv' => 'text/tab-separated-values',
- 'txt' => 'text/plain',
- 'ustar' => 'application/x-ustar',
- 'vcd' => 'application/x-cdlink',
- 'vrml' => 'model/vrml',
- 'vxml' => 'application/voicexml+xml',
- 'wav' => 'audio/x-wav',
- 'wbmp' => 'image/vnd.wap.wbmp',
- 'wbxml' => 'application/vnd.wap.wbxml',
- 'wml' => 'text/vnd.wap.wml',
- 'wmlc' => 'application/vnd.wap.wmlc',
- 'wmls' => 'text/vnd.wap.wmlscript',
- 'wmlsc' => 'application/vnd.wap.wmlscriptc',
- 'wrl' => 'model/vrml',
- 'xbm' => 'image/x-xbitmap',
- 'xcf' => 'image/xcf',
- 'xht' => 'application/xhtml+xml',
- 'xhtml' => 'application/xhtml+xml',
- 'xls' => 'application/vnd.ms-excel',
- 'xml' => 'text/xml',
- 'xpi' => 'application/zip',
- 'xpm' => 'image/x-xpixmap',
- 'xsl' => 'text/xml',
- 'xslt' => 'text/xml',
- 'xwd' => 'image/x-xwindowdump',
- 'xyz' => 'chemical/x-xyz',
- 'zip' => 'application/zip',
- 'odt' => 'application/vnd.oasis.opendocument.text',
- 'ott' => 'application/vnd.oasis.opendocument.text-template',
- 'odg' => 'application/vnd.oasis.opendocument.graphics',
- 'otg' => 'application/vnd.oasis.opendocument.graphics-template',
- 'odp' => 'application/vnd.oasis.opendocument.presentation',
- 'otp' => 'application/vnd.oasis.opendocument.presentation-template',
- 'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
- 'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
- 'odc' => 'application/vnd.oasis.opendocument.chart',
- 'otc' => 'application/vnd.oasis.opendocument.chart-template',
- 'odi' => 'application/vnd.oasis.opendocument.image',
- 'oti' => 'application/vnd.oasis.opendocument.image-template',
- 'odf' => 'application/vnd.oasis.opendocument.formula',
- 'otf' => 'application/vnd.oasis.opendocument.formula-template',
- 'odm' => 'application/vnd.oasis.opendocument.text-master',
- 'oth' => 'application/vnd.oasis.opendocument.text-web'
+ 'ai' => 'application/postscript',
+ 'aif' => 'audio/x-aiff',
+ 'aifc' => 'audio/x-aiff',
+ 'aiff' => 'audio/x-aiff',
+ 'au' => 'audio/basic',
+ 'avi' => 'video/x-msvideo',
+ 'bcpio' => 'application/x-bcpio',
+ 'bin' => 'application/octet-stream',
+ 'bmp' => 'image/bmp',
+ 'bz2' => 'application/x-bzip',
+ 'cdf' => 'application/x-netcdf',
+ 'cgm' => 'image/cgm',
+ 'class' => 'application/octet-stream',
+ 'cpio' => 'application/x-cpio',
+ 'cpt' => 'application/mac-compactpro',
+ 'csh' => 'application/x-csh',
+ 'css' => 'text/css',
+ 'dcr' => 'application/x-director',
+ 'dir' => 'application/x-director',
+ 'djv' => 'image/vnd.djvu',
+ 'djvu' => 'image/vnd.djvu',
+ 'dll' => 'application/octet-stream',
+ 'dms' => 'application/octet-stream',
+ 'doc' => 'application/msword',
+ 'dtd' => 'application/xml-dtd',
+ 'dvi' => 'application/x-dvi',
+ 'dxr' => 'application/x-director',
+ 'eps' => 'application/postscript',
+ 'etx' => 'text/x-setext',
+ 'exe' => 'application/octet-stream',
+ 'ez' => 'application/andrew-inset',
+ 'gif' => 'image/gif',
+ 'gram' => 'application/srgs',
+ 'grxml' => 'application/srgs+xml',
+ 'gtar' => 'application/x-gtar',
+ 'gz' => 'application/x-gzip',
+ 'hdf' => 'application/x-hdf',
+ 'hqx' => 'application/mac-binhex40',
+ 'htm' => 'text/html',
+ 'html' => 'text/html',
+ 'ice' => 'x-conference/x-cooltalk',
+ 'ico' => 'image/x-icon',
+ 'ics' => 'text/calendar',
+ 'ief' => 'image/ief',
+ 'ifb' => 'text/calendar',
+ 'iges' => 'model/iges',
+ 'igs' => 'model/iges',
+ 'jar' => 'application/zip',
+ 'jpe' => 'image/jpeg',
+ 'jpeg' => 'image/jpeg',
+ 'jpg' => 'image/jpeg',
+ 'js' => 'application/x-javascript',
+ 'kar' => 'audio/midi',
+ 'latex' => 'application/x-latex',
+ 'lha' => 'application/octet-stream',
+ 'lzh' => 'application/octet-stream',
+ 'm3u' => 'audio/x-mpegurl',
+ 'man' => 'application/x-troff-man',
+ 'mathml' => 'application/mathml+xml',
+ 'me' => 'application/x-troff-me',
+ 'mesh' => 'model/mesh',
+ 'mid' => 'audio/midi',
+ 'midi' => 'audio/midi',
+ 'mif' => 'application/vnd.mif',
+ 'mov' => 'video/quicktime',
+ 'movie' => 'video/x-sgi-movie',
+ 'mp2' => 'audio/mpeg',
+ 'mp3' => 'audio/mpeg',
+ 'mpe' => 'video/mpeg',
+ 'mpeg' => 'video/mpeg',
+ 'mpg' => 'video/mpeg',
+ 'mpga' => 'audio/mpeg',
+ 'ms' => 'application/x-troff-ms',
+ 'msh' => 'model/mesh',
+ 'mxu' => 'video/vnd.mpegurl',
+ 'nc' => 'application/x-netcdf',
+ 'oda' => 'application/oda',
+ 'ogg' => 'application/ogg',
+ 'ogm' => 'application/ogg',
+ 'pbm' => 'image/x-portable-bitmap',
+ 'pdb' => 'chemical/x-pdb',
+ 'pdf' => 'application/pdf',
+ 'pgm' => 'image/x-portable-graymap',
+ 'pgn' => 'application/x-chess-pgn',
+ 'png' => 'image/png',
+ 'pnm' => 'image/x-portable-anymap',
+ 'ppm' => 'image/x-portable-pixmap',
+ 'ppt' => 'application/vnd.ms-powerpoint',
+ 'ps' => 'application/postscript',
+ 'psd' => 'image/x-photoshop',
+ 'qt' => 'video/quicktime',
+ 'ra' => 'audio/x-realaudio',
+ 'ram' => 'audio/x-pn-realaudio',
+ 'ras' => 'image/x-cmu-raster',
+ 'rdf' => 'text/xml',
+ 'rgb' => 'image/x-rgb',
+ 'rm' => 'audio/x-pn-realaudio',
+ 'roff' => 'application/x-troff',
+ 'rpm' => 'audio/x-pn-realaudio-plugin',
+ 'rss' => 'text/xml',
+ 'rtf' => 'text/rtf',
+ 'rtx' => 'text/richtext',
+ 'sgm' => 'text/sgml',
+ 'sgml' => 'text/sgml',
+ 'sh' => 'application/x-sh',
+ 'shar' => 'application/x-shar',
+ 'silo' => 'model/mesh',
+ 'sit' => 'application/x-stuffit',
+ 'skd' => 'application/x-koan',
+ 'skm' => 'application/x-koan',
+ 'skp' => 'application/x-koan',
+ 'skt' => 'application/x-koan',
+ 'smi' => 'application/smil',
+ 'smil' => 'application/smil',
+ 'snd' => 'audio/basic',
+ 'so' => 'application/octet-stream',
+ 'spl' => 'application/x-futuresplash',
+ 'src' => 'application/x-wais-source',
+ 'stc' => 'application/zip',
+ 'std' => 'application/zip',
+ 'sti' => 'application/zip',
+ 'stm' => 'application/zip',
+ 'stw' => 'application/zip',
+ 'sv4cpio' => 'application/x-sv4cpio',
+ 'sv4crc' => 'application/x-sv4crc',
+ 'svg' => 'image/svg+xml',
+ 'swf' => 'application/x-shockwave-flash',
+ 'sxc' => 'application/zip',
+ 'sxd' => 'application/zip',
+ 'sxi' => 'application/zip',
+ 'sxm' => 'application/zip',
+ 'sxw' => 'application/zip',
+ 't' => 'application/x-troff',
+ 'tar' => 'application/x-tar',
+ 'tcl' => 'application/x-tcl',
+ 'tex' => 'application/x-tex',
+ 'texi' => 'application/x-texinfo',
+ 'texinfo' => 'application/x-texinfo',
+ 'tif' => 'image/tiff',
+ 'tiff' => 'image/tiff',
+ 'tr' => 'application/x-troff',
+ 'tsv' => 'text/tab-separated-values',
+ 'txt' => 'text/plain',
+ 'ustar' => 'application/x-ustar',
+ 'vcd' => 'application/x-cdlink',
+ 'vrml' => 'model/vrml',
+ 'vxml' => 'application/voicexml+xml',
+ 'wav' => 'audio/x-wav',
+ 'wbmp' => 'image/vnd.wap.wbmp',
+ 'wbxml' => 'application/vnd.wap.wbxml',
+ 'wml' => 'text/vnd.wap.wml',
+ 'wmlc' => 'application/vnd.wap.wmlc',
+ 'wmls' => 'text/vnd.wap.wmlscript',
+ 'wmlsc' => 'application/vnd.wap.wmlscriptc',
+ 'wrl' => 'model/vrml',
+ 'xbm' => 'image/x-xbitmap',
+ 'xcf' => 'image/xcf',
+ 'xht' => 'application/xhtml+xml',
+ 'xhtml' => 'application/xhtml+xml',
+ 'xls' => 'application/vnd.ms-excel',
+ 'xml' => 'text/xml',
+ 'xpi' => 'application/zip',
+ 'xpm' => 'image/x-xpixmap',
+ 'xsl' => 'text/xml',
+ 'xslt' => 'text/xml',
+ 'xwd' => 'image/x-xwindowdump',
+ 'xyz' => 'chemical/x-xyz',
+ 'zip' => 'application/zip',
+ 'odt' => 'application/vnd.oasis.opendocument.text',
+ 'ott' => 'application/vnd.oasis.opendocument.text-template',
+ 'odg' => 'application/vnd.oasis.opendocument.graphics',
+ 'otg' => 'application/vnd.oasis.opendocument.graphics-template',
+ 'odp' => 'application/vnd.oasis.opendocument.presentation',
+ 'otp' => 'application/vnd.oasis.opendocument.presentation-template',
+ 'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+ 'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
+ 'odc' => 'application/vnd.oasis.opendocument.chart',
+ 'otc' => 'application/vnd.oasis.opendocument.chart-template',
+ 'odi' => 'application/vnd.oasis.opendocument.image',
+ 'oti' => 'application/vnd.oasis.opendocument.image-template',
+ 'odf' => 'application/vnd.oasis.opendocument.formula',
+ 'otf' => 'application/vnd.oasis.opendocument.formula-template',
+ 'odm' => 'application/vnd.oasis.opendocument.text-master',
+ 'oth' => 'application/vnd.oasis.opendocument.text-web'
);
$mimetype_extlist = Array(
- 'application/andrew-inset'=>'ez',
- 'application/mac-binhex40'=>'hqx',
- 'application/mac-compactpro'=>'cpt',
- 'application/mathml+xml'=>'mathml',
- 'application/msword'=>'doc',
- 'application/octet-stream'=>'bin dms lha lzh exe class so dll',
- 'application/oda'=>'oda',
- 'application/ogg'=>'ogg ogm',
- 'application/pdf'=>'pdf',
- 'application/postscript'=>'ai eps ps',
- 'application/rdf+xml'=>'rdf',
- 'application/smil'=>'smi smil',
- 'application/srgs'=>'gram',
- 'application/srgs+xml'=>'grxml',
- 'application/vnd.mif'=>'mif',
- 'application/vnd.ms-excel'=>'xls',
- 'application/vnd.ms-powerpoint'=>'ppt',
- 'application/vnd.wap.wbxml'=>'wbxml',
- 'application/vnd.wap.wmlc'=>'wmlc',
- 'application/vnd.wap.wmlscriptc'=>'wmlsc',
- 'application/voicexml+xml'=>'vxml',
- 'application/x-bcpio'=>'bcpio',
- 'application/x-bzip'=>'gz bz2',
- 'application/x-cdlink'=>'vcd',
- 'application/x-chess-pgn'=>'pgn',
- 'application/x-cpio'=>'cpio',
- 'application/x-csh'=>'csh',
- 'application/x-director'=>'dcr dir dxr',
- 'application/x-dvi'=>'dvi',
- 'application/x-futuresplash'=>'spl',
- 'application/x-gtar'=>'gtar tar',
- 'application/x-gzip'=>'gz',
- 'application/x-hdf'=>'hdf',
- 'application/x-jar'=>'jar',
- 'application/x-javascript'=>'js',
- 'application/x-koan'=>'skp skd skt skm',
- 'application/x-latex'=>'latex',
- 'application/x-netcdf'=>'nc cdf',
- 'application/x-sh'=>'sh',
- 'application/x-shar'=>'shar',
- 'application/x-shockwave-flash'=>'swf',
- 'application/x-stuffit'=>'sit',
- 'application/x-sv4cpio'=>'sv4cpio',
- 'application/x-sv4crc'=>'sv4crc',
- 'application/x-tar'=>'tar',
- 'application/x-tcl'=>'tcl',
- 'application/x-tex'=>'tex',
- 'application/x-texinfo'=>'texinfo texi',
- 'application/x-troff'=>'t tr roff',
- 'application/x-troff-man'=>'man',
- 'application/x-troff-me'=>'me',
- 'application/x-troff-ms'=>'ms',
- 'application/x-ustar'=>'ustar',
- 'application/x-wais-source'=>'src',
- 'application/x-xpinstall'=>'xpi',
- 'application/xhtml+xml'=>'xhtml xht',
- 'application/xslt+xml'=>'xslt',
- 'application/xml'=>'xml xsl',
- 'application/xml-dtd'=>'dtd',
- 'application/zip'=>'zip jar xpi sxc stc sxd std sxi sti sxm stm sxw stw ',
- 'audio/basic'=>'au snd',
- 'audio/midi'=>'mid midi kar',
- 'audio/mpeg'=>'mpga mp2 mp3',
- 'audio/ogg'=>'ogg ',
- 'audio/x-aiff'=>'aif aiff aifc',
- 'audio/x-mpegurl'=>'m3u',
- 'audio/x-ogg'=>'ogg ',
- 'audio/x-pn-realaudio'=>'ram rm',
- 'audio/x-pn-realaudio-plugin'=>'rpm',
- 'audio/x-realaudio'=>'ra',
- 'audio/x-wav'=>'wav',
- 'chemical/x-pdb'=>'pdb',
- 'chemical/x-xyz'=>'xyz',
- 'image/bmp'=>'bmp',
- 'image/cgm'=>'cgm',
- 'image/gif'=>'gif',
- 'image/ief'=>'ief',
- 'image/jpeg'=>'jpeg jpg jpe',
- 'image/png'=>'png',
- 'image/svg+xml'=>'svg',
- 'image/tiff'=>'tiff tif',
- 'image/vnd.djvu'=>'djvu djv',
- 'image/vnd.wap.wbmp'=>'wbmp',
- 'image/x-cmu-raster'=>'ras',
- 'image/x-icon'=>'ico',
- 'image/x-portable-anymap'=>'pnm',
- 'image/x-portable-bitmap'=>'pbm',
- 'image/x-portable-graymap'=>'pgm',
- 'image/x-portable-pixmap'=>'ppm',
- 'image/x-rgb'=>'rgb',
- 'image/x-photoshop'=>'psd',
- 'image/x-xbitmap'=>'xbm',
- 'image/x-xpixmap'=>'xpm',
- 'image/x-xwindowdump'=>'xwd',
- 'model/iges'=>'igs iges',
- 'model/mesh'=>'msh mesh silo',
- 'model/vrml'=>'wrl vrml',
- 'text/calendar'=>'ics ifb',
- 'text/css'=>'css',
- 'text/html'=>'html htm',
- 'text/plain'=>'txt',
- 'text/richtext'=>'rtx',
- 'text/rtf'=>'rtf',
- 'text/sgml'=>'sgml sgm',
- 'text/tab-separated-values'=>'tsv',
- 'text/vnd.wap.wml'=>'wml',
- 'text/vnd.wap.wmlscript'=>'wmls',
- 'text/xml'=>'xml xsl xslt rss rdf',
- 'text/x-setext'=>'etx',
- 'video/mpeg'=>'mpeg mpg mpe',
- 'video/ogg'=>'ogm ogg',
- 'video/quicktime'=>'qt mov',
- 'video/vnd.mpegurl'=>'mxu',
- 'video/x-msvideo'=>'avi',
- 'video/x-ogg'=>'ogm ogg',
- 'video/x-sgi-movie'=>'movie',
- 'x-conference/x-cooltalk'=>'ice',
- // Added for Enano
- 'image/xcf' => 'xcf xcfbz2 xcf.bz2',
- 'application/vnd.oasis.opendocument.text' => 'odt',
- 'application/vnd.oasis.opendocument.text-template' => 'ott',
- 'application/vnd.oasis.opendocument.graphics' => 'odg',
- 'application/vnd.oasis.opendocument.graphics-template' => 'otg',
- 'application/vnd.oasis.opendocument.presentation' => 'odp',
- 'application/vnd.oasis.opendocument.presentation-template' => 'otp',
- 'application/vnd.oasis.opendocument.spreadsheet' => 'ods',
- 'application/vnd.oasis.opendocument.spreadsheet-template' => 'ots',
- 'application/vnd.oasis.opendocument.chart' => 'odc',
- 'application/vnd.oasis.opendocument.chart-template' => 'otc',
- 'application/vnd.oasis.opendocument.image' => 'odi',
- 'application/vnd.oasis.opendocument.image-template' => 'oti',
- 'application/vnd.oasis.opendocument.formula' => 'odf',
- 'application/vnd.oasis.opendocument.formula-template' => 'otf',
- 'application/vnd.oasis.opendocument.text-master' => 'odm',
- 'application/vnd.oasis.opendocument.text-web' => 'oth'
+ 'application/andrew-inset'=>'ez',
+ 'application/mac-binhex40'=>'hqx',
+ 'application/mac-compactpro'=>'cpt',
+ 'application/mathml+xml'=>'mathml',
+ 'application/msword'=>'doc',
+ 'application/octet-stream'=>'bin dms lha lzh exe class so dll',
+ 'application/oda'=>'oda',
+ 'application/ogg'=>'ogg ogm',
+ 'application/pdf'=>'pdf',
+ 'application/postscript'=>'ai eps ps',
+ 'application/rdf+xml'=>'rdf',
+ 'application/smil'=>'smi smil',
+ 'application/srgs'=>'gram',
+ 'application/srgs+xml'=>'grxml',
+ 'application/vnd.mif'=>'mif',
+ 'application/vnd.ms-excel'=>'xls',
+ 'application/vnd.ms-powerpoint'=>'ppt',
+ 'application/vnd.wap.wbxml'=>'wbxml',
+ 'application/vnd.wap.wmlc'=>'wmlc',
+ 'application/vnd.wap.wmlscriptc'=>'wmlsc',
+ 'application/voicexml+xml'=>'vxml',
+ 'application/x-bcpio'=>'bcpio',
+ 'application/x-bzip'=>'gz bz2',
+ 'application/x-cdlink'=>'vcd',
+ 'application/x-chess-pgn'=>'pgn',
+ 'application/x-cpio'=>'cpio',
+ 'application/x-csh'=>'csh',
+ 'application/x-director'=>'dcr dir dxr',
+ 'application/x-dvi'=>'dvi',
+ 'application/x-futuresplash'=>'spl',
+ 'application/x-gtar'=>'gtar tar',
+ 'application/x-gzip'=>'gz',
+ 'application/x-hdf'=>'hdf',
+ 'application/x-jar'=>'jar',
+ 'application/x-javascript'=>'js',
+ 'application/x-koan'=>'skp skd skt skm',
+ 'application/x-latex'=>'latex',
+ 'application/x-netcdf'=>'nc cdf',
+ 'application/x-sh'=>'sh',
+ 'application/x-shar'=>'shar',
+ 'application/x-shockwave-flash'=>'swf',
+ 'application/x-stuffit'=>'sit',
+ 'application/x-sv4cpio'=>'sv4cpio',
+ 'application/x-sv4crc'=>'sv4crc',
+ 'application/x-tar'=>'tar',
+ 'application/x-tcl'=>'tcl',
+ 'application/x-tex'=>'tex',
+ 'application/x-texinfo'=>'texinfo texi',
+ 'application/x-troff'=>'t tr roff',
+ 'application/x-troff-man'=>'man',
+ 'application/x-troff-me'=>'me',
+ 'application/x-troff-ms'=>'ms',
+ 'application/x-ustar'=>'ustar',
+ 'application/x-wais-source'=>'src',
+ 'application/x-xpinstall'=>'xpi',
+ 'application/xhtml+xml'=>'xhtml xht',
+ 'application/xslt+xml'=>'xslt',
+ 'application/xml'=>'xml xsl',
+ 'application/xml-dtd'=>'dtd',
+ 'application/zip'=>'zip jar xpi sxc stc sxd std sxi sti sxm stm sxw stw ',
+ 'audio/basic'=>'au snd',
+ 'audio/midi'=>'mid midi kar',
+ 'audio/mpeg'=>'mpga mp2 mp3',
+ 'audio/ogg'=>'ogg ',
+ 'audio/x-aiff'=>'aif aiff aifc',
+ 'audio/x-mpegurl'=>'m3u',
+ 'audio/x-ogg'=>'ogg ',
+ 'audio/x-pn-realaudio'=>'ram rm',
+ 'audio/x-pn-realaudio-plugin'=>'rpm',
+ 'audio/x-realaudio'=>'ra',
+ 'audio/x-wav'=>'wav',
+ 'chemical/x-pdb'=>'pdb',
+ 'chemical/x-xyz'=>'xyz',
+ 'image/bmp'=>'bmp',
+ 'image/cgm'=>'cgm',
+ 'image/gif'=>'gif',
+ 'image/ief'=>'ief',
+ 'image/jpeg'=>'jpeg jpg jpe',
+ 'image/png'=>'png',
+ 'image/svg+xml'=>'svg',
+ 'image/tiff'=>'tiff tif',
+ 'image/vnd.djvu'=>'djvu djv',
+ 'image/vnd.wap.wbmp'=>'wbmp',
+ 'image/x-cmu-raster'=>'ras',
+ 'image/x-icon'=>'ico',
+ 'image/x-portable-anymap'=>'pnm',
+ 'image/x-portable-bitmap'=>'pbm',
+ 'image/x-portable-graymap'=>'pgm',
+ 'image/x-portable-pixmap'=>'ppm',
+ 'image/x-rgb'=>'rgb',
+ 'image/x-photoshop'=>'psd',
+ 'image/x-xbitmap'=>'xbm',
+ 'image/x-xpixmap'=>'xpm',
+ 'image/x-xwindowdump'=>'xwd',
+ 'model/iges'=>'igs iges',
+ 'model/mesh'=>'msh mesh silo',
+ 'model/vrml'=>'wrl vrml',
+ 'text/calendar'=>'ics ifb',
+ 'text/css'=>'css',
+ 'text/html'=>'html htm',
+ 'text/plain'=>'txt',
+ 'text/richtext'=>'rtx',
+ 'text/rtf'=>'rtf',
+ 'text/sgml'=>'sgml sgm',
+ 'text/tab-separated-values'=>'tsv',
+ 'text/vnd.wap.wml'=>'wml',
+ 'text/vnd.wap.wmlscript'=>'wmls',
+ 'text/xml'=>'xml xsl xslt rss rdf',
+ 'text/x-setext'=>'etx',
+ 'video/mpeg'=>'mpeg mpg mpe',
+ 'video/ogg'=>'ogm ogg',
+ 'video/quicktime'=>'qt mov',
+ 'video/vnd.mpegurl'=>'mxu',
+ 'video/x-msvideo'=>'avi',
+ 'video/x-ogg'=>'ogm ogg',
+ 'video/x-sgi-movie'=>'movie',
+ 'x-conference/x-cooltalk'=>'ice',
+ // Added for Enano
+ 'image/xcf' => 'xcf xcfbz2 xcf.bz2',
+ 'application/vnd.oasis.opendocument.text' => 'odt',
+ 'application/vnd.oasis.opendocument.text-template' => 'ott',
+ 'application/vnd.oasis.opendocument.graphics' => 'odg',
+ 'application/vnd.oasis.opendocument.graphics-template' => 'otg',
+ 'application/vnd.oasis.opendocument.presentation' => 'odp',
+ 'application/vnd.oasis.opendocument.presentation-template' => 'otp',
+ 'application/vnd.oasis.opendocument.spreadsheet' => 'ods',
+ 'application/vnd.oasis.opendocument.spreadsheet-template' => 'ots',
+ 'application/vnd.oasis.opendocument.chart' => 'odc',
+ 'application/vnd.oasis.opendocument.chart-template' => 'otc',
+ 'application/vnd.oasis.opendocument.image' => 'odi',
+ 'application/vnd.oasis.opendocument.image-template' => 'oti',
+ 'application/vnd.oasis.opendocument.formula' => 'odf',
+ 'application/vnd.oasis.opendocument.formula-template' => 'otf',
+ 'application/vnd.oasis.opendocument.text-master' => 'odm',
+ 'application/vnd.oasis.opendocument.text-web' => 'oth'
);
$k = array_keys($mime_types);
$mimetype_exps = Array();
foreach($k as $s => $x)
{
- $mimetype_exps[$x] = pow(2, $s);
+ $mimetype_exps[$x] = pow(2, $s);
}
unset($k, $s, $x);
@@ -669,38 +669,38 @@
******************************************************************************/
$GLOBALS[ "JPEG_Segment_Names" ] = array(
- 0xC0 => "SOF0", 0xC1 => "SOF1", 0xC2 => "SOF2", 0xC3 => "SOF4",
- 0xC5 => "SOF5", 0xC6 => "SOF6", 0xC7 => "SOF7", 0xC8 => "JPG",
- 0xC9 => "SOF9", 0xCA => "SOF10", 0xCB => "SOF11", 0xCD => "SOF13",
- 0xCE => "SOF14", 0xCF => "SOF15",
- 0xC4 => "DHT", 0xCC => "DAC",
-
- 0xD0 => "RST0", 0xD1 => "RST1", 0xD2 => "RST2", 0xD3 => "RST3",
- 0xD4 => "RST4", 0xD5 => "RST5", 0xD6 => "RST6", 0xD7 => "RST7",
-
- 0xD8 => "SOI", 0xD9 => "EOI", 0xDA => "SOS", 0xDB => "DQT",
- 0xDC => "DNL", 0xDD => "DRI", 0xDE => "DHP", 0xDF => "EXP",
-
- 0xE0 => "APP0", 0xE1 => "APP1", 0xE2 => "APP2", 0xE3 => "APP3",
- 0xE4 => "APP4", 0xE5 => "APP5", 0xE6 => "APP6", 0xE7 => "APP7",
- 0xE8 => "APP8", 0xE9 => "APP9", 0xEA => "APP10", 0xEB => "APP11",
- 0xEC => "APP12", 0xED => "APP13", 0xEE => "APP14", 0xEF => "APP15",
-
-
- 0xF0 => "JPG0", 0xF1 => "JPG1", 0xF2 => "JPG2", 0xF3 => "JPG3",
- 0xF4 => "JPG4", 0xF5 => "JPG5", 0xF6 => "JPG6", 0xF7 => "JPG7",
- 0xF8 => "JPG8", 0xF9 => "JPG9", 0xFA => "JPG10", 0xFB => "JPG11",
- 0xFC => "JPG12", 0xFD => "JPG13",
-
- 0xFE => "COM", 0x01 => "TEM", 0x02 => "RES",
+ 0xC0 => "SOF0", 0xC1 => "SOF1", 0xC2 => "SOF2", 0xC3 => "SOF4",
+ 0xC5 => "SOF5", 0xC6 => "SOF6", 0xC7 => "SOF7", 0xC8 => "JPG",
+ 0xC9 => "SOF9", 0xCA => "SOF10", 0xCB => "SOF11", 0xCD => "SOF13",
+ 0xCE => "SOF14", 0xCF => "SOF15",
+ 0xC4 => "DHT", 0xCC => "DAC",
+
+ 0xD0 => "RST0", 0xD1 => "RST1", 0xD2 => "RST2", 0xD3 => "RST3",
+ 0xD4 => "RST4", 0xD5 => "RST5", 0xD6 => "RST6", 0xD7 => "RST7",
+
+ 0xD8 => "SOI", 0xD9 => "EOI", 0xDA => "SOS", 0xDB => "DQT",
+ 0xDC => "DNL", 0xDD => "DRI", 0xDE => "DHP", 0xDF => "EXP",
+
+ 0xE0 => "APP0", 0xE1 => "APP1", 0xE2 => "APP2", 0xE3 => "APP3",
+ 0xE4 => "APP4", 0xE5 => "APP5", 0xE6 => "APP6", 0xE7 => "APP7",
+ 0xE8 => "APP8", 0xE9 => "APP9", 0xEA => "APP10", 0xEB => "APP11",
+ 0xEC => "APP12", 0xED => "APP13", 0xEE => "APP14", 0xEF => "APP15",
+
+
+ 0xF0 => "JPG0", 0xF1 => "JPG1", 0xF2 => "JPG2", 0xF3 => "JPG3",
+ 0xF4 => "JPG4", 0xF5 => "JPG5", 0xF6 => "JPG6", 0xF7 => "JPG7",
+ 0xF8 => "JPG8", 0xF9 => "JPG9", 0xFA => "JPG10", 0xFB => "JPG11",
+ 0xFC => "JPG12", 0xFD => "JPG13",
+
+ 0xFE => "COM", 0x01 => "TEM", 0x02 => "RES",
);
// DST profiles
global $dst_profiles;
$dst_profiles = array(
- 'off' => '0;0;0;0;60',
- 'usa' => '3;' . SECOND_SUNDAY . ';11;' . FIRST_SUNDAY . ';60',
- 'europe' => '3;' . LAST_SUNDAY . ';10;' . LAST_SUNDAY . ';60',
- 'australia' => '10;' . LAST_SUNDAY . ';3;' . LAST_SUNDAY . ';60',
- 'tasmania' => '10;' . FIRST_SUNDAY . ';3;' . LAST_SUNDAY . ';60'
- );
+ 'off' => '0;0;0;0;60',
+ 'usa' => '3;' . SECOND_SUNDAY . ';11;' . FIRST_SUNDAY . ';60',
+ 'europe' => '3;' . LAST_SUNDAY . ';10;' . LAST_SUNDAY . ';60',
+ 'australia' => '10;' . LAST_SUNDAY . ';3;' . LAST_SUNDAY . ';60',
+ 'tasmania' => '10;' . FIRST_SUNDAY . ';3;' . LAST_SUNDAY . ';60'
+ );
diff -r de56132c008d -r bdac73ed481e includes/dbal.php
--- a/includes/dbal.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/dbal.php Sun Mar 28 23:10:46 2010 -0400
@@ -13,1152 +13,1152 @@
function db_error_handler($errno, $errstr, $errfile = false, $errline = false, $errcontext = Array() )
{
- if ( !defined('ENANO_DEBUG') )
- return;
- $e = error_reporting(0);
- error_reporting($e);
- if ( $e < $errno )
- return;
- $errtype = 'Notice';
- switch ( $errno )
- {
- case E_ERROR: case E_USER_ERROR: case E_CORE_ERROR: case E_COMPILE_ERROR: $errtype = 'Error'; break;
- case E_WARNING: case E_USER_WARNING: case E_CORE_WARNING: case E_COMPILE_WARNING: $errtype = 'Warning'; break;
- }
- $debug = debug_backtrace();
- if ( !isset($debug[0]['file']) )
- return false;
- $debug = $debug[0]['file'] . ', line ' . $debug[0]['line'];
- echo "$errtype: $errstr
Error source:$debug
";
+ if ( !defined('ENANO_DEBUG') )
+ return;
+ $e = error_reporting(0);
+ error_reporting($e);
+ if ( $e < $errno )
+ return;
+ $errtype = 'Notice';
+ switch ( $errno )
+ {
+ case E_ERROR: case E_USER_ERROR: case E_CORE_ERROR: case E_COMPILE_ERROR: $errtype = 'Error'; break;
+ case E_WARNING: case E_USER_WARNING: case E_CORE_WARNING: case E_COMPILE_WARNING: $errtype = 'Warning'; break;
+ }
+ $debug = debug_backtrace();
+ if ( !isset($debug[0]['file']) )
+ return false;
+ $debug = $debug[0]['file'] . ', line ' . $debug[0]['line'];
+ echo "$errtype: $errstr
Error source:$debug
";
}
global $db_sql_parse_time;
$db_sql_parse_time = 0;
class mysql {
- var $num_queries, $query_backtrace, $query_times, $query_sources, $latest_result, $latest_query, $_conn, $sql_stack_fields, $sql_stack_values, $debug;
- var $row = array();
+ var $num_queries, $query_backtrace, $query_times, $query_sources, $latest_result, $latest_query, $_conn, $sql_stack_fields, $sql_stack_values, $debug;
+ var $row = array();
var $rowset = array();
- var $errhandler;
- var $dbms_name = 'MySQL';
-
- /**
- * Get a flat textual list of queries that have been made.
- */
-
- function sql_backtrace()
- {
- return implode("\n-------------------------------------------------------------------\n", $this->query_backtrace);
- }
-
- /**
- * Connect to the database, but only if a connection isn't already up.
- */
-
- function ensure_connection()
- {
- if(!$this->_conn)
- {
- $this->connect();
- }
- }
-
- /**
- * Exit Enano, dumping out a friendly error message indicating a database error on the way out.
- * @param string Description or location of error; defaults to none
- */
+ var $errhandler;
+ var $dbms_name = 'MySQL';
+
+ /**
+ * Get a flat textual list of queries that have been made.
+ */
+
+ function sql_backtrace()
+ {
+ return implode("\n-------------------------------------------------------------------\n", $this->query_backtrace);
+ }
+
+ /**
+ * Connect to the database, but only if a connection isn't already up.
+ */
+
+ function ensure_connection()
+ {
+ if(!$this->_conn)
+ {
+ $this->connect();
+ }
+ }
+
+ /**
+ * Exit Enano, dumping out a friendly error message indicating a database error on the way out.
+ * @param string Description or location of error; defaults to none
+ */
- function _die($t = '')
- {
- if ( defined('ENANO_HEADERS_SENT') )
- ob_clean();
-
- $internal_text = $this->get_error($t);
-
- if ( defined('ENANO_CONFIG_FETCHED') )
- // config is in, we can show a slightly nicer looking error page
- die_semicritical('Database error', $internal_text);
- else
- // no config, display using no-DB template engine
- grinding_halt('Database error', $internal_text);
-
- exit;
- }
-
- /**
- * Get the internal text used for a database error message.
- * @param string Description or location of error; defaults to none
- */
-
- function get_error($t = '')
- {
- @header('HTTP/1.1 500 Internal Server Error');
-
- $bt = $this->latest_query;
- $e = htmlspecialchars($this->sql_error());
- if ( empty($e) )
- $e = '<none>';
-
- global $email;
-
- // As long as the admin's e-mail is accessible, display it.
- $email_info = ( defined('ENANO_CONFIG_FETCHED') && is_object($email) )
- ? ', at <' . $email->jscode() . $email->encryptEmail(getConfig('contact_email')) . '>'
- : '';
-
- $internal_text = "The site was unable to finish serving your request.
- We apologize for the inconveience, but an error occurred in the Enano database layer. Please report the full text of this page to the administrator of this site{$email_info}.
- Description or location of error: $t
- Error returned by $this->dbms_name extension: $e
- Most recent SQL query:
- $bt
";
- return $internal_text;
- }
-
- /**
- * Exit Enano and output a JSON format datbase error.
- * @param string Description or location of error; defaults to none
- */
-
- function die_json($loc = false)
- {
- $e = str_replace("\n", "\\n", addslashes(htmlspecialchars($this->sql_error())));
- $q = str_replace("\n", "\\n", addslashes($this->latest_query));
- $loc = ( $loc ) ? addslashes("\n\nDescription or location of error: $loc") : "";
- $loc .= "\n\nPlease report the full text of this error to the administrator of the site. If you believe that this is a bug with the software, please contact support@enanocms.org.";
- $loc = str_replace("\n", "\\n", $loc);
- $t = "{\"mode\":\"error\",\"error\":\"An error occurred during database query.\\nQuery was:\\n $q\\n\\nError returned by {$this->dbms_name}: $e$loc\"}";
- die($t);
- }
-
- /**
- * Connect to the database.
- * @param bool If true, enables all other parameters. Defaults to false, which emans that you can call this function with no arguments and it will fetch information from the config file.
- * @param string Database server hostname
- * @param string Database server username
- * @param string Database server password
- * @param string Name of the database
- * @param int Optional port number to connect over
- */
-
- function connect($manual_credentials = false, $dbhost = false, $dbuser = false, $dbpasswd = false, $dbname = false, $dbport = false)
- {
- if ( !defined('ENANO_SQL_CONSTANTS') )
- {
- define('ENANO_SQL_CONSTANTS', '');
- define('ENANO_DBLAYER', 'MYSQL');
- define('ENANO_SQLFUNC_LOWERCASE', 'lcase');
- define('ENANO_SQL_MULTISTRING_PRFIX', '');
- define('ENANO_SQL_BOOLEAN_TRUE', 'true');
- define('ENANO_SQL_BOOLEAN_FALSE', 'false');
- }
-
- if ( !$manual_credentials )
- {
- if ( defined('IN_ENANO_INSTALL') && !defined('IN_ENANO_UPGRADE') )
- {
- @include(ENANO_ROOT.'/config.new.php');
- }
- else
- {
- @include(ENANO_ROOT.'/config.php');
- }
-
- if ( isset($crypto_key) )
- unset($crypto_key); // Get this sucker out of memory fast
- if ( empty($dbport) )
- $dbport = 3306;
-
- if ( !defined('ENANO_INSTALLED') && !defined('MIDGET_INSTALLED') && !defined('IN_ENANO_INSTALL') )
- {
- // scriptPath isn't set yet - we need to autodetect it to avoid infinite redirects
- if ( !defined('scriptPath') )
- {
- if ( isset($_SERVER['PATH_INFO']) && !preg_match('/index\.php$/', $_SERVER['PATH_INFO']) )
- {
- $_SERVER['REQUEST_URI'] = preg_replace(';' . preg_quote($_SERVER['PATH_INFO']) . '$;', '', $_SERVER['REQUEST_URI']);
- }
- if ( !preg_match('/\.php$/', $_SERVER['REQUEST_URI']) )
- {
- // user requested http://foo/enano as opposed to http://foo/enano/index.php
- $_SERVER['REQUEST_URI'] .= '/index.php';
- }
- $sp = dirname($_SERVER['REQUEST_URI']);
- if($sp == '/' || $sp == '\\') $sp = '';
- define('scriptPath', $sp);
- define('contentPath', "$sp/index.php?title=");
- }
- $loc = scriptPath . '/install/index.php';
- define('IN_ENANO_INSTALL', 1);
- $GLOBALS['lang'] = new Language('eng');
- global $lang;
- $lang->load_file('./language/english/core.json');
- $lang->load_file('./language/english/install.json');
- // header("Location: $loc");
- redirect($loc, 'Enano not installed', 'We can\'t seem to find an Enano installation (valid config file). You will be transferred to the installation wizard momentarily...', 0);
- exit;
- }
- }
-
- if ( !$dbport )
- $dbport = 3306;
-
- if ( $dbhost && !empty($dbport) && $dbport != 3306 )
- $dbhost = '127.0.0.1';
-
- $host_line = ( preg_match('/^:/', $dbhost) ) ? $dbhost : "{$dbhost}:{$dbport}";
-
- $this->_conn = @mysql_connect($host_line, $dbuser, $dbpasswd);
- unset($dbuser);
- unset($dbpasswd); // Security
-
- if ( !$this->_conn && !$manual_credentials )
- {
- grinding_halt('Enano is having a problem', 'Error: couldn\'t connect to MySQL.
'.mysql_error().'
');
- }
- else if ( !$this->_conn && $manual_credentials )
- {
- return false;
- }
-
- // Reset some variables
- $this->query_backtrace = array();
- $this->query_times = array();
- $this->query_sources = array();
- $this->num_queries = 0;
-
- $this->debug = ( defined('ENANO_DEBUG') );
-
- $q = @mysql_select_db($dbname);
-
- if ( !$q )
- {
- if ( $manual_credentials )
- return false;
- $this->_die('The database could not be selected.');
- }
-
- // We're in!
- return true;
- }
-
- /**
- * Make a SQL query.
- * @param string Query
- * @param bool If false, skips all checks and logging stages. If you're doing a ton of queries, set this to true; in all other cases, leave at the default of false.
- * @return resource or false on failure
- */
-
- function sql_query($q, $log_query = true)
- {
- if ( $this->debug && function_exists('debug_backtrace') )
- {
- $backtrace = @debug_backtrace();
- if ( is_array($backtrace) )
- {
- $bt = $backtrace[0];
- if ( isset($backtrace[1]['class']) )
- {
- if ( $backtrace[1]['class'] == 'sessionManager' )
- {
- $bt = $backtrace[1];
- }
- }
- $this->query_sources[$q] = substr($bt['file'], strlen(ENANO_ROOT) + 1) . ', line ' . $bt['line'];
- }
- unset($backtrace);
- }
-
- $this->num_queries++;
- if ( $log_query || defined('ENANO_DEBUG') )
- {
- $this->query_backtrace[] = $q;
- $this->latest_query = $q;
- }
- // First make sure we have a connection
- if ( !$this->_conn )
- {
- $this->_die('A database connection has not yet been established.');
- }
- // Start the timer
- if ( $log_query || defined('ENANO_DEBUG') )
- $time_start = microtime_float();
- // Does this query look malicious?
- if ( $log_query || defined('ENANO_DEBUG') )
- {
- if ( !$this->check_query($q) )
- {
- $this->report_query($q);
- $debug = ( defined('ENANO_DEBUG') ) ? 'Query was:
'.htmlspecialchars($q).'
' : '';
- grinding_halt('SQL Injection attempt', 'Enano has caught and prevented an SQL injection attempt. Your IP address has been recorded and the administrator has been notified.
' . $debug);
- }
- }
-
- $r = mysql_query($q, $this->_conn);
-
- if ( $log_query )
- $this->query_times[$q] = microtime_float() - $time_start;
-
- $this->latest_result = $r;
-
- return $r;
- }
-
- /**
- * Make a SQL query, but do not have PHP buffer all the results. Useful for queries that are expected to return a huge number of results.
- * @param string Query
- * @param bool If false, skips all checks and logging stages. If you're doing a ton of queries, set this to true; in all other cases, leave at the default of false.
- * @return resource or false on failure
- */
-
- function sql_unbuffered_query($q, $log_query = true)
- {
- $this->num_queries++;
- if ( $log_query || defined('ENANO_DEBUG') )
- $this->query_backtrace[] = '(UNBUFFERED) ' . $q;
- $this->latest_query = $q;
- // First make sure we have a connection
- if ( !$this->_conn )
- {
- $this->_die('A database connection has not yet been established.');
- }
- // Does this query look malicious?
- if ( !$this->check_query($q) )
- {
- $this->report_query($q);
- $debug = ( defined('ENANO_DEBUG') ) ? 'Query was:
'.htmlspecialchars($q).'
' : '';
- grinding_halt('SQL Injection attempt', 'Enano has caught and prevented an SQL injection attempt. Your IP address has been recorded and the administrator has been notified.
' . $debug);
- }
-
- $time_start = microtime_float();
- $r = @mysql_unbuffered_query($q, $this->_conn);
- $this->query_times[$q] = microtime_float() - $time_start;
- $this->latest_result = $r;
- return $r;
- }
-
- /**
- * Performs heuristic analysis on a SQL query to check for known attack patterns.
- * @param string $q the query to check
- * @return bool true if query passed check, otherwise false
- */
-
- function check_query($q, $debug = false)
- {
- global $db_sql_parse_time;
- $ts = microtime_float();
-
- // remove properly escaped quotes
- $q = str_replace('\\\\', '', $q);
- $q = str_replace(array("\\\"", "\\'"), '', $q);
-
- // make sure quotes match
- foreach ( array("'", '"') as $quote )
- {
- $n_quotes = get_char_count($q, $quote);
- if ( $n_quotes % 2 == 1 )
- {
- // mismatched quotes
- if ( $debug ) echo "Found mismatched quotes in query; parsed:\n$q\n";
- return false;
- }
- // this quote is now confirmed to be matching; we can safely move all quoted strings out and replace with a token
- $q = preg_replace("/$quote(.*?)$quote/s", 'SAFE_QUOTE', $q);
- }
- $q = preg_replace("/(SAFE_QUOTE)+/", 'SAFE_QUOTE', $q);
-
- // quotes are now matched out. does this string have a comment marker in it?
- if ( strstr($q, '--') )
- {
- return false;
- }
-
- if ( preg_match('/[\s]+(SAFE_QUOTE|[\S]+)=\\1($|[\s]+)/', $q, $match) )
- {
- if ( $debug ) echo 'Found always-true test in query, injection attempt caught, match:
' . '' . print_r($match, true) . '
';
- return false;
- }
-
- $ts = microtime_float() - $ts;
- $db_sql_parse_time += $ts;
- return true;
- }
-
- /**
- * Set the internal result pointer to X
- * @param int $pos The number of the row
- * @param resource $result The MySQL result resource - if not given, the latest cached query is assumed
- * @return true on success, false on failure
- */
-
- function sql_data_seek($pos, $result = false)
- {
- if ( !$result )
- $result = $this->latest_result;
- if ( !$result )
- return false;
-
- return mysql_data_seek($result, $pos) ? true : false;
- }
-
- /**
- * Reports a bad query to the admin
- * @param string $query the naughty query
- * @access private
- */
-
- function report_query($query)
- {
- global $session;
- if ( is_object($session) && defined('ENANO_MAINSTREAM') )
- {
- $username = $session->username;
- $user_id = $session->user_id;
- }
- else
- {
- $username = 'Unavailable';
- $user_id = 1;
- }
-
- $query = $this->escape($query);
- $q = $this->sql_query('INSERT INTO '.table_prefix.'logs(log_type, action, time_id, date_string, page_text, author, author_uid, edit_summary)
- VALUES(\'security\', \'sql_inject\', '.time().', \'\', \''.$query.'\', \''.$username.'\', ' . $user_id . ', \''.$_SERVER['REMOTE_ADDR'].'\');');
- }
-
- /**
- * Returns the ID of the row last inserted.
- * @return int
- */
-
- function insert_id()
- {
- return @mysql_insert_id();
- }
-
- /**
- * Fetch one row from the given query as an associative array.
- * @param resource The resource returned from sql_query; if this isn't provided, the last result resource is used.
- * @return array
- */
-
- function fetchrow($r = false)
- {
- if ( !$this->_conn )
- return false;
-
- if ( !$r )
- $r = $this->latest_result;
-
- if ( !$r )
- $this->_die('$db->fetchrow(): an invalid MySQL resource was passed.');
-
- $row = mysql_fetch_assoc($r);
-
- return integerize_array($row);
- }
-
- /**
- * Fetch one row from the given query as a numeric array.
- * @param resource The resource returned from sql_query; if this isn't provided, the last result resource is used.
- * @return array
- */
-
- function fetchrow_num($r = false)
- {
- if ( !$r )
- $r = $this->latest_result;
- if ( !$r )
- $this->_die('$db->fetchrow(): an invalid MySQL resource was passed.');
-
- $row = mysql_fetch_row($r);
- return integerize_array($row);
- }
-
- /**
- * Get the number of results for a given query.
- * @param resource The resource returned from sql_query; if this isn't provided, the last result resource is used.
- * @return array
- */
-
- function numrows($r = false)
- {
- if ( !$r )
- $r = $this->latest_result;
- if ( !$r )
- $this->_die('$db->fetchrow(): an invalid MySQL resource was passed.');
-
- return mysql_num_rows($r);
- }
-
- /**
- * Escape a string so that it may safely be included in a SQL query.
- * @param string String to escape
- * @return string Escaped string
- */
-
- function escape($str)
- {
- $str = mysql_real_escape_string($str);
- return $str;
- }
-
- /**
- * Free the given result from memory. Use this when completely finished with a result resource.
- * @param resource The resource returned from sql_query; if this isn't provided, the last result resource is used.
- * @return null
- */
-
- function free_result($result = false)
- {
- if ( !$result )
- $result = $this->latest_result;
- if ( !$result )
- return null;
-
- @mysql_free_result($result);
- return null;
- }
-
- /**
- * Returns the number of rows affected.
- * @return int
- */
-
- function sql_affectedrows()
- {
- return mysql_affected_rows($this->_conn);
- }
-
- /**
- * Close the database connection
- */
-
- function close()
- {
- @mysql_close($this->_conn);
- unset($this->_conn);
- }
-
- /**
- * Get a list of columns in the given table
- * @param string Table
- * @return array
- */
-
- function columns_in($table)
- {
- if ( !is_string($table) )
- return false;
- $q = $this->sql_query("SHOW COLUMNS IN $table;");
- if ( !$q )
- $this->_die();
-
- $columns = array();
- while ( $row = $this->fetchrow_num() )
- {
- $columns[] = $row[0];
- }
- return $columns;
- }
-
- /**
- * Get the text of the most recent error.
- * @return string
- */
-
- function sql_error()
+ function _die($t = '')
+ {
+ if ( defined('ENANO_HEADERS_SENT') )
+ ob_clean();
+
+ $internal_text = $this->get_error($t);
+
+ if ( defined('ENANO_CONFIG_FETCHED') )
+ // config is in, we can show a slightly nicer looking error page
+ die_semicritical('Database error', $internal_text);
+ else
+ // no config, display using no-DB template engine
+ grinding_halt('Database error', $internal_text);
+
+ exit;
+ }
+
+ /**
+ * Get the internal text used for a database error message.
+ * @param string Description or location of error; defaults to none
+ */
+
+ function get_error($t = '')
+ {
+ @header('HTTP/1.1 500 Internal Server Error');
+
+ $bt = $this->latest_query;
+ $e = htmlspecialchars($this->sql_error());
+ if ( empty($e) )
+ $e = '<none>';
+
+ global $email;
+
+ // As long as the admin's e-mail is accessible, display it.
+ $email_info = ( defined('ENANO_CONFIG_FETCHED') && is_object($email) )
+ ? ', at <' . $email->jscode() . $email->encryptEmail(getConfig('contact_email')) . '>'
+ : '';
+
+ $internal_text = "The site was unable to finish serving your request.
+ We apologize for the inconveience, but an error occurred in the Enano database layer. Please report the full text of this page to the administrator of this site{$email_info}.
+ Description or location of error: $t
+ Error returned by $this->dbms_name extension: $e
+ Most recent SQL query:
+ $bt
";
+ return $internal_text;
+ }
+
+ /**
+ * Exit Enano and output a JSON format datbase error.
+ * @param string Description or location of error; defaults to none
+ */
+
+ function die_json($loc = false)
+ {
+ $e = str_replace("\n", "\\n", addslashes(htmlspecialchars($this->sql_error())));
+ $q = str_replace("\n", "\\n", addslashes($this->latest_query));
+ $loc = ( $loc ) ? addslashes("\n\nDescription or location of error: $loc") : "";
+ $loc .= "\n\nPlease report the full text of this error to the administrator of the site. If you believe that this is a bug with the software, please contact support@enanocms.org.";
+ $loc = str_replace("\n", "\\n", $loc);
+ $t = "{\"mode\":\"error\",\"error\":\"An error occurred during database query.\\nQuery was:\\n $q\\n\\nError returned by {$this->dbms_name}: $e$loc\"}";
+ die($t);
+ }
+
+ /**
+ * Connect to the database.
+ * @param bool If true, enables all other parameters. Defaults to false, which emans that you can call this function with no arguments and it will fetch information from the config file.
+ * @param string Database server hostname
+ * @param string Database server username
+ * @param string Database server password
+ * @param string Name of the database
+ * @param int Optional port number to connect over
+ */
+
+ function connect($manual_credentials = false, $dbhost = false, $dbuser = false, $dbpasswd = false, $dbname = false, $dbport = false)
+ {
+ if ( !defined('ENANO_SQL_CONSTANTS') )
+ {
+ define('ENANO_SQL_CONSTANTS', '');
+ define('ENANO_DBLAYER', 'MYSQL');
+ define('ENANO_SQLFUNC_LOWERCASE', 'lcase');
+ define('ENANO_SQL_MULTISTRING_PRFIX', '');
+ define('ENANO_SQL_BOOLEAN_TRUE', 'true');
+ define('ENANO_SQL_BOOLEAN_FALSE', 'false');
+ }
+
+ if ( !$manual_credentials )
+ {
+ if ( defined('IN_ENANO_INSTALL') && !defined('IN_ENANO_UPGRADE') )
+ {
+ @include(ENANO_ROOT.'/config.new.php');
+ }
+ else
+ {
+ @include(ENANO_ROOT.'/config.php');
+ }
+
+ if ( isset($crypto_key) )
+ unset($crypto_key); // Get this sucker out of memory fast
+ if ( empty($dbport) )
+ $dbport = 3306;
+
+ if ( !defined('ENANO_INSTALLED') && !defined('MIDGET_INSTALLED') && !defined('IN_ENANO_INSTALL') )
+ {
+ // scriptPath isn't set yet - we need to autodetect it to avoid infinite redirects
+ if ( !defined('scriptPath') )
+ {
+ if ( isset($_SERVER['PATH_INFO']) && !preg_match('/index\.php$/', $_SERVER['PATH_INFO']) )
+ {
+ $_SERVER['REQUEST_URI'] = preg_replace(';' . preg_quote($_SERVER['PATH_INFO']) . '$;', '', $_SERVER['REQUEST_URI']);
+ }
+ if ( !preg_match('/\.php$/', $_SERVER['REQUEST_URI']) )
+ {
+ // user requested http://foo/enano as opposed to http://foo/enano/index.php
+ $_SERVER['REQUEST_URI'] .= '/index.php';
+ }
+ $sp = dirname($_SERVER['REQUEST_URI']);
+ if($sp == '/' || $sp == '\\') $sp = '';
+ define('scriptPath', $sp);
+ define('contentPath', "$sp/index.php?title=");
+ }
+ $loc = scriptPath . '/install/index.php';
+ define('IN_ENANO_INSTALL', 1);
+ $GLOBALS['lang'] = new Language('eng');
+ global $lang;
+ $lang->load_file('./language/english/core.json');
+ $lang->load_file('./language/english/install.json');
+ // header("Location: $loc");
+ redirect($loc, 'Enano not installed', 'We can\'t seem to find an Enano installation (valid config file). You will be transferred to the installation wizard momentarily...', 0);
+ exit;
+ }
+ }
+
+ if ( !$dbport )
+ $dbport = 3306;
+
+ if ( $dbhost && !empty($dbport) && $dbport != 3306 )
+ $dbhost = '127.0.0.1';
+
+ $host_line = ( preg_match('/^:/', $dbhost) ) ? $dbhost : "{$dbhost}:{$dbport}";
+
+ $this->_conn = @mysql_connect($host_line, $dbuser, $dbpasswd);
+ unset($dbuser);
+ unset($dbpasswd); // Security
+
+ if ( !$this->_conn && !$manual_credentials )
+ {
+ grinding_halt('Enano is having a problem', 'Error: couldn\'t connect to MySQL.
'.mysql_error().'
');
+ }
+ else if ( !$this->_conn && $manual_credentials )
+ {
+ return false;
+ }
+
+ // Reset some variables
+ $this->query_backtrace = array();
+ $this->query_times = array();
+ $this->query_sources = array();
+ $this->num_queries = 0;
+
+ $this->debug = ( defined('ENANO_DEBUG') );
+
+ $q = @mysql_select_db($dbname);
+
+ if ( !$q )
+ {
+ if ( $manual_credentials )
+ return false;
+ $this->_die('The database could not be selected.');
+ }
+
+ // We're in!
+ return true;
+ }
+
+ /**
+ * Make a SQL query.
+ * @param string Query
+ * @param bool If false, skips all checks and logging stages. If you're doing a ton of queries, set this to true; in all other cases, leave at the default of false.
+ * @return resource or false on failure
+ */
+
+ function sql_query($q, $log_query = true)
+ {
+ if ( $this->debug && function_exists('debug_backtrace') )
+ {
+ $backtrace = @debug_backtrace();
+ if ( is_array($backtrace) )
+ {
+ $bt = $backtrace[0];
+ if ( isset($backtrace[1]['class']) )
+ {
+ if ( $backtrace[1]['class'] == 'sessionManager' )
+ {
+ $bt = $backtrace[1];
+ }
+ }
+ $this->query_sources[$q] = substr($bt['file'], strlen(ENANO_ROOT) + 1) . ', line ' . $bt['line'];
+ }
+ unset($backtrace);
+ }
+
+ $this->num_queries++;
+ if ( $log_query || defined('ENANO_DEBUG') )
+ {
+ $this->query_backtrace[] = $q;
+ $this->latest_query = $q;
+ }
+ // First make sure we have a connection
+ if ( !$this->_conn )
+ {
+ $this->_die('A database connection has not yet been established.');
+ }
+ // Start the timer
+ if ( $log_query || defined('ENANO_DEBUG') )
+ $time_start = microtime_float();
+ // Does this query look malicious?
+ if ( $log_query || defined('ENANO_DEBUG') )
+ {
+ if ( !$this->check_query($q) )
+ {
+ $this->report_query($q);
+ $debug = ( defined('ENANO_DEBUG') ) ? 'Query was:
'.htmlspecialchars($q).'
' : '';
+ grinding_halt('SQL Injection attempt', 'Enano has caught and prevented an SQL injection attempt. Your IP address has been recorded and the administrator has been notified.
' . $debug);
+ }
+ }
+
+ $r = mysql_query($q, $this->_conn);
+
+ if ( $log_query )
+ $this->query_times[$q] = microtime_float() - $time_start;
+
+ $this->latest_result = $r;
+
+ return $r;
+ }
+
+ /**
+ * Make a SQL query, but do not have PHP buffer all the results. Useful for queries that are expected to return a huge number of results.
+ * @param string Query
+ * @param bool If false, skips all checks and logging stages. If you're doing a ton of queries, set this to true; in all other cases, leave at the default of false.
+ * @return resource or false on failure
+ */
+
+ function sql_unbuffered_query($q, $log_query = true)
+ {
+ $this->num_queries++;
+ if ( $log_query || defined('ENANO_DEBUG') )
+ $this->query_backtrace[] = '(UNBUFFERED) ' . $q;
+ $this->latest_query = $q;
+ // First make sure we have a connection
+ if ( !$this->_conn )
+ {
+ $this->_die('A database connection has not yet been established.');
+ }
+ // Does this query look malicious?
+ if ( !$this->check_query($q) )
+ {
+ $this->report_query($q);
+ $debug = ( defined('ENANO_DEBUG') ) ? 'Query was:
'.htmlspecialchars($q).'
' : '';
+ grinding_halt('SQL Injection attempt', 'Enano has caught and prevented an SQL injection attempt. Your IP address has been recorded and the administrator has been notified.
' . $debug);
+ }
+
+ $time_start = microtime_float();
+ $r = @mysql_unbuffered_query($q, $this->_conn);
+ $this->query_times[$q] = microtime_float() - $time_start;
+ $this->latest_result = $r;
+ return $r;
+ }
+
+ /**
+ * Performs heuristic analysis on a SQL query to check for known attack patterns.
+ * @param string $q the query to check
+ * @return bool true if query passed check, otherwise false
+ */
+
+ function check_query($q, $debug = false)
{
- return mysql_error();
+ global $db_sql_parse_time;
+ $ts = microtime_float();
+
+ // remove properly escaped quotes
+ $q = str_replace('\\\\', '', $q);
+ $q = str_replace(array("\\\"", "\\'"), '', $q);
+
+ // make sure quotes match
+ foreach ( array("'", '"') as $quote )
+ {
+ $n_quotes = get_char_count($q, $quote);
+ if ( $n_quotes % 2 == 1 )
+ {
+ // mismatched quotes
+ if ( $debug ) echo "Found mismatched quotes in query; parsed:\n$q\n";
+ return false;
+ }
+ // this quote is now confirmed to be matching; we can safely move all quoted strings out and replace with a token
+ $q = preg_replace("/$quote(.*?)$quote/s", 'SAFE_QUOTE', $q);
+ }
+ $q = preg_replace("/(SAFE_QUOTE)+/", 'SAFE_QUOTE', $q);
+
+ // quotes are now matched out. does this string have a comment marker in it?
+ if ( strstr($q, '--') )
+ {
+ return false;
+ }
+
+ if ( preg_match('/[\s]+(SAFE_QUOTE|[\S]+)=\\1($|[\s]+)/', $q, $match) )
+ {
+ if ( $debug ) echo 'Found always-true test in query, injection attempt caught, match:
' . '' . print_r($match, true) . '
';
+ return false;
+ }
+
+ $ts = microtime_float() - $ts;
+ $db_sql_parse_time += $ts;
+ return true;
+ }
+
+ /**
+ * Set the internal result pointer to X
+ * @param int $pos The number of the row
+ * @param resource $result The MySQL result resource - if not given, the latest cached query is assumed
+ * @return true on success, false on failure
+ */
+
+ function sql_data_seek($pos, $result = false)
+ {
+ if ( !$result )
+ $result = $this->latest_result;
+ if ( !$result )
+ return false;
+
+ return mysql_data_seek($result, $pos) ? true : false;
+ }
+
+ /**
+ * Reports a bad query to the admin
+ * @param string $query the naughty query
+ * @access private
+ */
+
+ function report_query($query)
+ {
+ global $session;
+ if ( is_object($session) && defined('ENANO_MAINSTREAM') )
+ {
+ $username = $session->username;
+ $user_id = $session->user_id;
+ }
+ else
+ {
+ $username = 'Unavailable';
+ $user_id = 1;
+ }
+
+ $query = $this->escape($query);
+ $q = $this->sql_query('INSERT INTO '.table_prefix.'logs(log_type, action, time_id, date_string, page_text, author, author_uid, edit_summary)
+ VALUES(\'security\', \'sql_inject\', '.time().', \'\', \''.$query.'\', \''.$username.'\', ' . $user_id . ', \''.$_SERVER['REMOTE_ADDR'].'\');');
+ }
+
+ /**
+ * Returns the ID of the row last inserted.
+ * @return int
+ */
+
+ function insert_id()
+ {
+ return @mysql_insert_id();
+ }
+
+ /**
+ * Fetch one row from the given query as an associative array.
+ * @param resource The resource returned from sql_query; if this isn't provided, the last result resource is used.
+ * @return array
+ */
+
+ function fetchrow($r = false)
+ {
+ if ( !$this->_conn )
+ return false;
+
+ if ( !$r )
+ $r = $this->latest_result;
+
+ if ( !$r )
+ $this->_die('$db->fetchrow(): an invalid MySQL resource was passed.');
+
+ $row = mysql_fetch_assoc($r);
+
+ return integerize_array($row);
+ }
+
+ /**
+ * Fetch one row from the given query as a numeric array.
+ * @param resource The resource returned from sql_query; if this isn't provided, the last result resource is used.
+ * @return array
+ */
+
+ function fetchrow_num($r = false)
+ {
+ if ( !$r )
+ $r = $this->latest_result;
+ if ( !$r )
+ $this->_die('$db->fetchrow(): an invalid MySQL resource was passed.');
+
+ $row = mysql_fetch_row($r);
+ return integerize_array($row);
+ }
+
+ /**
+ * Get the number of results for a given query.
+ * @param resource The resource returned from sql_query; if this isn't provided, the last result resource is used.
+ * @return array
+ */
+
+ function numrows($r = false)
+ {
+ if ( !$r )
+ $r = $this->latest_result;
+ if ( !$r )
+ $this->_die('$db->fetchrow(): an invalid MySQL resource was passed.');
+
+ return mysql_num_rows($r);
}
-
- /**
- * Generates and outputs a report of all the SQL queries made during execution. Should only be called after everything's over with.
- */
-
- function sql_report()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- if ( !$session->get_permissions('mod_misc') )
- {
- die_friendly('Access denied', 'You are not authorized to generate a SQL backtrace.
');
- }
- // Create copies of variables that may be changed after header is called
- $backtrace = $this->query_backtrace;
- $times = $this->query_times;
- $template->header();
- echo 'SQL query log and timetable
';
- echo '
- ';
- $i = 0;
- foreach ( $backtrace as $query )
- {
- $i++;
- $unbuffered = false;
- if ( substr($query, 0, 13) == '(UNBUFFERED) ' )
- {
- $query = substr($query, 13);
- $unbuffered = true;
- }
- if ( $i == 1 )
- {
- echo '
- SQL backtrace for a normal page load of ' . htmlspecialchars($paths->cpage['urlname']) . '
- ';
- }
- else
- {
- echo '
-
- ';
- }
- echo '
- Query:
- ' . htmlspecialchars($query) . '
-
- Time:
- ' . number_format($this->query_times[$query], 6) . ' seconds
-
-
- Unbuffered:
- ' . ( $unbuffered ? 'Yes' : 'No' ) . '
- ';
- if ( isset($this->query_sources[$query]) )
- {
- echo '
- Called from:
- ' . $this->query_sources[$query] . '
- ';
- }
- }
- if ( function_exists('array_sum') )
- {
- $query_time_total = array_sum($this->query_times);
- echo '
-
- Total time taken for SQL queries: ' . round( $query_time_total, 6 ) . ' seconds
-
- ';
- }
- echo '
- ';
- $template->footer();
- }
+
+ /**
+ * Escape a string so that it may safely be included in a SQL query.
+ * @param string String to escape
+ * @return string Escaped string
+ */
+
+ function escape($str)
+ {
+ $str = mysql_real_escape_string($str);
+ return $str;
+ }
+
+ /**
+ * Free the given result from memory. Use this when completely finished with a result resource.
+ * @param resource The resource returned from sql_query; if this isn't provided, the last result resource is used.
+ * @return null
+ */
+
+ function free_result($result = false)
+ {
+ if ( !$result )
+ $result = $this->latest_result;
+ if ( !$result )
+ return null;
+
+ @mysql_free_result($result);
+ return null;
+ }
+
+ /**
+ * Returns the number of rows affected.
+ * @return int
+ */
+
+ function sql_affectedrows()
+ {
+ return mysql_affected_rows($this->_conn);
+ }
+
+ /**
+ * Close the database connection
+ */
+
+ function close()
+ {
+ @mysql_close($this->_conn);
+ unset($this->_conn);
+ }
+
+ /**
+ * Get a list of columns in the given table
+ * @param string Table
+ * @return array
+ */
+
+ function columns_in($table)
+ {
+ if ( !is_string($table) )
+ return false;
+ $q = $this->sql_query("SHOW COLUMNS IN $table;");
+ if ( !$q )
+ $this->_die();
+
+ $columns = array();
+ while ( $row = $this->fetchrow_num() )
+ {
+ $columns[] = $row[0];
+ }
+ return $columns;
+ }
+
+ /**
+ * Get the text of the most recent error.
+ * @return string
+ */
+
+ function sql_error()
+ {
+ return mysql_error();
+ }
+
+ /**
+ * Generates and outputs a report of all the SQL queries made during execution. Should only be called after everything's over with.
+ */
+
+ function sql_report()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ if ( !$session->get_permissions('mod_misc') )
+ {
+ die_friendly('Access denied', 'You are not authorized to generate a SQL backtrace.
');
+ }
+ // Create copies of variables that may be changed after header is called
+ $backtrace = $this->query_backtrace;
+ $times = $this->query_times;
+ $template->header();
+ echo 'SQL query log and timetable
';
+ echo '
+ ';
+ $i = 0;
+ foreach ( $backtrace as $query )
+ {
+ $i++;
+ $unbuffered = false;
+ if ( substr($query, 0, 13) == '(UNBUFFERED) ' )
+ {
+ $query = substr($query, 13);
+ $unbuffered = true;
+ }
+ if ( $i == 1 )
+ {
+ echo '
+ SQL backtrace for a normal page load of ' . htmlspecialchars($paths->cpage['urlname']) . '
+ ';
+ }
+ else
+ {
+ echo '
+
+ ';
+ }
+ echo '
+ Query:
+ ' . htmlspecialchars($query) . '
+
+ Time:
+ ' . number_format($this->query_times[$query], 6) . ' seconds
+
+
+ Unbuffered:
+ ' . ( $unbuffered ? 'Yes' : 'No' ) . '
+ ';
+ if ( isset($this->query_sources[$query]) )
+ {
+ echo '
+ Called from:
+ ' . $this->query_sources[$query] . '
+ ';
+ }
+ }
+ if ( function_exists('array_sum') )
+ {
+ $query_time_total = array_sum($this->query_times);
+ echo '
+
+ Total time taken for SQL queries: ' . round( $query_time_total, 6 ) . ' seconds
+
+ ';
+ }
+ echo '
+ ';
+ $template->footer();
+ }
}
class postgresql
{
- var $num_queries, $query_backtrace, $query_times, $query_sources, $latest_result, $latest_query, $_conn, $sql_stack_fields, $sql_stack_values, $debug;
- var $row = array();
+ var $num_queries, $query_backtrace, $query_times, $query_sources, $latest_result, $latest_query, $_conn, $sql_stack_fields, $sql_stack_values, $debug;
+ var $row = array();
var $rowset = array();
- var $errhandler;
- var $dbms_name = 'PostgreSQL';
-
- /**
- * Get a flat textual list of queries that have been made.
- */
-
- function sql_backtrace()
- {
- return implode("\n-------------------------------------------------------------------\n", $this->query_backtrace);
- }
-
- /**
- * Connect to the database, but only if a connection isn't already up.
- */
-
- function ensure_connection()
- {
- if(!$this->_conn)
- {
- $this->connect();
- }
- }
-
- /**
- * Exit Enano, dumping out a friendly error message indicating a database error on the way out.
- * @param string Description or location of error; defaults to none
- */
+ var $errhandler;
+ var $dbms_name = 'PostgreSQL';
+
+ /**
+ * Get a flat textual list of queries that have been made.
+ */
+
+ function sql_backtrace()
+ {
+ return implode("\n-------------------------------------------------------------------\n", $this->query_backtrace);
+ }
+
+ /**
+ * Connect to the database, but only if a connection isn't already up.
+ */
+
+ function ensure_connection()
+ {
+ if(!$this->_conn)
+ {
+ $this->connect();
+ }
+ }
+
+ /**
+ * Exit Enano, dumping out a friendly error message indicating a database error on the way out.
+ * @param string Description or location of error; defaults to none
+ */
- function _die($t = '')
- {
- if ( defined('ENANO_HEADERS_SENT') )
- ob_clean();
-
- $internal_text = $this->get_error($t);
-
- if ( defined('ENANO_CONFIG_FETCHED') )
- // config is in, we can show a slightly nicer looking error page
- die_semicritical('Database error', $internal_text);
- else
- // no config, display using no-DB template engine
- grinding_halt('Database error', $internal_text);
-
- exit;
- }
-
- /**
- * Get the internal text used for a database error message.
- * @param string Description or location of error; defaults to none
- */
-
- function get_error($t = '')
- {
- @header('HTTP/1.1 500 Internal Server Error');
-
- $bt = $this->latest_query;
- $e = htmlspecialchars($this->sql_error());
- if ( empty($e) )
- $e = '<none>';
-
- global $email;
-
- // As long as the admin's e-mail is accessible, display it.
- $email_info = ( defined('ENANO_CONFIG_FETCHED') && is_object($email) )
- ? ', at <' . $email->jscode() . $email->encryptEmail(getConfig('contact_email')) . '>'
- : '';
-
- $internal_text = "The site was unable to finish serving your request.
- We apologize for the inconveience, but an error occurred in the Enano database layer. Please report the full text of this page to the administrator of this site{$email_info}.
- Description or location of error: $t
- Error returned by $this->dbms_name extension: $e
- Most recent SQL query:
- $bt
";
- return $internal_text;
- }
-
- /**
- * Exit Enano and output a JSON format datbase error.
- * @param string Description or location of error; defaults to none
- */
-
- function die_json($loc = false)
- {
- $e = str_replace("\n", "\\n", addslashes(htmlspecialchars($this->sql_error())));
- $q = str_replace("\n", "\\n", addslashes($this->latest_query));
- $loc = ( $loc ) ? addslashes("\n\nDescription or location of error: $loc") : "";
- $loc .= "\n\nPlease report the full text of this error to the administrator of the site. If you believe that this is a bug with the software, please contact support@enanocms.org.";
- $loc = str_replace("\n", "\\n", $loc);
- $t = "{\"mode\":\"error\",\"error\":\"An error occurred during database query.\\nQuery was:\\n $q\\n\\nError returned by {$this->dbms_name}: $e$loc\"}";
- die($t);
- }
-
- /**
- * Connect to the database.
- * @param bool If true, enables all other parameters. Defaults to false, which emans that you can call this function with no arguments and it will fetch information from the config file.
- * @param string Database server hostname
- * @param string Database server username
- * @param string Database server password
- * @param string Name of the database
- * @param int Optional port number to connect over
- */
-
- function connect($manual_credentials = false, $dbhost = false, $dbuser = false, $dbpasswd = false, $dbname = false, $dbport = false)
- {
- if ( !defined('ENANO_SQL_CONSTANTS') )
- {
- define('ENANO_SQL_CONSTANTS', '');
- define('ENANO_DBLAYER', 'PGSQL');
- define('ENANO_SQLFUNC_LOWERCASE', 'lower');
- define('ENANO_SQL_MULTISTRING_PRFIX', 'E');
- define('ENANO_SQL_BOOLEAN_TRUE', '1');
- define('ENANO_SQL_BOOLEAN_FALSE', '0');
- }
-
- if ( !$manual_credentials )
- {
- if ( defined('IN_ENANO_INSTALL') && !defined('IN_ENANO_UPGRADE') )
- {
- @include(ENANO_ROOT.'/config.new.php');
- }
- else
- {
- @include(ENANO_ROOT.'/config.php');
- }
-
- if ( isset($crypto_key) )
- unset($crypto_key); // Get this sucker out of memory fast
- if ( empty($dbport) )
- $dbport = 5432;
-
- if ( !defined('ENANO_INSTALLED') && !defined('MIDGET_INSTALLED') && !defined('IN_ENANO_INSTALL') )
- {
- // scriptPath isn't set yet - we need to autodetect it to avoid infinite redirects
- if ( !defined('scriptPath') )
- {
- if ( isset($_SERVER['PATH_INFO']) && !preg_match('/index\.php$/', $_SERVER['PATH_INFO']) )
- {
- $_SERVER['REQUEST_URI'] = preg_replace(';' . preg_quote($_SERVER['PATH_INFO']) . '$;', '', $_SERVER['REQUEST_URI']);
- }
- if ( !preg_match('/\.php$/', $_SERVER['REQUEST_URI']) )
- {
- // user requested http://foo/enano as opposed to http://foo/enano/index.php
- $_SERVER['REQUEST_URI'] .= '/index.php';
- }
- $sp = dirname($_SERVER['REQUEST_URI']);
- if($sp == '/' || $sp == '\\') $sp = '';
- define('scriptPath', $sp);
- define('contentPath', "$sp/index.php?title=");
- }
- $loc = scriptPath . '/install.php';
- // header("Location: $loc");
- redirect($loc, 'Enano not installed', 'We can\'t seem to find an Enano installation (valid config file). You will be transferred to the installation wizard momentarily...', 3);
- exit;
- }
- }
-
- if ( empty($dbport) )
- $dbport = 5432;
-
- $this->_conn = @pg_connect("host=$dbhost port=$dbport dbname=$dbname user=$dbuser password=$dbpasswd");
- unset($dbuser);
- unset($dbpasswd); // Security
-
- if ( !$this->_conn && !$manual_credentials )
- {
- grinding_halt('Enano is having a problem', 'Error: couldn\'t connect to PostgreSQL.
'.pg_last_error().'
');
- }
- else if ( !$this->_conn && $manual_credentials )
- {
- return false;
- }
-
- // Reset some variables
- $this->query_backtrace = array();
- $this->query_times = array();
- $this->query_sources = array();
- $this->num_queries = 0;
-
- $this->debug = ( defined('ENANO_DEBUG') );
-
- // We're in!
- return true;
- }
-
- /**
- * Make a SQL query.
- * @param string Query
- * @param bool If false, skips all checks and logging stages. If you're doing a ton of queries, set this to true; in all other cases, leave at the default of false.
- * @return resource or false on failure
- */
-
- function sql_query($q)
- {
- if ( $this->debug && function_exists('debug_backtrace') )
- {
- $backtrace = @debug_backtrace();
- if ( is_array($backtrace) )
- {
- $bt = $backtrace[0];
- if ( isset($backtrace[1]['class']) )
- {
- if ( $backtrace[1]['class'] == 'sessionManager' )
- {
- $bt = $backtrace[1];
- }
- }
- $this->query_sources[$q] = substr($bt['file'], strlen(ENANO_ROOT) + 1) . ', line ' . $bt['line'];
- }
- unset($backtrace);
- }
-
- $this->num_queries++;
- $this->query_backtrace[] = $q;
- $this->latest_query = $q;
- // First make sure we have a connection
- if ( !$this->_conn )
- {
- $this->_die('A database connection has not yet been established.');
- }
- // Does this query look malicious?
- if ( !$this->check_query($q) )
- {
- $this->report_query($q);
- grinding_halt('SQL Injection attempt', 'Enano has caught and prevented an SQL injection attempt. Your IP address has been recorded and the administrator has been notified.
Query was:
'.htmlspecialchars($q).'
');
- }
-
- $time_start = microtime_float();
- $r = @pg_query($this->_conn, $q);
- $this->query_times[$q] = microtime_float() - $time_start;
- $this->latest_result = $r;
- return $r;
- }
-
- /**
- * Make a SQL query, but do not have PHP buffer all the results. Useful for queries that are expected to return a huge number of results.
- * @param string Query
- * @param bool If false, skips all checks and logging stages. If you're doing a ton of queries, set this to true; in all other cases, leave at the default of false.
- * @return resource or false on failure
- */
-
- function sql_unbuffered_query($q)
- {
- return $this->sql_query($q);
- }
-
- /**
- * Checks a SQL query for possible signs of injection attempts
- * @param string $q the query to check
- * @return bool true if query passed check, otherwise false
- */
-
- function check_query($q, $debug = false)
- {
- global $db_sql_parse_time;
- $ts = microtime_float();
-
- // remove properly escaped quotes
- $q = str_replace(array("\\\"", "\\'"), '', $q);
-
- // make sure quotes match
- foreach ( array("'", '"') as $quote )
- {
- if ( get_char_count($q, $quote) % 2 == 1 )
- {
- // mismatched quotes
- return false;
- }
- // this quote is now confirmed to be matching; we can safely move all quoted strings out and replace with a token
- $q = preg_replace("/$quote(.*?)$quote/s", 'SAFE_QUOTE', $q);
- }
- $q = preg_replace("/(SAFE_QUOTE)+/", 'SAFE_QUOTE', $q);
-
- // quotes are now matched out. does this string have a comment marker in it?
- if ( strstr($q, '--') )
- {
- return false;
- }
-
- if ( preg_match('/[\s]+(SAFE_QUOTE|[\S]+)=\\1($|[\s]+)/', $q, $match) )
- {
- if ( $debug ) echo 'Found always-true test in query, injection attempt caught, match:
' . '' . print_r($match, true) . '
';
- return false;
- }
-
- $ts = microtime_float() - $ts;
- $db_sql_parse_time += $ts;
- return true;
- }
-
- /**
- * Set the internal result pointer to X
- * @param int $pos The number of the row
- * @param resource $result The PostgreSQL result resource - if not given, the latest cached query is assumed
- * @return true on success, false on failure
- */
-
- function sql_data_seek($pos, $result = false)
- {
- if ( !$result )
- $result = $this->latest_result;
- if ( !$result )
- return false;
-
- return pg_result_seek($result, $pos) ? true : false;
- }
-
- /**
- * Reports a bad query to the admin
- * @param string $query the naughty query
- * @access private
- */
-
- function report_query($query)
- {
- global $session;
- if ( is_object($session) && defined('ENANO_MAINSTREAM') )
- {
- $username = $session->username;
- $user_id = $session->user_id;
- }
- else
- {
- $username = 'Unavailable';
- $user_id = 1;
- }
-
- $query = $this->escape($query);
- $q = $this->sql_query('INSERT INTO '.table_prefix.'logs(log_type, action, time_id, date_string, page_text, author, author_uid, edit_summary)
- VALUES(\'security\', \'sql_inject\', '.time().', \'\', \''.$query.'\', \''.$username.'\', ' . $user_id . ', \''.$_SERVER['REMOTE_ADDR'].'\');');
- }
-
- /**
- * Returns the ID of the row last inserted.
- * @return int
- */
-
- function insert_id()
- {
- // list of primary keys in Enano tables
- // this is a bit hackish, but not much choice.
- static $primary_keys = false;
- if ( !is_array($primary_keys) )
- {
- $primary_keys = array(
- table_prefix . 'comments' => 'comment_id',
- table_prefix . 'logs' => 'log_id',
- table_prefix . 'users' => 'user_id',
- table_prefix . 'banlist' => 'ban_id',
- table_prefix . 'files' => 'file_id',
- table_prefix . 'buddies' => 'buddy_id',
- table_prefix . 'privmsgs' => 'message_id',
- table_prefix . 'sidebar' => 'item_id',
- table_prefix . 'hits' => 'hit_id',
- table_prefix . 'groups' => 'group_id',
- table_prefix . 'group_members' => 'member_id',
- table_prefix . 'acl' => 'rule_id',
- table_prefix . 'page_groups' => 'pg_id',
- table_prefix . 'page_group_members' => 'pg_member_id',
- table_prefix . 'tags' => 'tag_id',
- table_prefix . 'lockout' => 'id',
- table_prefix . 'language' => 'lang_id',
- table_prefix . 'language_strings' => 'string_id',
- table_prefix . 'ranks' => 'rank_id',
- table_prefix . 'captcha' => 'code_id',
- table_prefix . 'diffiehellman' => 'key_id',
- table_prefix . 'plugins' => 'plugin_id'
- );
- // allow plugins to patch this if needed
- global $plugins;
- $code = $plugins->setHook('pgsql_set_serial_list');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
- }
- $last_was_insert = preg_match('/^INSERT INTO ([a-z0-9_]+)/i', $this->latest_query, $match);
- if ( $last_was_insert )
- {
- // trick based on PunBB's PostgreSQL driver
- $table =& $match[1];
- if ( isset($primary_keys[$table]) )
- {
- $primary_key = "{$table}_{$primary_keys[$table]}_seq";
- $q = pg_query("SELECT CURRVAL('$primary_key');");
- return ( $q ) ? intval(@pg_fetch_result($q, 0)) : false;
- }
- }
- return false;
- }
-
- /**
- * Fetch one row from the given query as an associative array.
- * @param resource The resource returned from sql_query; if this isn't provided, the last result resource is used.
- * @return array
- */
-
- function fetchrow($r = false)
- {
- if ( !$this->_conn )
- return false;
- if ( !$r )
- $r = $this->latest_result;
- if ( !$r )
- $this->_die('$db->fetchrow(): an invalid ' . $this->dbms_name . ' resource was passed.');
-
- $row = pg_fetch_assoc($r);
- return integerize_array($row);
- }
-
- /**
- * Fetch one row from the given query as a numeric array.
- * @param resource The resource returned from sql_query; if this isn't provided, the last result resource is used.
- * @return array
- */
-
- function fetchrow_num($r = false)
- {
- if ( !$r )
- $r = $this->latest_result;
- if ( !$r )
- $this->_die('$db->fetchrow(): an invalid ' . $this->dbms_name . ' resource was passed.');
-
- $row = pg_fetch_row($r);
- return integerize_array($row);
- }
-
- /**
- * Get the number of results for a given query.
- * @param resource The resource returned from sql_query; if this isn't provided, the last result resource is used.
- * @return array
- */
-
- function numrows($r = false)
- {
- if ( !$r )
- $r = $this->latest_result;
- if ( !$r )
- $this->_die('$db->fetchrow(): an invalid ' . $this->dbms_name . ' resource was passed.');
-
- $n = pg_num_rows($r);
- return $n;
- }
-
- /**
- * Escape a string so that it may safely be included in a SQL query.
- * @param string String to escape
- * @return string Escaped string
- */
-
- function escape($str)
- {
- $str = pg_escape_string($this->_conn, $str);
- return $str;
- }
-
- /**
- * Free the given result from memory. Use this when completely finished with a result resource.
- * @param resource The resource returned from sql_query; if this isn't provided, the last result resource is used.
- * @return null
- */
-
- function free_result($result = false)
- {
- if ( !$result )
- $result = $this->latest_result;
-
- if ( !$result )
- return null;
-
- @pg_free_result($result);
- return null;
- }
-
- /**
- * Close the database connection
- */
-
- function close()
- {
- @pg_close($this->_conn);
- unset($this->_conn);
- }
-
- /**
- * Get a list of columns in the given table
- * @param string Table
- * @return array
- */
-
- function columns_in($table)
- {
- if ( !is_string($table) )
- return false;
- $q = $this->sql_query("SELECT * FROM $table LIMIT 1 OFFSET 0;");
- if ( !$q )
- $this->_die();
- if ( $this->numrows() < 1 )
- {
- // FIXME: Have another way to do this if the table is empty
- return false;
- }
-
- $row = $this->fetchrow();
- $this->free_result();
- return array_keys($row);
- }
-
+ function _die($t = '')
+ {
+ if ( defined('ENANO_HEADERS_SENT') )
+ ob_clean();
+
+ $internal_text = $this->get_error($t);
+
+ if ( defined('ENANO_CONFIG_FETCHED') )
+ // config is in, we can show a slightly nicer looking error page
+ die_semicritical('Database error', $internal_text);
+ else
+ // no config, display using no-DB template engine
+ grinding_halt('Database error', $internal_text);
+
+ exit;
+ }
+
+ /**
+ * Get the internal text used for a database error message.
+ * @param string Description or location of error; defaults to none
+ */
+
+ function get_error($t = '')
+ {
+ @header('HTTP/1.1 500 Internal Server Error');
+
+ $bt = $this->latest_query;
+ $e = htmlspecialchars($this->sql_error());
+ if ( empty($e) )
+ $e = '<none>';
+
+ global $email;
+
+ // As long as the admin's e-mail is accessible, display it.
+ $email_info = ( defined('ENANO_CONFIG_FETCHED') && is_object($email) )
+ ? ', at <' . $email->jscode() . $email->encryptEmail(getConfig('contact_email')) . '>'
+ : '';
+
+ $internal_text = "The site was unable to finish serving your request.
+ We apologize for the inconveience, but an error occurred in the Enano database layer. Please report the full text of this page to the administrator of this site{$email_info}.
+ Description or location of error: $t
+ Error returned by $this->dbms_name extension: $e
+ Most recent SQL query:
+ $bt
";
+ return $internal_text;
+ }
+
+ /**
+ * Exit Enano and output a JSON format datbase error.
+ * @param string Description or location of error; defaults to none
+ */
+
+ function die_json($loc = false)
+ {
+ $e = str_replace("\n", "\\n", addslashes(htmlspecialchars($this->sql_error())));
+ $q = str_replace("\n", "\\n", addslashes($this->latest_query));
+ $loc = ( $loc ) ? addslashes("\n\nDescription or location of error: $loc") : "";
+ $loc .= "\n\nPlease report the full text of this error to the administrator of the site. If you believe that this is a bug with the software, please contact support@enanocms.org.";
+ $loc = str_replace("\n", "\\n", $loc);
+ $t = "{\"mode\":\"error\",\"error\":\"An error occurred during database query.\\nQuery was:\\n $q\\n\\nError returned by {$this->dbms_name}: $e$loc\"}";
+ die($t);
+ }
+
+ /**
+ * Connect to the database.
+ * @param bool If true, enables all other parameters. Defaults to false, which emans that you can call this function with no arguments and it will fetch information from the config file.
+ * @param string Database server hostname
+ * @param string Database server username
+ * @param string Database server password
+ * @param string Name of the database
+ * @param int Optional port number to connect over
+ */
+
+ function connect($manual_credentials = false, $dbhost = false, $dbuser = false, $dbpasswd = false, $dbname = false, $dbport = false)
+ {
+ if ( !defined('ENANO_SQL_CONSTANTS') )
+ {
+ define('ENANO_SQL_CONSTANTS', '');
+ define('ENANO_DBLAYER', 'PGSQL');
+ define('ENANO_SQLFUNC_LOWERCASE', 'lower');
+ define('ENANO_SQL_MULTISTRING_PRFIX', 'E');
+ define('ENANO_SQL_BOOLEAN_TRUE', '1');
+ define('ENANO_SQL_BOOLEAN_FALSE', '0');
+ }
+
+ if ( !$manual_credentials )
+ {
+ if ( defined('IN_ENANO_INSTALL') && !defined('IN_ENANO_UPGRADE') )
+ {
+ @include(ENANO_ROOT.'/config.new.php');
+ }
+ else
+ {
+ @include(ENANO_ROOT.'/config.php');
+ }
+
+ if ( isset($crypto_key) )
+ unset($crypto_key); // Get this sucker out of memory fast
+ if ( empty($dbport) )
+ $dbport = 5432;
+
+ if ( !defined('ENANO_INSTALLED') && !defined('MIDGET_INSTALLED') && !defined('IN_ENANO_INSTALL') )
+ {
+ // scriptPath isn't set yet - we need to autodetect it to avoid infinite redirects
+ if ( !defined('scriptPath') )
+ {
+ if ( isset($_SERVER['PATH_INFO']) && !preg_match('/index\.php$/', $_SERVER['PATH_INFO']) )
+ {
+ $_SERVER['REQUEST_URI'] = preg_replace(';' . preg_quote($_SERVER['PATH_INFO']) . '$;', '', $_SERVER['REQUEST_URI']);
+ }
+ if ( !preg_match('/\.php$/', $_SERVER['REQUEST_URI']) )
+ {
+ // user requested http://foo/enano as opposed to http://foo/enano/index.php
+ $_SERVER['REQUEST_URI'] .= '/index.php';
+ }
+ $sp = dirname($_SERVER['REQUEST_URI']);
+ if($sp == '/' || $sp == '\\') $sp = '';
+ define('scriptPath', $sp);
+ define('contentPath', "$sp/index.php?title=");
+ }
+ $loc = scriptPath . '/install.php';
+ // header("Location: $loc");
+ redirect($loc, 'Enano not installed', 'We can\'t seem to find an Enano installation (valid config file). You will be transferred to the installation wizard momentarily...', 3);
+ exit;
+ }
+ }
+
+ if ( empty($dbport) )
+ $dbport = 5432;
+
+ $this->_conn = @pg_connect("host=$dbhost port=$dbport dbname=$dbname user=$dbuser password=$dbpasswd");
+ unset($dbuser);
+ unset($dbpasswd); // Security
+
+ if ( !$this->_conn && !$manual_credentials )
+ {
+ grinding_halt('Enano is having a problem', 'Error: couldn\'t connect to PostgreSQL.
'.pg_last_error().'
');
+ }
+ else if ( !$this->_conn && $manual_credentials )
+ {
+ return false;
+ }
+
+ // Reset some variables
+ $this->query_backtrace = array();
+ $this->query_times = array();
+ $this->query_sources = array();
+ $this->num_queries = 0;
+
+ $this->debug = ( defined('ENANO_DEBUG') );
+
+ // We're in!
+ return true;
+ }
+
+ /**
+ * Make a SQL query.
+ * @param string Query
+ * @param bool If false, skips all checks and logging stages. If you're doing a ton of queries, set this to true; in all other cases, leave at the default of false.
+ * @return resource or false on failure
+ */
+
+ function sql_query($q)
+ {
+ if ( $this->debug && function_exists('debug_backtrace') )
+ {
+ $backtrace = @debug_backtrace();
+ if ( is_array($backtrace) )
+ {
+ $bt = $backtrace[0];
+ if ( isset($backtrace[1]['class']) )
+ {
+ if ( $backtrace[1]['class'] == 'sessionManager' )
+ {
+ $bt = $backtrace[1];
+ }
+ }
+ $this->query_sources[$q] = substr($bt['file'], strlen(ENANO_ROOT) + 1) . ', line ' . $bt['line'];
+ }
+ unset($backtrace);
+ }
+
+ $this->num_queries++;
+ $this->query_backtrace[] = $q;
+ $this->latest_query = $q;
+ // First make sure we have a connection
+ if ( !$this->_conn )
+ {
+ $this->_die('A database connection has not yet been established.');
+ }
+ // Does this query look malicious?
+ if ( !$this->check_query($q) )
+ {
+ $this->report_query($q);
+ grinding_halt('SQL Injection attempt', 'Enano has caught and prevented an SQL injection attempt. Your IP address has been recorded and the administrator has been notified.
Query was:
'.htmlspecialchars($q).'
');
+ }
+
+ $time_start = microtime_float();
+ $r = @pg_query($this->_conn, $q);
+ $this->query_times[$q] = microtime_float() - $time_start;
+ $this->latest_result = $r;
+ return $r;
+ }
+
+ /**
+ * Make a SQL query, but do not have PHP buffer all the results. Useful for queries that are expected to return a huge number of results.
+ * @param string Query
+ * @param bool If false, skips all checks and logging stages. If you're doing a ton of queries, set this to true; in all other cases, leave at the default of false.
+ * @return resource or false on failure
+ */
+
+ function sql_unbuffered_query($q)
+ {
+ return $this->sql_query($q);
+ }
+
+ /**
+ * Checks a SQL query for possible signs of injection attempts
+ * @param string $q the query to check
+ * @return bool true if query passed check, otherwise false
+ */
+
+ function check_query($q, $debug = false)
+ {
+ global $db_sql_parse_time;
+ $ts = microtime_float();
+
+ // remove properly escaped quotes
+ $q = str_replace(array("\\\"", "\\'"), '', $q);
+
+ // make sure quotes match
+ foreach ( array("'", '"') as $quote )
+ {
+ if ( get_char_count($q, $quote) % 2 == 1 )
+ {
+ // mismatched quotes
+ return false;
+ }
+ // this quote is now confirmed to be matching; we can safely move all quoted strings out and replace with a token
+ $q = preg_replace("/$quote(.*?)$quote/s", 'SAFE_QUOTE', $q);
+ }
+ $q = preg_replace("/(SAFE_QUOTE)+/", 'SAFE_QUOTE', $q);
+
+ // quotes are now matched out. does this string have a comment marker in it?
+ if ( strstr($q, '--') )
+ {
+ return false;
+ }
+
+ if ( preg_match('/[\s]+(SAFE_QUOTE|[\S]+)=\\1($|[\s]+)/', $q, $match) )
+ {
+ if ( $debug ) echo 'Found always-true test in query, injection attempt caught, match:
' . '' . print_r($match, true) . '
';
+ return false;
+ }
+
+ $ts = microtime_float() - $ts;
+ $db_sql_parse_time += $ts;
+ return true;
+ }
+
+ /**
+ * Set the internal result pointer to X
+ * @param int $pos The number of the row
+ * @param resource $result The PostgreSQL result resource - if not given, the latest cached query is assumed
+ * @return true on success, false on failure
+ */
+
+ function sql_data_seek($pos, $result = false)
+ {
+ if ( !$result )
+ $result = $this->latest_result;
+ if ( !$result )
+ return false;
+
+ return pg_result_seek($result, $pos) ? true : false;
+ }
+
+ /**
+ * Reports a bad query to the admin
+ * @param string $query the naughty query
+ * @access private
+ */
+
+ function report_query($query)
+ {
+ global $session;
+ if ( is_object($session) && defined('ENANO_MAINSTREAM') )
+ {
+ $username = $session->username;
+ $user_id = $session->user_id;
+ }
+ else
+ {
+ $username = 'Unavailable';
+ $user_id = 1;
+ }
+
+ $query = $this->escape($query);
+ $q = $this->sql_query('INSERT INTO '.table_prefix.'logs(log_type, action, time_id, date_string, page_text, author, author_uid, edit_summary)
+ VALUES(\'security\', \'sql_inject\', '.time().', \'\', \''.$query.'\', \''.$username.'\', ' . $user_id . ', \''.$_SERVER['REMOTE_ADDR'].'\');');
+ }
+
+ /**
+ * Returns the ID of the row last inserted.
+ * @return int
+ */
+
+ function insert_id()
+ {
+ // list of primary keys in Enano tables
+ // this is a bit hackish, but not much choice.
+ static $primary_keys = false;
+ if ( !is_array($primary_keys) )
+ {
+ $primary_keys = array(
+ table_prefix . 'comments' => 'comment_id',
+ table_prefix . 'logs' => 'log_id',
+ table_prefix . 'users' => 'user_id',
+ table_prefix . 'banlist' => 'ban_id',
+ table_prefix . 'files' => 'file_id',
+ table_prefix . 'buddies' => 'buddy_id',
+ table_prefix . 'privmsgs' => 'message_id',
+ table_prefix . 'sidebar' => 'item_id',
+ table_prefix . 'hits' => 'hit_id',
+ table_prefix . 'groups' => 'group_id',
+ table_prefix . 'group_members' => 'member_id',
+ table_prefix . 'acl' => 'rule_id',
+ table_prefix . 'page_groups' => 'pg_id',
+ table_prefix . 'page_group_members' => 'pg_member_id',
+ table_prefix . 'tags' => 'tag_id',
+ table_prefix . 'lockout' => 'id',
+ table_prefix . 'language' => 'lang_id',
+ table_prefix . 'language_strings' => 'string_id',
+ table_prefix . 'ranks' => 'rank_id',
+ table_prefix . 'captcha' => 'code_id',
+ table_prefix . 'diffiehellman' => 'key_id',
+ table_prefix . 'plugins' => 'plugin_id'
+ );
+ // allow plugins to patch this if needed
+ global $plugins;
+ $code = $plugins->setHook('pgsql_set_serial_list');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+ }
+ $last_was_insert = preg_match('/^INSERT INTO ([a-z0-9_]+)/i', $this->latest_query, $match);
+ if ( $last_was_insert )
+ {
+ // trick based on PunBB's PostgreSQL driver
+ $table =& $match[1];
+ if ( isset($primary_keys[$table]) )
+ {
+ $primary_key = "{$table}_{$primary_keys[$table]}_seq";
+ $q = pg_query("SELECT CURRVAL('$primary_key');");
+ return ( $q ) ? intval(@pg_fetch_result($q, 0)) : false;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Fetch one row from the given query as an associative array.
+ * @param resource The resource returned from sql_query; if this isn't provided, the last result resource is used.
+ * @return array
+ */
+
+ function fetchrow($r = false)
+ {
+ if ( !$this->_conn )
+ return false;
+ if ( !$r )
+ $r = $this->latest_result;
+ if ( !$r )
+ $this->_die('$db->fetchrow(): an invalid ' . $this->dbms_name . ' resource was passed.');
+
+ $row = pg_fetch_assoc($r);
+ return integerize_array($row);
+ }
+
+ /**
+ * Fetch one row from the given query as a numeric array.
+ * @param resource The resource returned from sql_query; if this isn't provided, the last result resource is used.
+ * @return array
+ */
+
+ function fetchrow_num($r = false)
+ {
+ if ( !$r )
+ $r = $this->latest_result;
+ if ( !$r )
+ $this->_die('$db->fetchrow(): an invalid ' . $this->dbms_name . ' resource was passed.');
+
+ $row = pg_fetch_row($r);
+ return integerize_array($row);
+ }
+
+ /**
+ * Get the number of results for a given query.
+ * @param resource The resource returned from sql_query; if this isn't provided, the last result resource is used.
+ * @return array
+ */
+
+ function numrows($r = false)
+ {
+ if ( !$r )
+ $r = $this->latest_result;
+ if ( !$r )
+ $this->_die('$db->fetchrow(): an invalid ' . $this->dbms_name . ' resource was passed.');
+
+ $n = pg_num_rows($r);
+ return $n;
+ }
+
+ /**
+ * Escape a string so that it may safely be included in a SQL query.
+ * @param string String to escape
+ * @return string Escaped string
+ */
+
+ function escape($str)
+ {
+ $str = pg_escape_string($this->_conn, $str);
+ return $str;
+ }
+
+ /**
+ * Free the given result from memory. Use this when completely finished with a result resource.
+ * @param resource The resource returned from sql_query; if this isn't provided, the last result resource is used.
+ * @return null
+ */
+
+ function free_result($result = false)
+ {
+ if ( !$result )
+ $result = $this->latest_result;
+
+ if ( !$result )
+ return null;
+
+ @pg_free_result($result);
+ return null;
+ }
+
+ /**
+ * Close the database connection
+ */
+
+ function close()
+ {
+ @pg_close($this->_conn);
+ unset($this->_conn);
+ }
+
+ /**
+ * Get a list of columns in the given table
+ * @param string Table
+ * @return array
+ */
+
+ function columns_in($table)
+ {
+ if ( !is_string($table) )
+ return false;
+ $q = $this->sql_query("SELECT * FROM $table LIMIT 1 OFFSET 0;");
+ if ( !$q )
+ $this->_die();
+ if ( $this->numrows() < 1 )
+ {
+ // FIXME: Have another way to do this if the table is empty
+ return false;
+ }
+
+ $row = $this->fetchrow();
+ $this->free_result();
+ return array_keys($row);
+ }
+
function sql_error()
{
if ( $this->_conn )
@@ -1172,88 +1172,88 @@
}
/**
- * Returns the number of rows affected.
- * @return int
- */
-
- function sql_affectedrows()
- {
- return pg_affected_rows($this->latest_result);
- }
+ * Returns the number of rows affected.
+ * @return int
+ */
+
+ function sql_affectedrows()
+ {
+ return pg_affected_rows($this->latest_result);
+ }
- /**
- * Generates and outputs a report of all the SQL queries made during execution. Should only be called after everything's over with.
- */
-
- function sql_report()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- if ( !$session->get_permissions('mod_misc') )
- {
- die_friendly('Access denied', 'You are not authorized to generate a SQL backtrace.
');
- }
- // Create copies of variables that may be changed after header is called
- $backtrace = $this->query_backtrace;
- $times = $this->query_times;
- $template->header();
- echo 'SQL query log and timetable
';
- echo '
- ';
- $i = 0;
- foreach ( $backtrace as $query )
- {
- $i++;
- $unbuffered = false;
- if ( substr($query, 0, 13) == '(UNBUFFERED) ' )
- {
- $query = substr($query, 13);
- $unbuffered = true;
- }
- if ( $i == 1 )
- {
- echo '
- SQL backtrace for a normal page load of ' . htmlspecialchars($paths->cpage['urlname']) . '
- ';
- }
- else
- {
- echo '
-
- ';
- }
- echo '
- Query:
- ' . htmlspecialchars($query) . '
-
- Time:
- ' . number_format($this->query_times[$query], 6) . ' seconds
-
-
- Unbuffered:
- ' . ( $unbuffered ? 'Yes' : 'No' ) . '
- ';
- if ( isset($this->query_sources[$query]) )
- {
- echo '
- Called from:
- ' . $this->query_sources[$query] . '
- ';
- }
- }
- if ( function_exists('array_sum') )
- {
- $query_time_total = array_sum($this->query_times);
- echo '
-
- Total time taken for SQL queries: ' . round( $query_time_total, 6 ) . ' seconds
-
- ';
- }
- echo '
- ';
- $template->footer();
- }
+ /**
+ * Generates and outputs a report of all the SQL queries made during execution. Should only be called after everything's over with.
+ */
+
+ function sql_report()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ if ( !$session->get_permissions('mod_misc') )
+ {
+ die_friendly('Access denied', 'You are not authorized to generate a SQL backtrace.
');
+ }
+ // Create copies of variables that may be changed after header is called
+ $backtrace = $this->query_backtrace;
+ $times = $this->query_times;
+ $template->header();
+ echo 'SQL query log and timetable
';
+ echo '
+ ';
+ $i = 0;
+ foreach ( $backtrace as $query )
+ {
+ $i++;
+ $unbuffered = false;
+ if ( substr($query, 0, 13) == '(UNBUFFERED) ' )
+ {
+ $query = substr($query, 13);
+ $unbuffered = true;
+ }
+ if ( $i == 1 )
+ {
+ echo '
+ SQL backtrace for a normal page load of ' . htmlspecialchars($paths->cpage['urlname']) . '
+ ';
+ }
+ else
+ {
+ echo '
+
+ ';
+ }
+ echo '
+ Query:
+ ' . htmlspecialchars($query) . '
+
+ Time:
+ ' . number_format($this->query_times[$query], 6) . ' seconds
+
+
+ Unbuffered:
+ ' . ( $unbuffered ? 'Yes' : 'No' ) . '
+ ';
+ if ( isset($this->query_sources[$query]) )
+ {
+ echo '
+ Called from:
+ ' . $this->query_sources[$query] . '
+ ';
+ }
+ }
+ if ( function_exists('array_sum') )
+ {
+ $query_time_total = array_sum($this->query_times);
+ echo '
+
+ Total time taken for SQL queries: ' . round( $query_time_total, 6 ) . ' seconds
+
+ ';
+ }
+ echo '
+ ';
+ $template->footer();
+ }
}
?>
diff -r de56132c008d -r bdac73ed481e includes/diffengine/Engine/native.php
--- a/includes/diffengine/Engine/native.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/diffengine/Engine/native.php Sun Mar 28 23:10:46 2010 -0400
@@ -27,409 +27,409 @@
*/
class Text_Diff_Engine_native {
- function diff($from_lines, $to_lines)
- {
- array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
- array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
+ function diff($from_lines, $to_lines)
+ {
+ array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
+ array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
- $n_from = count($from_lines);
- $n_to = count($to_lines);
+ $n_from = count($from_lines);
+ $n_to = count($to_lines);
- $this->xchanged = $this->ychanged = array();
- $this->xv = $this->yv = array();
- $this->xind = $this->yind = array();
- unset($this->seq);
- unset($this->in_seq);
- unset($this->lcs);
+ $this->xchanged = $this->ychanged = array();
+ $this->xv = $this->yv = array();
+ $this->xind = $this->yind = array();
+ unset($this->seq);
+ unset($this->in_seq);
+ unset($this->lcs);
- // Skip leading common lines.
- for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
- if ($from_lines[$skip] !== $to_lines[$skip]) {
- break;
- }
- $this->xchanged[$skip] = $this->ychanged[$skip] = false;
- }
+ // Skip leading common lines.
+ for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
+ if ($from_lines[$skip] !== $to_lines[$skip]) {
+ break;
+ }
+ $this->xchanged[$skip] = $this->ychanged[$skip] = false;
+ }
- // Skip trailing common lines.
- $xi = $n_from; $yi = $n_to;
- for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) {
- if ($from_lines[$xi] !== $to_lines[$yi]) {
- break;
- }
- $this->xchanged[$xi] = $this->ychanged[$yi] = false;
- }
+ // Skip trailing common lines.
+ $xi = $n_from; $yi = $n_to;
+ for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) {
+ if ($from_lines[$xi] !== $to_lines[$yi]) {
+ break;
+ }
+ $this->xchanged[$xi] = $this->ychanged[$yi] = false;
+ }
- // Ignore lines which do not exist in both files.
- for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
- $xhash[$from_lines[$xi]] = 1;
- }
- for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
- $line = $to_lines[$yi];
- if (($this->ychanged[$yi] = empty($xhash[$line]))) {
- continue;
- }
- $yhash[$line] = 1;
- $this->yv[] = $line;
- $this->yind[] = $yi;
- }
- for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
- $line = $from_lines[$xi];
- if (($this->xchanged[$xi] = empty($yhash[$line]))) {
- continue;
- }
- $this->xv[] = $line;
- $this->xind[] = $xi;
- }
+ // Ignore lines which do not exist in both files.
+ for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+ $xhash[$from_lines[$xi]] = 1;
+ }
+ for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
+ $line = $to_lines[$yi];
+ if (($this->ychanged[$yi] = empty($xhash[$line]))) {
+ continue;
+ }
+ $yhash[$line] = 1;
+ $this->yv[] = $line;
+ $this->yind[] = $yi;
+ }
+ for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+ $line = $from_lines[$xi];
+ if (($this->xchanged[$xi] = empty($yhash[$line]))) {
+ continue;
+ }
+ $this->xv[] = $line;
+ $this->xind[] = $xi;
+ }
- // Find the LCS.
- $this->_compareseq(0, count($this->xv), 0, count($this->yv));
+ // Find the LCS.
+ $this->_compareseq(0, count($this->xv), 0, count($this->yv));
- // Merge edits when possible.
- $this->_shiftBoundaries($from_lines, $this->xchanged, $this->ychanged);
- $this->_shiftBoundaries($to_lines, $this->ychanged, $this->xchanged);
+ // Merge edits when possible.
+ $this->_shiftBoundaries($from_lines, $this->xchanged, $this->ychanged);
+ $this->_shiftBoundaries($to_lines, $this->ychanged, $this->xchanged);
- // Compute the edit operations.
- $edits = array();
- $xi = $yi = 0;
- while ($xi < $n_from || $yi < $n_to) {
- assert($yi < $n_to || $this->xchanged[$xi]);
- assert($xi < $n_from || $this->ychanged[$yi]);
+ // Compute the edit operations.
+ $edits = array();
+ $xi = $yi = 0;
+ while ($xi < $n_from || $yi < $n_to) {
+ assert($yi < $n_to || $this->xchanged[$xi]);
+ assert($xi < $n_from || $this->ychanged[$yi]);
- // Skip matching "snake".
- $copy = array();
- while ($xi < $n_from && $yi < $n_to
- && !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
- $copy[] = $from_lines[$xi++];
- ++$yi;
- }
- if ($copy) {
- $edits[] = &new Text_Diff_Op_copy($copy);
- }
+ // Skip matching "snake".
+ $copy = array();
+ while ($xi < $n_from && $yi < $n_to
+ && !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
+ $copy[] = $from_lines[$xi++];
+ ++$yi;
+ }
+ if ($copy) {
+ $edits[] = &new Text_Diff_Op_copy($copy);
+ }
- // Find deletes & adds.
- $delete = array();
- while ($xi < $n_from && $this->xchanged[$xi]) {
- $delete[] = $from_lines[$xi++];
- }
+ // Find deletes & adds.
+ $delete = array();
+ while ($xi < $n_from && $this->xchanged[$xi]) {
+ $delete[] = $from_lines[$xi++];
+ }
- $add = array();
- while ($yi < $n_to && $this->ychanged[$yi]) {
- $add[] = $to_lines[$yi++];
- }
+ $add = array();
+ while ($yi < $n_to && $this->ychanged[$yi]) {
+ $add[] = $to_lines[$yi++];
+ }
- if ($delete && $add) {
- $edits[] = &new Text_Diff_Op_change($delete, $add);
- } elseif ($delete) {
- $edits[] = &new Text_Diff_Op_delete($delete);
- } elseif ($add) {
- $edits[] = &new Text_Diff_Op_add($add);
- }
- }
+ if ($delete && $add) {
+ $edits[] = &new Text_Diff_Op_change($delete, $add);
+ } elseif ($delete) {
+ $edits[] = &new Text_Diff_Op_delete($delete);
+ } elseif ($add) {
+ $edits[] = &new Text_Diff_Op_add($add);
+ }
+ }
- return $edits;
- }
+ return $edits;
+ }
- /**
- * Divides the Largest Common Subsequence (LCS) of the sequences (XOFF,
- * XLIM) and (YOFF, YLIM) into NCHUNKS approximately equally sized
- * segments.
- *
- * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an array of
- * NCHUNKS+1 (X, Y) indexes giving the diving points between sub
- * sequences. The first sub-sequence is contained in (X0, X1), (Y0, Y1),
- * the second in (X1, X2), (Y1, Y2) and so on. Note that (X0, Y0) ==
- * (XOFF, YOFF) and (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
- *
- * This function assumes that the first lines of the specified portions of
- * the two files do not match, and likewise that the last lines do not
- * match. The caller must trim matching lines from the beginning and end
- * of the portions it is going to specify.
- */
- function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
- {
- $flip = false;
+ /**
+ * Divides the Largest Common Subsequence (LCS) of the sequences (XOFF,
+ * XLIM) and (YOFF, YLIM) into NCHUNKS approximately equally sized
+ * segments.
+ *
+ * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an array of
+ * NCHUNKS+1 (X, Y) indexes giving the diving points between sub
+ * sequences. The first sub-sequence is contained in (X0, X1), (Y0, Y1),
+ * the second in (X1, X2), (Y1, Y2) and so on. Note that (X0, Y0) ==
+ * (XOFF, YOFF) and (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
+ *
+ * This function assumes that the first lines of the specified portions of
+ * the two files do not match, and likewise that the last lines do not
+ * match. The caller must trim matching lines from the beginning and end
+ * of the portions it is going to specify.
+ */
+ function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
+ {
+ $flip = false;
- if ($xlim - $xoff > $ylim - $yoff) {
- /* Things seems faster (I'm not sure I understand why) when the
- * shortest sequence is in X. */
- $flip = true;
- list ($xoff, $xlim, $yoff, $ylim)
- = array($yoff, $ylim, $xoff, $xlim);
- }
+ if ($xlim - $xoff > $ylim - $yoff) {
+ /* Things seems faster (I'm not sure I understand why) when the
+ * shortest sequence is in X. */
+ $flip = true;
+ list ($xoff, $xlim, $yoff, $ylim)
+ = array($yoff, $ylim, $xoff, $xlim);
+ }
- if ($flip) {
- for ($i = $ylim - 1; $i >= $yoff; $i--) {
- $ymatches[$this->xv[$i]][] = $i;
- }
- } else {
- for ($i = $ylim - 1; $i >= $yoff; $i--) {
- $ymatches[$this->yv[$i]][] = $i;
- }
- }
+ if ($flip) {
+ for ($i = $ylim - 1; $i >= $yoff; $i--) {
+ $ymatches[$this->xv[$i]][] = $i;
+ }
+ } else {
+ for ($i = $ylim - 1; $i >= $yoff; $i--) {
+ $ymatches[$this->yv[$i]][] = $i;
+ }
+ }
- $this->lcs = 0;
- $this->seq[0]= $yoff - 1;
- $this->in_seq = array();
- $ymids[0] = array();
+ $this->lcs = 0;
+ $this->seq[0]= $yoff - 1;
+ $this->in_seq = array();
+ $ymids[0] = array();
- $numer = $xlim - $xoff + $nchunks - 1;
- $x = $xoff;
- for ($chunk = 0; $chunk < $nchunks; $chunk++) {
- if ($chunk > 0) {
- for ($i = 0; $i <= $this->lcs; $i++) {
- $ymids[$i][$chunk - 1] = $this->seq[$i];
- }
- }
+ $numer = $xlim - $xoff + $nchunks - 1;
+ $x = $xoff;
+ for ($chunk = 0; $chunk < $nchunks; $chunk++) {
+ if ($chunk > 0) {
+ for ($i = 0; $i <= $this->lcs; $i++) {
+ $ymids[$i][$chunk - 1] = $this->seq[$i];
+ }
+ }
- $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks);
- for (; $x < $x1; $x++) {
- $line = $flip ? $this->yv[$x] : $this->xv[$x];
- if (empty($ymatches[$line])) {
- continue;
- }
- $matches = $ymatches[$line];
- foreach ($matches as $y) {
- if (empty($this->in_seq[$y])) {
- $k = $this->_lcsPos($y);
- assert($k > 0);
- $ymids[$k] = $ymids[$k - 1];
- break;
- }
- }
+ $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks);
+ for (; $x < $x1; $x++) {
+ $line = $flip ? $this->yv[$x] : $this->xv[$x];
+ if (empty($ymatches[$line])) {
+ continue;
+ }
+ $matches = $ymatches[$line];
+ foreach ($matches as $y) {
+ if (empty($this->in_seq[$y])) {
+ $k = $this->_lcsPos($y);
+ assert($k > 0);
+ $ymids[$k] = $ymids[$k - 1];
+ break;
+ }
+ }
- while (list($junk, $y) = each($matches)) {
- if ($y > $this->seq[$k - 1]) {
- assert($y < $this->seq[$k]);
- /* Optimization: this is a common case: next match is
- * just replacing previous match. */
- $this->in_seq[$this->seq[$k]] = false;
- $this->seq[$k] = $y;
- $this->in_seq[$y] = 1;
- } elseif (empty($this->in_seq[$y])) {
- $k = $this->_lcsPos($y);
- assert($k > 0);
- $ymids[$k] = $ymids[$k - 1];
- }
- }
- }
- }
+ while (list($junk, $y) = each($matches)) {
+ if ($y > $this->seq[$k - 1]) {
+ assert($y < $this->seq[$k]);
+ /* Optimization: this is a common case: next match is
+ * just replacing previous match. */
+ $this->in_seq[$this->seq[$k]] = false;
+ $this->seq[$k] = $y;
+ $this->in_seq[$y] = 1;
+ } elseif (empty($this->in_seq[$y])) {
+ $k = $this->_lcsPos($y);
+ assert($k > 0);
+ $ymids[$k] = $ymids[$k - 1];
+ }
+ }
+ }
+ }
- $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
- $ymid = $ymids[$this->lcs];
- for ($n = 0; $n < $nchunks - 1; $n++) {
- $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
- $y1 = $ymid[$n] + 1;
- $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
- }
- $seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
+ $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
+ $ymid = $ymids[$this->lcs];
+ for ($n = 0; $n < $nchunks - 1; $n++) {
+ $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
+ $y1 = $ymid[$n] + 1;
+ $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
+ }
+ $seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
- return array($this->lcs, $seps);
- }
+ return array($this->lcs, $seps);
+ }
- function _lcsPos($ypos)
- {
- $end = $this->lcs;
- if ($end == 0 || $ypos > $this->seq[$end]) {
- $this->seq[++$this->lcs] = $ypos;
- $this->in_seq[$ypos] = 1;
- return $this->lcs;
- }
+ function _lcsPos($ypos)
+ {
+ $end = $this->lcs;
+ if ($end == 0 || $ypos > $this->seq[$end]) {
+ $this->seq[++$this->lcs] = $ypos;
+ $this->in_seq[$ypos] = 1;
+ return $this->lcs;
+ }
- $beg = 1;
- while ($beg < $end) {
- $mid = (int)(($beg + $end) / 2);
- if ($ypos > $this->seq[$mid]) {
- $beg = $mid + 1;
- } else {
- $end = $mid;
- }
- }
+ $beg = 1;
+ while ($beg < $end) {
+ $mid = (int)(($beg + $end) / 2);
+ if ($ypos > $this->seq[$mid]) {
+ $beg = $mid + 1;
+ } else {
+ $end = $mid;
+ }
+ }
- assert($ypos != $this->seq[$end]);
+ assert($ypos != $this->seq[$end]);
- $this->in_seq[$this->seq[$end]] = false;
- $this->seq[$end] = $ypos;
- $this->in_seq[$ypos] = 1;
- return $end;
- }
+ $this->in_seq[$this->seq[$end]] = false;
+ $this->seq[$end] = $ypos;
+ $this->in_seq[$ypos] = 1;
+ return $end;
+ }
- /**
- * Finds LCS of two sequences.
- *
- * The results are recorded in the vectors $this->{x,y}changed[], by
- * storing a 1 in the element for each line that is an insertion or
- * deletion (ie. is not in the LCS).
- *
- * The subsequence of file 0 is (XOFF, XLIM) and likewise for file 1.
- *
- * Note that XLIM, YLIM are exclusive bounds. All line numbers are
- * origin-0 and discarded lines are not counted.
- */
- function _compareseq ($xoff, $xlim, $yoff, $ylim)
- {
- /* Slide down the bottom initial diagonal. */
- while ($xoff < $xlim && $yoff < $ylim
- && $this->xv[$xoff] == $this->yv[$yoff]) {
- ++$xoff;
- ++$yoff;
- }
+ /**
+ * Finds LCS of two sequences.
+ *
+ * The results are recorded in the vectors $this->{x,y}changed[], by
+ * storing a 1 in the element for each line that is an insertion or
+ * deletion (ie. is not in the LCS).
+ *
+ * The subsequence of file 0 is (XOFF, XLIM) and likewise for file 1.
+ *
+ * Note that XLIM, YLIM are exclusive bounds. All line numbers are
+ * origin-0 and discarded lines are not counted.
+ */
+ function _compareseq ($xoff, $xlim, $yoff, $ylim)
+ {
+ /* Slide down the bottom initial diagonal. */
+ while ($xoff < $xlim && $yoff < $ylim
+ && $this->xv[$xoff] == $this->yv[$yoff]) {
+ ++$xoff;
+ ++$yoff;
+ }
- /* Slide up the top initial diagonal. */
- while ($xlim > $xoff && $ylim > $yoff
- && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) {
- --$xlim;
- --$ylim;
- }
+ /* Slide up the top initial diagonal. */
+ while ($xlim > $xoff && $ylim > $yoff
+ && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) {
+ --$xlim;
+ --$ylim;
+ }
- if ($xoff == $xlim || $yoff == $ylim) {
- $lcs = 0;
- } else {
- /* This is ad hoc but seems to work well. $nchunks =
- * sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5); $nchunks =
- * max(2,min(8,(int)$nchunks)); */
- $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
- list($lcs, $seps)
- = $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks);
- }
+ if ($xoff == $xlim || $yoff == $ylim) {
+ $lcs = 0;
+ } else {
+ /* This is ad hoc but seems to work well. $nchunks =
+ * sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5); $nchunks =
+ * max(2,min(8,(int)$nchunks)); */
+ $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
+ list($lcs, $seps)
+ = $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks);
+ }
- if ($lcs == 0) {
- /* X and Y sequences have no common subsequence: mark all
- * changed. */
- while ($yoff < $ylim) {
- $this->ychanged[$this->yind[$yoff++]] = 1;
- }
- while ($xoff < $xlim) {
- $this->xchanged[$this->xind[$xoff++]] = 1;
- }
- } else {
- /* Use the partitions to split this problem into subproblems. */
- reset($seps);
- $pt1 = $seps[0];
- while ($pt2 = next($seps)) {
- $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
- $pt1 = $pt2;
- }
- }
- }
+ if ($lcs == 0) {
+ /* X and Y sequences have no common subsequence: mark all
+ * changed. */
+ while ($yoff < $ylim) {
+ $this->ychanged[$this->yind[$yoff++]] = 1;
+ }
+ while ($xoff < $xlim) {
+ $this->xchanged[$this->xind[$xoff++]] = 1;
+ }
+ } else {
+ /* Use the partitions to split this problem into subproblems. */
+ reset($seps);
+ $pt1 = $seps[0];
+ while ($pt2 = next($seps)) {
+ $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
+ $pt1 = $pt2;
+ }
+ }
+ }
- /**
- * Adjusts inserts/deletes of identical lines to join changes as much as
- * possible.
- *
- * We do something when a run of changed lines include a line at one end
- * and has an excluded, identical line at the other. We are free to
- * choose which identical line is included. `compareseq' usually chooses
- * the one at the beginning, but usually it is cleaner to consider the
- * following identical line to be the "change".
- *
- * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
- */
- function _shiftBoundaries($lines, &$changed, $other_changed)
- {
- $i = 0;
- $j = 0;
+ /**
+ * Adjusts inserts/deletes of identical lines to join changes as much as
+ * possible.
+ *
+ * We do something when a run of changed lines include a line at one end
+ * and has an excluded, identical line at the other. We are free to
+ * choose which identical line is included. `compareseq' usually chooses
+ * the one at the beginning, but usually it is cleaner to consider the
+ * following identical line to be the "change".
+ *
+ * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
+ */
+ function _shiftBoundaries($lines, &$changed, $other_changed)
+ {
+ $i = 0;
+ $j = 0;
- assert('count($lines) == count($changed)');
- $len = count($lines);
- $other_len = count($other_changed);
+ assert('count($lines) == count($changed)');
+ $len = count($lines);
+ $other_len = count($other_changed);
- while (1) {
- /* Scan forward to find the beginning of another run of
- * changes. Also keep track of the corresponding point in the
- * other file.
- *
- * Throughout this code, $i and $j are adjusted together so that
- * the first $i elements of $changed and the first $j elements of
- * $other_changed both contain the same number of zeros (unchanged
- * lines).
- *
- * Furthermore, $j is always kept so that $j == $other_len or
- * $other_changed[$j] == false. */
- while ($j < $other_len && $other_changed[$j]) {
- $j++;
- }
+ while (1) {
+ /* Scan forward to find the beginning of another run of
+ * changes. Also keep track of the corresponding point in the
+ * other file.
+ *
+ * Throughout this code, $i and $j are adjusted together so that
+ * the first $i elements of $changed and the first $j elements of
+ * $other_changed both contain the same number of zeros (unchanged
+ * lines).
+ *
+ * Furthermore, $j is always kept so that $j == $other_len or
+ * $other_changed[$j] == false. */
+ while ($j < $other_len && $other_changed[$j]) {
+ $j++;
+ }
- while ($i < $len && ! $changed[$i]) {
- assert('$j < $other_len && ! $other_changed[$j]');
- $i++; $j++;
- while ($j < $other_len && $other_changed[$j]) {
- $j++;
- }
- }
+ while ($i < $len && ! $changed[$i]) {
+ assert('$j < $other_len && ! $other_changed[$j]');
+ $i++; $j++;
+ while ($j < $other_len && $other_changed[$j]) {
+ $j++;
+ }
+ }
- if ($i == $len) {
- break;
- }
+ if ($i == $len) {
+ break;
+ }
- $start = $i;
+ $start = $i;
- /* Find the end of this run of changes. */
- while (++$i < $len && $changed[$i]) {
- continue;
- }
+ /* Find the end of this run of changes. */
+ while (++$i < $len && $changed[$i]) {
+ continue;
+ }
- do {
- /* Record the length of this run of changes, so that we can
- * later determine whether the run has grown. */
- $runlength = $i - $start;
+ do {
+ /* Record the length of this run of changes, so that we can
+ * later determine whether the run has grown. */
+ $runlength = $i - $start;
- /* Move the changed region back, so long as the previous
- * unchanged line matches the last changed one. This merges
- * with previous changed regions. */
- while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
- $changed[--$start] = 1;
- $changed[--$i] = false;
- while ($start > 0 && $changed[$start - 1]) {
- $start--;
- }
- assert('$j > 0');
- while ($other_changed[--$j]) {
- continue;
- }
- assert('$j >= 0 && !$other_changed[$j]');
- }
+ /* Move the changed region back, so long as the previous
+ * unchanged line matches the last changed one. This merges
+ * with previous changed regions. */
+ while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
+ $changed[--$start] = 1;
+ $changed[--$i] = false;
+ while ($start > 0 && $changed[$start - 1]) {
+ $start--;
+ }
+ assert('$j > 0');
+ while ($other_changed[--$j]) {
+ continue;
+ }
+ assert('$j >= 0 && !$other_changed[$j]');
+ }
- /* Set CORRESPONDING to the end of the changed run, at the
- * last point where it corresponds to a changed run in the
- * other file. CORRESPONDING == LEN means no such point has
- * been found. */
- $corresponding = $j < $other_len ? $i : $len;
+ /* Set CORRESPONDING to the end of the changed run, at the
+ * last point where it corresponds to a changed run in the
+ * other file. CORRESPONDING == LEN means no such point has
+ * been found. */
+ $corresponding = $j < $other_len ? $i : $len;
- /* Move the changed region forward, so long as the first
- * changed line matches the following unchanged one. This
- * merges with following changed regions. Do this second, so
- * that if there are no merges, the changed region is moved
- * forward as far as possible. */
- while ($i < $len && $lines[$start] == $lines[$i]) {
- $changed[$start++] = false;
- $changed[$i++] = 1;
- while ($i < $len && $changed[$i]) {
- $i++;
- }
+ /* Move the changed region forward, so long as the first
+ * changed line matches the following unchanged one. This
+ * merges with following changed regions. Do this second, so
+ * that if there are no merges, the changed region is moved
+ * forward as far as possible. */
+ while ($i < $len && $lines[$start] == $lines[$i]) {
+ $changed[$start++] = false;
+ $changed[$i++] = 1;
+ while ($i < $len && $changed[$i]) {
+ $i++;
+ }
- assert('$j < $other_len && ! $other_changed[$j]');
- $j++;
- if ($j < $other_len && $other_changed[$j]) {
- $corresponding = $i;
- while ($j < $other_len && $other_changed[$j]) {
- $j++;
- }
- }
- }
- } while ($runlength != $i - $start);
+ assert('$j < $other_len && ! $other_changed[$j]');
+ $j++;
+ if ($j < $other_len && $other_changed[$j]) {
+ $corresponding = $i;
+ while ($j < $other_len && $other_changed[$j]) {
+ $j++;
+ }
+ }
+ }
+ } while ($runlength != $i - $start);
- /* If possible, move the fully-merged run of changes back to a
- * corresponding run in the other file. */
- while ($corresponding < $i) {
- $changed[--$start] = 1;
- $changed[--$i] = 0;
- assert('$j > 0');
- while ($other_changed[--$j]) {
- continue;
- }
- assert('$j >= 0 && !$other_changed[$j]');
- }
- }
- }
+ /* If possible, move the fully-merged run of changes back to a
+ * corresponding run in the other file. */
+ while ($corresponding < $i) {
+ $changed[--$start] = 1;
+ $changed[--$i] = 0;
+ assert('$j > 0');
+ while ($other_changed[--$j]) {
+ continue;
+ }
+ assert('$j >= 0 && !$other_changed[$j]');
+ }
+ }
+ }
}
diff -r de56132c008d -r bdac73ed481e includes/diffengine/Engine/string.php
--- a/includes/diffengine/Engine/string.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/diffengine/Engine/string.php Sun Mar 28 23:10:46 2010 -0400
@@ -18,199 +18,199 @@
*/
class Text_Diff_Engine_string {
- /**
- * Parses a unified or context diff.
- *
- * First param contains the whole diff and the second can be used to force
- * a specific diff type. If the second parameter is 'autodetect', the
- * diff will be examined to find out which type of diff this is.
- *
- * @param string $diff The diff content.
- * @param string $mode The diff mode of the content in $diff. One of
- * 'context', 'unified', or 'autodetect'.
- *
- * @return array List of all diff operations.
- */
- function diff($diff, $mode = 'autodetect')
- {
- if ($mode != 'autodetect' && $mode != 'context' && $mode != 'unified') {
- die_friendly('Text_Diff', 'Type of diff is unsupported
');
- }
+ /**
+ * Parses a unified or context diff.
+ *
+ * First param contains the whole diff and the second can be used to force
+ * a specific diff type. If the second parameter is 'autodetect', the
+ * diff will be examined to find out which type of diff this is.
+ *
+ * @param string $diff The diff content.
+ * @param string $mode The diff mode of the content in $diff. One of
+ * 'context', 'unified', or 'autodetect'.
+ *
+ * @return array List of all diff operations.
+ */
+ function diff($diff, $mode = 'autodetect')
+ {
+ if ($mode != 'autodetect' && $mode != 'context' && $mode != 'unified') {
+ die_friendly('Text_Diff', 'Type of diff is unsupported
');
+ }
- if ($mode == 'autodetect') {
- $context = strpos($diff, '***');
- $unified = strpos($diff, '---');
- if ($context === $unified) {
- die_friendly('Text_Diff', 'Type of diff could not be detected
');
- } elseif ($context === false || $context === false) {
- $mode = $context !== false ? 'context' : 'unified';
- } else {
- $mode = $context < $unified ? 'context' : 'unified';
- }
- }
+ if ($mode == 'autodetect') {
+ $context = strpos($diff, '***');
+ $unified = strpos($diff, '---');
+ if ($context === $unified) {
+ die_friendly('Text_Diff', 'Type of diff could not be detected
');
+ } elseif ($context === false || $context === false) {
+ $mode = $context !== false ? 'context' : 'unified';
+ } else {
+ $mode = $context < $unified ? 'context' : 'unified';
+ }
+ }
- // split by new line and remove the diff header
- $diff = explode("\n", $diff);
- array_shift($diff);
- array_shift($diff);
+ // split by new line and remove the diff header
+ $diff = explode("\n", $diff);
+ array_shift($diff);
+ array_shift($diff);
- if ($mode == 'context') {
- return $this->parseContextDiff($diff);
- } else {
- return $this->parseUnifiedDiff($diff);
- }
- }
+ if ($mode == 'context') {
+ return $this->parseContextDiff($diff);
+ } else {
+ return $this->parseUnifiedDiff($diff);
+ }
+ }
- /**
- * Parses an array containing the unified diff.
- *
- * @param array $diff Array of lines.
- *
- * @return array List of all diff operations.
- */
- function parseUnifiedDiff($diff)
- {
- $edits = array();
- $end = count($diff) - 1;
- for ($i = 0; $i < $end;) {
- $diff1 = array();
- switch (substr($diff[$i], 0, 1)) {
- case ' ':
- do {
- $diff1[] = substr($diff[$i], 1);
- } while (++$i < $end && substr($diff[$i], 0, 1) == ' ');
- $edits[] = &new Text_Diff_Op_copy($diff1);
- break;
- case '+':
- // get all new lines
- do {
- $diff1[] = substr($diff[$i], 1);
- } while (++$i < $end && substr($diff[$i], 0, 1) == '+');
- $edits[] = &new Text_Diff_Op_add($diff1);
- break;
- case '-':
- // get changed or removed lines
- $diff2 = array();
- do {
- $diff1[] = substr($diff[$i], 1);
- } while (++$i < $end && substr($diff[$i], 0, 1) == '-');
- while ($i < $end && substr($diff[$i], 0, 1) == '+') {
- $diff2[] = substr($diff[$i++], 1);
- }
- if (count($diff2) == 0) {
- $edits[] = &new Text_Diff_Op_delete($diff1);
- } else {
- $edits[] = &new Text_Diff_Op_change($diff1, $diff2);
- }
- break;
- default:
- $i++;
- break;
- }
- }
- return $edits;
- }
+ /**
+ * Parses an array containing the unified diff.
+ *
+ * @param array $diff Array of lines.
+ *
+ * @return array List of all diff operations.
+ */
+ function parseUnifiedDiff($diff)
+ {
+ $edits = array();
+ $end = count($diff) - 1;
+ for ($i = 0; $i < $end;) {
+ $diff1 = array();
+ switch (substr($diff[$i], 0, 1)) {
+ case ' ':
+ do {
+ $diff1[] = substr($diff[$i], 1);
+ } while (++$i < $end && substr($diff[$i], 0, 1) == ' ');
+ $edits[] = &new Text_Diff_Op_copy($diff1);
+ break;
+ case '+':
+ // get all new lines
+ do {
+ $diff1[] = substr($diff[$i], 1);
+ } while (++$i < $end && substr($diff[$i], 0, 1) == '+');
+ $edits[] = &new Text_Diff_Op_add($diff1);
+ break;
+ case '-':
+ // get changed or removed lines
+ $diff2 = array();
+ do {
+ $diff1[] = substr($diff[$i], 1);
+ } while (++$i < $end && substr($diff[$i], 0, 1) == '-');
+ while ($i < $end && substr($diff[$i], 0, 1) == '+') {
+ $diff2[] = substr($diff[$i++], 1);
+ }
+ if (count($diff2) == 0) {
+ $edits[] = &new Text_Diff_Op_delete($diff1);
+ } else {
+ $edits[] = &new Text_Diff_Op_change($diff1, $diff2);
+ }
+ break;
+ default:
+ $i++;
+ break;
+ }
+ }
+ return $edits;
+ }
- /**
- * Parses an array containing the context diff.
- *
- * @param array $diff Array of lines.
- *
- * @return array List of all diff operations.
- */
- function parseContextDiff(&$diff)
- {
- $edits = array();
- $i = $max_i = $j = $max_j = 0;
- $end = count($diff) - 1;
- while ($i < $end && $j < $end) {
- while ($i >= $max_i && $j >= $max_j) {
- // find the boundaries of the diff output of the two files
- for ($i = $j;
- $i < $end && substr($diff[$i], 0, 3) == '***';
- $i++);
- for ($max_i = $i;
- $max_i < $end && substr($diff[$max_i], 0, 3) != '---';
- $max_i++);
- for ($j = $max_i;
- $j < $end && substr($diff[$j], 0, 3) == '---';
- $j++);
- for ($max_j = $j;
- $max_j < $end && substr($diff[$max_j], 0, 3) != '***';
- $max_j++);
- }
+ /**
+ * Parses an array containing the context diff.
+ *
+ * @param array $diff Array of lines.
+ *
+ * @return array List of all diff operations.
+ */
+ function parseContextDiff(&$diff)
+ {
+ $edits = array();
+ $i = $max_i = $j = $max_j = 0;
+ $end = count($diff) - 1;
+ while ($i < $end && $j < $end) {
+ while ($i >= $max_i && $j >= $max_j) {
+ // find the boundaries of the diff output of the two files
+ for ($i = $j;
+ $i < $end && substr($diff[$i], 0, 3) == '***';
+ $i++);
+ for ($max_i = $i;
+ $max_i < $end && substr($diff[$max_i], 0, 3) != '---';
+ $max_i++);
+ for ($j = $max_i;
+ $j < $end && substr($diff[$j], 0, 3) == '---';
+ $j++);
+ for ($max_j = $j;
+ $max_j < $end && substr($diff[$max_j], 0, 3) != '***';
+ $max_j++);
+ }
- // find what hasn't been changed
- $array = array();
- while ($i < $max_i &&
- $j < $max_j &&
- strcmp($diff[$i], $diff[$j]) == 0) {
- $array[] = substr($diff[$i], 2);
- $i++;
- $j++;
- }
- while ($i < $max_i && ($max_j-$j) <= 1) {
- if ($diff[$i] != '' && substr($diff[$i], 0, 1) != ' ') {
- break;
- }
- $array[] = substr($diff[$i++], 2);
- }
- while ($j < $max_j && ($max_i-$i) <= 1) {
- if ($diff[$j] != '' && substr($diff[$j], 0, 1) != ' ') {
- break;
- }
- $array[] = substr($diff[$j++], 2);
- }
- if (count($array) > 0) {
- $edits[] = &new Text_Diff_Op_copy($array);
- }
+ // find what hasn't been changed
+ $array = array();
+ while ($i < $max_i &&
+ $j < $max_j &&
+ strcmp($diff[$i], $diff[$j]) == 0) {
+ $array[] = substr($diff[$i], 2);
+ $i++;
+ $j++;
+ }
+ while ($i < $max_i && ($max_j-$j) <= 1) {
+ if ($diff[$i] != '' && substr($diff[$i], 0, 1) != ' ') {
+ break;
+ }
+ $array[] = substr($diff[$i++], 2);
+ }
+ while ($j < $max_j && ($max_i-$i) <= 1) {
+ if ($diff[$j] != '' && substr($diff[$j], 0, 1) != ' ') {
+ break;
+ }
+ $array[] = substr($diff[$j++], 2);
+ }
+ if (count($array) > 0) {
+ $edits[] = &new Text_Diff_Op_copy($array);
+ }
- if ($i < $max_i) {
- $diff1 = array();
- switch (substr($diff[$i], 0, 1)) {
- case '!':
- $diff2 = array();
- do {
- $diff1[] = substr($diff[$i], 2);
- if ($j < $max_j && substr($diff[$j], 0, 1) == '!') {
- $diff2[] = substr($diff[$j++], 2);
- }
- } while (++$i < $max_i && substr($diff[$i], 0, 1) == '!');
- $edits[] = &new Text_Diff_Op_change($diff1, $diff2);
- break;
- case '+':
- do {
- $diff1[] = substr($diff[$i], 2);
- } while (++$i < $max_i && substr($diff[$i], 0, 1) == '+');
- $edits[] = &new Text_Diff_Op_add($diff1);
- break;
- case '-':
- do {
- $diff1[] = substr($diff[$i], 2);
- } while (++$i < $max_i && substr($diff[$i], 0, 1) == '-');
- $edits[] = &new Text_Diff_Op_delete($diff1);
- break;
- }
- }
+ if ($i < $max_i) {
+ $diff1 = array();
+ switch (substr($diff[$i], 0, 1)) {
+ case '!':
+ $diff2 = array();
+ do {
+ $diff1[] = substr($diff[$i], 2);
+ if ($j < $max_j && substr($diff[$j], 0, 1) == '!') {
+ $diff2[] = substr($diff[$j++], 2);
+ }
+ } while (++$i < $max_i && substr($diff[$i], 0, 1) == '!');
+ $edits[] = &new Text_Diff_Op_change($diff1, $diff2);
+ break;
+ case '+':
+ do {
+ $diff1[] = substr($diff[$i], 2);
+ } while (++$i < $max_i && substr($diff[$i], 0, 1) == '+');
+ $edits[] = &new Text_Diff_Op_add($diff1);
+ break;
+ case '-':
+ do {
+ $diff1[] = substr($diff[$i], 2);
+ } while (++$i < $max_i && substr($diff[$i], 0, 1) == '-');
+ $edits[] = &new Text_Diff_Op_delete($diff1);
+ break;
+ }
+ }
- if ($j < $max_j) {
- $diff2 = array();
- switch (substr($diff[$j], 0, 1)) {
- case '+':
- do {
- $diff2[] = substr($diff[$j++], 2);
- } while ($j < $max_j && substr($diff[$j], 0, 1) == '+');
- $edits[] = &new Text_Diff_Op_add($diff2);
- break;
- case '-':
- do {
- $diff2[] = substr($diff[$j++], 2);
- } while ($j < $max_j && substr($diff[$j], 0, 1) == '-');
- $edits[] = &new Text_Diff_Op_delete($diff2);
- break;
- }
- }
- }
- return $edits;
- }
+ if ($j < $max_j) {
+ $diff2 = array();
+ switch (substr($diff[$j], 0, 1)) {
+ case '+':
+ do {
+ $diff2[] = substr($diff[$j++], 2);
+ } while ($j < $max_j && substr($diff[$j], 0, 1) == '+');
+ $edits[] = &new Text_Diff_Op_add($diff2);
+ break;
+ case '-':
+ do {
+ $diff2[] = substr($diff[$j++], 2);
+ } while ($j < $max_j && substr($diff[$j], 0, 1) == '-');
+ $edits[] = &new Text_Diff_Op_delete($diff2);
+ break;
+ }
+ }
+ }
+ return $edits;
+ }
}
diff -r de56132c008d -r bdac73ed481e includes/diffengine/Engine/xdiff.php
--- a/includes/diffengine/Engine/xdiff.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/diffengine/Engine/xdiff.php Sun Mar 28 23:10:46 2010 -0400
@@ -11,45 +11,45 @@
*/
class Text_Diff_Engine_xdiff {
- function diff($from_lines, $to_lines)
- {
- array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
- array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
+ function diff($from_lines, $to_lines)
+ {
+ array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
+ array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
- /* Convert the two input arrays into strings for xdiff processing. */
- $from_string = implode("\n", $from_lines);
- $to_string = implode("\n", $to_lines);
+ /* Convert the two input arrays into strings for xdiff processing. */
+ $from_string = implode("\n", $from_lines);
+ $to_string = implode("\n", $to_lines);
- /* Diff the two strings and convert the result to an array. */
- $diff = xdiff_string_diff($from_string, $to_string, count($to_lines));
- $diff = explode("\n", $diff);
+ /* Diff the two strings and convert the result to an array. */
+ $diff = xdiff_string_diff($from_string, $to_string, count($to_lines));
+ $diff = explode("\n", $diff);
- /* Walk through the diff one line at a time. We build the $edits
- * array of diff operations by reading the first character of the
- * xdiff output (which is in the "unified diff" format).
- *
- * Note that we don't have enough information to detect "changed"
- * lines using this approach, so we can't add Text_Diff_Op_changed
- * instances to the $edits array. The result is still perfectly
- * valid, albeit a little less descriptive and efficient. */
- $edits = array();
- foreach ($diff as $line) {
- switch ($line[0]) {
- case ' ':
- $edits[] = &new Text_Diff_Op_copy(array(substr($line, 1)));
- break;
+ /* Walk through the diff one line at a time. We build the $edits
+ * array of diff operations by reading the first character of the
+ * xdiff output (which is in the "unified diff" format).
+ *
+ * Note that we don't have enough information to detect "changed"
+ * lines using this approach, so we can't add Text_Diff_Op_changed
+ * instances to the $edits array. The result is still perfectly
+ * valid, albeit a little less descriptive and efficient. */
+ $edits = array();
+ foreach ($diff as $line) {
+ switch ($line[0]) {
+ case ' ':
+ $edits[] = &new Text_Diff_Op_copy(array(substr($line, 1)));
+ break;
- case '+':
- $edits[] = &new Text_Diff_Op_add(array(substr($line, 1)));
- break;
+ case '+':
+ $edits[] = &new Text_Diff_Op_add(array(substr($line, 1)));
+ break;
- case '-':
- $edits[] = &new Text_Diff_Op_delete(array(substr($line, 1)));
- break;
- }
- }
+ case '-':
+ $edits[] = &new Text_Diff_Op_delete(array(substr($line, 1)));
+ break;
+ }
+ }
- return $edits;
- }
+ return $edits;
+ }
}
diff -r de56132c008d -r bdac73ed481e includes/diffengine/Renderer.php
--- a/includes/diffengine/Renderer.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/diffengine/Renderer.php Sun Mar 28 23:10:46 2010 -0400
@@ -11,201 +11,201 @@
*/
class Text_Diff_Renderer {
- /**
- * Number of leading context "lines" to preserve.
- *
- * This should be left at zero for this class, but subclasses may want to
- * set this to other values.
- */
- var $_leading_context_lines = 0;
+ /**
+ * Number of leading context "lines" to preserve.
+ *
+ * This should be left at zero for this class, but subclasses may want to
+ * set this to other values.
+ */
+ var $_leading_context_lines = 0;
- /**
- * Number of trailing context "lines" to preserve.
- *
- * This should be left at zero for this class, but subclasses may want to
- * set this to other values.
- */
- var $_trailing_context_lines = 0;
+ /**
+ * Number of trailing context "lines" to preserve.
+ *
+ * This should be left at zero for this class, but subclasses may want to
+ * set this to other values.
+ */
+ var $_trailing_context_lines = 0;
- /**
- * Constructor.
- */
- function Text_Diff_Renderer($params = array())
- {
- foreach ($params as $param => $value) {
- $v = '_' . $param;
- if (isset($this->$v)) {
- $this->$v = $value;
- }
- }
- }
+ /**
+ * Constructor.
+ */
+ function Text_Diff_Renderer($params = array())
+ {
+ foreach ($params as $param => $value) {
+ $v = '_' . $param;
+ if (isset($this->$v)) {
+ $this->$v = $value;
+ }
+ }
+ }
- /**
- * Get any renderer parameters.
- *
- * @return array All parameters of this renderer object.
- */
- function getParams()
- {
- $params = array();
- foreach (get_object_vars($this) as $k => $v) {
- if ($k[0] == '_') {
- $params[substr($k, 1)] = $v;
- }
- }
+ /**
+ * Get any renderer parameters.
+ *
+ * @return array All parameters of this renderer object.
+ */
+ function getParams()
+ {
+ $params = array();
+ foreach (get_object_vars($this) as $k => $v) {
+ if ($k[0] == '_') {
+ $params[substr($k, 1)] = $v;
+ }
+ }
- return $params;
- }
+ return $params;
+ }
- /**
- * Renders a diff.
- *
- * @param Text_Diff $diff A Text_Diff object.
- *
- * @return string The formatted output.
- */
- function render($diff)
- {
- $xi = $yi = 1;
- $block = false;
- $context = array();
+ /**
+ * Renders a diff.
+ *
+ * @param Text_Diff $diff A Text_Diff object.
+ *
+ * @return string The formatted output.
+ */
+ function render($diff)
+ {
+ $xi = $yi = 1;
+ $block = false;
+ $context = array();
- $nlead = $this->_leading_context_lines;
- $ntrail = $this->_trailing_context_lines;
+ $nlead = $this->_leading_context_lines;
+ $ntrail = $this->_trailing_context_lines;
- $output = $this->_startDiff();
+ $output = $this->_startDiff();
- $diffs = $diff->getDiff();
- foreach ($diffs as $i => $edit) {
- if (is_a($edit, 'Text_Diff_Op_copy')) {
- if (is_array($block)) {
- $keep = $i == count($diffs) - 1 ? $ntrail : $nlead + $ntrail;
- if (count($edit->orig) <= $keep) {
- $block[] = $edit;
- } else {
- if ($ntrail) {
- $context = array_slice($edit->orig, 0, $ntrail);
- $block[] = &new Text_Diff_Op_copy($context);
- }
- $output .= $this->_block($x0, $ntrail + $xi - $x0,
- $y0, $ntrail + $yi - $y0,
- $block);
- $block = false;
- }
- }
- $context = $edit->orig;
- } else {
- if (!is_array($block)) {
- $context = array_slice($context, count($context) - $nlead);
- $x0 = $xi - count($context);
- $y0 = $yi - count($context);
- $block = array();
- if ($context) {
- $block[] = &new Text_Diff_Op_copy($context);
- }
- }
- $block[] = $edit;
- }
+ $diffs = $diff->getDiff();
+ foreach ($diffs as $i => $edit) {
+ if (is_a($edit, 'Text_Diff_Op_copy')) {
+ if (is_array($block)) {
+ $keep = $i == count($diffs) - 1 ? $ntrail : $nlead + $ntrail;
+ if (count($edit->orig) <= $keep) {
+ $block[] = $edit;
+ } else {
+ if ($ntrail) {
+ $context = array_slice($edit->orig, 0, $ntrail);
+ $block[] = &new Text_Diff_Op_copy($context);
+ }
+ $output .= $this->_block($x0, $ntrail + $xi - $x0,
+ $y0, $ntrail + $yi - $y0,
+ $block);
+ $block = false;
+ }
+ }
+ $context = $edit->orig;
+ } else {
+ if (!is_array($block)) {
+ $context = array_slice($context, count($context) - $nlead);
+ $x0 = $xi - count($context);
+ $y0 = $yi - count($context);
+ $block = array();
+ if ($context) {
+ $block[] = &new Text_Diff_Op_copy($context);
+ }
+ }
+ $block[] = $edit;
+ }
- if ($edit->orig) {
- $xi += count($edit->orig);
- }
- if ($edit->final) {
- $yi += count($edit->final);
- }
- }
+ if ($edit->orig) {
+ $xi += count($edit->orig);
+ }
+ if ($edit->final) {
+ $yi += count($edit->final);
+ }
+ }
- if (is_array($block)) {
- $output .= $this->_block($x0, $xi - $x0,
- $y0, $yi - $y0,
- $block);
- }
+ if (is_array($block)) {
+ $output .= $this->_block($x0, $xi - $x0,
+ $y0, $yi - $y0,
+ $block);
+ }
- return $output . $this->_endDiff();
- }
+ return $output . $this->_endDiff();
+ }
- function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
- {
- $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
+ function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
+ {
+ $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
- foreach ($edits as $edit) {
- switch (strtolower(get_class($edit))) {
- case 'text_diff_op_copy':
- $output .= $this->_context($edit->orig);
- break;
+ foreach ($edits as $edit) {
+ switch (strtolower(get_class($edit))) {
+ case 'text_diff_op_copy':
+ $output .= $this->_context($edit->orig);
+ break;
- case 'text_diff_op_add':
- $output .= $this->_added($edit->final);
- break;
+ case 'text_diff_op_add':
+ $output .= $this->_added($edit->final);
+ break;
- case 'text_diff_op_delete':
- $output .= $this->_deleted($edit->orig);
- break;
+ case 'text_diff_op_delete':
+ $output .= $this->_deleted($edit->orig);
+ break;
- case 'text_diff_op_change':
- $output .= $this->_changed($edit->orig, $edit->final);
- break;
- }
- }
+ case 'text_diff_op_change':
+ $output .= $this->_changed($edit->orig, $edit->final);
+ break;
+ }
+ }
- return $output . $this->_endBlock();
- }
+ return $output . $this->_endBlock();
+ }
- function _startDiff()
- {
- return '';
- }
+ function _startDiff()
+ {
+ return '';
+ }
- function _endDiff()
- {
- return '';
- }
+ function _endDiff()
+ {
+ return '';
+ }
- function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
- {
- if ($xlen > 1) {
- $xbeg .= ',' . ($xbeg + $xlen - 1);
- }
- if ($ylen > 1) {
- $ybeg .= ',' . ($ybeg + $ylen - 1);
- }
+ function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
+ {
+ if ($xlen > 1) {
+ $xbeg .= ',' . ($xbeg + $xlen - 1);
+ }
+ if ($ylen > 1) {
+ $ybeg .= ',' . ($ybeg + $ylen - 1);
+ }
- return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
- }
+ return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
+ }
- function _startBlock($header)
- {
- return $header . "\n";
- }
+ function _startBlock($header)
+ {
+ return $header . "\n";
+ }
- function _endBlock()
- {
- return '';
- }
+ function _endBlock()
+ {
+ return '';
+ }
- function _lines($lines, $prefix = ' ')
- {
- return $prefix . implode("\n$prefix", $lines) . "\n";
- }
+ function _lines($lines, $prefix = ' ')
+ {
+ return $prefix . implode("\n$prefix", $lines) . "\n";
+ }
- function _context($lines)
- {
- return $this->_lines($lines);
- }
+ function _context($lines)
+ {
+ return $this->_lines($lines);
+ }
- function _added($lines)
- {
- return $this->_lines($lines, '>');
- }
+ function _added($lines)
+ {
+ return $this->_lines($lines, '>');
+ }
- function _deleted($lines)
- {
- return $this->_lines($lines, '<');
- }
+ function _deleted($lines)
+ {
+ return $this->_lines($lines, '<');
+ }
- function _changed($orig, $final)
- {
- return $this->_deleted($orig) . "---\n" . $this->_added($final);
- }
+ function _changed($orig, $final)
+ {
+ return $this->_deleted($orig) . "---\n" . $this->_added($final);
+ }
}
diff -r de56132c008d -r bdac73ed481e includes/diffengine/Renderer/inline.php
--- a/includes/diffengine/Renderer/inline.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/diffengine/Renderer/inline.php Sun Mar 28 23:10:46 2010 -0400
@@ -12,147 +12,147 @@
*/
class Text_Diff_Renderer_inline extends Text_Diff_Renderer {
- /**
- * Number of leading context "lines" to preserve.
- */
- var $_leading_context_lines = 10000;
+ /**
+ * Number of leading context "lines" to preserve.
+ */
+ var $_leading_context_lines = 10000;
- /**
- * Number of trailing context "lines" to preserve.
- */
- var $_trailing_context_lines = 10000;
+ /**
+ * Number of trailing context "lines" to preserve.
+ */
+ var $_trailing_context_lines = 10000;
- /**
- * Prefix for inserted text.
- */
- var $_ins_prefix = '';
+ /**
+ * Prefix for inserted text.
+ */
+ var $_ins_prefix = '';
- /**
- * Suffix for inserted text.
- */
- var $_ins_suffix = '';
+ /**
+ * Suffix for inserted text.
+ */
+ var $_ins_suffix = '';
- /**
- * Prefix for deleted text.
- */
- var $_del_prefix = '';
+ /**
+ * Prefix for deleted text.
+ */
+ var $_del_prefix = '';
- /**
- * Suffix for deleted text.
- */
- var $_del_suffix = '';
+ /**
+ * Suffix for deleted text.
+ */
+ var $_del_suffix = '';
- /**
- * Header for each change block.
- */
- var $_block_header = '';
+ /**
+ * Header for each change block.
+ */
+ var $_block_header = '';
- /**
- * What are we currently splitting on? Used to recurse to show word-level
- * changes.
- */
- var $_split_level = 'words';
+ /**
+ * What are we currently splitting on? Used to recurse to show word-level
+ * changes.
+ */
+ var $_split_level = 'words';
- function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
- {
- return $this->_block_header;
- }
+ function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
+ {
+ return $this->_block_header;
+ }
- function _startBlock($header)
- {
- return $header;
- }
+ function _startBlock($header)
+ {
+ return $header;
+ }
- function _lines($lines, $prefix = ' ', $encode = true)
- {
- if ($encode) {
- array_walk($lines, array(&$this, '_encode'));
- }
+ function _lines($lines, $prefix = ' ', $encode = true)
+ {
+ if ($encode) {
+ array_walk($lines, array(&$this, '_encode'));
+ }
- if ($this->_split_level == 'words') {
- return implode('', $lines);
- } else {
- return implode("\n", $lines) . "\n";
- }
- }
+ if ($this->_split_level == 'words') {
+ return implode('', $lines);
+ } else {
+ return implode("\n", $lines) . "\n";
+ }
+ }
- function _added($lines)
- {
- array_walk($lines, array(&$this, '_encode'));
- $lines[0] = $this->_ins_prefix . $lines[0];
- $lines[count($lines) - 1] .= $this->_ins_suffix;
- return $this->_lines($lines, ' ', false);
- }
+ function _added($lines)
+ {
+ array_walk($lines, array(&$this, '_encode'));
+ $lines[0] = $this->_ins_prefix . $lines[0];
+ $lines[count($lines) - 1] .= $this->_ins_suffix;
+ return $this->_lines($lines, ' ', false);
+ }
- function _deleted($lines, $words = false)
- {
- array_walk($lines, array(&$this, '_encode'));
- $lines[0] = $this->_del_prefix . $lines[0];
- $lines[count($lines) - 1] .= $this->_del_suffix;
- return $this->_lines($lines, ' ', false);
- }
-
- function _context($lines)
- {
- return "\n".$this->_lines($lines).' ".$this->_lines($lines).' + ";
+ /**
+ * Prefix for inserted text.
+ */
+ var $_ins_prefix = "\n + ";
- /**
- * Suffix for inserted text.
- */
- var $_ins_suffix = " - ";
+ /**
+ * Prefix for deleted text.
+ */
+ var $_del_prefix = "\n - ";
- /**
- * Suffix for deleted text.
- */
- var $_del_suffix = " Line $xbeg: {$this->_block_header} Line $xbeg: {$this->_block_header}
", $lines) . "\n";
- }
- }
+ if ($this->_split_level == 'words') {
+ return implode('', $lines);
+ } else {
+ return implode("
", $lines) . "\n";
+ }
+ }
- function _added($lines)
- {
- array_walk($lines, array(&$this, '_encode'));
- $lines[0] = $this->_ins_prefix . $lines[0];
- $lines[count($lines) - 1] .= $this->_ins_suffix;
- return $this->_lines($lines, ' ', false);
- }
+ function _added($lines)
+ {
+ array_walk($lines, array(&$this, '_encode'));
+ $lines[0] = $this->_ins_prefix . $lines[0];
+ $lines[count($lines) - 1] .= $this->_ins_suffix;
+ return $this->_lines($lines, ' ', false);
+ }
- function _deleted($lines, $words = false)
- {
- array_walk($lines, array(&$this, '_encode'));
- $lines[0] = $this->_del_prefix . $lines[0];
- $lines[count($lines) - 1] .= $this->_del_suffix;
- return $this->_lines($lines, ' ', false);
- }
-
- function _context($lines)
- {
- return "\n".$this->_lines($lines).' ".$this->_lines($lines).' '.htmlspecialchars($ret).'
';
- return $ret;
- }
+ function _changed($orig, $final)
+ {
+ /* If we've already split on words, don't try to do so again - just display. */
+ if ($this->_split_level == 'words') {
+ $prefix = '';
+ while ($orig[0] !== false && $final[0] !== false &&
+ substr($orig[0], 0, 1) == ' ' &&
+ substr($final[0], 0, 1) == ' ') {
+ $prefix .= substr($orig[0], 0, 1);
+ $orig[0] = substr($orig[0], 1);
+ $final[0] = substr($final[0], 1);
+ }
+ $ret = $prefix . $this->_deleted($orig) . $this->_added($final) . "\n";
+ //echo 'DEBUG:'.htmlspecialchars($ret).'
';
+ return $ret;
+ }
- $text1 = implode("\n", $orig);
- $text2 = implode("\n", $final);
+ $text1 = implode("\n", $orig);
+ $text2 = implode("\n", $final);
- /* Non-printing newline marker. */
- $nl = "\0";
+ /* Non-printing newline marker. */
+ $nl = "\0";
- /* We want to split on word boundaries, but we need to
- * preserve whitespace as well. Therefore we split on words,
- * but include all blocks of whitespace in the wordlist. */
- $diff = &new Text_Diff($this->_splitOnWords($text1, $nl),
- $this->_splitOnWords($text2, $nl));
+ /* We want to split on word boundaries, but we need to
+ * preserve whitespace as well. Therefore we split on words,
+ * but include all blocks of whitespace in the wordlist. */
+ $diff = &new Text_Diff($this->_splitOnWords($text1, $nl),
+ $this->_splitOnWords($text2, $nl));
- /* Get the diff in inline format. */
- $renderer = &new Text_Diff_Renderer_inline(array_merge($this->getParams(),
- array('split_level' => 'words')));
+ /* Get the diff in inline format. */
+ $renderer = &new Text_Diff_Renderer_inline(array_merge($this->getParams(),
+ array('split_level' => 'words')));
- /* Run the diff and get the output. */
- $ret = str_replace($nl, "
", $renderer->render($diff));
- //echo 'DEBUG:'.htmlspecialchars($ret).'
';
- return $ret . "\n";
- }
+ /* Run the diff and get the output. */
+ $ret = str_replace($nl, "
", $renderer->render($diff));
+ //echo 'DEBUG:'.htmlspecialchars($ret).'
';
+ return $ret . "\n";
+ }
- function _splitOnWords($string, $newlineEscape = "
")
- {
- $words = array();
- $length = strlen($string);
- $pos = 0;
+ function _splitOnWords($string, $newlineEscape = "
")
+ {
+ $words = array();
+ $length = strlen($string);
+ $pos = 0;
- while ($pos < $length) {
- // Eat a word with any preceding whitespace.
- $spaces = strspn(substr($string, $pos), " \n");
- $nextpos = strcspn(substr($string, $pos + $spaces), " \n");
- $words[] = str_replace("\n", $newlineEscape, substr($string, $pos, $spaces + $nextpos));
- $pos += $spaces + $nextpos;
- }
+ while ($pos < $length) {
+ // Eat a word with any preceding whitespace.
+ $spaces = strspn(substr($string, $pos), " \n");
+ $nextpos = strcspn(substr($string, $pos + $spaces), " \n");
+ $words[] = str_replace("\n", $newlineEscape, substr($string, $pos, $spaces + $nextpos));
+ $pos += $spaces + $nextpos;
+ }
- return $words;
- }
+ return $words;
+ }
- function _encode(&$string)
- {
- $string = htmlspecialchars($string);
- }
-
- /**
- * Renders a diff.
- *
- * @param Text_Diff $diff A Text_Diff object.
- *
- * @return string The formatted output.
- */
-
- function render($diff)
- {
- $xi = $yi = 1;
- $block = false;
- $context = array();
+ function _encode(&$string)
+ {
+ $string = htmlspecialchars($string);
+ }
+
+ /**
+ * Renders a diff.
+ *
+ * @param Text_Diff $diff A Text_Diff object.
+ *
+ * @return string The formatted output.
+ */
+
+ function render($diff)
+ {
+ $xi = $yi = 1;
+ $block = false;
+ $context = array();
- $nlead = $this->_leading_context_lines;
- $ntrail = $this->_trailing_context_lines;
+ $nlead = $this->_leading_context_lines;
+ $ntrail = $this->_trailing_context_lines;
- $output = $this->_startDiff();
+ $output = $this->_startDiff();
- $diffs = $diff->getDiff();
- foreach ($diffs as $i => $edit) {
- if (is_a($edit, 'Text_Diff_Op_copy')) {
- if (is_array($block)) {
- $keep = $i == count($diffs) - 1 ? $ntrail : $nlead + $ntrail;
- if (count($edit->orig) <= $keep) {
- $block[] = $edit;
- } else {
- if ($ntrail) {
- $context = array_slice($edit->orig, 0, $ntrail);
- $block[] = &new Text_Diff_Op_copy($context);
- }
- $bk = $this->_block($x0, $ntrail + $xi - $x0,
- $y0, $ntrail + $yi - $y0,
- $block);
- $output .= $bk;
- $block = false;
- }
- }
- $context = $edit->orig;
- } else {
- if (!is_array($block)) {
- $context = array_slice($context, count($context) - $nlead);
- $x0 = $xi - count($context);
- $y0 = $yi - count($context);
- $block = array();
- if ($context) {
- $block[] = &new Text_Diff_Op_copy($context);
- }
- }
- $block[] = $edit;
- }
+ $diffs = $diff->getDiff();
+ foreach ($diffs as $i => $edit) {
+ if (is_a($edit, 'Text_Diff_Op_copy')) {
+ if (is_array($block)) {
+ $keep = $i == count($diffs) - 1 ? $ntrail : $nlead + $ntrail;
+ if (count($edit->orig) <= $keep) {
+ $block[] = $edit;
+ } else {
+ if ($ntrail) {
+ $context = array_slice($edit->orig, 0, $ntrail);
+ $block[] = &new Text_Diff_Op_copy($context);
+ }
+ $bk = $this->_block($x0, $ntrail + $xi - $x0,
+ $y0, $ntrail + $yi - $y0,
+ $block);
+ $output .= $bk;
+ $block = false;
+ }
+ }
+ $context = $edit->orig;
+ } else {
+ if (!is_array($block)) {
+ $context = array_slice($context, count($context) - $nlead);
+ $x0 = $xi - count($context);
+ $y0 = $yi - count($context);
+ $block = array();
+ if ($context) {
+ $block[] = &new Text_Diff_Op_copy($context);
+ }
+ }
+ $block[] = $edit;
+ }
- if ($edit->orig) {
- $xi += count($edit->orig);
- }
- if ($edit->final) {
- $yi += count($edit->final);
- }
- }
+ if ($edit->orig) {
+ $xi += count($edit->orig);
+ }
+ if ($edit->final) {
+ $yi += count($edit->final);
+ }
+ }
- if (is_array($block)) {
- $bk = $this->_block($x0, $xi - $x0,
- $y0, $yi - $y0,
- $block);
- $output .= $bk;
- }
+ if (is_array($block)) {
+ $bk = $this->_block($x0, $xi - $x0,
+ $y0, $yi - $y0,
+ $block);
+ $output .= $bk;
+ }
- $final = $output . $this->_endDiff();
- if ($final == '') $final = 'No differences. '.$final.''."\n\n";
- }
-
- function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
- {
- $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
+ $final = $output . $this->_endDiff();
+ if ($final == '') $final = ' No differences. '.$final.''."\n\n";
+ }
+
+ function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
+ {
+ $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
- foreach ($edits as $edit) {
- switch (strtolower(get_class($edit))) {
- case 'text_diff_op_copy':
- $output .= $this->_context($edit->orig);
- break;
+ foreach ($edits as $edit) {
+ switch (strtolower(get_class($edit))) {
+ case 'text_diff_op_copy':
+ $output .= $this->_context($edit->orig);
+ break;
- case 'text_diff_op_add':
- $output .= $this->_added($edit->final);
- break;
+ case 'text_diff_op_add':
+ $output .= $this->_added($edit->final);
+ break;
- case 'text_diff_op_delete':
- $output .= $this->_deleted($edit->orig);
- break;
+ case 'text_diff_op_delete':
+ $output .= $this->_deleted($edit->orig);
+ break;
- case 'text_diff_op_change':
- $output .= $this->_changed($edit->orig, $edit->final);
- break;
- }
- }
+ case 'text_diff_op_change':
+ $output .= $this->_changed($edit->orig, $edit->final);
+ break;
+ }
+ }
- return $output . $this->_endBlock();
- }
+ return $output . $this->_endBlock();
+ }
}
diff -r de56132c008d -r bdac73ed481e includes/diffiehellman.php
--- a/includes/diffiehellman.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/diffiehellman.php Sun Mar 28 23:10:46 2010 -0400
@@ -20,11 +20,11 @@
$dh_supported = true;
try
{
- $GLOBALS['_math'] = enanomath_create();
+ $GLOBALS['_math'] = enanomath_create();
}
catch ( Exception $e )
{
- $dh_supported = false;
+ $dh_supported = false;
}
// Our prime number as a base for operations.
$GLOBALS['dh_prime'] = '7916586051748534588306961133067968196965257961415756656521818848750723547477673457670019632882524164647651492025728980571833579341743988603191694784406703';
@@ -40,8 +40,8 @@
function dh_gen_private()
{
- global $_math;
- return $_math->random(256);
+ global $_math;
+ return $_math->random(256);
}
/**
@@ -52,8 +52,8 @@
function dh_gen_public($b)
{
- global $_math, $dh_g, $dh_prime;
- return $_math->powmod($dh_g, $b, $dh_prime);
+ global $_math, $dh_g, $dh_prime;
+ return $_math->powmod($dh_g, $b, $dh_prime);
}
/**
@@ -65,8 +65,8 @@
function dh_gen_shared_secret($a, $B)
{
- global $_math, $dh_g, $dh_prime;
- return $_math->powmod($B, $a, $dh_prime);
+ global $_math, $dh_g, $dh_prime;
+ return $_math->powmod($B, $a, $dh_prime);
}
/*
@@ -80,13 +80,13 @@
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
+ list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
* Neither the name of the nor the names of its contributors may
- be used to endorse or promote products derived from this software without
- specific prior written permission.
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -101,165 +101,165 @@
*/
class SHA256
{
- var $chrsz = 8; /* bits per input character. 8 - ASCII; 16 - Unicode */
-
- function safe_add ($x, $y) {
- $lsw = ($x & 0xFFFF) + ($y & 0xFFFF);
- $msw = ($x >> 16) + ($y >> 16) + ($lsw >> 16);
- // 2009-07-02 Added & 0xFFFFFFFF here to fix problem on PHP w/ native 64-bit integer support (rev. 1030)
- return (($msw << 16) | ($lsw & 0xFFFF)) & 0xFFFFFFFF;
- }
- function rshz($X, $n)
- {
- // equivalent to $X >>> $n in javascript
- // pulled from http://www.tapouillo.com/firefox_extension/sourcecode.txt, public domain
- $z = hexdec(80000000);
- if ($z & $X)
- {
- $X = ($X>>1);
- $X &= (~$z);
- $X |= 0x40000000;
- $X = ($X>>($n-1));
- }
- else
- {
- $X = ($X>>$n);
- }
- return $X;
- }
- function S ($X, $n) {return ( $this->rshz($X, $n) ) | ($X << (32 - $n));}
- function R ($X, $n) {return ( $this->rshz($X, $n) );}
- function Ch($x, $y, $z) {return (($x & $y) ^ ((~$x) & $z));}
- function Maj($x, $y, $z) {return (($x & $y) ^ ($x & $z) ^ ($y & $z));}
- function Sigma0256($x) {return ($this->S($x, 2) ^ $this->S($x, 13) ^ $this->S($x, 22));}
- function Sigma1256($x) {return ($this->S($x, 6) ^ $this->S($x, 11) ^ $this->S($x, 25));}
- function Gamma0256($x) {return ($this->S($x, 7) ^ $this->S($x, 18) ^ $this->R($x, 3));}
- function Gamma1256($x) {return ($this->S($x, 17) ^ $this->S($x, 19) ^ $this->R($x, 10));}
- function core_sha256 ($m, $l) {
- $K = Array(0x428A2F98,0x71374491,0xB5C0FBCF,0xE9B5DBA5,0x3956C25B,0x59F111F1,0x923F82A4,0xAB1C5ED5,0xD807AA98,0x12835B01,0x243185BE,0x550C7DC3,0x72BE5D74,0x80DEB1FE,0x9BDC06A7,0xC19BF174,0xE49B69C1,0xEFBE4786,0xFC19DC6,0x240CA1CC,0x2DE92C6F,0x4A7484AA,0x5CB0A9DC,0x76F988DA,0x983E5152,0xA831C66D,0xB00327C8,0xBF597FC7,0xC6E00BF3,0xD5A79147,0x6CA6351,0x14292967,0x27B70A85,0x2E1B2138,0x4D2C6DFC,0x53380D13,0x650A7354,0x766A0ABB,0x81C2C92E,0x92722C85,0xA2BFE8A1,0xA81A664B,0xC24B8B70,0xC76C51A3,0xD192E819,0xD6990624,0xF40E3585,0x106AA070,0x19A4C116,0x1E376C08,0x2748774C,0x34B0BCB5,0x391C0CB3,0x4ED8AA4A,0x5B9CCA4F,0x682E6FF3,0x748F82EE,0x78A5636F,0x84C87814,0x8CC70208,0x90BEFFFA,0xA4506CEB,0xBEF9A3F7,0xC67178F2);
- $HASH = Array(0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A, 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19);
- $W = Array(64);
- /* append padding */
- if ( !isset($m[$l >> 5]) )
- $m[$l >> 5] = 0;
- $m[$l >> 5] |= 0x80 << (24 - $l % 32);
- $m[(($l + 64 >> 9) << 4) + 15] = $l;
- for ( $i = 0; $isafe_add(
- $this->safe_add(
- $this->safe_add(
- $this->Gamma1256($W[$j - 2]), $W[$j - 7]),
- $this->Gamma0256($W[$j - 15])),
- $W[$j - 16]);
- }
- $T1 = $this->safe_add(
- $this->safe_add(
- $this->safe_add(
- $this->safe_add($h, $this->Sigma1256($e)
- ),
- $this->Ch($e, $f, $g)),
- $K[$j]),
- $W[$j]);
- $T2 = $this->safe_add($this->Sigma0256($a), $this->Maj($a, $b, $c));
- $h = $g;
- $g = $f;
- $f = $e;
- $e = $this->safe_add($d, $T1);
- $d = $c;
- $c = $b;
- $b = $a;
- $a = $this->safe_add($T1, $T2);
- }
- $HASH[0] = $this->safe_add($a, $HASH[0]);
- $HASH[1] = $this->safe_add($b, $HASH[1]);
- $HASH[2] = $this->safe_add($c, $HASH[2]);
- $HASH[3] = $this->safe_add($d, $HASH[3]);
- $HASH[4] = $this->safe_add($e, $HASH[4]);
- $HASH[5] = $this->safe_add($f, $HASH[5]);
- $HASH[6] = $this->safe_add($g, $HASH[6]);
- $HASH[7] = $this->safe_add($h, $HASH[7]);
- }
- return $HASH;
- }
- function str2binb ($str) {
- $bin = Array();
- for ( $i = 0; $i < strlen($str); $i++ )
- {
- $byte = ord($str{$i});
- $block = floor($i / 4);
- $stage = $i % 4;
- if ( $stage == 0 )
- {
- $bin[$block] = $byte;
- }
- else
- {
- $bin[$block] <<= 8;
- $bin[$block] |= $byte;
- }
- }
- while ( $stage < 3 )
- {
- $stage++;
- $bin[$block] <<= 8;
- }
- return $bin;
- }
- function byte2hex($byte)
- {
- $b = dechex(ord($byte));
- return ( strlen($b) < 2 ) ? "0$b" : $b;
- }
- function binb2hex ($binarray) {
- $hexcase = 0; /* hex output format. 0 - lowercase; 1 - uppercase */
- $hex_tab = $hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
- $str = "";
- foreach ( $binarray as $bytes )
- {
- $str .= implode('', array(
- $this->byte2hex(chr(( $bytes >> 24 ) & 0xFF)),
- $this->byte2hex(chr(( $bytes >> 16 ) & 0xFF)),
- $this->byte2hex(chr(( $bytes >> 8 ) & 0xFF)),
- $this->byte2hex(chr($bytes & 0xFF))
- ));
- }
- return $str;
- }
- function hex_sha256 ( $s )
- {
- return $this->binb2hex(
- $this->core_sha256(
- $this->str2binb($s),
- strlen($s) * $this->chrsz)
- );
- }
+ var $chrsz = 8; /* bits per input character. 8 - ASCII; 16 - Unicode */
+
+ function safe_add ($x, $y) {
+ $lsw = ($x & 0xFFFF) + ($y & 0xFFFF);
+ $msw = ($x >> 16) + ($y >> 16) + ($lsw >> 16);
+ // 2009-07-02 Added & 0xFFFFFFFF here to fix problem on PHP w/ native 64-bit integer support (rev. 1030)
+ return (($msw << 16) | ($lsw & 0xFFFF)) & 0xFFFFFFFF;
+ }
+ function rshz($X, $n)
+ {
+ // equivalent to $X >>> $n in javascript
+ // pulled from http://www.tapouillo.com/firefox_extension/sourcecode.txt, public domain
+ $z = hexdec(80000000);
+ if ($z & $X)
+ {
+ $X = ($X>>1);
+ $X &= (~$z);
+ $X |= 0x40000000;
+ $X = ($X>>($n-1));
+ }
+ else
+ {
+ $X = ($X>>$n);
+ }
+ return $X;
+ }
+ function S ($X, $n) {return ( $this->rshz($X, $n) ) | ($X << (32 - $n));}
+ function R ($X, $n) {return ( $this->rshz($X, $n) );}
+ function Ch($x, $y, $z) {return (($x & $y) ^ ((~$x) & $z));}
+ function Maj($x, $y, $z) {return (($x & $y) ^ ($x & $z) ^ ($y & $z));}
+ function Sigma0256($x) {return ($this->S($x, 2) ^ $this->S($x, 13) ^ $this->S($x, 22));}
+ function Sigma1256($x) {return ($this->S($x, 6) ^ $this->S($x, 11) ^ $this->S($x, 25));}
+ function Gamma0256($x) {return ($this->S($x, 7) ^ $this->S($x, 18) ^ $this->R($x, 3));}
+ function Gamma1256($x) {return ($this->S($x, 17) ^ $this->S($x, 19) ^ $this->R($x, 10));}
+ function core_sha256 ($m, $l) {
+ $K = Array(0x428A2F98,0x71374491,0xB5C0FBCF,0xE9B5DBA5,0x3956C25B,0x59F111F1,0x923F82A4,0xAB1C5ED5,0xD807AA98,0x12835B01,0x243185BE,0x550C7DC3,0x72BE5D74,0x80DEB1FE,0x9BDC06A7,0xC19BF174,0xE49B69C1,0xEFBE4786,0xFC19DC6,0x240CA1CC,0x2DE92C6F,0x4A7484AA,0x5CB0A9DC,0x76F988DA,0x983E5152,0xA831C66D,0xB00327C8,0xBF597FC7,0xC6E00BF3,0xD5A79147,0x6CA6351,0x14292967,0x27B70A85,0x2E1B2138,0x4D2C6DFC,0x53380D13,0x650A7354,0x766A0ABB,0x81C2C92E,0x92722C85,0xA2BFE8A1,0xA81A664B,0xC24B8B70,0xC76C51A3,0xD192E819,0xD6990624,0xF40E3585,0x106AA070,0x19A4C116,0x1E376C08,0x2748774C,0x34B0BCB5,0x391C0CB3,0x4ED8AA4A,0x5B9CCA4F,0x682E6FF3,0x748F82EE,0x78A5636F,0x84C87814,0x8CC70208,0x90BEFFFA,0xA4506CEB,0xBEF9A3F7,0xC67178F2);
+ $HASH = Array(0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A, 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19);
+ $W = Array(64);
+ /* append padding */
+ if ( !isset($m[$l >> 5]) )
+ $m[$l >> 5] = 0;
+ $m[$l >> 5] |= 0x80 << (24 - $l % 32);
+ $m[(($l + 64 >> 9) << 4) + 15] = $l;
+ for ( $i = 0; $isafe_add(
+ $this->safe_add(
+ $this->safe_add(
+ $this->Gamma1256($W[$j - 2]), $W[$j - 7]),
+ $this->Gamma0256($W[$j - 15])),
+ $W[$j - 16]);
+ }
+ $T1 = $this->safe_add(
+ $this->safe_add(
+ $this->safe_add(
+ $this->safe_add($h, $this->Sigma1256($e)
+ ),
+ $this->Ch($e, $f, $g)),
+ $K[$j]),
+ $W[$j]);
+ $T2 = $this->safe_add($this->Sigma0256($a), $this->Maj($a, $b, $c));
+ $h = $g;
+ $g = $f;
+ $f = $e;
+ $e = $this->safe_add($d, $T1);
+ $d = $c;
+ $c = $b;
+ $b = $a;
+ $a = $this->safe_add($T1, $T2);
+ }
+ $HASH[0] = $this->safe_add($a, $HASH[0]);
+ $HASH[1] = $this->safe_add($b, $HASH[1]);
+ $HASH[2] = $this->safe_add($c, $HASH[2]);
+ $HASH[3] = $this->safe_add($d, $HASH[3]);
+ $HASH[4] = $this->safe_add($e, $HASH[4]);
+ $HASH[5] = $this->safe_add($f, $HASH[5]);
+ $HASH[6] = $this->safe_add($g, $HASH[6]);
+ $HASH[7] = $this->safe_add($h, $HASH[7]);
+ }
+ return $HASH;
+ }
+ function str2binb ($str) {
+ $bin = Array();
+ for ( $i = 0; $i < strlen($str); $i++ )
+ {
+ $byte = ord($str{$i});
+ $block = floor($i / 4);
+ $stage = $i % 4;
+ if ( $stage == 0 )
+ {
+ $bin[$block] = $byte;
+ }
+ else
+ {
+ $bin[$block] <<= 8;
+ $bin[$block] |= $byte;
+ }
+ }
+ while ( $stage < 3 )
+ {
+ $stage++;
+ $bin[$block] <<= 8;
+ }
+ return $bin;
+ }
+ function byte2hex($byte)
+ {
+ $b = dechex(ord($byte));
+ return ( strlen($b) < 2 ) ? "0$b" : $b;
+ }
+ function binb2hex ($binarray) {
+ $hexcase = 0; /* hex output format. 0 - lowercase; 1 - uppercase */
+ $hex_tab = $hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
+ $str = "";
+ foreach ( $binarray as $bytes )
+ {
+ $str .= implode('', array(
+ $this->byte2hex(chr(( $bytes >> 24 ) & 0xFF)),
+ $this->byte2hex(chr(( $bytes >> 16 ) & 0xFF)),
+ $this->byte2hex(chr(( $bytes >> 8 ) & 0xFF)),
+ $this->byte2hex(chr($bytes & 0xFF))
+ ));
+ }
+ return $str;
+ }
+ function hex_sha256 ( $s )
+ {
+ return $this->binb2hex(
+ $this->core_sha256(
+ $this->str2binb($s),
+ strlen($s) * $this->chrsz)
+ );
+ }
}
if ( !function_exists('sha256') )
{
- function sha256($text)
- {
- static $sha_obj = false;
- if ( !is_object($sha_obj) )
- $sha_obj = new SHA256();
- return $sha_obj->hex_sha256($text);
- }
+ function sha256($text)
+ {
+ static $sha_obj = false;
+ if ( !is_object($sha_obj) )
+ $sha_obj = new SHA256();
+ return $sha_obj->hex_sha256($text);
+ }
}
?>
diff -r de56132c008d -r bdac73ed481e includes/email.php
--- a/includes/email.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/email.php Sun Mar 28 23:10:46 2010 -0400
@@ -20,305 +20,305 @@
//
class emailer
{
- var $msg, $subject, $extra_headers;
- var $addresses, $reply_to, $from;
- var $use_smtp;
+ var $msg, $subject, $extra_headers;
+ var $addresses, $reply_to, $from;
+ var $use_smtp;
- var $tpl_msg;
+ var $tpl_msg;
- function __construct($use_smtp)
- {
- $this->reset();
- $this->use_smtp = $use_smtp;
- $this->reply_to = $this->from = '';
- }
+ function __construct($use_smtp)
+ {
+ $this->reset();
+ $this->use_smtp = $use_smtp;
+ $this->reply_to = $this->from = '';
+ }
- // Resets all the data (address, template file, etc etc to default
- function reset()
- {
- $this->addresses = array();
- $this->vars = $this->msg = $this->extra_headers = '';
- }
+ // Resets all the data (address, template file, etc etc to default
+ function reset()
+ {
+ $this->addresses = array();
+ $this->vars = $this->msg = $this->extra_headers = '';
+ }
- // Sets an email address to send to
- function email_address($address)
- {
- $this->addresses['to'] = trim($address);
- }
+ // Sets an email address to send to
+ function email_address($address)
+ {
+ $this->addresses['to'] = trim($address);
+ }
- function cc($address)
- {
- $this->addresses['cc'][] = trim($address);
- }
+ function cc($address)
+ {
+ $this->addresses['cc'][] = trim($address);
+ }
- function bcc($address)
- {
- $this->addresses['bcc'][] = trim($address);
- }
+ function bcc($address)
+ {
+ $this->addresses['bcc'][] = trim($address);
+ }
- function replyto($address)
- {
- $this->reply_to = trim($address);
- }
+ function replyto($address)
+ {
+ $this->reply_to = trim($address);
+ }
- function from($address)
- {
- $this->from = trim($address);
- }
+ function from($address)
+ {
+ $this->from = trim($address);
+ }
- // set up subject for mail
- function set_subject($subject = '')
- {
- $this->subject = trim(preg_replace('#[\n\r]+#s', '', $subject));
- }
+ // set up subject for mail
+ function set_subject($subject = '')
+ {
+ $this->subject = trim(preg_replace('#[\n\r]+#s', '', $subject));
+ }
- // set up extra mail headers
- function extra_headers($headers)
- {
- $this->extra_headers .= trim($headers) . "\n";
- }
+ // set up extra mail headers
+ function extra_headers($headers)
+ {
+ $this->extra_headers .= trim($headers) . "\n";
+ }
- function use_template($template_code)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $this->tpl_msg = $template->makeParserText($template_code);
+ function use_template($template_code)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $this->tpl_msg = $template->makeParserText($template_code);
- return true;
- }
+ return true;
+ }
- // assign variables
- function assign_vars($vars)
- {
- if ( is_object($this->tpl_msg) )
- {
- $this->tpl_msg->assign_vars($vars);
- }
- else
- {
- die_friendly(GENERAL_ERROR, 'Can\'t set vars, the template is not set');
- }
- }
+ // assign variables
+ function assign_vars($vars)
+ {
+ if ( is_object($this->tpl_msg) )
+ {
+ $this->tpl_msg->assign_vars($vars);
+ }
+ else
+ {
+ die_friendly(GENERAL_ERROR, 'Can\'t set vars, the template is not set');
+ }
+ }
- // Send the mail out to the recipients set previously in var $this->address
- function send()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $this->msg = $this->tpl_msg->run();
- if ( empty($this->msg) )
- {
- die_friendly(GENERAL_ERROR, 'Template for e-mail message returned a blank');
- }
+ // Send the mail out to the recipients set previously in var $this->address
+ function send()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $this->msg = $this->tpl_msg->run();
+ if ( empty($this->msg) )
+ {
+ die_friendly(GENERAL_ERROR, 'Template for e-mail message returned a blank');
+ }
- // We now try and pull a subject from the email body ... if it exists,
- // do this here because the subject may contain a variable
- $drop_header = '';
- $match = array();
- if (preg_match('#^(Subject:(.*?))$#m', $this->msg, $match))
- {
- $this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : 'No Subject');
- $drop_header .= '[\r\n]*?' . preg_quote($match[1], '#');
- }
- else
- {
- $this->subject = (($this->subject != '') ? $this->subject : 'No Subject');
- }
+ // We now try and pull a subject from the email body ... if it exists,
+ // do this here because the subject may contain a variable
+ $drop_header = '';
+ $match = array();
+ if (preg_match('#^(Subject:(.*?))$#m', $this->msg, $match))
+ {
+ $this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : 'No Subject');
+ $drop_header .= '[\r\n]*?' . preg_quote($match[1], '#');
+ }
+ else
+ {
+ $this->subject = (($this->subject != '') ? $this->subject : 'No Subject');
+ }
- if (preg_match('#^(Charset:(.*?))$#m', $this->msg, $match))
- {
- $this->encoding = (trim($match[2]) != '') ? trim($match[2]) : trim('iso-8859-1');
- $drop_header .= '[\r\n]*?' . preg_quote($match[1], '#');
- }
- else
- {
- $this->encoding = trim('iso-8859-1');
- }
+ if (preg_match('#^(Charset:(.*?))$#m', $this->msg, $match))
+ {
+ $this->encoding = (trim($match[2]) != '') ? trim($match[2]) : trim('iso-8859-1');
+ $drop_header .= '[\r\n]*?' . preg_quote($match[1], '#');
+ }
+ else
+ {
+ $this->encoding = trim('iso-8859-1');
+ }
- if ($drop_header != '')
- {
- $this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg));
- }
+ if ($drop_header != '')
+ {
+ $this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg));
+ }
- $to = $this->addresses['to'];
+ $to = $this->addresses['to'];
- $cc = (count($this->addresses['cc'])) ? implode(', ', $this->addresses['cc']) : '';
- $bcc = (count($this->addresses['bcc'])) ? implode(', ', $this->addresses['bcc']) : '';
+ $cc = (count($this->addresses['cc'])) ? implode(', ', $this->addresses['cc']) : '';
+ $bcc = (count($this->addresses['bcc'])) ? implode(', ', $this->addresses['bcc']) : '';
- // Build header
- $this->extra_headers = (($this->reply_to != '') ? "Reply-to: $this->reply_to\n" : '') .
- (($this->from != '') ? "From: $this->from\n" : "From: " . getConfig('contact_email') . "\n") .
- "Return-Path: " . getConfig('contact_email') .
- "\nMessage-ID: <" . md5(uniqid(time())) . "@" . $_SERVER['SERVER_NAME'] . ">\nMIME-Version: 1.0\nContent-type: text/plain; charset=" . $this->encoding .
- "\nContent-transfer-encoding: 8bit\nDate: " . enano_date('r', time()) .
- "\nX-Priority: 3\nX-MSMail-Priority: Normal\nX-Mailer: PHP\nX-MimeOLE: Produced By Enano CMS\n" .
- $this->extra_headers .
- (($cc != '') ? "Cc: $cc\n" : '') .
- (($bcc != '') ? "Bcc: $bcc\n" : '');
-
- //die(''.print_r($this,true).'
');
+ // Build header
+ $this->extra_headers = (($this->reply_to != '') ? "Reply-to: $this->reply_to\n" : '') .
+ (($this->from != '') ? "From: $this->from\n" : "From: " . getConfig('contact_email') . "\n") .
+ "Return-Path: " . getConfig('contact_email') .
+ "\nMessage-ID: <" . md5(uniqid(time())) . "@" . $_SERVER['SERVER_NAME'] . ">\nMIME-Version: 1.0\nContent-type: text/plain; charset=" . $this->encoding .
+ "\nContent-transfer-encoding: 8bit\nDate: " . enano_date('r', time()) .
+ "\nX-Priority: 3\nX-MSMail-Priority: Normal\nX-Mailer: PHP\nX-MimeOLE: Produced By Enano CMS\n" .
+ $this->extra_headers .
+ (($cc != '') ? "Cc: $cc\n" : '') .
+ (($bcc != '') ? "Bcc: $bcc\n" : '');
+
+ //die(''.print_r($this,true).'
');
- // Send message ... removed $this->encode() from subject for time being
- if ( $this->use_smtp )
- {
- $result = smtp_send_email_core($to, $this->subject, $this->msg, $this->extra_headers);
- }
- else
- {
- $empty_to_header = ($to == '') ? TRUE : FALSE;
- $to = ($to == '') ? ((getConfig('sendmail_fix')=='1') ? ' ' : 'Undisclosed-recipients:;') : $to;
-
- $result = @mail($to, $this->subject, preg_replace("#(?msg), $this->extra_headers);
-
- if (!$result && !getConfig('sendmail_fix') && $empty_to_header)
- {
- $to = ' ';
+ // Send message ... removed $this->encode() from subject for time being
+ if ( $this->use_smtp )
+ {
+ $result = smtp_send_email_core($to, $this->subject, $this->msg, $this->extra_headers);
+ }
+ else
+ {
+ $empty_to_header = ($to == '') ? TRUE : FALSE;
+ $to = ($to == '') ? ((getConfig('sendmail_fix')=='1') ? ' ' : 'Undisclosed-recipients:;') : $to;
+
+ $result = @mail($to, $this->subject, preg_replace("#(?msg), $this->extra_headers);
+
+ if (!$result && !getConfig('sendmail_fix') && $empty_to_header)
+ {
+ $to = ' ';
- setConfig('sendmail_fix', '1');
-
- $result = @mail($to, $this->subject, preg_replace("#(?msg), $this->extra_headers);
- }
- }
+ setConfig('sendmail_fix', '1');
+
+ $result = @mail($to, $this->subject, preg_replace("#(?msg), $this->extra_headers);
+ }
+ }
- // Did it work?
- if (!$result || ( $this->use_smtp && $result != 'success' ))
- {
- die_friendly(GENERAL_ERROR, 'Failed sending email :: ' . (($this->use_smtp) ? 'SMTP' : 'PHP') . ' :: ' . $result);
- }
+ // Did it work?
+ if (!$result || ( $this->use_smtp && $result != 'success' ))
+ {
+ die_friendly(GENERAL_ERROR, 'Failed sending email :: ' . (($this->use_smtp) ? 'SMTP' : 'PHP') . ' :: ' . $result);
+ }
- return true;
- }
+ return true;
+ }
- // Encodes the given string for proper display for this encoding ... nabbed
- // from php.net and modified. There is an alternative encoding method which
- // may produce lesd output but it's questionable as to its worth in this
- // scenario IMO
- function encode($str)
- {
- if ($this->encoding == '')
- {
- return $str;
- }
+ // Encodes the given string for proper display for this encoding ... nabbed
+ // from php.net and modified. There is an alternative encoding method which
+ // may produce lesd output but it's questionable as to its worth in this
+ // scenario IMO
+ function encode($str)
+ {
+ if ($this->encoding == '')
+ {
+ return $str;
+ }
- // define start delimimter, end delimiter and spacer
- $end = "?=";
- $start = "=?$this->encoding?B?";
- $spacer = "$end\r\n $start";
+ // define start delimimter, end delimiter and spacer
+ $end = "?=";
+ $start = "=?$this->encoding?B?";
+ $spacer = "$end\r\n $start";
- // determine length of encoded text within chunks and ensure length is even
- $length = 75 - strlen($start) - strlen($end);
- $length = floor($length / 2) * 2;
+ // determine length of encoded text within chunks and ensure length is even
+ $length = 75 - strlen($start) - strlen($end);
+ $length = floor($length / 2) * 2;
- // encode the string and split it into chunks with spacers after each chunk
- $str = chunk_split(base64_encode($str), $length, $spacer);
+ // encode the string and split it into chunks with spacers after each chunk
+ $str = chunk_split(base64_encode($str), $length, $spacer);
- // remove trailing spacer and add start and end delimiters
- $str = preg_replace('#' . preg_quote($spacer, '#') . '$#', '', $str);
+ // remove trailing spacer and add start and end delimiters
+ $str = preg_replace('#' . preg_quote($spacer, '#') . '$#', '', $str);
- return $start . $str . $end;
- }
+ return $start . $str . $end;
+ }
- //
- // Attach files via MIME.
- //
- function attachFile($filename, $mimetype = "application/octet-stream", $szFromAddress, $szFilenameToDisplay)
- {
- global $lang;
- $mime_boundary = "--==================_846811060==_";
+ //
+ // Attach files via MIME.
+ //
+ function attachFile($filename, $mimetype = "application/octet-stream", $szFromAddress, $szFilenameToDisplay)
+ {
+ global $lang;
+ $mime_boundary = "--==================_846811060==_";
- $this->msg = '--' . $mime_boundary . "\nContent-Type: text/plain;\n\tcharset=".'"' . $lang['ENCODING'] . '"'."\n\n" . $this->msg;
+ $this->msg = '--' . $mime_boundary . "\nContent-Type: text/plain;\n\tcharset=".'"' . $lang['ENCODING'] . '"'."\n\n" . $this->msg;
- if ($mime_filename)
- {
- $filename = $mime_filename;
- $encoded = $this->encode_file($filename);
- }
+ if ($mime_filename)
+ {
+ $filename = $mime_filename;
+ $encoded = $this->encode_file($filename);
+ }
- $fd = fopen($filename, "r");
- $contents = fread($fd, filesize($filename));
+ $fd = fopen($filename, "r");
+ $contents = fread($fd, filesize($filename));
- $this->mimeOut = "--" . $mime_boundary . "\n";
- $this->mimeOut .= "Content-Type: " . $mimetype . ";\n\tname=".'"'."$szFilenameToDisplay".'"'."\n";
- $this->mimeOut .= "Content-Transfer-Encoding: quoted-printable\n";
- $this->mimeOut .= "Content-Disposition: attachment;\n\tfilename=".'"'."$szFilenameToDisplay".'"'."\n\n";
+ $this->mimeOut = "--" . $mime_boundary . "\n";
+ $this->mimeOut .= "Content-Type: " . $mimetype . ";\n\tname=".'"'."$szFilenameToDisplay".'"'."\n";
+ $this->mimeOut .= "Content-Transfer-Encoding: quoted-printable\n";
+ $this->mimeOut .= "Content-Disposition: attachment;\n\tfilename=".'"'."$szFilenameToDisplay".'"'."\n\n";
- if ( $mimetype == "message/rfc822" )
- {
- $this->mimeOut .= "From: ".$szFromAddress."\n";
- $this->mimeOut .= "To: ".$this->emailAddress."\n";
- $this->mimeOut .= "Date: ".enano_date('r') . " UT\n";
- $this->mimeOut .= "Reply-To:".$szFromAddress."\n";
- $this->mimeOut .= "Subject: ".$this->mailSubject."\n";
- $this->mimeOut .= "X-Mailer: PHP/".phpversion()."\n";
- $this->mimeOut .= "MIME-Version: 1.0\n";
- }
+ if ( $mimetype == "message/rfc822" )
+ {
+ $this->mimeOut .= "From: ".$szFromAddress."\n";
+ $this->mimeOut .= "To: ".$this->emailAddress."\n";
+ $this->mimeOut .= "Date: ".enano_date('r') . " UT\n";
+ $this->mimeOut .= "Reply-To:".$szFromAddress."\n";
+ $this->mimeOut .= "Subject: ".$this->mailSubject."\n";
+ $this->mimeOut .= "X-Mailer: PHP/".phpversion()."\n";
+ $this->mimeOut .= "MIME-Version: 1.0\n";
+ }
- $this->mimeOut .= $contents."\n";
- $this->mimeOut .= "--" . $mime_boundary . "--" . "\n";
+ $this->mimeOut .= $contents."\n";
+ $this->mimeOut .= "--" . $mime_boundary . "--" . "\n";
- return $out;
- // added -- to notify email client attachment is done
- }
+ return $out;
+ // added -- to notify email client attachment is done
+ }
- function getMimeHeaders($filename, $mime_filename="")
- {
- $mime_boundary = "--==================_846811060==_";
+ function getMimeHeaders($filename, $mime_filename="")
+ {
+ $mime_boundary = "--==================_846811060==_";
- if ($mime_filename)
- {
- $filename = $mime_filename;
- }
+ if ($mime_filename)
+ {
+ $filename = $mime_filename;
+ }
- $out = "MIME-Version: 1.0\n";
- $out .= "Content-Type: multipart/mixed;\n\tboundary=".'"'."$mime_boundary".'"'."\n\n";
- $out .= "This message is in MIME format. Since your mail reader does not understand\n";
- $out .= "this format, some or all of this message may not be legible.";
+ $out = "MIME-Version: 1.0\n";
+ $out .= "Content-Type: multipart/mixed;\n\tboundary=".'"'."$mime_boundary".'"'."\n\n";
+ $out .= "This message is in MIME format. Since your mail reader does not understand\n";
+ $out .= "this format, some or all of this message may not be legible.";
- return $out;
- }
+ return $out;
+ }
- //
- // Split string by RFC 2045 semantics (76 chars per line, end with \r\n).
- //
- function myChunkSplit($str)
- {
- $stmp = $str;
- $len = strlen($stmp);
- $out = "";
+ //
+ // Split string by RFC 2045 semantics (76 chars per line, end with \r\n).
+ //
+ function myChunkSplit($str)
+ {
+ $stmp = $str;
+ $len = strlen($stmp);
+ $out = "";
- while ($len > 0)
- {
- if ($len >= 76)
- {
- $out .= substr($stmp, 0, 76) . "\r\n";
- $stmp = substr($stmp, 76);
- $len = $len - 76;
- }
- else
- {
- $out .= $stmp . "\r\n";
- $stmp = "";
- $len = 0;
- }
- }
- return $out;
- }
+ while ($len > 0)
+ {
+ if ($len >= 76)
+ {
+ $out .= substr($stmp, 0, 76) . "\r\n";
+ $stmp = substr($stmp, 76);
+ $len = $len - 76;
+ }
+ else
+ {
+ $out .= $stmp . "\r\n";
+ $stmp = "";
+ $len = 0;
+ }
+ }
+ return $out;
+ }
- //
- // Split the specified file up into a string and return it
- //
- function encode_file($sourcefile)
- {
- if (is_readable(@realpath($sourcefile)))
- {
- $fd = fopen($sourcefile, "r");
- $contents = fread($fd, filesize($sourcefile));
- $encoded = $this->myChunkSplit(base64_encode($contents));
- fclose($fd);
- }
+ //
+ // Split the specified file up into a string and return it
+ //
+ function encode_file($sourcefile)
+ {
+ if (is_readable(@realpath($sourcefile)))
+ {
+ $fd = fopen($sourcefile, "r");
+ $contents = fread($fd, filesize($sourcefile));
+ $encoded = $this->myChunkSplit(base64_encode($contents));
+ fclose($fd);
+ }
- return $encoded;
- }
+ return $encoded;
+ }
} // class emailer
@@ -334,293 +334,293 @@
class EmailEncryptor
{
- var $primes = Array(2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 173, 179, 181, 191, 193, 197, 199);
-
- function __construct()
- {
- $i = 0;
- $this->p = 0;
- $this->q = 0;
- while($this->p * $this->q < 255 || $this->p == $this->q)
- {
- $this->p = $this->primes[mt_rand(0, sizeof($this->primes)-1)];
- $this->q = $this->primes[mt_rand(0, sizeof($this->primes)-1)];
- }
- }
-
- function testAll() {
- $size = sizeof($this->primes);
-
- $allCharacters = "";
- for($c = 33; $c <= 126; $c++)
- $allCharacters = $allCharacters . $this->fromCharCode($c);
-
- for($i = 0; $i < $size - 1; $i++) {
- for($j = $i + 1; $j < $size; $j++) {
- $this->p = $this->primes[$i];
- $this->q = $this->primes[$j];
- if($this->p*$this->q < 255)
- break;
- $k = $this->makeKey($allCharacters);
- $encrypted = $k['X'];
- $decrypted = $this->goForth($encrypted,$this->p*$this->q,$k['D']);
- if($decrypted != $allCharacters) {
- die('Test failed');
- }
- }
- }
- return 'GOOD';
- }
-
- function charCodeAt($str, $i)
- {
- return ord(substr($str, $i, 1));
- }
-
- function fromCharCode($str)
- {
- return chr($str);
- }
-
- function MakeArray($l) {
- $a = Array();
- $i=0;
- do {
- $a[$i]=null;
- $i++;
- } while($i < $l);
- return $a;
- }
-
- function makeKey($addr,$subj = '',$body = '') {
- $value = "";
-
- if($this->p * $this->q < 255)
- {
- return("P*Q must be greater than 255! P*Q = " . $this->p*$this->q);
- }
- elseif($this->p == $this->q)
- {
- return("P cannot be equal to Q!");
- }
- elseif($addr == "")
- {
- return("You must enter an address to encrypt!");
- }
- else
- {
- // Make the key
- $c = 0;
- $z = ($this->p-1)*($this->q-1);
- $e = 0;
- $n = $this->p*$this->q;
- $d = 0;
-
- do {
- $e++;
- $d = $this->getKey($this->primes[$e],$z);
- } while($d==1);
- $e = $this->primes[$e];
-
- // Turn the string into an array of numbers < 255
- $m = $addr;
- $emailLength = strlen($m);
- $justEmail = "";
- $sep = ( strstr('?', $m) ) ? '&' : '?';
- if($subj != "") {
- $m = $m . "{$sep}subject=" . $subj;
- }
- $sep = ( strstr($m, '?') ) ? '&' : '?';
- if($body != "") {
- $m = $m . "{$sep}body=" . $body;
- }
-
- $length = strlen($m);
- $theString = $this->MakeArray($length);
- for($i = 0; $i < $length; $i++) {
- $theString[$i] = $this->charCodeAt($m, $i);
- }
-
- // Encrypt each of the numbers
- $theCode = $this->MakeArray($length);
- $c = "";
- $temp = 0;
- for($i = 0; $i < $length; $i++) {
- if($i != 0)
- $c .= " ";
- $temp = $this->myMod($theString[$i],$e,$n);
- $theCode[$i] = $temp;
- $c .= $temp;
- if($i == $emailLength - 1)
- $justEmail = $c;
- }
- }
- return Array('X'=>$justEmail, 'N'=>$n, 'D'=>$d, 'E'=>$e, 'C'=>$c, 'M'=>$m);
- }
-
- // Finds x^e % y for large values of (x^e)
- function myMod($x,$e,$y) {
- if ($e % 2 == 0) {
- $answer = 1;
- for($i = 1; $i <= e/2; $i++) {
- $temp = ($x*$x) % $y;
- $answer = ($temp*$answer) % $y;
- }
- } else {
- $answer = $x;
- for($i = 1; $i <= $e/2; $i++) {
- $temp = ($x*$x) % $y;
- $answer = ($temp*$answer) % $y;
- }
- }
- return $answer;
- }
-
-
- function getKey($e,$z) {
- $A = 1;
- $B = 0;
- $C = $z;
- $F = 0;
- $G = 1;
- $bar = $e;
- // Euclid's Algorithm:
- while ($bar != 0) {
- $foo = floor($C/$bar);
- $K = $A - $foo * $F;
- $L = $B - $foo * $G;
- $M = $C - $foo * $bar;
- $A = $F;
- $B = $G;
- $C = $bar;
- $F = $K;
- $G = $L;
- $bar = $M;
- }
- if ($B < 0)
- {
- return ($B + $z);
- }
- else
- {
- return ($B);
- }
- }
-
- function goForth($c,$n,$d) {
- $c .= " ";
- $length = strlen($c);
- $number = 0;
- $bar = 0;
- $answer = "";
-
- for($i = 0; $i < $length; $i++) {
- $number = 0;
- $bar = 0;
- while($this->charCodeAt($c, $i) != 32) {
- $number = $number * 10;
- $number = $number + $this->charCodeAt($c, $i)-48;
- $i++;
- }
- $answer .= $this->fromCharCode($this->decrypt($number,$n,$d));
- }
- return $answer;
- }
-
- function decrypt($c,$n,$d) {
- // Split exponents up
- if ($d % 2== 0) {
- $bar = 1;
- for($i = 1; $i <= $d/2; $i++) {
- $foo = ($c*$c) % $n;
- $bar = ($foo*$bar) % $n;
- }
- } else {
- $bar = $c;
- for($i = 1; $i <= $d/2; $i++) {
- $foo = ($c*$c) % $n;
- $bar = ($foo*$bar) % $n;
- }
- }
- return $bar;
- }
-
- function writeOptions() {
- $size = sizeof($this->primes);
- for($i = 0; $i < $size; $i++)
- echo("");
- }
-
- function jscode() {
- return "";
- }
-
- /**
- * Wrapper - spits out ready-to-use HTML
- * @param string $address The e-mail address
- * @param string $subject The subject of the e-mail. OPTIONAL.
- * @param string $body The main content of the e-mail. OPTIONAL and doesn't work in many e-mail clients.
- * @param string $text The text to be shown on the e-mail link. Leave as false to make the e-mail address be shown in the link (but still fully encrypted)
- */
-
- function encryptEmail($address, $subject = '', $body = '', $text = false)
- {
- $key = $this->makeKey($address, $subject, $body);
- if ( $text )
- {
- if(preg_match('/^(mailto:)?(?:[\w\d]+\.?)+@(?:(?:[\w\d]\-?)+\.)+\w{2,4}$/', $text))
- {
- // This is a mailto link and normal obfuscation should be used
- $text = false;
- }
- }
- $text1 = ( $text ) ? '' : '';
- $text2 = ( $text ) ? "$text <".$this->obfuscate_text($this->mask_address($address)).">" : $this->obfuscate_text($this->mask_address($address));
- $email = ''.$text1.'';
- return $email;
- }
-
- /**
- * Replace @ symbols with " " and dots with " ".
- * @param string $email An e-mail address.
- * @return string
- */
-
- function mask_address($email)
- {
- $at = array(' (AT) ', ' __AT__ ', ' *AT* ', ' [AT] ', ' ', ' <__AT__> ');
- $dot = array(' (DOT) ', ' __DOT__ ', ' *DOT* ', ' [DOT] ', ' ', ' <__DOT__> ');
- while(strstr($email, '@'))
- {
- $my_at = $at[ array_rand($at) ];
- $email = str_replace_once('@', $my_at, $email);
- }
- while(strstr($email, '.'))
- {
- $my_dot = $dot[ array_rand($dot) ];
- $email = str_replace_once('.', $my_dot, $email);
- }
- return $email;
- }
-
- /**
- * Turn a string of text into hex-encoded HTML entities
- * @param string $text the text to encode
- * @return string
- */
+ var $primes = Array(2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 173, 179, 181, 191, 193, 197, 199);
+
+ function __construct()
+ {
+ $i = 0;
+ $this->p = 0;
+ $this->q = 0;
+ while($this->p * $this->q < 255 || $this->p == $this->q)
+ {
+ $this->p = $this->primes[mt_rand(0, sizeof($this->primes)-1)];
+ $this->q = $this->primes[mt_rand(0, sizeof($this->primes)-1)];
+ }
+ }
+
+ function testAll() {
+ $size = sizeof($this->primes);
+
+ $allCharacters = "";
+ for($c = 33; $c <= 126; $c++)
+ $allCharacters = $allCharacters . $this->fromCharCode($c);
+
+ for($i = 0; $i < $size - 1; $i++) {
+ for($j = $i + 1; $j < $size; $j++) {
+ $this->p = $this->primes[$i];
+ $this->q = $this->primes[$j];
+ if($this->p*$this->q < 255)
+ break;
+ $k = $this->makeKey($allCharacters);
+ $encrypted = $k['X'];
+ $decrypted = $this->goForth($encrypted,$this->p*$this->q,$k['D']);
+ if($decrypted != $allCharacters) {
+ die('Test failed');
+ }
+ }
+ }
+ return 'GOOD';
+ }
+
+ function charCodeAt($str, $i)
+ {
+ return ord(substr($str, $i, 1));
+ }
+
+ function fromCharCode($str)
+ {
+ return chr($str);
+ }
+
+ function MakeArray($l) {
+ $a = Array();
+ $i=0;
+ do {
+ $a[$i]=null;
+ $i++;
+ } while($i < $l);
+ return $a;
+ }
+
+ function makeKey($addr,$subj = '',$body = '') {
+ $value = "";
+
+ if($this->p * $this->q < 255)
+ {
+ return("P*Q must be greater than 255! P*Q = " . $this->p*$this->q);
+ }
+ elseif($this->p == $this->q)
+ {
+ return("P cannot be equal to Q!");
+ }
+ elseif($addr == "")
+ {
+ return("You must enter an address to encrypt!");
+ }
+ else
+ {
+ // Make the key
+ $c = 0;
+ $z = ($this->p-1)*($this->q-1);
+ $e = 0;
+ $n = $this->p*$this->q;
+ $d = 0;
+
+ do {
+ $e++;
+ $d = $this->getKey($this->primes[$e],$z);
+ } while($d==1);
+ $e = $this->primes[$e];
+
+ // Turn the string into an array of numbers < 255
+ $m = $addr;
+ $emailLength = strlen($m);
+ $justEmail = "";
+ $sep = ( strstr('?', $m) ) ? '&' : '?';
+ if($subj != "") {
+ $m = $m . "{$sep}subject=" . $subj;
+ }
+ $sep = ( strstr($m, '?') ) ? '&' : '?';
+ if($body != "") {
+ $m = $m . "{$sep}body=" . $body;
+ }
+
+ $length = strlen($m);
+ $theString = $this->MakeArray($length);
+ for($i = 0; $i < $length; $i++) {
+ $theString[$i] = $this->charCodeAt($m, $i);
+ }
+
+ // Encrypt each of the numbers
+ $theCode = $this->MakeArray($length);
+ $c = "";
+ $temp = 0;
+ for($i = 0; $i < $length; $i++) {
+ if($i != 0)
+ $c .= " ";
+ $temp = $this->myMod($theString[$i],$e,$n);
+ $theCode[$i] = $temp;
+ $c .= $temp;
+ if($i == $emailLength - 1)
+ $justEmail = $c;
+ }
+ }
+ return Array('X'=>$justEmail, 'N'=>$n, 'D'=>$d, 'E'=>$e, 'C'=>$c, 'M'=>$m);
+ }
+
+ // Finds x^e % y for large values of (x^e)
+ function myMod($x,$e,$y) {
+ if ($e % 2 == 0) {
+ $answer = 1;
+ for($i = 1; $i <= e/2; $i++) {
+ $temp = ($x*$x) % $y;
+ $answer = ($temp*$answer) % $y;
+ }
+ } else {
+ $answer = $x;
+ for($i = 1; $i <= $e/2; $i++) {
+ $temp = ($x*$x) % $y;
+ $answer = ($temp*$answer) % $y;
+ }
+ }
+ return $answer;
+ }
+
+
+ function getKey($e,$z) {
+ $A = 1;
+ $B = 0;
+ $C = $z;
+ $F = 0;
+ $G = 1;
+ $bar = $e;
+ // Euclid's Algorithm:
+ while ($bar != 0) {
+ $foo = floor($C/$bar);
+ $K = $A - $foo * $F;
+ $L = $B - $foo * $G;
+ $M = $C - $foo * $bar;
+ $A = $F;
+ $B = $G;
+ $C = $bar;
+ $F = $K;
+ $G = $L;
+ $bar = $M;
+ }
+ if ($B < 0)
+ {
+ return ($B + $z);
+ }
+ else
+ {
+ return ($B);
+ }
+ }
+
+ function goForth($c,$n,$d) {
+ $c .= " ";
+ $length = strlen($c);
+ $number = 0;
+ $bar = 0;
+ $answer = "";
+
+ for($i = 0; $i < $length; $i++) {
+ $number = 0;
+ $bar = 0;
+ while($this->charCodeAt($c, $i) != 32) {
+ $number = $number * 10;
+ $number = $number + $this->charCodeAt($c, $i)-48;
+ $i++;
+ }
+ $answer .= $this->fromCharCode($this->decrypt($number,$n,$d));
+ }
+ return $answer;
+ }
+
+ function decrypt($c,$n,$d) {
+ // Split exponents up
+ if ($d % 2== 0) {
+ $bar = 1;
+ for($i = 1; $i <= $d/2; $i++) {
+ $foo = ($c*$c) % $n;
+ $bar = ($foo*$bar) % $n;
+ }
+ } else {
+ $bar = $c;
+ for($i = 1; $i <= $d/2; $i++) {
+ $foo = ($c*$c) % $n;
+ $bar = ($foo*$bar) % $n;
+ }
+ }
+ return $bar;
+ }
+
+ function writeOptions() {
+ $size = sizeof($this->primes);
+ for($i = 0; $i < $size; $i++)
+ echo("");
+ }
+
+ function jscode() {
+ return "";
+ }
+
+ /**
+ * Wrapper - spits out ready-to-use HTML
+ * @param string $address The e-mail address
+ * @param string $subject The subject of the e-mail. OPTIONAL.
+ * @param string $body The main content of the e-mail. OPTIONAL and doesn't work in many e-mail clients.
+ * @param string $text The text to be shown on the e-mail link. Leave as false to make the e-mail address be shown in the link (but still fully encrypted)
+ */
+
+ function encryptEmail($address, $subject = '', $body = '', $text = false)
+ {
+ $key = $this->makeKey($address, $subject, $body);
+ if ( $text )
+ {
+ if(preg_match('/^(mailto:)?(?:[\w\d]+\.?)+@(?:(?:[\w\d]\-?)+\.)+\w{2,4}$/', $text))
+ {
+ // This is a mailto link and normal obfuscation should be used
+ $text = false;
+ }
+ }
+ $text1 = ( $text ) ? '' : '';
+ $text2 = ( $text ) ? "$text <".$this->obfuscate_text($this->mask_address($address)).">" : $this->obfuscate_text($this->mask_address($address));
+ $email = ''.$text1.'';
+ return $email;
+ }
+
+ /**
+ * Replace @ symbols with " " and dots with " ".
+ * @param string $email An e-mail address.
+ * @return string
+ */
+
+ function mask_address($email)
+ {
+ $at = array(' (AT) ', ' __AT__ ', ' *AT* ', ' [AT] ', ' ', ' <__AT__> ');
+ $dot = array(' (DOT) ', ' __DOT__ ', ' *DOT* ', ' [DOT] ', ' ', ' <__DOT__> ');
+ while(strstr($email, '@'))
+ {
+ $my_at = $at[ array_rand($at) ];
+ $email = str_replace_once('@', $my_at, $email);
+ }
+ while(strstr($email, '.'))
+ {
+ $my_dot = $dot[ array_rand($dot) ];
+ $email = str_replace_once('.', $my_dot, $email);
+ }
+ return $email;
+ }
+
+ /**
+ * Turn a string of text into hex-encoded HTML entities
+ * @param string $text the text to encode
+ * @return string
+ */
- function obfuscate_text($text)
- {
- $a = enano_str_split($text, 1);
- $s = '';
- foreach($a as $k => $c)
- {
- $ch = (string)dechex(ord($a[$k]));
- if(strlen($ch) < 2) $ch = '0' . $ch;
- $s .= '&#x'.$ch.';';
- }
- return $s;
- }
+ function obfuscate_text($text)
+ {
+ $a = enano_str_split($text, 1);
+ $s = '';
+ foreach($a as $k => $c)
+ {
+ $ch = (string)dechex(ord($a[$k]));
+ if(strlen($ch) < 2) $ch = '0' . $ch;
+ $s .= '&#x'.$ch.';';
+ }
+ return $s;
+ }
}
diff -r de56132c008d -r bdac73ed481e includes/functions.php
--- a/includes/functions.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/functions.php Sun Mar 28 23:10:46 2010 -0400
@@ -20,15 +20,15 @@
function getConfig($n, $default = false)
{
- global $enano_config;
- if ( isset( $enano_config[ $n ] ) )
- {
- return $enano_config[$n];
- }
- else
- {
- return $default;
- }
+ global $enano_config;
+ if ( isset( $enano_config[ $n ] ) )
+ {
+ return $enano_config[$n];
+ }
+ else
+ {
+ return $default;
+ }
}
/**
@@ -40,37 +40,37 @@
function setConfig($n, $v)
{
- global $enano_config, $db;
-
- if ( isset($enano_config[$n]) )
- {
- if ( $enano_config[$n] === $v )
- {
- // configuration already matches this value
- return true;
- }
- }
-
- $enano_config[$n] = $v;
- if ( $v === false )
- unset($enano_config[$n]);
-
- $v = $db->escape($v);
-
- $e = $db->sql_query('DELETE FROM '.table_prefix.'config WHERE config_name=\''.$n.'\';');
- if ( !$e )
- {
- $db->_die('Error during generic setConfig() call row deletion.');
- }
-
- if ( $v !== false )
- {
- $e = $db->sql_query('INSERT INTO '.table_prefix.'config(config_name, config_value) VALUES(\''.$n.'\', \''.$v.'\')');
- if ( !$e )
- {
- $db->_die('Error during generic setConfig() call row insertion.');
- }
- }
+ global $enano_config, $db;
+
+ if ( isset($enano_config[$n]) )
+ {
+ if ( $enano_config[$n] === $v )
+ {
+ // configuration already matches this value
+ return true;
+ }
+ }
+
+ $enano_config[$n] = $v;
+ if ( $v === false )
+ unset($enano_config[$n]);
+
+ $v = $db->escape($v);
+
+ $e = $db->sql_query('DELETE FROM '.table_prefix.'config WHERE config_name=\''.$n.'\';');
+ if ( !$e )
+ {
+ $db->_die('Error during generic setConfig() call row deletion.');
+ }
+
+ if ( $v !== false )
+ {
+ $e = $db->sql_query('INSERT INTO '.table_prefix.'config(config_name, config_value) VALUES(\''.$n.'\', \''.$v.'\')');
+ if ( !$e )
+ {
+ $db->_die('Error during generic setConfig() call row insertion.');
+ }
+ }
}
/**
@@ -83,42 +83,42 @@
if ( !function_exists('makeUrl') )
{
- function makeUrl($t, $query = false, $escape = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $flags = '';
- $sep = urlSeparator;
- $t = sanitize_page_id($t);
- if ( isset($_GET['printable'] ) )
- {
- $flags .= $sep . 'printable=yes';
- $sep = '&';
- }
- if ( isset($_GET['theme'] ) )
- {
- $flags .= $sep . 'theme='.$session->theme;
- $sep = '&';
- }
- if ( isset($_GET['style'] ) )
- {
- $flags .= $sep . 'style='.$session->style;
- $sep = '&';
- }
- if ( isset($_GET['lang']) && preg_match('/^[a-z0-9_]+$/', @$_GET['lang']) )
- {
- $flags .= $sep . 'lang=' . urlencode($_GET['lang']);
- $sep = '&';
- }
-
- $url = is_object($session) ? $session->append_sid(contentPath.$t.$flags) : contentPath . $t . $flags;
- if($query)
- {
- $sep = strstr($url, '?') ? '&' : '?';
- $url = $url . $sep . $query;
- }
-
- return ($escape) ? htmlspecialchars($url) : $url;
- }
+ function makeUrl($t, $query = false, $escape = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $flags = '';
+ $sep = urlSeparator;
+ $t = sanitize_page_id($t);
+ if ( isset($_GET['printable'] ) )
+ {
+ $flags .= $sep . 'printable=yes';
+ $sep = '&';
+ }
+ if ( isset($_GET['theme'] ) )
+ {
+ $flags .= $sep . 'theme='.$session->theme;
+ $sep = '&';
+ }
+ if ( isset($_GET['style'] ) )
+ {
+ $flags .= $sep . 'style='.$session->style;
+ $sep = '&';
+ }
+ if ( isset($_GET['lang']) && preg_match('/^[a-z0-9_]+$/', @$_GET['lang']) )
+ {
+ $flags .= $sep . 'lang=' . urlencode($_GET['lang']);
+ $sep = '&';
+ }
+
+ $url = is_object($session) ? $session->append_sid(contentPath.$t.$flags) : contentPath . $t . $flags;
+ if($query)
+ {
+ $sep = strstr($url, '?') ? '&' : '?';
+ $url = $url . $sep . $query;
+ }
+
+ return ($escape) ? htmlspecialchars($url) : $url;
+ }
}
/**
@@ -132,72 +132,72 @@
if ( !function_exists('makeUrlNS') )
{
- function makeUrlNS($n, $t, $query = false, $escape = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $flags = '';
-
- if(defined('ENANO_BASE_CLASSES_INITIALIZED'))
- {
- $sep = urlSeparator;
- }
- else
- {
- $sep = (strstr($_SERVER['REQUEST_URI'], '?')) ? '&' : '?';
- }
- if ( isset( $_GET['printable'] ) ) {
- $flags .= $sep . 'printable';
- $sep = '&';
- }
- if ( isset( $_GET['theme'] ) )
- {
- $flags .= $sep . 'theme='.$session->theme;
- $sep = '&';
- }
- if ( isset( $_GET['style'] ) )
- {
- $flags .= $sep . 'style='.$session->style;
- $sep = '&';
- }
- if ( isset($_GET['lang']) && preg_match('/^[a-z0-9_]+$/', @$_GET['lang']) )
- {
- $flags .= $sep . 'lang=' . urlencode($_GET['lang']);
- $sep = '&';
- }
-
- $ns_prefix = "$n:";
-
- if(defined('ENANO_BASE_CLASSES_INITIALIZED'))
- {
- $ns_prefix = ( isset($paths->nslist[$n]) ) ? $paths->nslist[$n] : $n . substr($paths->nslist['Special'], -1);
- $url = contentPath . $ns_prefix . $t . $flags;
- }
- else
- {
- // If the path manager hasn't been initted yet, take an educated guess at what the URI should be
- $url = contentPath . $n . ':' . $t . $flags;
- }
-
- if($query)
- {
- if(strstr($url, '?'))
- {
- $sep = '&';
- }
- else
- {
- $sep = '?';
- }
- $url = $url . $sep . $query . $flags;
- }
-
- if(defined('ENANO_BASE_CLASSES_INITIALIZED'))
- {
- $url = $session->append_sid($url);
- }
-
- return ($escape) ? htmlspecialchars($url) : $url;
- }
+ function makeUrlNS($n, $t, $query = false, $escape = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $flags = '';
+
+ if(defined('ENANO_BASE_CLASSES_INITIALIZED'))
+ {
+ $sep = urlSeparator;
+ }
+ else
+ {
+ $sep = (strstr($_SERVER['REQUEST_URI'], '?')) ? '&' : '?';
+ }
+ if ( isset( $_GET['printable'] ) ) {
+ $flags .= $sep . 'printable';
+ $sep = '&';
+ }
+ if ( isset( $_GET['theme'] ) )
+ {
+ $flags .= $sep . 'theme='.$session->theme;
+ $sep = '&';
+ }
+ if ( isset( $_GET['style'] ) )
+ {
+ $flags .= $sep . 'style='.$session->style;
+ $sep = '&';
+ }
+ if ( isset($_GET['lang']) && preg_match('/^[a-z0-9_]+$/', @$_GET['lang']) )
+ {
+ $flags .= $sep . 'lang=' . urlencode($_GET['lang']);
+ $sep = '&';
+ }
+
+ $ns_prefix = "$n:";
+
+ if(defined('ENANO_BASE_CLASSES_INITIALIZED'))
+ {
+ $ns_prefix = ( isset($paths->nslist[$n]) ) ? $paths->nslist[$n] : $n . substr($paths->nslist['Special'], -1);
+ $url = contentPath . $ns_prefix . $t . $flags;
+ }
+ else
+ {
+ // If the path manager hasn't been initted yet, take an educated guess at what the URI should be
+ $url = contentPath . $n . ':' . $t . $flags;
+ }
+
+ if($query)
+ {
+ if(strstr($url, '?'))
+ {
+ $sep = '&';
+ }
+ else
+ {
+ $sep = '?';
+ }
+ $url = $url . $sep . $query . $flags;
+ }
+
+ if(defined('ENANO_BASE_CLASSES_INITIALIZED'))
+ {
+ $url = $session->append_sid($url);
+ }
+
+ return ($escape) ? htmlspecialchars($url) : $url;
+ }
}
/**
@@ -211,7 +211,7 @@
function makeUrlComplete($n, $t, $query = false, $escape = false)
{
- return get_server_url() . makeUrlNS($n, $t, $query, $escape);
+ return get_server_url() . makeUrlNS($n, $t, $query, $escape);
}
/**
@@ -221,15 +221,15 @@
function get_server_url()
{
- $server_name = false;
- if ( isset($_SERVER['HTTP_HOST']) )
- $server_name = $_SERVER['HTTP_HOST'];
- else if ( isset($_SERVER['SERVER_NAME']) )
- $server_name = $_SERVER['SERVER_NAME'];
- else
- $server_name = 'localhost';
-
- return 'http' . ( $GLOBALS['is_https'] ) . '://' . $server_name;
+ $server_name = false;
+ if ( isset($_SERVER['HTTP_HOST']) )
+ $server_name = $_SERVER['HTTP_HOST'];
+ else if ( isset($_SERVER['SERVER_NAME']) )
+ $server_name = $_SERVER['SERVER_NAME'];
+ else
+ $server_name = 'localhost';
+
+ return 'http' . ( $GLOBALS['is_https'] ) . '://' . $server_name;
}
/**
@@ -239,18 +239,18 @@
function get_main_page($force_logged_in = false)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $logged_in = false;
- if ( is_object($session) && !$force_logged_in )
- {
- $logged_in = $session->user_logged_in;
- }
- else if ( $force_logged_in )
- {
- $logged_in = true;
- }
- return $logged_in && getConfig('main_page_alt_enable', '0') == '1' ? getConfig('main_page_alt', getConfig('main_page', 'Main_Page')) : getConfig('main_page', 'Main_Page');
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $logged_in = false;
+ if ( is_object($session) && !$force_logged_in )
+ {
+ $logged_in = $session->user_logged_in;
+ }
+ else if ( $force_logged_in )
+ {
+ $logged_in = true;
+ }
+ return $logged_in && getConfig('main_page_alt_enable', '0') == '1' ? getConfig('main_page_alt', getConfig('main_page', 'Main_Page')) : getConfig('main_page', 'Main_Page');
}
/**
@@ -262,44 +262,44 @@
function get_title($sanitize = true, $chop_special = false)
{
- $title = '';
- if ( isset($_GET['title']) )
- {
- $title = $_GET['title'];
- }
- else if ( isset($_SERVER['PATH_INFO']) )
- {
- // fix for apache + CGI (occurred on a GoDaddy server, thanks mm3)
- if ( @substr(@$_SERVER['GATEWAY_INTERFACE'], 0, 3) === 'CGI' && $_SERVER['PATH_INFO'] == scriptPath . '/index.php' )
- {
- // do nothing; ignore PATH_INFO
- }
- else
- {
- $title = substr($_SERVER['PATH_INFO'], ( strpos($_SERVER['PATH_INFO'], '/') ) + 1 );
- }
- }
- else
- {
- // This method really isn't supported because apache has a habit of passing dots as underscores, thus corrupting the request
- // If you really want to try it, the URI format is yoursite.com/?/Page_title
- if ( !empty($_SERVER['QUERY_STRING']) && substr($_SERVER['QUERY_STRING'], 0, 1) == '/' )
- {
- $pos = ( ($_ = strpos($_SERVER['QUERY_STRING'], '&')) !== false ) ? $_ - 1: 0x7FFFFFFF;
- $title = substr($_SERVER['QUERY_STRING'], 1, $pos);
- }
- }
-
- if ( $chop_special )
- {
- list(, $ns) = RenderMan::strToPageID($title);
- if ( $ns == 'Special' || $ns == 'Admin' )
- {
- list($title) = explode('/', $title);
- }
- }
-
- return ( $sanitize ) ? sanitize_page_id($title) : $title;
+ $title = '';
+ if ( isset($_GET['title']) )
+ {
+ $title = $_GET['title'];
+ }
+ else if ( isset($_SERVER['PATH_INFO']) )
+ {
+ // fix for apache + CGI (occurred on a GoDaddy server, thanks mm3)
+ if ( @substr(@$_SERVER['GATEWAY_INTERFACE'], 0, 3) === 'CGI' && $_SERVER['PATH_INFO'] == scriptPath . '/index.php' )
+ {
+ // do nothing; ignore PATH_INFO
+ }
+ else
+ {
+ $title = substr($_SERVER['PATH_INFO'], ( strpos($_SERVER['PATH_INFO'], '/') ) + 1 );
+ }
+ }
+ else
+ {
+ // This method really isn't supported because apache has a habit of passing dots as underscores, thus corrupting the request
+ // If you really want to try it, the URI format is yoursite.com/?/Page_title
+ if ( !empty($_SERVER['QUERY_STRING']) && substr($_SERVER['QUERY_STRING'], 0, 1) == '/' )
+ {
+ $pos = ( ($_ = strpos($_SERVER['QUERY_STRING'], '&')) !== false ) ? $_ - 1: 0x7FFFFFFF;
+ $title = substr($_SERVER['QUERY_STRING'], 1, $pos);
+ }
+ }
+
+ if ( $chop_special )
+ {
+ list(, $ns) = RenderMan::strToPageID($title);
+ if ( $ns == 'Special' || $ns == 'Admin' )
+ {
+ list($title) = explode('/', $title);
+ }
+ }
+
+ return ( $sanitize ) ? sanitize_page_id($title) : $title;
}
/**
@@ -309,7 +309,7 @@
function have_blank_urlname_page()
{
- return getConfig('main_page', 'Main_Page') == '' || getConfig('main_page', getConfig('main_page', 'Main_Page')) == '';
+ return getConfig('main_page', 'Main_Page') == '' || getConfig('main_page', getConfig('main_page', 'Main_Page')) == '';
}
/**
@@ -321,78 +321,78 @@
function enano_date($string, $timestamp = false)
{
- if ( !is_int($timestamp) && !is_double($timestamp) && strval(intval($timestamp)) !== $timestamp )
- $timestamp = time();
-
- if ( is_int($string) )
- {
- global $session, $lang;
- $date_fmt = is_object($session) ? $session->date_format : DATE_4;
- $time_fmt = is_object($session) ? $session->time_format : TIME_24_NS;
-
- // within a week? use a relative date
- if ( $timestamp + ( 86400 * 7 ) >= time() && $string & ED_DATE && is_object($lang) && is_object($session) && !($string & ED_DATE_FULL) )
- {
- $relative_date = get_relative_date($timestamp);
- if ( $string === ED_DATE )
- // why do more work if we're done?
- return $relative_date;
- }
-
- $flags = $string;
- $string = array();
- if ( $flags & ED_DATE && !isset($relative_date) )
- $string[] = $date_fmt;
- if ( $flags & ED_TIME )
- $string[] = $time_fmt;
-
- $string = implode(' ', $string);
- }
-
- // perform timestamp offset
- global $timezone;
- // it's gonna be in minutes, so multiply by 60 to offset the unix timestamp
- $timestamp = $timestamp + ( $timezone * 60 );
-
- // are we in DST?
- global $dst_params;
- $dst_offset = 0;
- if ( check_timestamp_dst($timestamp, $dst_params[0], $dst_params[1], $dst_params[2], $dst_params[3]) )
- {
- // offset for DST
- $timestamp += ( $dst_params[4] * 60 );
- $dst_offset = $dst_params[4];
- }
-
- // Does this date string include a timezone? If so, gmdate() will report UTC, which is wrong
- // FIXME This is kind of a halfass replacement...
- foreach ( array('e', 'T', 'O', 'P') as $char )
- {
- if ( ($pos = strpos($string, $char)) !== false )
- {
- if ( $string{ $pos - 1 } != '\\' )
- {
- // add in our own timezone string
- // FIXME: l10n? (do we need to? does anyone really not know what "GMT" means? even uglier escaping?)
- $tzi = '\\G\\M\\T';
- $tzo = $timezone + $dst_offset;
- $sign = $tzo > 0 ? '+' : '-';
- $tzi .= $sign . (intval(abs($tzo / 60)));
- if ( $tzo % 60 )
- $tzi .= sprintf(":%02d", abs($tzo) % 60);
-
- $string = substr($string, 0, $pos) . $tzi . substr($string, $pos + 1);
- }
- }
- }
-
- // Let PHP do the work for us =)
- $result = gmdate($string, $timestamp);
- if ( isset($relative_date) )
- {
- $result = "$relative_date, $result";
- }
- return $result;
+ if ( !is_int($timestamp) && !is_double($timestamp) && strval(intval($timestamp)) !== $timestamp )
+ $timestamp = time();
+
+ if ( is_int($string) )
+ {
+ global $session, $lang;
+ $date_fmt = is_object($session) ? $session->date_format : DATE_4;
+ $time_fmt = is_object($session) ? $session->time_format : TIME_24_NS;
+
+ // within a week? use a relative date
+ if ( $timestamp + ( 86400 * 7 ) >= time() && $string & ED_DATE && is_object($lang) && is_object($session) && !($string & ED_DATE_FULL) )
+ {
+ $relative_date = get_relative_date($timestamp);
+ if ( $string === ED_DATE )
+ // why do more work if we're done?
+ return $relative_date;
+ }
+
+ $flags = $string;
+ $string = array();
+ if ( $flags & ED_DATE && !isset($relative_date) )
+ $string[] = $date_fmt;
+ if ( $flags & ED_TIME )
+ $string[] = $time_fmt;
+
+ $string = implode(' ', $string);
+ }
+
+ // perform timestamp offset
+ global $timezone;
+ // it's gonna be in minutes, so multiply by 60 to offset the unix timestamp
+ $timestamp = $timestamp + ( $timezone * 60 );
+
+ // are we in DST?
+ global $dst_params;
+ $dst_offset = 0;
+ if ( check_timestamp_dst($timestamp, $dst_params[0], $dst_params[1], $dst_params[2], $dst_params[3]) )
+ {
+ // offset for DST
+ $timestamp += ( $dst_params[4] * 60 );
+ $dst_offset = $dst_params[4];
+ }
+
+ // Does this date string include a timezone? If so, gmdate() will report UTC, which is wrong
+ // FIXME This is kind of a halfass replacement...
+ foreach ( array('e', 'T', 'O', 'P') as $char )
+ {
+ if ( ($pos = strpos($string, $char)) !== false )
+ {
+ if ( $string{ $pos - 1 } != '\\' )
+ {
+ // add in our own timezone string
+ // FIXME: l10n? (do we need to? does anyone really not know what "GMT" means? even uglier escaping?)
+ $tzi = '\\G\\M\\T';
+ $tzo = $timezone + $dst_offset;
+ $sign = $tzo > 0 ? '+' : '-';
+ $tzi .= $sign . (intval(abs($tzo / 60)));
+ if ( $tzo % 60 )
+ $tzi .= sprintf(":%02d", abs($tzo) % 60);
+
+ $string = substr($string, 0, $pos) . $tzi . substr($string, $pos + 1);
+ }
+ }
+ }
+
+ // Let PHP do the work for us =)
+ $result = gmdate($string, $timestamp);
+ if ( isset($relative_date) )
+ {
+ $result = "$relative_date, $result";
+ }
+ return $result;
}
/**
@@ -403,47 +403,47 @@
function get_relative_date($time)
{
- global $lang, $session;
- // Our formatting string to pass to enano_date()
- // This should not include minute/second info, only today's date in whatever format suits your fancy
- $formatstring = $session->date_format;
- // Today's date
- $today = enano_date($formatstring);
- // Yesterday's date
- $yesterday = enano_date($formatstring, (time() - (24*60*60)));
- // Date on the input
- $then = enano_date($formatstring, $time);
- // "X days ago" logic
- for ( $i = 2; $i <= 6; $i++ )
- {
- // hours_in_day * minutes_in_hour * seconds_in_minute * num_days
- $offset = 24 * 60 * 60 * $i;
- $days_ago = enano_date($formatstring, (time() - $offset));
- // so does the input timestamp match the date from $i days ago?
- if ( $then == $days_ago )
- {
- // yes, return $i
- return $lang->get('userfuncs_ml_date_daysago', array('days_ago' => $i));
- }
- }
- // either yesterday, today, or before 6 days ago
- switch($then)
- {
- case $today:
- return $lang->get('userfuncs_ml_date_today');
- case $yesterday:
- return $lang->get('userfuncs_ml_date_yesterday');
- default:
- return $then;
- }
- // .--.
- // |o_o |
- // |!_/ |
- // // \ \
- // (| | )
- // /'\_ _/`\
- // \___)=(___/
- return 'Linux rocks!';
+ global $lang, $session;
+ // Our formatting string to pass to enano_date()
+ // This should not include minute/second info, only today's date in whatever format suits your fancy
+ $formatstring = $session->date_format;
+ // Today's date
+ $today = enano_date($formatstring);
+ // Yesterday's date
+ $yesterday = enano_date($formatstring, (time() - (24*60*60)));
+ // Date on the input
+ $then = enano_date($formatstring, $time);
+ // "X days ago" logic
+ for ( $i = 2; $i <= 6; $i++ )
+ {
+ // hours_in_day * minutes_in_hour * seconds_in_minute * num_days
+ $offset = 24 * 60 * 60 * $i;
+ $days_ago = enano_date($formatstring, (time() - $offset));
+ // so does the input timestamp match the date from $i days ago?
+ if ( $then == $days_ago )
+ {
+ // yes, return $i
+ return $lang->get('userfuncs_ml_date_daysago', array('days_ago' => $i));
+ }
+ }
+ // either yesterday, today, or before 6 days ago
+ switch($then)
+ {
+ case $today:
+ return $lang->get('userfuncs_ml_date_today');
+ case $yesterday:
+ return $lang->get('userfuncs_ml_date_yesterday');
+ default:
+ return $then;
+ }
+ // .--.
+ // |o_o |
+ // |!_/ |
+ // // \ \
+ // (| | )
+ // /'\_ _/`\
+ // \___)=(___/
+ return 'Linux rocks!';
}
/**
@@ -458,31 +458,31 @@
function check_timestamp_dst($time, $start_month, $start_sunday, $end_month, $end_sunday)
{
- static $sundays = array(FIRST_SUNDAY, SECOND_SUNDAY, THIRD_SUNDAY, LAST_SUNDAY);
-
- // perform timestamp offset
- global $timezone;
- // it's gonna be in minutes, so multiply by 60 to offset the unix timestamp
- $time = $time + ( $timezone * 60 );
- $year = intval(gmdate('Y', $time));
-
- // one-pass validation
- if ( !in_array($start_sunday, $sundays) || !in_array($end_sunday, $sundays) ||
- $start_month < 1 || $start_month > 12 || $end_month < 1 || $end_month > 12 )
- return false;
-
- // get timestamp of the selected sunday (start)
- $dst_start = get_sunday_timestamp($start_month, $start_sunday, $year);
- $dst_end = get_sunday_timestamp($end_month, $end_sunday, $year);
-
- if ( $dst_start > $dst_end )
- {
- // start time is past the end time, this means we're in the southern hemisphere
- // as a result, if we're within the range, DST is NOT in progress.
- return !( $time >= $dst_start && $time <= $dst_end );
- }
-
- return $time >= $dst_start && $time <= $dst_end;
+ static $sundays = array(FIRST_SUNDAY, SECOND_SUNDAY, THIRD_SUNDAY, LAST_SUNDAY);
+
+ // perform timestamp offset
+ global $timezone;
+ // it's gonna be in minutes, so multiply by 60 to offset the unix timestamp
+ $time = $time + ( $timezone * 60 );
+ $year = intval(gmdate('Y', $time));
+
+ // one-pass validation
+ if ( !in_array($start_sunday, $sundays) || !in_array($end_sunday, $sundays) ||
+ $start_month < 1 || $start_month > 12 || $end_month < 1 || $end_month > 12 )
+ return false;
+
+ // get timestamp of the selected sunday (start)
+ $dst_start = get_sunday_timestamp($start_month, $start_sunday, $year);
+ $dst_end = get_sunday_timestamp($end_month, $end_sunday, $year);
+
+ if ( $dst_start > $dst_end )
+ {
+ // start time is past the end time, this means we're in the southern hemisphere
+ // as a result, if we're within the range, DST is NOT in progress.
+ return !( $time >= $dst_start && $time <= $dst_end );
+ }
+
+ return $time >= $dst_start && $time <= $dst_end;
}
/**
@@ -495,48 +495,48 @@
function get_sunday_timestamp($month, $sunday, $year)
{
- $days_in_month = array(
- 1 => 31,
- 2 => $year % 4 == 0 && ( $year % 100 != 0 || ( $year % 100 == 0 && $year % 400 == 0 ) ) ? 29 : 28,
- 3 => 31,
- 4 => 30,
- 5 => 31,
- 6 => 30,
- 7 => 31,
- 8 => 31,
- 9 => 30,
- 10 => 31,
- 11 => 30,
- 12 => 31
- );
-
- $result = mktime(0, 0, 0, $month, 1, $year);
-
- // hack. allows a specific day of the month to be set instead of a sunday. not a good place to do this.
- if ( is_string($sunday) && substr($sunday, -1) === 'd' )
- {
- $result += 86400 * ( intval($sunday) - 1);
- return $result;
- }
-
- $tick = 0;
- $days_remaining = $days_in_month[$month];
- while ( true )
- {
- if ( date('D', $result) == 'Sun' )
- {
- $tick++;
- if ( ( $tick == 1 && $sunday == FIRST_SUNDAY ) ||
- ( $tick == 2 && $sunday == SECOND_SUNDAY ) ||
- ( $tick == 3 && $sunday == THIRD_SUNDAY ) ||
- ( $sunday == LAST_SUNDAY && $days_remaining < 7 ) )
- break;
- }
- $days_remaining--;
- $result += 86400;
- }
-
- return $result;
+ $days_in_month = array(
+ 1 => 31,
+ 2 => $year % 4 == 0 && ( $year % 100 != 0 || ( $year % 100 == 0 && $year % 400 == 0 ) ) ? 29 : 28,
+ 3 => 31,
+ 4 => 30,
+ 5 => 31,
+ 6 => 30,
+ 7 => 31,
+ 8 => 31,
+ 9 => 30,
+ 10 => 31,
+ 11 => 30,
+ 12 => 31
+ );
+
+ $result = mktime(0, 0, 0, $month, 1, $year);
+
+ // hack. allows a specific day of the month to be set instead of a sunday. not a good place to do this.
+ if ( is_string($sunday) && substr($sunday, -1) === 'd' )
+ {
+ $result += 86400 * ( intval($sunday) - 1);
+ return $result;
+ }
+
+ $tick = 0;
+ $days_remaining = $days_in_month[$month];
+ while ( true )
+ {
+ if ( date('D', $result) == 'Sun' )
+ {
+ $tick++;
+ if ( ( $tick == 1 && $sunday == FIRST_SUNDAY ) ||
+ ( $tick == 2 && $sunday == SECOND_SUNDAY ) ||
+ ( $tick == 3 && $sunday == THIRD_SUNDAY ) ||
+ ( $sunday == LAST_SUNDAY && $days_remaining < 7 ) )
+ break;
+ }
+ $days_remaining--;
+ $result += 86400;
+ }
+
+ return $result;
}
/**
@@ -548,10 +548,10 @@
function get_page_title($page_id, $show_ns = true)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $idata = RenderMan::strToPageID($page_id);
- return get_page_title_ns($idata[0], $idata[1]);
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $idata = RenderMan::strToPageID($page_id);
+ return get_page_title_ns($idata[0], $idata[1]);
}
/**
@@ -563,10 +563,10 @@
function get_page_title_ns($page_id, $namespace)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $ns = namespace_factory($page_id, $namespace);
- return $ns->title;
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $ns = namespace_factory($page_id, $namespace);
+ return $ns->title;
}
/**
@@ -579,59 +579,59 @@
function redirect($url, $title = 'etc_redirect_title', $message = 'etc_redirect_body', $timeout = 3)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- // POST check added in 1.1.x because Firefox 3.0 asks us if we want to "resend the form
- // data to the new location", which can be confusing for some users.
- $is_firefox_3 = ( strstr(@$_SERVER['HTTP_USER_AGENT'], 'Firefox/3.') ) ? true : false;
- if ( $timeout == 0 && ( empty($_POST) || !$is_firefox_3 ) )
- {
- header('Location: ' . $url);
- header('Content-length: 0');
- header('HTTP/1.1 307 Temporary Redirect');
-
- // with 3xx codes HTTP clients expect a response of 0 bytes, so just die here
- exit();
- }
-
- if ( !is_object($template) )
- {
- $template = new template_nodb();
- $template->load_theme('oxygen', 'bleu', false);
- $template->assign_vars(array(
- 'SITE_NAME' => 'Enano',
- 'SITE_DESC' => 'This site is experiencing a critical error and cannot load.',
- 'COPYRIGHT' => 'Powered by Enano CMS - © 2006-2008 Dan Fuhry. This program is Free Software; see the GPL file included with this package for details.',
- 'PAGE_NAME' => htmlspecialchars($title)
- ));
- }
-
- $template->add_header('');
- $template->add_header('
- ');
-
- if ( get_class($template) == 'template_nodb' )
- $template->init_vars();
-
- $template->assign_vars(array('PAGE_NAME' => $title));
- $template->header(true);
- echo '' . $message . '
';
- $subst = array(
- 'timeout' => $timeout,
- 'redirect_url' => str_replace('"', '\\"', $url)
- );
- echo '' . $lang->get('etc_redirect_timeout', $subst) . '
';
- $template->footer(true);
-
- $db->close();
- exit(0);
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ // POST check added in 1.1.x because Firefox 3.0 asks us if we want to "resend the form
+ // data to the new location", which can be confusing for some users.
+ $is_firefox_3 = ( strstr(@$_SERVER['HTTP_USER_AGENT'], 'Firefox/3.') ) ? true : false;
+ if ( $timeout == 0 && ( empty($_POST) || !$is_firefox_3 ) )
+ {
+ header('Location: ' . $url);
+ header('Content-length: 0');
+ header('HTTP/1.1 307 Temporary Redirect');
+
+ // with 3xx codes HTTP clients expect a response of 0 bytes, so just die here
+ exit();
+ }
+
+ if ( !is_object($template) )
+ {
+ $template = new template_nodb();
+ $template->load_theme('oxygen', 'bleu', false);
+ $template->assign_vars(array(
+ 'SITE_NAME' => 'Enano',
+ 'SITE_DESC' => 'This site is experiencing a critical error and cannot load.',
+ 'COPYRIGHT' => 'Powered by Enano CMS - © 2006-2008 Dan Fuhry. This program is Free Software; see the GPL file included with this package for details.',
+ 'PAGE_NAME' => htmlspecialchars($title)
+ ));
+ }
+
+ $template->add_header('');
+ $template->add_header('
+ ');
+
+ if ( get_class($template) == 'template_nodb' )
+ $template->init_vars();
+
+ $template->assign_vars(array('PAGE_NAME' => $title));
+ $template->header(true);
+ echo '' . $message . '
';
+ $subst = array(
+ 'timeout' => $timeout,
+ 'redirect_url' => str_replace('"', '\\"', $url)
+ );
+ echo '' . $lang->get('etc_redirect_timeout', $subst) . '
';
+ $template->footer(true);
+
+ $db->close();
+ exit(0);
}
@@ -641,85 +641,85 @@
function csrf_request_confirm()
{
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang, $output;
-
- // If the token was overridden with the correct one, the user confirmed the action using this form. Continue exec.
- if ( isset($_POST['cstok']) || isset($_GET['cstok']) )
- {
- // using the if() check makes sure that the token isn't in a cookie, since $_REQUEST includes $_COOKIE.
- $token_check =& $_REQUEST['cstok'];
- if ( $token_check === $session->csrf_token )
- {
- // overridden token matches, continue exec
- return true;
- }
- }
-
- @ob_end_clean();
-
- $output->set_title($lang->get('user_csrf_confirm_title'));
- $output->header();
-
- // initial info
- echo '' . $lang->get('user_csrf_confirm_body') . '
';
-
- // start form
- $form_method = ( empty($_POST) ) ? 'get' : 'post';
- echo '';
-
- $output->footer();
-
- exit;
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang, $output;
+
+ // If the token was overridden with the correct one, the user confirmed the action using this form. Continue exec.
+ if ( isset($_POST['cstok']) || isset($_GET['cstok']) )
+ {
+ // using the if() check makes sure that the token isn't in a cookie, since $_REQUEST includes $_COOKIE.
+ $token_check =& $_REQUEST['cstok'];
+ if ( $token_check === $session->csrf_token )
+ {
+ // overridden token matches, continue exec
+ return true;
+ }
+ }
+
+ @ob_end_clean();
+
+ $output->set_title($lang->get('user_csrf_confirm_title'));
+ $output->header();
+
+ // initial info
+ echo '' . $lang->get('user_csrf_confirm_body') . '
';
+
+ // start form
+ $form_method = ( empty($_POST) ) ? 'get' : 'post';
+ echo '';
+
+ $output->footer();
+
+ exit;
}
function csrf_confirm_get_recursive($_inner = false, $pfx = false, $data = false)
{
- // make posted arrays work right
- if ( !$data )
- ( $_inner == 'post' ) ? $data =& $_POST : $data =& $_GET;
- foreach ( $data as $key => $value )
- {
- $pfx_this = ( empty($pfx) ) ? $key : "{$pfx}[{$key}]";
- if ( is_array($value) )
- {
- csrf_confirm_get_recursive(true, $pfx_this, $value);
- }
- else if ( empty($value) )
- {
- echo htmlspecialchars($pfx_this . " = ") . "
\n";
- echo '';
- }
- else
- {
- echo htmlspecialchars($pfx_this . " = " . $value) . "
\n";
- echo '';
- }
- }
+ // make posted arrays work right
+ if ( !$data )
+ ( $_inner == 'post' ) ? $data =& $_POST : $data =& $_GET;
+ foreach ( $data as $key => $value )
+ {
+ $pfx_this = ( empty($pfx) ) ? $key : "{$pfx}[{$key}]";
+ if ( is_array($value) )
+ {
+ csrf_confirm_get_recursive(true, $pfx_this, $value);
+ }
+ else if ( empty($value) )
+ {
+ echo htmlspecialchars($pfx_this . " = ") . "
\n";
+ echo '';
+ }
+ else
+ {
+ echo htmlspecialchars($pfx_this . " = " . $value) . "
\n";
+ echo '';
+ }
+ }
}
function csrf_confirm_post_recursive()
{
- csrf_confirm_get_recursive('post');
+ csrf_confirm_get_recursive('post');
}
// Removed wikiFormat() from here, replaced with RenderMan::render
@@ -732,22 +732,22 @@
function isPage($p)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
- static $ispage_cache = array();
- if ( isset($ispage_cache[$p]) )
- return $ispage_cache[$p];
-
- list($page_id, $namespace) = RenderMan::strToPageID($p);
- $cdata = $paths->get_cdata($page_id, $namespace);
- if ( !isset($cdata['page_exists']) )
- {
- $class = ( class_exists($_ = "Namespace_$namespace") ) ? $_ : "Namespace_Default";
- $page = new $class($page_id, $namespace);
- return $page->exists();
- }
-
- $ispage_cache[$p] = $cdata['page_exists'];
- return $cdata['page_exists'];
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ static $ispage_cache = array();
+ if ( isset($ispage_cache[$p]) )
+ return $ispage_cache[$p];
+
+ list($page_id, $namespace) = RenderMan::strToPageID($p);
+ $cdata = $paths->get_cdata($page_id, $namespace);
+ if ( !isset($cdata['page_exists']) )
+ {
+ $class = ( class_exists($_ = "Namespace_$namespace") ) ? $_ : "Namespace_Default";
+ $page = new $class($page_id, $namespace);
+ return $page->exists();
+ }
+
+ $ispage_cache[$p] = $cdata['page_exists'];
+ return $cdata['page_exists'];
}
/**
@@ -759,33 +759,33 @@
function namespace_factory($page_id, $namespace, $revision_id = 0)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- static $objcache = array();
- $pathskey = $paths->get_pathskey($page_id, $namespace) . ":$revision_id";
- if ( isset($objcache[$pathskey]) )
- return $objcache[$pathskey];
-
- if ( !class_exists("Namespace_$namespace") )
- {
- if ( file_exists(ENANO_ROOT . "/includes/namespaces/" . strtolower($namespace) . ".php") )
- {
- require(ENANO_ROOT . "/includes/namespaces/" . strtolower($namespace) . ".php");
- }
- }
- if ( class_exists("Namespace_$namespace") )
- {
- $class = "Namespace_$namespace";
- $ns = new $class($page_id, $namespace, $revision_id);
- $objcache[$pathskey] = $ns;
- return $ns;
- }
- else
- {
- $ns = new Namespace_Default($page_id, $namespace, $revision_id);
- $objcache[$pathskey] = $ns;
- return $ns;
- }
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ static $objcache = array();
+ $pathskey = $paths->get_pathskey($page_id, $namespace) . ":$revision_id";
+ if ( isset($objcache[$pathskey]) )
+ return $objcache[$pathskey];
+
+ if ( !class_exists("Namespace_$namespace") )
+ {
+ if ( file_exists(ENANO_ROOT . "/includes/namespaces/" . strtolower($namespace) . ".php") )
+ {
+ require(ENANO_ROOT . "/includes/namespaces/" . strtolower($namespace) . ".php");
+ }
+ }
+ if ( class_exists("Namespace_$namespace") )
+ {
+ $class = "Namespace_$namespace";
+ $ns = new $class($page_id, $namespace, $revision_id);
+ $objcache[$pathskey] = $ns;
+ return $ns;
+ }
+ else
+ {
+ $ns = new Namespace_Default($page_id, $namespace, $revision_id);
+ $objcache[$pathskey] = $ns;
+ return $ns;
+ }
}
/**
@@ -793,52 +793,52 @@
*/
function arrayItemUp($arr, $keyname) {
- $keylist = array_keys($arr);
- $keyflop = array_flip($keylist);
- $idx = $keyflop[$keyname];
- $idxm = $idx - 1;
- $temp = $arr[$keylist[$idxm]];
- if($arr[$keylist[0]] == $arr[$keyname]) return $arr;
- $arr[$keylist[$idxm]] = $arr[$keylist[$idx]];
- $arr[$keylist[$idx]] = $temp;
- return $arr;
+ $keylist = array_keys($arr);
+ $keyflop = array_flip($keylist);
+ $idx = $keyflop[$keyname];
+ $idxm = $idx - 1;
+ $temp = $arr[$keylist[$idxm]];
+ if($arr[$keylist[0]] == $arr[$keyname]) return $arr;
+ $arr[$keylist[$idxm]] = $arr[$keylist[$idx]];
+ $arr[$keylist[$idx]] = $temp;
+ return $arr;
}
function arrayItemDown($arr, $keyname) {
- $keylist = array_keys($arr);
- $keyflop = array_flip($keylist);
- $idx = $keyflop[$keyname];
- $idxm = $idx + 1;
- $temp = $arr[$keylist[$idxm]];
- $sz = sizeof($arr); $sz--;
- if($arr[$keylist[$sz]] == $arr[$keyname]) return $arr;
- $arr[$keylist[$idxm]] = $arr[$keylist[$idx]];
- $arr[$keylist[$idx]] = $temp;
- return $arr;
+ $keylist = array_keys($arr);
+ $keyflop = array_flip($keylist);
+ $idx = $keyflop[$keyname];
+ $idxm = $idx + 1;
+ $temp = $arr[$keylist[$idxm]];
+ $sz = sizeof($arr); $sz--;
+ if($arr[$keylist[$sz]] == $arr[$keyname]) return $arr;
+ $arr[$keylist[$idxm]] = $arr[$keylist[$idx]];
+ $arr[$keylist[$idx]] = $temp;
+ return $arr;
}
function arrayItemTop($arr, $keyname) {
- $keylist = array_keys($arr);
- $keyflop = array_flip($keylist);
- $idx = $keyflop[$keyname];
- while( $orig != $arr[$keylist[0]] ) {
- // echo 'Keyname: '.$keylist[$idx] . '
'; flush(); ob_flush(); // Debugger
- if($idx < 0) return $arr;
- if($keylist[$idx] == '' || $keylist[$idx] < 0 || !$keylist[$idx]) {
- return $arr;
- }
- $arr = arrayItemUp($arr, $keylist[$idx]);
- $idx--;
- }
- return $arr;
+ $keylist = array_keys($arr);
+ $keyflop = array_flip($keylist);
+ $idx = $keyflop[$keyname];
+ while( $orig != $arr[$keylist[0]] ) {
+ // echo 'Keyname: '.$keylist[$idx] . '
'; flush(); ob_flush(); // Debugger
+ if($idx < 0) return $arr;
+ if($keylist[$idx] == '' || $keylist[$idx] < 0 || !$keylist[$idx]) {
+ return $arr;
+ }
+ $arr = arrayItemUp($arr, $keylist[$idx]);
+ $idx--;
+ }
+ return $arr;
}
function arrayItemBottom($arr, $keyname) {
- $b = $arr[$keyname];
- unset($arr[$keyname]);
- $arr[$keyname] = $b;
- unset($b);
- return $arr;
+ $b = $arr[$keyname];
+ unset($arr[$keyname]);
+ $arr[$keyname] = $b;
+ unset($b);
+ return $arr;
}
/**
@@ -850,12 +850,12 @@
function enano_safe_array_merge($arr1, $arr2)
{
- $arr3 = $arr1;
- foreach($arr2 as $k => $v)
- {
- $arr3[$k] = $v;
- }
- return $arr3;
+ $arr3 = $arr1;
+ foreach($arr2 as $k => $v)
+ {
+ $arr3[$k] = $v;
+ }
+ return $arr3;
}
/**
@@ -866,21 +866,21 @@
function integerize_array($arr)
{
- if ( !is_array($arr) )
- return $arr;
-
- foreach ( $arr as &$val )
- {
- if ( is_string($val) && ctype_digit($val) && strlen($val) < 10 )
- {
- $val = intval($val);
- }
- else if ( is_array($val) )
- {
- $val = integerize_array($val);
- }
- }
- return $arr;
+ if ( !is_array($arr) )
+ return $arr;
+
+ foreach ( $arr as &$val )
+ {
+ if ( is_string($val) && ctype_digit($val) && strlen($val) < 10 )
+ {
+ $val = intval($val);
+ }
+ else if ( is_array($val) )
+ {
+ $val = integerize_array($val);
+ }
+ }
+ return $arr;
}
// Convert IP address to hex string
@@ -888,21 +888,21 @@
// Output: 0x7f000001 (string)
// Updated 12/8/06 to work with PHP4 and not use eval() (blech)
function ip2hex($ip) {
- if ( preg_match('/^([0-9a-f:]+)$/', $ip) )
- {
- // this is an ipv6 address
- return str_replace(':', '', $ip);
- }
- $nums = explode('.', $ip);
- if(sizeof($nums) != 4) return false;
- $str = '0x';
- foreach($nums as $n)
- {
- $byte = (string)dechex($n);
- if ( strlen($byte) < 2 )
- $byte = '0' . $byte;
- }
- return $str;
+ if ( preg_match('/^([0-9a-f:]+)$/', $ip) )
+ {
+ // this is an ipv6 address
+ return str_replace(':', '', $ip);
+ }
+ $nums = explode('.', $ip);
+ if(sizeof($nums) != 4) return false;
+ $str = '0x';
+ foreach($nums as $n)
+ {
+ $byte = (string)dechex($n);
+ if ( strlen($byte) < 2 )
+ $byte = '0' . $byte;
+ }
+ return $str;
}
// Convert DWord to IP address
@@ -910,17 +910,17 @@
// Output: 127.0.0.1
// Updated 12/8/06 to work with PHP4 and not use eval() (blech)
function hex2ip($in) {
- if(substr($in, 0, 2) == '0x') $ip = substr($in, 2, 8);
- else $ip = substr($in, 0, 8);
- $octets = enano_str_split($ip, 2);
- $str = '';
- $newoct = Array();
- foreach($octets as $o)
- {
- $o = (int)hexdec($o);
- $newoct[] = $o;
- }
- return implode('.', $newoct);
+ if(substr($in, 0, 2) == '0x') $ip = substr($in, 2, 8);
+ else $ip = substr($in, 0, 8);
+ $octets = enano_str_split($ip, 2);
+ $str = '';
+ $newoct = Array();
+ foreach($octets as $o)
+ {
+ $o = (int)hexdec($o);
+ $newoct[] = $o;
+ }
+ return implode('.', $newoct);
}
// Function strip_php moved to RenderMan class
@@ -936,38 +936,38 @@
function die_semicritical($t, $p, $no_wrapper = false)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
- $db->close();
-
- if ( @ob_get_status() )
- ob_end_clean();
-
- // If the config hasn't been fetched yet, call grinding_halt.
- if ( !defined('ENANO_CONFIG_FETCHED') )
- {
- grinding_halt($t, $p);
- }
-
- // also do grinding_halt() if we're in CLI mode
- if ( defined('ENANO_CLI') )
- {
- grinding_halt($t, $p);
- }
-
- if ( $no_wrapper )
- {
- echo '' . htmlspecialchars($t) . '
';
- echo "$p
";
- exit;
- }
-
- $output = new Output_Safe();
- $output->set_title($t);
- $output->header();
- echo $p;
- $output->footer();
-
- exit;
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $db->close();
+
+ if ( @ob_get_status() )
+ ob_end_clean();
+
+ // If the config hasn't been fetched yet, call grinding_halt.
+ if ( !defined('ENANO_CONFIG_FETCHED') )
+ {
+ grinding_halt($t, $p);
+ }
+
+ // also do grinding_halt() if we're in CLI mode
+ if ( defined('ENANO_CLI') )
+ {
+ grinding_halt($t, $p);
+ }
+
+ if ( $no_wrapper )
+ {
+ echo '' . htmlspecialchars($t) . '
';
+ echo "$p
";
+ exit;
+ }
+
+ $output = new Output_Safe();
+ $output->set_title($t);
+ $output->header();
+ echo $p;
+ $output->footer();
+
+ exit;
}
/**
@@ -978,20 +978,20 @@
function die_friendly($t, $p)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( @ob_get_status() )
- ob_end_clean();
-
- global $output;
-
- $output->set_title($t);
- $template->header();
- echo $p;
- $template->footer();
- $db->close();
-
- exit;
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( @ob_get_status() )
+ ob_end_clean();
+
+ global $output;
+
+ $output->set_title($t);
+ $template->header();
+ echo $p;
+ $template->footer();
+ $db->close();
+
+ exit;
}
/**
@@ -1002,47 +1002,47 @@
function grinding_halt($t, $p)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( !defined('scriptPath') )
- require( ENANO_ROOT . '/config.php' );
-
- if ( is_object($db) )
- $db->close();
-
- if ( @ob_get_status() )
- ob_end_clean();
-
- if ( defined('ENANO_CLI') )
- {
- // set console color
- echo "\x1B[31;1m";
- // error title
- echo "Critical error in Enano runtime: ";
- // unbold
- echo "$t\n";
- // bold
- echo "\x1B[37;1m";
- echo "Error: ";
- // unbold
- echo "\x1B[0m";
- echo "$p\n";
- exit(1);
- }
- $theme = ( defined('ENANO_CONFIG_FETCHED') ) ? getConfig('theme_default') : 'oxygen';
- $style = ( defined('ENANO_CONFIG_FETCHED') ) ? '__foo__' : 'bleu';
-
- $tpl = new template_nodb();
- $tpl->load_theme($theme, $style);
- $tpl->tpl_strings['SITE_NAME'] = 'Critical error';
- $tpl->tpl_strings['SITE_DESC'] = 'This website is experiencing a serious error and cannot load.';
- $tpl->tpl_strings['COPYRIGHT'] = 'Unable to retrieve copyright information';
- $tpl->tpl_strings['PAGE_NAME'] = $t;
- $tpl->header();
- echo $p;
- $tpl->footer();
-
- exit;
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( !defined('scriptPath') )
+ require( ENANO_ROOT . '/config.php' );
+
+ if ( is_object($db) )
+ $db->close();
+
+ if ( @ob_get_status() )
+ ob_end_clean();
+
+ if ( defined('ENANO_CLI') )
+ {
+ // set console color
+ echo "\x1B[31;1m";
+ // error title
+ echo "Critical error in Enano runtime: ";
+ // unbold
+ echo "$t\n";
+ // bold
+ echo "\x1B[37;1m";
+ echo "Error: ";
+ // unbold
+ echo "\x1B[0m";
+ echo "$p\n";
+ exit(1);
+ }
+ $theme = ( defined('ENANO_CONFIG_FETCHED') ) ? getConfig('theme_default') : 'oxygen';
+ $style = ( defined('ENANO_CONFIG_FETCHED') ) ? '__foo__' : 'bleu';
+
+ $tpl = new template_nodb();
+ $tpl->load_theme($theme, $style);
+ $tpl->tpl_strings['SITE_NAME'] = 'Critical error';
+ $tpl->tpl_strings['SITE_DESC'] = 'This website is experiencing a serious error and cannot load.';
+ $tpl->tpl_strings['COPYRIGHT'] = 'Unable to retrieve copyright information';
+ $tpl->tpl_strings['PAGE_NAME'] = $t;
+ $tpl->header();
+ echo $p;
+ $tpl->footer();
+
+ exit;
}
/**
@@ -1051,7 +1051,7 @@
function show_category_info()
{
- throw new Exception('show_category_info() is deprecated. Use Namespace_*::display_categories().');
+ throw new Exception('show_category_info() is deprecated. Use Namespace_*::display_categories().');
}
/**
@@ -1060,7 +1060,7 @@
function show_file_info($page = false)
{
- throw new Exception('show_file_info() is deprecated. Use Namespace_File::show_info().');
+ throw new Exception('show_file_info() is deprecated. Use Namespace_File::show_info().');
}
/**
@@ -1069,7 +1069,7 @@
function display_page_headers()
{
- // Deprecated.
+ // Deprecated.
}
/**
@@ -1078,18 +1078,18 @@
function display_page_footers()
{
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( isset($_GET['nofooters']) )
- {
- return;
- }
-
- $code = $plugins->setHook('send_page_footers');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( isset($_GET['nofooters']) )
+ {
+ return;
+ }
+
+ $code = $plugins->setHook('send_page_footers');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
}
/**
@@ -1100,34 +1100,34 @@
function display_redirect_notice($page_id, $namespace)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang, $output;
-
- $url = makeUrlNS($namespace, $page_id, false, true);
- $ns = namespace_factory($page_id, $namespace);
- $page_data = $ns->get_cdata();
-
- $title = $page_data['name'];
-
- $cls = $ns->exists() ? '' : 'class="wikilink-nonexistent" ';
-
- $a = '' . $title . '';
- $redir_html = '
-
-
-
- 
-
-
- ' . $lang->get('page_msg_this_is_a_redirector', array( 'redirect_target' => $a )) . '
-
-
-
-
-
-
';
-
- $output->add_after_header($redir_html);
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang, $output;
+
+ $url = makeUrlNS($namespace, $page_id, false, true);
+ $ns = namespace_factory($page_id, $namespace);
+ $page_data = $ns->get_cdata();
+
+ $title = $page_data['name'];
+
+ $cls = $ns->exists() ? '' : 'class="wikilink-nonexistent" ';
+
+ $a = '' . $title . '';
+ $redir_html = '
+
+
+
+
+
+
+ ' . $lang->get('page_msg_this_is_a_redirector', array( 'redirect_target' => $a )) . '
+
+
+
+
+
+
';
+
+ $output->add_after_header($redir_html);
}
/**
@@ -1138,19 +1138,19 @@
function smtp_get_response($socket, $response, $line = __LINE__)
{
- $server_response = '';
- while (substr($server_response, 3, 1) != ' ')
- {
- if (!($server_response = fgets($socket, 256)))
- {
- die_friendly('SMTP Error', "Couldn't get mail server response codes
");
- }
- }
-
- if (!(substr($server_response, 0, 3) == $response))
- {
- die_friendly('SMTP Error', "Ran into problems sending mail. Response: $server_response
");
- }
+ $server_response = '';
+ while (substr($server_response, 3, 1) != ' ')
+ {
+ if (!($server_response = fgets($socket, 256)))
+ {
+ die_friendly('SMTP Error', "Couldn't get mail server response codes
");
+ }
+ }
+
+ if (!(substr($server_response, 0, 3) == $response))
+ {
+ die_friendly('SMTP Error', "Ran into problems sending mail. Response: $server_response
");
+ }
}
/**
@@ -1163,7 +1163,7 @@
function smtp_send_email($to, $subject, $message, $from)
{
- return smtp_send_email_core($to, $subject, $message, "From: <$from>\n");
+ return smtp_send_email_core($to, $subject, $message, "From: <$from>\n");
}
/**
@@ -1178,184 +1178,184 @@
function smtp_send_email_core($mail_to, $subject, $message, $headers = '')
{
- // Fix any bare linefeeds in the message to make it RFC821 Compliant.
- $message = preg_replace("#(? 1)
- {
- $headers = join("\n", $headers);
- }
- else
- {
- $headers = $headers[0];
- }
- }
- $headers = chop($headers);
-
- // Make sure there are no bare linefeeds in the headers
- $headers = preg_replace('#(?\r\n");
- smtp_get_response($socket, "250", __LINE__);
-
- // Specify each user to send to and build to header.
- $to_header = '';
-
- // Add an additional bit of error checking to the To field.
- $mail_to = (trim($mail_to) == '') ? 'Undisclosed-recipients:;' : trim($mail_to);
- if (preg_match('#[^ ]+\@[^ ]+#', $mail_to))
- {
- enano_fputs($socket, "RCPT TO: <$mail_to>\r\n");
- smtp_get_response($socket, "250", __LINE__);
- }
-
- // Ok now do the CC and BCC fields...
- @reset($bcc);
- while(list(, $bcc_address) = each($bcc))
- {
- // Add an additional bit of error checking to bcc header...
- $bcc_address = trim($bcc_address);
- if (preg_match('#[^ ]+\@[^ ]+#', $bcc_address))
- {
- enano_fputs($socket, "RCPT TO: <$bcc_address>\r\n");
- smtp_get_response($socket, "250", __LINE__);
- }
- }
-
- @reset($cc);
- while(list(, $cc_address) = each($cc))
- {
- // Add an additional bit of error checking to cc header
- $cc_address = trim($cc_address);
- if (preg_match('#[^ ]+\@[^ ]+#', $cc_address))
- {
- enano_fputs($socket, "RCPT TO: <$cc_address>\r\n");
- smtp_get_response($socket, "250", __LINE__);
- }
- }
-
- // Ok now we tell the server we are ready to start sending data
- enano_fputs($socket, "DATA\r\n");
-
- // This is the last response code we look for until the end of the message.
- smtp_get_response($socket, "354", __LINE__);
-
- // Send the Subject Line...
- enano_fputs($socket, "Subject: $subject\r\n");
-
- // Now the To Header.
- enano_fputs($socket, "To: $mail_to\r\n");
-
- // Now any custom headers....
- enano_fputs($socket, "$headers\r\n\r\n");
-
- // Ok now we are ready for the message...
- enano_fputs($socket, "$message\r\n");
-
- // Ok the all the ingredients are mixed in let's cook this puppy...
- enano_fputs($socket, ".\r\n");
- smtp_get_response($socket, "250", __LINE__);
-
- // Now tell the server we are done and close the socket...
- enano_fputs($socket, "QUIT\r\n");
- fclose($socket);
-
- return TRUE;
+ // Fix any bare linefeeds in the message to make it RFC821 Compliant.
+ $message = preg_replace("#(? 1)
+ {
+ $headers = join("\n", $headers);
+ }
+ else
+ {
+ $headers = $headers[0];
+ }
+ }
+ $headers = chop($headers);
+
+ // Make sure there are no bare linefeeds in the headers
+ $headers = preg_replace('#(?\r\n");
+ smtp_get_response($socket, "250", __LINE__);
+
+ // Specify each user to send to and build to header.
+ $to_header = '';
+
+ // Add an additional bit of error checking to the To field.
+ $mail_to = (trim($mail_to) == '') ? 'Undisclosed-recipients:;' : trim($mail_to);
+ if (preg_match('#[^ ]+\@[^ ]+#', $mail_to))
+ {
+ enano_fputs($socket, "RCPT TO: <$mail_to>\r\n");
+ smtp_get_response($socket, "250", __LINE__);
+ }
+
+ // Ok now do the CC and BCC fields...
+ @reset($bcc);
+ while(list(, $bcc_address) = each($bcc))
+ {
+ // Add an additional bit of error checking to bcc header...
+ $bcc_address = trim($bcc_address);
+ if (preg_match('#[^ ]+\@[^ ]+#', $bcc_address))
+ {
+ enano_fputs($socket, "RCPT TO: <$bcc_address>\r\n");
+ smtp_get_response($socket, "250", __LINE__);
+ }
+ }
+
+ @reset($cc);
+ while(list(, $cc_address) = each($cc))
+ {
+ // Add an additional bit of error checking to cc header
+ $cc_address = trim($cc_address);
+ if (preg_match('#[^ ]+\@[^ ]+#', $cc_address))
+ {
+ enano_fputs($socket, "RCPT TO: <$cc_address>\r\n");
+ smtp_get_response($socket, "250", __LINE__);
+ }
+ }
+
+ // Ok now we tell the server we are ready to start sending data
+ enano_fputs($socket, "DATA\r\n");
+
+ // This is the last response code we look for until the end of the message.
+ smtp_get_response($socket, "354", __LINE__);
+
+ // Send the Subject Line...
+ enano_fputs($socket, "Subject: $subject\r\n");
+
+ // Now the To Header.
+ enano_fputs($socket, "To: $mail_to\r\n");
+
+ // Now any custom headers....
+ enano_fputs($socket, "$headers\r\n\r\n");
+
+ // Ok now we are ready for the message...
+ enano_fputs($socket, "$message\r\n");
+
+ // Ok the all the ingredients are mixed in let's cook this puppy...
+ enano_fputs($socket, ".\r\n");
+ smtp_get_response($socket, "250", __LINE__);
+
+ // Now tell the server we are done and close the socket...
+ enano_fputs($socket, "QUIT\r\n");
+ fclose($socket);
+
+ return TRUE;
}
/**
@@ -1367,24 +1367,24 @@
function enano_version($long = false, $no_nightly = false)
{
- if ( !defined('ENANO_CONFIG_FETCHED') )
- {
- return function_exists('installer_enano_version') ? installer_enano_version() : $GLOBALS['enano_version'];
- }
- $r = getConfig('enano_version');
- $rc = ( $long ) ? ' release candidate ' : 'RC';
- $b = ( $long ) ? ' beta ' : 'b';
- $a = ( $long ) ? ' alpha ' : 'a';
- if($v = getConfig('enano_rc_version')) $r .= $rc.$v;
- if($v = getConfig('enano_beta_version')) $r .= $b.$v;
- if($v = getConfig('enano_alpha_version')) $r .= $a.$v;
- if ( defined('ENANO_NIGHTLY') && !$no_nightly )
- {
- $nightlytag = ENANO_NIGHTLY_MONTH . '-' . ENANO_NIGHTLY_DAY . '-' . ENANO_NIGHTLY_YEAR;
- $nightlylong = ' nightly; build date: ' . ENANO_NIGHTLY_MONTH . '-' . ENANO_NIGHTLY_DAY . '-' . ENANO_NIGHTLY_YEAR;
- $r = ( $long ) ? $r . $nightlylong : $r . '-nightly-' . $nightlytag;
- }
- return $r;
+ if ( !defined('ENANO_CONFIG_FETCHED') )
+ {
+ return function_exists('installer_enano_version') ? installer_enano_version() : $GLOBALS['enano_version'];
+ }
+ $r = getConfig('enano_version');
+ $rc = ( $long ) ? ' release candidate ' : 'RC';
+ $b = ( $long ) ? ' beta ' : 'b';
+ $a = ( $long ) ? ' alpha ' : 'a';
+ if($v = getConfig('enano_rc_version')) $r .= $rc.$v;
+ if($v = getConfig('enano_beta_version')) $r .= $b.$v;
+ if($v = getConfig('enano_alpha_version')) $r .= $a.$v;
+ if ( defined('ENANO_NIGHTLY') && !$no_nightly )
+ {
+ $nightlytag = ENANO_NIGHTLY_MONTH . '-' . ENANO_NIGHTLY_DAY . '-' . ENANO_NIGHTLY_YEAR;
+ $nightlylong = ' nightly; build date: ' . ENANO_NIGHTLY_MONTH . '-' . ENANO_NIGHTLY_DAY . '-' . ENANO_NIGHTLY_YEAR;
+ $r = ( $long ) ? $r . $nightlylong : $r . '-nightly-' . $nightlytag;
+ }
+ return $r;
}
/**
@@ -1394,31 +1394,31 @@
function enano_codename()
{
- $names = array(
- '1.0RC1' => 'Leprechaun',
- '1.0RC2' => 'Clurichaun',
- '1.0RC3' => 'Druid',
- '1.0' => 'Banshee',
- '1.0.1' => 'Loch Ness',
- '1.0.1.1'=> 'Loch Ness internal bugfix build',
- '1.0.2b1'=> 'Coblynau unstable',
- '1.0.2' => 'Coblynau',
- '1.0.3' => 'Dyrad',
- '1.1.1' => 'Caoineag alpha 1',
- '1.1.2' => 'Caoineag alpha 2',
- '1.1.3' => 'Caoineag alpha 3',
- '1.1.4' => 'Caoineag alpha 4',
- '1.1.5' => 'Caoineag alpha 5',
- '1.1.6' => 'Caoineag beta 1',
- '1.1.7' => 'Caoineag beta 2',
- '1.1.8' => 'Caoineag beta 3',
- );
- $version = enano_version();
- if ( isset($names[$version]) )
- {
- return $names[$version];
- }
- return 'Anonymous build';
+ $names = array(
+ '1.0RC1' => 'Leprechaun',
+ '1.0RC2' => 'Clurichaun',
+ '1.0RC3' => 'Druid',
+ '1.0' => 'Banshee',
+ '1.0.1' => 'Loch Ness',
+ '1.0.1.1'=> 'Loch Ness internal bugfix build',
+ '1.0.2b1'=> 'Coblynau unstable',
+ '1.0.2' => 'Coblynau',
+ '1.0.3' => 'Dyrad',
+ '1.1.1' => 'Caoineag alpha 1',
+ '1.1.2' => 'Caoineag alpha 2',
+ '1.1.3' => 'Caoineag alpha 3',
+ '1.1.4' => 'Caoineag alpha 4',
+ '1.1.5' => 'Caoineag alpha 5',
+ '1.1.6' => 'Caoineag beta 1',
+ '1.1.7' => 'Caoineag beta 2',
+ '1.1.8' => 'Caoineag beta 3',
+ );
+ $version = enano_version();
+ if ( isset($names[$version]) )
+ {
+ return $names[$version];
+ }
+ return 'Anonymous build';
}
/**
@@ -1427,8 +1427,8 @@
*/
function _die($t) {
- $_ob = 'document.getElementById("ajaxEditContainer").innerHTML = unescape(\'' . rawurlencode('' . $t . '') . '\')';
- die($_ob);
+ $_ob = 'document.getElementById("ajaxEditContainer").innerHTML = unescape(\'' . rawurlencode('' . $t . '') . '\')';
+ die($_ob);
}
/**
@@ -1437,9 +1437,9 @@
*/
function jsdie($text) {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $text = rawurlencode($text . "\n\nSQL Backtrace:\n" . $db->sql_backtrace());
- echo 'document.getElementById("ajaxEditContainer").innerHTML = unescape(\''.$text.'\');';
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $text = rawurlencode($text . "\n\nSQL Backtrace:\n" . $db->sql_backtrace());
+ echo 'document.getElementById("ajaxEditContainer").innerHTML = unescape(\''.$text.'\');';
}
/**
@@ -1450,7 +1450,7 @@
function capitalize_first_letter($text)
{
- return strtoupper(substr($text, 0, 1)) . substr($text, 1);
+ return strtoupper(substr($text, 0, 1)) . substr($text, 1);
}
/**
@@ -1462,7 +1462,7 @@
function is_bit($bitfield, $value)
{
- return ( $bitfield & $value ) ? true : false;
+ return ( $bitfield & $value ) ? true : false;
}
/**
@@ -1473,16 +1473,16 @@
function trim_spaces($text)
{
- $d = true;
- while($d)
- {
- $c = substr($text, 0, 1);
- $a = substr($text, strlen($text)-1, strlen($text));
- if($c == "\n" || $c == "\r" || $c == "\t" || $c == ' ') $text = substr($text, 1, strlen($text));
- elseif($a == "\n" || $a == "\r" || $a == "\t" || $a == ' ') $text = substr($text, 0, strlen($text)-1);
- else $d = false;
- }
- return $text;
+ $d = true;
+ while($d)
+ {
+ $c = substr($text, 0, 1);
+ $a = substr($text, strlen($text)-1, strlen($text));
+ if($c == "\n" || $c == "\r" || $c == "\t" || $c == ' ') $text = substr($text, 1, strlen($text));
+ elseif($a == "\n" || $a == "\r" || $a == "\t" || $a == ' ') $text = substr($text, 0, strlen($text)-1);
+ else $d = false;
+ }
+ return $text;
}
/**
@@ -1494,21 +1494,21 @@
function enano_str_split($text, $inc = 1)
{
- if($inc < 1)
- {
- return false;
- }
- if($inc >= strlen($text))
- {
- return Array($text);
- }
- $len = ceil(strlen($text) / $inc);
- $ret = Array();
- for ( $i = 0; $i < strlen($text); $i = $i + $inc )
- {
- $ret[] = substr($text, $i, $inc);
- }
- return $ret;
+ if($inc < 1)
+ {
+ return false;
+ }
+ if($inc >= strlen($text))
+ {
+ return Array($text);
+ }
+ $len = ceil(strlen($text) / $inc);
+ $ret = Array();
+ for ( $i = 0; $i < strlen($text); $i = $i + $inc )
+ {
+ $ret[] = substr($text, $i, $inc);
+ }
+ return $ret;
}
/**
@@ -1518,13 +1518,13 @@
*/
function hex2bin($text)
{
- $arr = enano_str_split($text, 2);
- $ret = '';
- for ($i=0; $i';
- if ( function_exists('debug_print_backtrace') )
- {
- debug_print_backtrace();
- }
- else
- {
- echo 'Warning: No debug_print_backtrace() support!';
- }
- if ( !$return )
- echo '';
- $c = ob_get_contents();
- ob_end_clean();
- if($return) return $c;
- else echo $c;
- return null;
+ ob_start();
+ if ( !$return )
+ echo '';
+ if ( function_exists('debug_print_backtrace') )
+ {
+ debug_print_backtrace();
+ }
+ else
+ {
+ echo 'Warning: No debug_print_backtrace() support!';
+ }
+ if ( !$return )
+ echo '';
+ $c = ob_get_contents();
+ ob_end_clean();
+ if($return) return $c;
+ else echo $c;
+ return null;
}
/**
@@ -1565,15 +1565,15 @@
function hexencode($text, $prefix = '%', $suffix = '')
{
- $arr = enano_str_split($text);
- $r = '';
- foreach($arr as $a)
- {
- $nibble = (string)dechex(ord($a));
- if(strlen($nibble) == 1) $nibble = '0' . $nibble;
- $r .= $prefix . $nibble . $suffix;
- }
- return $r;
+ $arr = enano_str_split($text);
+ $r = '';
+ foreach($arr as $a)
+ {
+ $nibble = (string)dechex(ord($a));
+ if(strlen($nibble) == 1) $nibble = '0' . $nibble;
+ $r .= $prefix . $nibble . $suffix;
+ }
+ return $r;
}
/**
@@ -1583,14 +1583,14 @@
function enano_get_magic_quotes_gpc()
{
- if(function_exists('get_magic_quotes_gpc'))
- {
- return ( get_magic_quotes_gpc() == 1 );
- }
- else
- {
- return ( strtolower(@ini_get('magic_quotes_gpc')) == '1' );
- }
+ if(function_exists('get_magic_quotes_gpc'))
+ {
+ return ( get_magic_quotes_gpc() == 1 );
+ }
+ else
+ {
+ return ( strtolower(@ini_get('magic_quotes_gpc')) == '1' );
+ }
}
/**
@@ -1601,15 +1601,15 @@
function stripslashes_recurse($arr)
{
- foreach($arr as $k => $xxxx)
- {
- $val =& $arr[$k];
- if(is_string($val))
- $val = stripslashes($val);
- elseif(is_array($val))
- $val = stripslashes_recurse($val);
- }
- return $arr;
+ foreach($arr as $k => $xxxx)
+ {
+ $val =& $arr[$k];
+ if(is_string($val))
+ $val = stripslashes($val);
+ elseif(is_array($val))
+ $val = stripslashes_recurse($val);
+ }
+ return $arr;
}
/**
@@ -1620,15 +1620,15 @@
function strip_nul_chars($arr)
{
- foreach($arr as $k => $xxxx_unused)
- {
- $val =& $arr[$k];
- if(is_string($val))
- $val = str_replace("\000", '', $val);
- elseif(is_array($val))
- $val = strip_nul_chars($val);
- }
- return $arr;
+ foreach($arr as $k => $xxxx_unused)
+ {
+ $val =& $arr[$k];
+ if(is_string($val))
+ $val = str_replace("\000", '', $val);
+ elseif(is_array($val))
+ $val = strip_nul_chars($val);
+ }
+ return $arr;
}
/**
@@ -1639,21 +1639,21 @@
*/
function strip_magic_quotes_gpc()
{
- if(enano_get_magic_quotes_gpc())
- {
- $_POST = stripslashes_recurse($_POST);
- $_GET = stripslashes_recurse($_GET);
- $_COOKIE = stripslashes_recurse($_COOKIE);
- $_REQUEST = stripslashes_recurse($_REQUEST);
- }
- $_POST = strip_nul_chars($_POST);
- $_GET = strip_nul_chars($_GET);
- $_COOKIE = strip_nul_chars($_COOKIE);
- $_REQUEST = strip_nul_chars($_REQUEST);
- $_POST = decode_unicode_array($_POST);
- $_GET = decode_unicode_array($_GET);
- $_COOKIE = decode_unicode_array($_COOKIE);
- $_REQUEST = decode_unicode_array($_REQUEST);
+ if(enano_get_magic_quotes_gpc())
+ {
+ $_POST = stripslashes_recurse($_POST);
+ $_GET = stripslashes_recurse($_GET);
+ $_COOKIE = stripslashes_recurse($_COOKIE);
+ $_REQUEST = stripslashes_recurse($_REQUEST);
+ }
+ $_POST = strip_nul_chars($_POST);
+ $_GET = strip_nul_chars($_GET);
+ $_COOKIE = strip_nul_chars($_COOKIE);
+ $_REQUEST = strip_nul_chars($_REQUEST);
+ $_POST = decode_unicode_array($_POST);
+ $_GET = decode_unicode_array($_GET);
+ $_COOKIE = decode_unicode_array($_COOKIE);
+ $_REQUEST = decode_unicode_array($_REQUEST);
}
/**
@@ -1664,42 +1664,42 @@
function compress_bitfield($bits)
{
- if ( !preg_match('/^[01]+$/', $bits) )
- return false;
-
- $current = intval($bits{0});
- $clen = 0;
- $out = '';
- for ( $i = 0; $i < strlen($bits); $i++ )
- {
- $cbit = intval($bits{$i});
- if ( $cbit !== $current || $clen == 127 || $i == strlen($bits) - 1 )
- {
- if ( $i == strlen($bits) - 1 && $cbit === $current )
- {
- $clen++;
- }
- // write chunk
- $byte = $clen;
- if ( $current === 1 )
- $byte |= 0x80;
- $out .= chr($byte);
-
- if ( $i == strlen($bits) - 1 && $cbit !== $current )
- {
- $out .= ( $cbit === 1 ) ? chr(0x81) : chr(0x1);
- }
-
- // reset
- $current = intval($cbit);
- $clen = 0;
- }
- $clen++;
- }
- $crc = dechex(crc32($out));
- while ( strlen($crc) < 8 )
- $crc = "0$crc";
- return "cbf2:{$crc}" . hexencode($out, '', '');
+ if ( !preg_match('/^[01]+$/', $bits) )
+ return false;
+
+ $current = intval($bits{0});
+ $clen = 0;
+ $out = '';
+ for ( $i = 0; $i < strlen($bits); $i++ )
+ {
+ $cbit = intval($bits{$i});
+ if ( $cbit !== $current || $clen == 127 || $i == strlen($bits) - 1 )
+ {
+ if ( $i == strlen($bits) - 1 && $cbit === $current )
+ {
+ $clen++;
+ }
+ // write chunk
+ $byte = $clen;
+ if ( $current === 1 )
+ $byte |= 0x80;
+ $out .= chr($byte);
+
+ if ( $i == strlen($bits) - 1 && $cbit !== $current )
+ {
+ $out .= ( $cbit === 1 ) ? chr(0x81) : chr(0x1);
+ }
+
+ // reset
+ $current = intval($cbit);
+ $clen = 0;
+ }
+ $clen++;
+ }
+ $crc = dechex(crc32($out));
+ while ( strlen($crc) < 8 )
+ $crc = "0$crc";
+ return "cbf2:{$crc}" . hexencode($out, '', '');
}
// test case
@@ -1714,36 +1714,36 @@
function uncompress_bitfield($bits)
{
- if ( substr($bits, 0, 4) == 'cbf:' )
- {
- return uncompress_bitfield_old($bits);
- }
- if ( substr($bits, 0, 5) != 'cbf2:' )
- {
- echo __FUNCTION__.'(): ERROR: Invalid stream';
- return false;
- }
- $bits = substr($bits, 5);
- $crc = substr($bits, 0, 8);
- $bits = substr($bits, 8);
- $bits = hexdecode($bits);
- if ( dechex(crc32($bits)) !== $crc )
- {
- echo __FUNCTION__."(): ERROR: CRC failed";
- return false;
- }
- $out = '';
- for ( $i = 0; $i < strlen($bits); $i++ )
- {
- $byte = ord($bits{$i});
- $char = $byte & 0x80 ? '1' : '0';
- $byte &= ~0x80;
- for ( $j = 0; $j < $byte; $j++ )
- {
- $out .= $char;
- }
- }
- return $out;
+ if ( substr($bits, 0, 4) == 'cbf:' )
+ {
+ return uncompress_bitfield_old($bits);
+ }
+ if ( substr($bits, 0, 5) != 'cbf2:' )
+ {
+ echo __FUNCTION__.'(): ERROR: Invalid stream';
+ return false;
+ }
+ $bits = substr($bits, 5);
+ $crc = substr($bits, 0, 8);
+ $bits = substr($bits, 8);
+ $bits = hexdecode($bits);
+ if ( dechex(crc32($bits)) !== $crc )
+ {
+ echo __FUNCTION__."(): ERROR: CRC failed";
+ return false;
+ }
+ $out = '';
+ for ( $i = 0; $i < strlen($bits); $i++ )
+ {
+ $byte = ord($bits{$i});
+ $char = $byte & 0x80 ? '1' : '0';
+ $byte &= ~0x80;
+ for ( $j = 0; $j < $byte; $j++ )
+ {
+ $out .= $char;
+ }
+ }
+ return $out;
}
/**
@@ -1755,34 +1755,34 @@
function uncompress_bitfield_old($bits)
{
- if(substr($bits, 0, 4) != 'cbf:')
- {
- echo __FUNCTION__.'(): ERROR: Invalid stream';
- return false;
- }
- $len = intval(substr($bits, strpos($bits, 'len=')+4, strpos($bits, ';')-strpos($bits, 'len=')-4));
- $crc = substr($bits, strpos($bits, 'crc=')+4, 8);
- $data = substr($bits, strpos($bits, 'data=')+5, strpos($bits, '|end')-strpos($bits, 'data=')-5);
- $data = explode(',', $data);
- foreach($data as $a => $b)
- {
- $d =& $data[$a];
- $char = substr($d, 0, 1);
- $dlen = intval(substr($d, 2, strlen($d)-1));
- $s = '';
- for($i=0;$i<$dlen;$i++,$s.=$char);
- $d = $s;
- unset($s, $dlen, $char);
- }
- $decompressed = implode('', $data);
- $decompressed = substr($decompressed, 0, -1);
- $dcrc = (string)dechex(crc32($decompressed));
- if($dcrc != $crc)
- {
- echo __FUNCTION__.'(): ERROR: CRC check failed
debug info:
original crc: '.$crc.'
decomp\'ed crc: '.$dcrc.'
';
- return false;
- }
- return $decompressed;
+ if(substr($bits, 0, 4) != 'cbf:')
+ {
+ echo __FUNCTION__.'(): ERROR: Invalid stream';
+ return false;
+ }
+ $len = intval(substr($bits, strpos($bits, 'len=')+4, strpos($bits, ';')-strpos($bits, 'len=')-4));
+ $crc = substr($bits, strpos($bits, 'crc=')+4, 8);
+ $data = substr($bits, strpos($bits, 'data=')+5, strpos($bits, '|end')-strpos($bits, 'data=')-5);
+ $data = explode(',', $data);
+ foreach($data as $a => $b)
+ {
+ $d =& $data[$a];
+ $char = substr($d, 0, 1);
+ $dlen = intval(substr($d, 2, strlen($d)-1));
+ $s = '';
+ for($i=0;$i<$dlen;$i++,$s.=$char);
+ $d = $s;
+ unset($s, $dlen, $char);
+ }
+ $decompressed = implode('', $data);
+ $decompressed = substr($decompressed, 0, -1);
+ $dcrc = (string)dechex(crc32($decompressed));
+ if($dcrc != $crc)
+ {
+ echo __FUNCTION__.'(): ERROR: CRC check failed
debug info:
original crc: '.$crc.'
decomp\'ed crc: '.$dcrc.'
';
+ return false;
+ }
+ return $decompressed;
}
/**
@@ -1796,125 +1796,125 @@
function export_table($table, $structure = true, $data = true, $compact = false)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
- $struct_keys = '';
- $divider = (!$compact) ? "\n" : "\n";
- $spacer1 = (!$compact) ? "\n" : " ";
- $spacer2 = (!$compact) ? " " : " ";
- $rowspacer = (!$compact) ? "\n " : " ";
- $index_list = Array();
- $cols = $db->sql_query('SHOW COLUMNS IN '.$table.';');
- if(!$cols)
- {
- echo 'export_table(): Error getting column list: '.$db->get_error_text().'
';
- return false;
- }
- $col = Array();
- $sqlcol = Array();
- $collist = Array();
- $pri_keys = Array();
- // Using fetchrow_num() here to compensate for MySQL l10n
- while( $row = $db->fetchrow_num() )
- {
- $field =& $row[0];
- $type =& $row[1];
- $null =& $row[2];
- $key =& $row[3];
- $def =& $row[4];
- $extra =& $row[5];
- $col[] = Array(
- 'name'=>$field,
- 'type'=>$type,
- 'null'=>$null,
- 'key'=>$key,
- 'default'=>$def,
- 'extra'=>$extra,
- );
- $collist[] = $field;
- }
-
- if ( $structure )
- {
- $db->sql_query('SET SQL_QUOTE_SHOW_CREATE = 0;');
- $struct = $db->sql_query('SHOW CREATE TABLE '.$table.';');
- if ( !$struct )
- $db->_die();
- $row = $db->fetchrow_num();
- $db->free_result();
- $struct = $row[1];
- $struct = preg_replace("/\n\) ENGINE=(.+)$/", "\n);", $struct);
- unset($row);
- if ( $compact )
- {
- $struct_arr = explode("\n", $struct);
- foreach ( $struct_arr as $i => $leg )
- {
- if ( $i == 0 )
- continue;
- $test = trim($leg);
- if ( empty($test) )
- {
- unset($struct_arr[$i]);
- continue;
- }
- $struct_arr[$i] = preg_replace('/^([\s]*)/', ' ', $leg);
- }
- $struct = implode("", $struct_arr);
- }
- }
-
- // Structuring complete
- if($data)
- {
- $datq = $db->sql_query('SELECT * FROM '.$table.';');
- if(!$datq)
- {
- echo 'export_table(): Error getting column list: '.$db->get_error_text().'
';
- return false;
- }
- if($db->numrows() < 1)
- {
- if($structure) return $struct;
- else return '';
- }
- $rowdata = Array();
- $dataqs = Array();
- $insert_strings = Array();
- $z = false;
- while($row = $db->fetchrow_num())
- {
- $z = false;
- foreach($row as $i => $cell)
- {
- $str = mysql_encode_column($cell, $col[$i]['type']);
- $rowdata[] = $str;
- }
- $dataqs2 = implode(",$rowspacer", $dataqs) . ",$rowspacer" . '( ' . implode(', ', $rowdata) . ' )';
- $ins = 'INSERT INTO '.$table.'( '.implode(',', $collist).' ) VALUES' . $dataqs2 . ";";
- if ( strlen( $ins ) > MYSQL_MAX_PACKET_SIZE )
- {
- // We've exceeded the maximum allowed packet size for MySQL - separate this into a different query
- $insert_strings[] = 'INSERT INTO '.$table.'( '.implode(',', $collist).' ) VALUES' . implode(",$rowspacer", $dataqs) . ";";;
- $dataqs = Array('( ' . implode(', ', $rowdata) . ' )');
- $z = true;
- }
- else
- {
- $dataqs[] = '( ' . implode(', ', $rowdata) . ' )';
- }
- $rowdata = Array();
- }
- if ( !$z )
- {
- $insert_strings[] = 'INSERT INTO '.$table.'( '.implode(',', $collist).' ) VALUES' . implode(",$rowspacer", $dataqs) . ";";;
- $dataqs = Array();
- }
- $datstring = implode($divider, $insert_strings);
- }
- if($structure && !$data) return $struct;
- elseif(!$structure && $data) return $datstring;
- elseif($structure && $data) return $struct . $divider . $datstring;
- elseif(!$structure && !$data) return '';
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $struct_keys = '';
+ $divider = (!$compact) ? "\n" : "\n";
+ $spacer1 = (!$compact) ? "\n" : " ";
+ $spacer2 = (!$compact) ? " " : " ";
+ $rowspacer = (!$compact) ? "\n " : " ";
+ $index_list = Array();
+ $cols = $db->sql_query('SHOW COLUMNS IN '.$table.';');
+ if(!$cols)
+ {
+ echo 'export_table(): Error getting column list: '.$db->get_error_text().'
';
+ return false;
+ }
+ $col = Array();
+ $sqlcol = Array();
+ $collist = Array();
+ $pri_keys = Array();
+ // Using fetchrow_num() here to compensate for MySQL l10n
+ while( $row = $db->fetchrow_num() )
+ {
+ $field =& $row[0];
+ $type =& $row[1];
+ $null =& $row[2];
+ $key =& $row[3];
+ $def =& $row[4];
+ $extra =& $row[5];
+ $col[] = Array(
+ 'name'=>$field,
+ 'type'=>$type,
+ 'null'=>$null,
+ 'key'=>$key,
+ 'default'=>$def,
+ 'extra'=>$extra,
+ );
+ $collist[] = $field;
+ }
+
+ if ( $structure )
+ {
+ $db->sql_query('SET SQL_QUOTE_SHOW_CREATE = 0;');
+ $struct = $db->sql_query('SHOW CREATE TABLE '.$table.';');
+ if ( !$struct )
+ $db->_die();
+ $row = $db->fetchrow_num();
+ $db->free_result();
+ $struct = $row[1];
+ $struct = preg_replace("/\n\) ENGINE=(.+)$/", "\n);", $struct);
+ unset($row);
+ if ( $compact )
+ {
+ $struct_arr = explode("\n", $struct);
+ foreach ( $struct_arr as $i => $leg )
+ {
+ if ( $i == 0 )
+ continue;
+ $test = trim($leg);
+ if ( empty($test) )
+ {
+ unset($struct_arr[$i]);
+ continue;
+ }
+ $struct_arr[$i] = preg_replace('/^([\s]*)/', ' ', $leg);
+ }
+ $struct = implode("", $struct_arr);
+ }
+ }
+
+ // Structuring complete
+ if($data)
+ {
+ $datq = $db->sql_query('SELECT * FROM '.$table.';');
+ if(!$datq)
+ {
+ echo 'export_table(): Error getting column list: '.$db->get_error_text().'
';
+ return false;
+ }
+ if($db->numrows() < 1)
+ {
+ if($structure) return $struct;
+ else return '';
+ }
+ $rowdata = Array();
+ $dataqs = Array();
+ $insert_strings = Array();
+ $z = false;
+ while($row = $db->fetchrow_num())
+ {
+ $z = false;
+ foreach($row as $i => $cell)
+ {
+ $str = mysql_encode_column($cell, $col[$i]['type']);
+ $rowdata[] = $str;
+ }
+ $dataqs2 = implode(",$rowspacer", $dataqs) . ",$rowspacer" . '( ' . implode(', ', $rowdata) . ' )';
+ $ins = 'INSERT INTO '.$table.'( '.implode(',', $collist).' ) VALUES' . $dataqs2 . ";";
+ if ( strlen( $ins ) > MYSQL_MAX_PACKET_SIZE )
+ {
+ // We've exceeded the maximum allowed packet size for MySQL - separate this into a different query
+ $insert_strings[] = 'INSERT INTO '.$table.'( '.implode(',', $collist).' ) VALUES' . implode(",$rowspacer", $dataqs) . ";";;
+ $dataqs = Array('( ' . implode(', ', $rowdata) . ' )');
+ $z = true;
+ }
+ else
+ {
+ $dataqs[] = '( ' . implode(', ', $rowdata) . ' )';
+ }
+ $rowdata = Array();
+ }
+ if ( !$z )
+ {
+ $insert_strings[] = 'INSERT INTO '.$table.'( '.implode(',', $collist).' ) VALUES' . implode(",$rowspacer", $dataqs) . ";";;
+ $dataqs = Array();
+ }
+ $datstring = implode($divider, $insert_strings);
+ }
+ if($structure && !$data) return $struct;
+ elseif(!$structure && $data) return $datstring;
+ elseif($structure && $data) return $struct . $divider . $datstring;
+ elseif(!$structure && !$data) return '';
}
/**
@@ -1924,25 +1924,25 @@
function mysql_encode_column($input, $type)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
- // Decide whether to quote the string or not
- if(substr($type, 0, 7) == 'varchar' || $type == 'datetime' || $type == 'text' || $type == 'tinytext' || $type == 'smalltext' || $type == 'longtext' || substr($type, 0, 4) == 'char')
- {
- $str = "'" . $db->escape($input) . "'";
- }
- elseif(in_array($type, Array('blob', 'longblob', 'mediumblob', 'smallblob')) || substr($type, 0, 6) == 'binary' || substr($type, 0, 9) == 'varbinary')
- {
- $str = '0x' . hexencode($input, '', '');
- }
- elseif(is_null($input))
- {
- $str = 'NULL';
- }
- else
- {
- $str = (string)$input;
- }
- return $str;
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ // Decide whether to quote the string or not
+ if(substr($type, 0, 7) == 'varchar' || $type == 'datetime' || $type == 'text' || $type == 'tinytext' || $type == 'smalltext' || $type == 'longtext' || substr($type, 0, 4) == 'char')
+ {
+ $str = "'" . $db->escape($input) . "'";
+ }
+ elseif(in_array($type, Array('blob', 'longblob', 'mediumblob', 'smallblob')) || substr($type, 0, 6) == 'binary' || substr($type, 0, 9) == 'varbinary')
+ {
+ $str = '0x' . hexencode($input, '', '');
+ }
+ elseif(is_null($input))
+ {
+ $str = 'NULL';
+ }
+ else
+ {
+ $str = (string)$input;
+ }
+ return $str;
}
/**
@@ -1952,19 +1952,19 @@
function fetch_allowed_extensions()
{
- global $mime_types;
- $bits = getConfig('allowed_mime_types');
- if(!$bits) return Array(false);
- $bits = uncompress_bitfield($bits);
- if(!$bits) return Array(false);
- $bits = enano_str_split($bits, 1);
- $ret = Array();
- $mt = array_keys($mime_types);
- foreach($bits as $i => $b)
- {
- $ret[$mt[$i]] = ( $b == '1' ) ? true : false;
- }
- return $ret;
+ global $mime_types;
+ $bits = getConfig('allowed_mime_types');
+ if(!$bits) return Array(false);
+ $bits = uncompress_bitfield($bits);
+ if(!$bits) return Array(false);
+ $bits = enano_str_split($bits, 1);
+ $ret = Array();
+ $mt = array_keys($mime_types);
+ foreach($bits as $i => $b)
+ {
+ $ret[$mt[$i]] = ( $b == '1' ) ? true : false;
+ }
+ return $ret;
}
/**
@@ -1975,12 +1975,12 @@
function randkey($len = 32)
{
- $key = '';
- for($i=0;$i<$len;$i++)
- {
- $key .= chr(mt_rand(0, 255));
- }
- return $key;
+ $key = '';
+ for($i=0;$i<$len;$i++)
+ {
+ $key .= chr(mt_rand(0, 255));
+ }
+ return $key;
}
/**
@@ -1991,14 +1991,14 @@
function hexdecode($hex)
{
- $hex = enano_str_split($hex, 2);
- $bin_key = '';
- foreach($hex as $nibble)
- {
- $byte = chr(hexdec($nibble));
- $bin_key .= $byte;
- }
- return $bin_key;
+ $hex = enano_str_split($hex, 2);
+ $bin_key = '';
+ foreach($hex as $nibble)
+ {
+ $byte = chr(hexdec($nibble));
+ $bin_key .= $byte;
+ }
+ return $bin_key;
}
/**
@@ -2009,166 +2009,166 @@
function sanitize_html($html, $filter_php = true)
{
- // Random seed for substitution
- $rand_seed = md5( sha1(microtime()) . mt_rand() );
-
- // We need MediaWiki
- require_once(ENANO_ROOT . '/includes/wikiengine/TagSanitizer.php');
-
- // Strip out comments that are already escaped
- preg_match_all('/<!--(.*?)-->/', $html, $comment_match);
- $i = 0;
- foreach ( $comment_match[0] as $comment )
- {
- $html = str_replace_once($comment, "{HTMLCOMMENT:$i:$rand_seed}", $html);
- $i++;
- }
-
- // Strip out code sections that will be postprocessed by Text_Wiki
- preg_match_all(';^]*)?>((?:(?R)|.)*?)(\s|$);msi', $html, $code_match);
- $i = 0;
- foreach ( $code_match[0] as $code )
- {
- $html = str_replace_once($code, "{TW_CODE:$i:$rand_seed}", $html);
- $i++;
- }
-
- $html = preg_replace('#<([a-z]+)([\s]+)([^>]+?)'.htmlalternatives('javascript:').'(.+?)>(.*?)#is', '<\\1\\2\\3javascript:\\59>\\60</\\1>', $html);
- $html = preg_replace('#<([a-z]+)([\s]+)([^>]+?)'.htmlalternatives('javascript:').'(.+?)>#is', '<\\1\\2\\3javascript:\\59>', $html);
-
- if($filter_php)
- $html = str_replace(
- Array('', '%>'),
- Array('<?php', '<?', '<%', '?>', '%>'),
- $html);
-
- $tag_whitelist = array_keys ( setupAttributeWhitelist() );
- if ( !$filter_php )
- $tag_whitelist[] = '?php';
- // allow HTML comments
- $tag_whitelist[] = '!--';
- $len = strlen($html);
- $in_quote = false;
- $quote_char = '';
- $tag_start = 0;
- $tag_name = '';
- $in_tag = false;
- $trk_name = false;
- for ( $i = 0; $i < $len; $i++ )
- {
- $chr = $html{$i};
- $prev = ( $i == 0 ) ? '' : $html{ $i - 1 };
- $next = ( ( $i + 1 ) == $len ) ? '' : $html { $i + 1 };
- if ( $in_quote && $in_tag )
- {
- if ( $quote_char == $chr && $prev != '\\' )
- $in_quote = false;
- }
- elseif ( ( $chr == '"' || $chr == "'" ) && $prev != '\\' && $in_tag )
- {
- $in_quote = true;
- $quote_char = $chr;
- }
- if ( $chr == '<' && !$in_tag && $next != '/' )
- {
- // start of a tag
- $tag_start = $i;
- $in_tag = true;
- $trk_name = true;
- }
- elseif ( !$in_quote && $in_tag && $chr == '>' )
- {
- $full_tag = substr($html, $tag_start, ( $i - $tag_start ) + 1 );
- $l = strlen($tag_name) + 2;
- $attribs_only = trim( substr($full_tag, $l, ( strlen($full_tag) - $l - 1 ) ) );
-
- // Debugging message
- // echo htmlspecialchars($full_tag) . '
';
-
- if ( !in_array($tag_name, $tag_whitelist) && substr($tag_name, 0, 3) != '!--' )
- {
- // Illegal tag
- //echo $tag_name . ' ';
-
- $s = ( empty($attribs_only) ) ? '' : ' ';
-
- $sanitized = '<' . $tag_name . $s . $attribs_only . '>';
-
- $html = substr($html, 0, $tag_start) . $sanitized . substr($html, $i + 1);
- $html = str_replace('', '</' . $tag_name . '>', $html);
- $new_i = $tag_start + strlen($sanitized);
-
- $len = strlen($html);
- $i = $new_i;
-
- $in_tag = false;
- $tag_name = '';
- continue;
- }
- else
- {
- // If not filtering PHP, don't bother to strip
- if ( $tag_name == '?php' && !$filter_php )
- continue;
- // If this is a comment, likewise skip this "tag"
- if ( $tag_name == '!--' )
- continue;
- $f = fixTagAttributes( $attribs_only, $tag_name );
- $s = ( empty($f) ) ? '' : ' ';
-
- $sanitized = '<' . $tag_name . $f . '>';
- $new_i = $tag_start + strlen($sanitized);
-
- $html = substr($html, 0, $tag_start) . $sanitized . substr($html, $i + 1);
- $len = strlen($html);
- $i = $new_i;
-
- $in_tag = false;
- $tag_name = '';
- continue;
- }
- }
- elseif ( $in_tag && $trk_name )
- {
- $is_alphabetical = ( strtolower($chr) != strtoupper($chr) || in_array($chr, array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9')) || $chr == '?' || $chr == '!' || $chr == '-' );
- if ( $is_alphabetical )
- $tag_name .= $chr;
- else
- {
- $trk_name = false;
- }
- }
-
- }
-
- // Vulnerability from ha.ckers.org/xss.html:
- // ";
- // apply changes
- $html = str_replace($jscript[0][$i], $replacement, $html);
-
- }
-
- // Re-insert untouchable tags
- for ($i = 0;$i < sizeof($matches[1]); $i++)
- {
- $html = str_replace("{DONT_STRIP_ME_NAKED:$seed:$i}", "<{$matches[1][$i]}{$matches[2][$i]}>{$matches[3][$i]}", $html);
- }
-
- // Which tags to strip - you can change this if needed
- $strip_tags = Array('pre', 'script', 'style', 'enano:no-opt', 'textarea');
- $strip_tags = implode('|', $strip_tags);
-
- // Strip out the tags and replace with placeholders
- preg_match_all("#<($strip_tags)(.*?)>(.*?)#is", $html, $matches);
- $seed = md5(microtime() . mt_rand()); // Random value used for placeholders
- for ($i = 0;$i < sizeof($matches[1]); $i++)
- {
- $html = str_replace($matches[0][$i], "{DONT_STRIP_ME_NAKED:$seed:$i}", $html);
- }
-
- // Finally, process the HTML
- $html = preg_replace("#\n([ ]*)#", " ", $html);
-
- // Remove annoying spaces between tags
- $html = preg_replace("#>([ ][ ]+)<#", "> <", $html);
-
- // Re-insert untouchable tags
- for ($i = 0;$i < sizeof($matches[1]); $i++)
- {
- $html = str_replace("{DONT_STRIP_ME_NAKED:$seed:$i}", "<{$matches[1][$i]}{$matches[2][$i]}>{$matches[3][$i]}", $html);
- }
-
- // Remove blocks (can be used by themes that don't want their HTML optimized)
- $html = preg_replace('#<(\/|)enano:no-opt(.*?)>#', '', $html);
-
- $size_after = strlen($html);
-
- // Tell snoopish users what's going on
- $html = str_replace('\n(.*?)#is", $html, $matches);
+ $seed = md5(microtime() . mt_rand()); // Random value used for placeholders
+ for ($i = 0;$i < sizeof($matches[1]); $i++)
+ {
+ $html = str_replace($matches[0][$i], "{DONT_STRIP_ME_NAKED:$seed:$i}", $html);
+ }
+
+ // Optimize (but don't obfuscate) Javascript
+ preg_match_all('/(.*?)(\]\]>)?<\/script>/is', $html, $jscript);
+ require_once(ENANO_ROOT . '/includes/js-compressor.php');
+ $jsc = new JavascriptCompressor();
+
+ // list of Javascript reserved words - from about.com
+ $reserved_words = array('abstract', 'as', 'boolean', 'break', 'byte', 'case', 'catch', 'char', 'class', 'continue', 'const', 'debugger', 'default', 'delete', 'do',
+ 'double', 'else', 'enum', 'export', 'extends', 'false', 'final', 'finally', 'float', 'for', 'function', 'goto', 'if', 'implements', 'import',
+ 'in', 'instanceof', 'int', 'interface', 'is', 'long', 'namespace', 'native', 'new', 'null', 'package', 'private', 'protected', 'public',
+ 'return', 'short', 'static', 'super', 'switch', 'synchronized', 'this', 'throw', 'throws', 'transient', 'true', 'try', 'typeof', 'use', 'var',
+ 'void', 'volatile', 'while', 'with');
+
+ $reserved_words = '(' . implode('|', $reserved_words) . ')';
+
+ for ( $i = 0; $i < count($jscript[0]); $i++ )
+ {
+ $js =& $jscript[2][$i];
+ if ( empty($js) )
+ continue;
+
+ $js = $jsc->getClean($js);
+
+ $replacement = "/* */";
+ // apply changes
+ $html = str_replace($jscript[0][$i], $replacement, $html);
+
+ }
+
+ // Re-insert untouchable tags
+ for ($i = 0;$i < sizeof($matches[1]); $i++)
+ {
+ $html = str_replace("{DONT_STRIP_ME_NAKED:$seed:$i}", "<{$matches[1][$i]}{$matches[2][$i]}>{$matches[3][$i]}", $html);
+ }
+
+ // Which tags to strip - you can change this if needed
+ $strip_tags = Array('pre', 'script', 'style', 'enano:no-opt', 'textarea');
+ $strip_tags = implode('|', $strip_tags);
+
+ // Strip out the tags and replace with placeholders
+ preg_match_all("#<($strip_tags)(.*?)>(.*?)#is", $html, $matches);
+ $seed = md5(microtime() . mt_rand()); // Random value used for placeholders
+ for ($i = 0;$i < sizeof($matches[1]); $i++)
+ {
+ $html = str_replace($matches[0][$i], "{DONT_STRIP_ME_NAKED:$seed:$i}", $html);
+ }
+
+ // Finally, process the HTML
+ $html = preg_replace("#\n([ ]*)#", " ", $html);
+
+ // Remove annoying spaces between tags
+ $html = preg_replace("#>([ ][ ]+)<#", "> <", $html);
+
+ // Re-insert untouchable tags
+ for ($i = 0;$i < sizeof($matches[1]); $i++)
+ {
+ $html = str_replace("{DONT_STRIP_ME_NAKED:$seed:$i}", "<{$matches[1][$i]}{$matches[2][$i]}>{$matches[3][$i]}", $html);
+ }
+
+ // Remove blocks (can be used by themes that don't want their HTML optimized)
+ $html = preg_replace('#<(\/|)enano:no-opt(.*?)>#', '', $html);
+
+ $size_after = strlen($html);
+
+ // Tell snoopish users what's going on
+ $html = str_replace('\n array(), 1 => array(), 2 => array(), 3 => array() );
- foreach ( $octets as $octet )
- {
- $existing =& $possibilities[$i];
- $inner = explode('|', $octet);
- foreach ( $inner as $bit )
- {
- if ( $i >= 2 )
- {
- $bits = int_range($bit);
- if ( $bits === false )
- return false;
- else if ( !is_array($bits) )
- $existing[] = intval($bits);
- else
- $existing = array_merge($existing, $bits);
- }
- else
- {
- $bit = intval($bit);
- $existing[] = $bit;
- }
- }
- $existing = array_unique($existing);
- $i++;
- }
- $ips = array();
-
- // The only way to combine all those possibilities. ;-)
- foreach ( $possibilities[0] as $oc1 )
- foreach ( $possibilities[1] as $oc2 )
- foreach ( $possibilities[2] as $oc3 )
- foreach ( $possibilities[3] as $oc4 )
- $ips[] = "$oc1.$oc2.$oc3.$oc4";
-
- return $ips;
+ $octets = explode('.', $range);
+ if ( count($octets) != 4 )
+ // invalid range
+ return $range;
+ $i = 0;
+ $possibilities = array( 0 => array(), 1 => array(), 2 => array(), 3 => array() );
+ foreach ( $octets as $octet )
+ {
+ $existing =& $possibilities[$i];
+ $inner = explode('|', $octet);
+ foreach ( $inner as $bit )
+ {
+ if ( $i >= 2 )
+ {
+ $bits = int_range($bit);
+ if ( $bits === false )
+ return false;
+ else if ( !is_array($bits) )
+ $existing[] = intval($bits);
+ else
+ $existing = array_merge($existing, $bits);
+ }
+ else
+ {
+ $bit = intval($bit);
+ $existing[] = $bit;
+ }
+ }
+ $existing = array_unique($existing);
+ $i++;
+ }
+ $ips = array();
+
+ // The only way to combine all those possibilities. ;-)
+ foreach ( $possibilities[0] as $oc1 )
+ foreach ( $possibilities[1] as $oc2 )
+ foreach ( $possibilities[2] as $oc3 )
+ foreach ( $possibilities[3] as $oc4 )
+ $ips[] = "$oc1.$oc2.$oc3.$oc4";
+
+ return $ips;
}
/**
@@ -3428,14 +3428,14 @@
function parse_ip_range_regex($range)
{
- if ( strstr($range, ':') )
- {
- return parse_ipv6_range_regex($range);
- }
- else
- {
- return parse_ipv4_range_regex($range);
- }
+ if ( strstr($range, ':') )
+ {
+ return parse_ipv6_range_regex($range);
+ }
+ else
+ {
+ return parse_ipv4_range_regex($range);
+ }
}
/**
@@ -3446,62 +3446,62 @@
function parse_ipv4_range_regex($range)
{
- // Regular expression to test the range string for validity
- $regex = '/^(([0-9]+(-[0-9]+)?)(\|([0-9]+(-[0-9]+)?))*)\.'
- . '(([0-9]+(-[0-9]+)?)(\|([0-9]+(-[0-9]+)?))*)\.'
- . '(([0-9]+(-[0-9]+)?)(\|([0-9]+(-[0-9]+)?))*)\.'
- . '(([0-9]+(-[0-9]+)?)(\|([0-9]+(-[0-9]+)?))*)$/';
- if ( !preg_match($regex, $range) )
- {
- return false;
- }
- $octets = array(0 => array(), 1 => array(), 2 => array(), 3 => array());
- list($octets[0], $octets[1], $octets[2], $octets[3]) = explode('.', $range);
- $return = '^';
- foreach ( $octets as $octet )
- {
- // alternatives array
- $alts = array();
- if ( strpos($octet, '|') )
- {
- $particles = explode('|', $octet);
- }
- else
- {
- $particles = array($octet);
- }
- foreach ( $particles as $atom )
- {
- // each $atom will be either
- if ( strval(intval($atom)) == $atom )
- {
- $alts[] = $atom;
- continue;
- }
- else
- {
- // it's a range - parse it out
- $alt2 = int_range($atom);
- if ( !$alt2 )
- return false;
- foreach ( $alt2 as $neutrino )
- $alts[] = $neutrino;
- }
- }
- $alts = array_unique($alts);
- $alts = '|' . implode('|', $alts) . '|';
- // we can further optimize/compress this by weaseling our way into using some character ranges
- for ( $i = 1; $i <= 25; $i++ )
- {
- $alts = str_replace("|{$i}0|{$i}1|{$i}2|{$i}3|{$i}4|{$i}5|{$i}6|{$i}7|{$i}8|{$i}9|", "|{$i}[0-9]|", $alts);
- }
- $alts = str_replace("|1|2|3|4|5|6|7|8|9|", "|[1-9]|", $alts);
- $alts = '(' . substr($alts, 1, -1) . ')';
- $return .= $alts . '\.';
- }
- $return = substr($return, 0, -2);
- $return .= '$';
- return $return;
+ // Regular expression to test the range string for validity
+ $regex = '/^(([0-9]+(-[0-9]+)?)(\|([0-9]+(-[0-9]+)?))*)\.'
+ . '(([0-9]+(-[0-9]+)?)(\|([0-9]+(-[0-9]+)?))*)\.'
+ . '(([0-9]+(-[0-9]+)?)(\|([0-9]+(-[0-9]+)?))*)\.'
+ . '(([0-9]+(-[0-9]+)?)(\|([0-9]+(-[0-9]+)?))*)$/';
+ if ( !preg_match($regex, $range) )
+ {
+ return false;
+ }
+ $octets = array(0 => array(), 1 => array(), 2 => array(), 3 => array());
+ list($octets[0], $octets[1], $octets[2], $octets[3]) = explode('.', $range);
+ $return = '^';
+ foreach ( $octets as $octet )
+ {
+ // alternatives array
+ $alts = array();
+ if ( strpos($octet, '|') )
+ {
+ $particles = explode('|', $octet);
+ }
+ else
+ {
+ $particles = array($octet);
+ }
+ foreach ( $particles as $atom )
+ {
+ // each $atom will be either
+ if ( strval(intval($atom)) == $atom )
+ {
+ $alts[] = $atom;
+ continue;
+ }
+ else
+ {
+ // it's a range - parse it out
+ $alt2 = int_range($atom);
+ if ( !$alt2 )
+ return false;
+ foreach ( $alt2 as $neutrino )
+ $alts[] = $neutrino;
+ }
+ }
+ $alts = array_unique($alts);
+ $alts = '|' . implode('|', $alts) . '|';
+ // we can further optimize/compress this by weaseling our way into using some character ranges
+ for ( $i = 1; $i <= 25; $i++ )
+ {
+ $alts = str_replace("|{$i}0|{$i}1|{$i}2|{$i}3|{$i}4|{$i}5|{$i}6|{$i}7|{$i}8|{$i}9|", "|{$i}[0-9]|", $alts);
+ }
+ $alts = str_replace("|1|2|3|4|5|6|7|8|9|", "|[1-9]|", $alts);
+ $alts = '(' . substr($alts, 1, -1) . ')';
+ $return .= $alts . '\.';
+ }
+ $return = substr($return, 0, -2);
+ $return .= '$';
+ return $return;
}
/**
@@ -3512,89 +3512,89 @@
function parse_ipv6_range_regex($range)
{
- $range = strtolower(trim($range));
- $valid = '/^';
- $valid .= '(?:[0-9a-f]{0,4}|[0-9a-f]{1,4}-[0-9a-f]{1,4}):';
- $valid .= '(?:[0-9a-f]{0,4}|[0-9a-f]{1,4}-[0-9a-f]{1,4}):';
- $valid .= '(?:[0-9a-f]{0,4}|[0-9a-f]{1,4}-[0-9a-f]{1,4}:|:)?';
- $valid .= '(?:[0-9a-f]{0,4}|[0-9a-f]{1,4}-[0-9a-f]{1,4}:|:)?';
- $valid .= '(?:[0-9a-f]{0,4}|[0-9a-f]{1,4}-[0-9a-f]{1,4}:|:)?';
- $valid .= '(?:[0-9a-f]{0,4}|[0-9a-f]{1,4}-[0-9a-f]{1,4}:|:)?';
- $valid .= '(?:[0-9a-f]{0,4}|[0-9a-f]{1,4}-[0-9a-f]{1,4}:|:)?';
- $valid .= '(?:[0-9a-f]{0,4}|[0-9a-f]{1,4}-[0-9a-f]{1,4})$/';
- if ( !preg_match($valid, $range) )
- return false;
-
- // expand address range.
- // this takes short ranges like:
- // 2001:470-471:054-b02b::5-bb
- // up to:
- // 2001:0470-0471:0054-b02b:0000:0000:0000:0005-00bb
- $range = preg_replace('/^:/', '0000:', $range);
- $range = explode(':', $range);
- $expanded = '';
- $size = count($range);
- foreach ( $range as $byteset )
- {
- if ( empty($byteset) )
- {
- // ::
- while ( $size < 9 )
- {
- $expanded .= '0000:';
- $size++;
- }
- }
- else
- {
- if ( strstr($byteset, '-') )
- {
- // this is a range
- $sides = explode('-', $byteset);
- foreach ( $sides as &$bytepair )
- {
- while ( strlen($bytepair) < 4 )
- {
- $bytepair = "0$bytepair";
- }
- }
- $byteset = implode('-', $sides);
- }
- else
- {
- while ( strlen($byteset) < 4 )
- {
- $byteset = "0$byteset";
- }
- }
- $expanded .= "$byteset:";
- }
- }
- $expanded = explode(':', rtrim($expanded, ':'));
-
- // ready to dive in and start generating range regexes.
- // this has to be pretty optimized... we want to end up with regexes like:
- // range: 54-b12b
- /*
- /005[4-9a-f]|
- 00[6-9a-f][0-9a-f]|
- 0[1-9a-f][0-9a-f][0-9a-f]|
- [1-9a][0-9a-f][0-9a-f][0-9a-f]|
- b[0-0][0-1][0-9a-f]|
- b0[0-1][0-9a-f]|
- b02[0-9a-b]/x
- */
- foreach ( $expanded as &$word )
- {
- if ( strstr($word, '-') )
- {
- // oh... damn.
- $word = '(?:' . generate_hex_numeral_range($word) . ')';
- }
- }
-
- // return print_r($expanded, true);
- return '^' . implode(':', $expanded) . '$';
+ $range = strtolower(trim($range));
+ $valid = '/^';
+ $valid .= '(?:[0-9a-f]{0,4}|[0-9a-f]{1,4}-[0-9a-f]{1,4}):';
+ $valid .= '(?:[0-9a-f]{0,4}|[0-9a-f]{1,4}-[0-9a-f]{1,4}):';
+ $valid .= '(?:[0-9a-f]{0,4}|[0-9a-f]{1,4}-[0-9a-f]{1,4}:|:)?';
+ $valid .= '(?:[0-9a-f]{0,4}|[0-9a-f]{1,4}-[0-9a-f]{1,4}:|:)?';
+ $valid .= '(?:[0-9a-f]{0,4}|[0-9a-f]{1,4}-[0-9a-f]{1,4}:|:)?';
+ $valid .= '(?:[0-9a-f]{0,4}|[0-9a-f]{1,4}-[0-9a-f]{1,4}:|:)?';
+ $valid .= '(?:[0-9a-f]{0,4}|[0-9a-f]{1,4}-[0-9a-f]{1,4}:|:)?';
+ $valid .= '(?:[0-9a-f]{0,4}|[0-9a-f]{1,4}-[0-9a-f]{1,4})$/';
+ if ( !preg_match($valid, $range) )
+ return false;
+
+ // expand address range.
+ // this takes short ranges like:
+ // 2001:470-471:054-b02b::5-bb
+ // up to:
+ // 2001:0470-0471:0054-b02b:0000:0000:0000:0005-00bb
+ $range = preg_replace('/^:/', '0000:', $range);
+ $range = explode(':', $range);
+ $expanded = '';
+ $size = count($range);
+ foreach ( $range as $byteset )
+ {
+ if ( empty($byteset) )
+ {
+ // ::
+ while ( $size < 9 )
+ {
+ $expanded .= '0000:';
+ $size++;
+ }
+ }
+ else
+ {
+ if ( strstr($byteset, '-') )
+ {
+ // this is a range
+ $sides = explode('-', $byteset);
+ foreach ( $sides as &$bytepair )
+ {
+ while ( strlen($bytepair) < 4 )
+ {
+ $bytepair = "0$bytepair";
+ }
+ }
+ $byteset = implode('-', $sides);
+ }
+ else
+ {
+ while ( strlen($byteset) < 4 )
+ {
+ $byteset = "0$byteset";
+ }
+ }
+ $expanded .= "$byteset:";
+ }
+ }
+ $expanded = explode(':', rtrim($expanded, ':'));
+
+ // ready to dive in and start generating range regexes.
+ // this has to be pretty optimized... we want to end up with regexes like:
+ // range: 54-b12b
+ /*
+ /005[4-9a-f]|
+ 00[6-9a-f][0-9a-f]|
+ 0[1-9a-f][0-9a-f][0-9a-f]|
+ [1-9a][0-9a-f][0-9a-f][0-9a-f]|
+ b[0-0][0-1][0-9a-f]|
+ b0[0-1][0-9a-f]|
+ b02[0-9a-b]/x
+ */
+ foreach ( $expanded as &$word )
+ {
+ if ( strstr($word, '-') )
+ {
+ // oh... damn.
+ $word = '(?:' . generate_hex_numeral_range($word) . ')';
+ }
+ }
+
+ // return print_r($expanded, true);
+ return '^' . implode(':', $expanded) . '$';
}
/**
@@ -3606,152 +3606,152 @@
function generate_hex_numeral_range($word)
{
- list($low, $high) = explode('-', $word);
-
- if ( hexdec($low) > hexdec($high) )
- {
- $_ = $low;
- $low = $high;
- $high = $_;
- unset($_);
- }
-
- while ( strlen($low) < strlen($high) )
- {
- $low = "0$low";
- }
-
- // trim off everything that's the same
- $trimmed = '';
- $len = strlen($low);
- for ( $i = 0; $i < $len; $i++ )
- {
- if ( $low{0} === $high{0} )
- {
- $trimmed .= $low{0};
- $low = substr($low, 1);
- $high = substr($high, 1);
- }
- else
- {
- break;
- }
- }
-
- $len = strlen($high);
- if ( $len == 1 )
- {
- // this does happen sometimes, so we can save a bit of CPU power here.
- return $trimmed . __hexdigitrange($low, $high);
- }
-
- $return = '';
- // lower half
- for ( $i = $len - 1; $i > 0; $i-- )
- {
- if ( $low{$i} == 'f' )
- continue;
- $return .= $trimmed;
- for ( $j = 0; $j < $len; $j++ )
- {
- if ( $j < $i )
- {
- $return .= $low{$j};
- }
- else if ( $j == $i && ( $i == $len - 1 || $low{$j} == 'f' ) )
- {
- $return .= __hexdigitrange($low{$j}, 'f');
- }
- else if ( $j == $i && $i != $len - 1 )
- {
- $return .= __hexdigitrange(dechex(hexdec($low{$j}) + 1), 'f');
- }
- else
- {
- $return .= __hexdigitrange('0', 'f');
- }
- }
- $return .= '|';
- }
- // middle block
- if ( hexdec($low{0}) + 1 < hexdec($high{0}) )
- {
- if ( hexdec($low{0}) + 1 < hexdec($high{0}) - 1 )
- $return .= $trimmed . __hexdigitrange(dechex(hexdec($low{0}) + 1), dechex(hexdec($high{0}) - 1));
- else
- $return .= $trimmed . __hexdigitrange($low{0}, $high{0});
- if ( $len - 1 > 0 )
- $return .= '[0-9a-f]{' . ( $len - 1 ) . '}|';
- }
- // higher half
- for ( $i = 1; $i < $len; $i++ )
- {
- if ( $high{$i} == '0' )
- continue;
- $return .= $trimmed;
- for ( $j = 0; $j < $len; $j++ )
- {
- if ( $j < $i )
- {
- $return .= $high{$j};
- }
- else if ( $j == $i && ( $i == $len - 1 || $high{$j} == '0' ) )
- {
- $return .= __hexdigitrange('0', $high{$j});
- }
- else if ( $j == $i && $i != $len - 1 )
- {
- $return .= __hexdigitrange('0', dechex(hexdec($high{$j}) - 1));
- }
- else if ( $j > $i )
- {
- $return .= __hexdigitrange('0', 'f');
- }
- else
- {
- die("I don't know what to do! i $i j $j");
- }
- }
- $return .= '|';
- }
-
- return rtrim($return, '|');
+ list($low, $high) = explode('-', $word);
+
+ if ( hexdec($low) > hexdec($high) )
+ {
+ $_ = $low;
+ $low = $high;
+ $high = $_;
+ unset($_);
+ }
+
+ while ( strlen($low) < strlen($high) )
+ {
+ $low = "0$low";
+ }
+
+ // trim off everything that's the same
+ $trimmed = '';
+ $len = strlen($low);
+ for ( $i = 0; $i < $len; $i++ )
+ {
+ if ( $low{0} === $high{0} )
+ {
+ $trimmed .= $low{0};
+ $low = substr($low, 1);
+ $high = substr($high, 1);
+ }
+ else
+ {
+ break;
+ }
+ }
+
+ $len = strlen($high);
+ if ( $len == 1 )
+ {
+ // this does happen sometimes, so we can save a bit of CPU power here.
+ return $trimmed . __hexdigitrange($low, $high);
+ }
+
+ $return = '';
+ // lower half
+ for ( $i = $len - 1; $i > 0; $i-- )
+ {
+ if ( $low{$i} == 'f' )
+ continue;
+ $return .= $trimmed;
+ for ( $j = 0; $j < $len; $j++ )
+ {
+ if ( $j < $i )
+ {
+ $return .= $low{$j};
+ }
+ else if ( $j == $i && ( $i == $len - 1 || $low{$j} == 'f' ) )
+ {
+ $return .= __hexdigitrange($low{$j}, 'f');
+ }
+ else if ( $j == $i && $i != $len - 1 )
+ {
+ $return .= __hexdigitrange(dechex(hexdec($low{$j}) + 1), 'f');
+ }
+ else
+ {
+ $return .= __hexdigitrange('0', 'f');
+ }
+ }
+ $return .= '|';
+ }
+ // middle block
+ if ( hexdec($low{0}) + 1 < hexdec($high{0}) )
+ {
+ if ( hexdec($low{0}) + 1 < hexdec($high{0}) - 1 )
+ $return .= $trimmed . __hexdigitrange(dechex(hexdec($low{0}) + 1), dechex(hexdec($high{0}) - 1));
+ else
+ $return .= $trimmed . __hexdigitrange($low{0}, $high{0});
+ if ( $len - 1 > 0 )
+ $return .= '[0-9a-f]{' . ( $len - 1 ) . '}|';
+ }
+ // higher half
+ for ( $i = 1; $i < $len; $i++ )
+ {
+ if ( $high{$i} == '0' )
+ continue;
+ $return .= $trimmed;
+ for ( $j = 0; $j < $len; $j++ )
+ {
+ if ( $j < $i )
+ {
+ $return .= $high{$j};
+ }
+ else if ( $j == $i && ( $i == $len - 1 || $high{$j} == '0' ) )
+ {
+ $return .= __hexdigitrange('0', $high{$j});
+ }
+ else if ( $j == $i && $i != $len - 1 )
+ {
+ $return .= __hexdigitrange('0', dechex(hexdec($high{$j}) - 1));
+ }
+ else if ( $j > $i )
+ {
+ $return .= __hexdigitrange('0', 'f');
+ }
+ else
+ {
+ die("I don't know what to do! i $i j $j");
+ }
+ }
+ $return .= '|';
+ }
+
+ return rtrim($return, '|');
}
function __hexdigitrange($low, $high)
{
- if ( $low == $high )
- return $low;
- if ( empty($low) )
- $low = '0';
-
- $low_type = ( preg_match('/[0-9]/', $low) ) ? 'num' : 'alph';
- $high_type = ( preg_match('/[0-9]/', $high) ) ? 'num' : 'alph';
- if ( ( $low_type == 'num' && $high_type == 'num') || ( $low_type == 'alph' && $high_type == 'alph' ) )
- {
- return "[$low-$high]";
- }
- else if ( $low_type == 'num' && $high_type == 'alph' )
- {
- $ret = '[';
-
- if ( $low == '9' )
- $ret .= '9';
- else
- $ret .= "$low-9";
- if ( $high == 'a' )
- $ret .= 'a';
- else
- $ret .= "a-$high";
-
- $ret .= "]";
- return $ret;
- }
- else if ( $low_type == 'alph' && $high_type == 'num' )
- {
- // ???? this should never happen
- return __hexdigitrange($high, $low);
- }
+ if ( $low == $high )
+ return $low;
+ if ( empty($low) )
+ $low = '0';
+
+ $low_type = ( preg_match('/[0-9]/', $low) ) ? 'num' : 'alph';
+ $high_type = ( preg_match('/[0-9]/', $high) ) ? 'num' : 'alph';
+ if ( ( $low_type == 'num' && $high_type == 'num') || ( $low_type == 'alph' && $high_type == 'alph' ) )
+ {
+ return "[$low-$high]";
+ }
+ else if ( $low_type == 'num' && $high_type == 'alph' )
+ {
+ $ret = '[';
+
+ if ( $low == '9' )
+ $ret .= '9';
+ else
+ $ret .= "$low-9";
+ if ( $high == 'a' )
+ $ret .= 'a';
+ else
+ $ret .= "a-$high";
+
+ $ret .= "]";
+ return $ret;
+ }
+ else if ( $low_type == 'alph' && $high_type == 'num' )
+ {
+ // ???? this should never happen
+ return __hexdigitrange($high, $low);
+ }
}
/**
@@ -3762,26 +3762,26 @@
function expand_ipv6_address($addr)
{
- $expanded = array();
- $addr = explode(':', $addr);
- foreach ( $addr as $i => $bytepair )
- {
- if ( empty($bytepair) )
- {
- // ::
- while ( count($expanded) < (8 - count($addr) + $i + 1) )
- {
- $expanded[] = '0000';
- }
- }
- else
- {
- while ( strlen($bytepair) < 4 )
- $bytepair = "0$bytepair";
- $expanded[] = $bytepair;
- }
- }
- return implode(':', $expanded);
+ $expanded = array();
+ $addr = explode(':', $addr);
+ foreach ( $addr as $i => $bytepair )
+ {
+ if ( empty($bytepair) )
+ {
+ // ::
+ while ( count($expanded) < (8 - count($addr) + $i + 1) )
+ {
+ $expanded[] = '0000';
+ }
+ }
+ else
+ {
+ while ( strlen($bytepair) < 4 )
+ $bytepair = "0$bytepair";
+ $expanded[] = $bytepair;
+ }
+ }
+ return implode(':', $expanded);
}
/**
@@ -3792,19 +3792,19 @@
function check_email_address($email)
{
- static $regexp = '(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*@[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*|(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[^()<>@,;:".\\\[\]\x80-\xff\000-\010\012-\037]*(?:(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[^()<>@,;:".\\\[\]\x80-\xff\000-\010\012-\037]*)*<[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:@[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*(?:,[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*@[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*)*:[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)?(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*@[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*>)';
- return ( preg_match("/^$regexp$/", $email) ) ? true : false;
+ static $regexp = '(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*@[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*|(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[^()<>@,;:".\\\[\]\x80-\xff\000-\010\012-\037]*(?:(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[^()<>@,;:".\\\[\]\x80-\xff\000-\010\012-\037]*)*<[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:@[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*(?:,[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*@[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*)*:[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)?(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|"[^\\\x80-\xff\n\015"]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015"]*)*")[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*@[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:\.[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*(?:[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff])|\[(?:[^\\\x80-\xff\n\015\[\]]|\\[^\x80-\xff])*\])[\040\t]*(?:\([^\\\x80-\xff\n\015()]*(?:(?:\\[^\x80-\xff]|\([^\\\x80-\xff\n\015()]*(?:\\[^\x80-\xff][^\\\x80-\xff\n\015()]*)*\))[^\\\x80-\xff\n\015()]*)*\)[\040\t]*)*)*>)';
+ return ( preg_match("/^$regexp$/", $email) ) ? true : false;
}
function password_score_len($password)
{
- if ( !is_string($password) )
- {
- return -10;
- }
- $len = strlen($password);
- $score = $len - 7;
- return $score;
+ if ( !is_string($password) )
+ {
+ return -10;
+ }
+ $len = strlen($password);
+ $score = $len - 7;
+ return $score;
}
/**
@@ -3818,159 +3818,159 @@
function password_score($password, &$debug = false)
{
- if ( !is_string($password) )
- {
- return -10;
- }
- $score = 0;
- $debug = array();
- // length check
- $lenscore = password_score_len($password);
-
- $debug[] = "How this score was calculated\nYour score was tallied up based on an extensive algorithm which outputted\nthe following scores based on traits of your password. Above you can see the\ncomposite score; your individual scores based on certain tests are below.\n\nThe scale is open-ended, with a minimum score of -10. 10 is very strong, 4\nis strong, 1 is good and -3 is fair. Below -3 scores \"Weak.\"\n";
-
- $debug[] = 'Adding '.$lenscore.' points for length';
-
- $score += $lenscore;
-
- $has_upper_lower = false;
- $has_symbols = false;
- $has_numbers = false;
-
- // contains uppercase and lowercase
- if ( preg_match('/[A-z]+/', $password) && strtolower($password) != $password )
- {
- $score += 1;
- $has_upper_lower = true;
- $debug[] = 'Adding 1 point for having uppercase and lowercase';
- }
-
- // contains symbols
- if ( preg_match('/[^A-z0-9]+/', $password) )
- {
- $score += 1;
- $has_symbols = true;
- $debug[] = 'Adding 1 point for having nonalphanumeric characters (matching /[^A-z0-9]+/)';
- }
-
- // contains numbers
- if ( preg_match('/[0-9]+/', $password) )
- {
- $score += 1;
- $has_numbers = true;
- $debug[] = 'Adding 1 point for having numbers';
- }
-
- if ( $has_upper_lower && $has_symbols && $has_numbers && strlen($password) >= 9 )
- {
- // if it has uppercase and lowercase letters, symbols, and numbers, and is of considerable length, add some serious points
- $score += 4;
- $debug[] = 'Adding 4 points for having uppercase and lowercase, numbers, and nonalphanumeric and being more than 8 characters';
- }
- else if ( $has_upper_lower && $has_symbols && $has_numbers )
- {
- // still give some points for passing complexity check
- $score += 2;
- $debug[] = 'Adding 2 points for having uppercase and lowercase, numbers, and nonalphanumeric';
- }
- else if ( ( $has_upper_lower && $has_symbols ) ||
- ( $has_upper_lower && $has_numbers ) ||
- ( $has_symbols && $has_numbers ) )
- {
- // if 2 of the three main complexity checks passed, add a point
- $score += 1;
- $debug[] = 'Adding 1 point for having 2 of 3 complexity checks';
- }
- else if ( preg_match('/^[0-9]*?([a-z]+)[0-9]?$/', $password) )
- {
- // password is something like magnum1 which will be cracked in seconds
- $score += -4;
- $debug[] = 'Adding -4 points for being of the form [number][word][number]';
- }
- else if ( ( !$has_upper_lower && !$has_numbers && $has_symbols ) ||
- ( !$has_upper_lower && !$has_symbols && $has_numbers ) ||
- ( !$has_numbers && !$has_symbols && $has_upper_lower ) )
- {
- $score += -2;
- $debug[] = 'Adding -2 points for only meeting 1 complexity check';
- }
- else if ( !$has_upper_lower && !$has_numbers && !$has_symbols )
- {
- $debug[] = 'Adding -3 points for not meeting any complexity checks';
- $score += -3;
- }
-
- //
- // Repetition
- // Example: foobar12345 should be deducted points, where f1o2o3b4a5r should be given points
- //
-
- if ( preg_match('/([A-Z][A-Z][A-Z][A-Z]|[a-z][a-z][a-z][a-z])/', $password) )
- {
- $debug[] = 'Adding -2 points for having more than 4 letters of the same case in a row';
- $score += -2;
- }
- else if ( preg_match('/([A-Z][A-Z][A-Z]|[a-z][a-z][a-z])/', $password) )
- {
- $debug[] = 'Adding -1 points for having more than 3 letters of the same case in a row';
- $score += -1;
- }
- else if ( preg_match('/[A-z]/', $password) && !preg_match('/([A-Z][A-Z][A-Z]|[a-z][a-z][a-z])/', $password) )
- {
- $debug[] = 'Adding 1 point for never having more than 2 letters of the same case in a row';
- $score += 1;
- }
-
- if ( preg_match('/[0-9][0-9][0-9][0-9]/', $password) )
- {
- $debug[] = 'Adding -2 points for having 4 or more numbers in a row';
- $score += -2;
- }
- else if ( preg_match('/[0-9][0-9][0-9]/', $password) )
- {
- $debug[] = 'Adding -1 points for having 3 or more numbers in a row';
- $score += -1;
- }
- else if ( $has_numbers && !preg_match('/[0-9][0-9][0-9]/', $password) )
- {
- $debug[] = 'Adding 1 point for never more than 2 numbers in a row';
- $score += -1;
- }
-
- // make passwords like fooooooooooooooooooooooooooooooooooooo totally die by subtracting a point for each character repeated at least 3 times in a row
- $prev_char = '';
- $warn = false;
- $loss = 0;
- for ( $i = 0; $i < strlen($password); $i++ )
- {
- $chr = $password{$i};
- if ( $chr == $prev_char && $warn )
- {
- $loss += -1;
- }
- else if ( $chr == $prev_char && !$warn )
- {
- $warn = true;
- }
- else if ( $chr != $prev_char && $warn )
- {
- $warn = false;
- }
- $prev_char = $chr;
- }
- if ( $loss < 0 )
- {
- $debug[] = 'Adding '.$loss.' points for immediate character repetition';
- $score += $loss;
- // this can bring the score below -10 sometimes
- if ( $score < -10 )
- {
- $debug[] = 'Setting score to -10 because it went below ('.$score.')';
- $score = -10;
- }
- }
-
- return $score;
+ if ( !is_string($password) )
+ {
+ return -10;
+ }
+ $score = 0;
+ $debug = array();
+ // length check
+ $lenscore = password_score_len($password);
+
+ $debug[] = "How this score was calculated\nYour score was tallied up based on an extensive algorithm which outputted\nthe following scores based on traits of your password. Above you can see the\ncomposite score; your individual scores based on certain tests are below.\n\nThe scale is open-ended, with a minimum score of -10. 10 is very strong, 4\nis strong, 1 is good and -3 is fair. Below -3 scores \"Weak.\"\n";
+
+ $debug[] = 'Adding '.$lenscore.' points for length';
+
+ $score += $lenscore;
+
+ $has_upper_lower = false;
+ $has_symbols = false;
+ $has_numbers = false;
+
+ // contains uppercase and lowercase
+ if ( preg_match('/[A-z]+/', $password) && strtolower($password) != $password )
+ {
+ $score += 1;
+ $has_upper_lower = true;
+ $debug[] = 'Adding 1 point for having uppercase and lowercase';
+ }
+
+ // contains symbols
+ if ( preg_match('/[^A-z0-9]+/', $password) )
+ {
+ $score += 1;
+ $has_symbols = true;
+ $debug[] = 'Adding 1 point for having nonalphanumeric characters (matching /[^A-z0-9]+/)';
+ }
+
+ // contains numbers
+ if ( preg_match('/[0-9]+/', $password) )
+ {
+ $score += 1;
+ $has_numbers = true;
+ $debug[] = 'Adding 1 point for having numbers';
+ }
+
+ if ( $has_upper_lower && $has_symbols && $has_numbers && strlen($password) >= 9 )
+ {
+ // if it has uppercase and lowercase letters, symbols, and numbers, and is of considerable length, add some serious points
+ $score += 4;
+ $debug[] = 'Adding 4 points for having uppercase and lowercase, numbers, and nonalphanumeric and being more than 8 characters';
+ }
+ else if ( $has_upper_lower && $has_symbols && $has_numbers )
+ {
+ // still give some points for passing complexity check
+ $score += 2;
+ $debug[] = 'Adding 2 points for having uppercase and lowercase, numbers, and nonalphanumeric';
+ }
+ else if ( ( $has_upper_lower && $has_symbols ) ||
+ ( $has_upper_lower && $has_numbers ) ||
+ ( $has_symbols && $has_numbers ) )
+ {
+ // if 2 of the three main complexity checks passed, add a point
+ $score += 1;
+ $debug[] = 'Adding 1 point for having 2 of 3 complexity checks';
+ }
+ else if ( preg_match('/^[0-9]*?([a-z]+)[0-9]?$/', $password) )
+ {
+ // password is something like magnum1 which will be cracked in seconds
+ $score += -4;
+ $debug[] = 'Adding -4 points for being of the form [number][word][number]';
+ }
+ else if ( ( !$has_upper_lower && !$has_numbers && $has_symbols ) ||
+ ( !$has_upper_lower && !$has_symbols && $has_numbers ) ||
+ ( !$has_numbers && !$has_symbols && $has_upper_lower ) )
+ {
+ $score += -2;
+ $debug[] = 'Adding -2 points for only meeting 1 complexity check';
+ }
+ else if ( !$has_upper_lower && !$has_numbers && !$has_symbols )
+ {
+ $debug[] = 'Adding -3 points for not meeting any complexity checks';
+ $score += -3;
+ }
+
+ //
+ // Repetition
+ // Example: foobar12345 should be deducted points, where f1o2o3b4a5r should be given points
+ //
+
+ if ( preg_match('/([A-Z][A-Z][A-Z][A-Z]|[a-z][a-z][a-z][a-z])/', $password) )
+ {
+ $debug[] = 'Adding -2 points for having more than 4 letters of the same case in a row';
+ $score += -2;
+ }
+ else if ( preg_match('/([A-Z][A-Z][A-Z]|[a-z][a-z][a-z])/', $password) )
+ {
+ $debug[] = 'Adding -1 points for having more than 3 letters of the same case in a row';
+ $score += -1;
+ }
+ else if ( preg_match('/[A-z]/', $password) && !preg_match('/([A-Z][A-Z][A-Z]|[a-z][a-z][a-z])/', $password) )
+ {
+ $debug[] = 'Adding 1 point for never having more than 2 letters of the same case in a row';
+ $score += 1;
+ }
+
+ if ( preg_match('/[0-9][0-9][0-9][0-9]/', $password) )
+ {
+ $debug[] = 'Adding -2 points for having 4 or more numbers in a row';
+ $score += -2;
+ }
+ else if ( preg_match('/[0-9][0-9][0-9]/', $password) )
+ {
+ $debug[] = 'Adding -1 points for having 3 or more numbers in a row';
+ $score += -1;
+ }
+ else if ( $has_numbers && !preg_match('/[0-9][0-9][0-9]/', $password) )
+ {
+ $debug[] = 'Adding 1 point for never more than 2 numbers in a row';
+ $score += -1;
+ }
+
+ // make passwords like fooooooooooooooooooooooooooooooooooooo totally die by subtracting a point for each character repeated at least 3 times in a row
+ $prev_char = '';
+ $warn = false;
+ $loss = 0;
+ for ( $i = 0; $i < strlen($password); $i++ )
+ {
+ $chr = $password{$i};
+ if ( $chr == $prev_char && $warn )
+ {
+ $loss += -1;
+ }
+ else if ( $chr == $prev_char && !$warn )
+ {
+ $warn = true;
+ }
+ else if ( $chr != $prev_char && $warn )
+ {
+ $warn = false;
+ }
+ $prev_char = $chr;
+ }
+ if ( $loss < 0 )
+ {
+ $debug[] = 'Adding '.$loss.' points for immediate character repetition';
+ $score += $loss;
+ // this can bring the score below -10 sometimes
+ if ( $score < -10 )
+ {
+ $debug[] = 'Setting score to -10 because it went below ('.$score.')';
+ $score = -10;
+ }
+ }
+
+ return $score;
}
/**
@@ -3981,11 +3981,11 @@
function register_cron_task($func, $hour_interval = 24)
{
- global $cron_tasks;
- $hour_interval = strval($hour_interval);
- if ( !isset($cron_tasks[$hour_interval]) )
- $cron_tasks[$hour_interval] = array();
- $cron_tasks[$hour_interval][] = $func;
+ global $cron_tasks;
+ $hour_interval = strval($hour_interval);
+ if ( !isset($cron_tasks[$hour_interval]) )
+ $cron_tasks[$hour_interval] = array();
+ $cron_tasks[$hour_interval][] = $func;
}
/**
@@ -3995,10 +3995,10 @@
function get_cron_next_run()
{
- global $cron_tasks;
- $lowest_ivl = min(array_keys($cron_tasks));
- $last_run = intval(getConfig("cron_lastrun_ivl_$lowest_ivl"));
- return intval($last_run + ( 3600 * $lowest_ivl )) - 30;
+ global $cron_tasks;
+ $lowest_ivl = min(array_keys($cron_tasks));
+ $last_run = intval(getConfig("cron_lastrun_ivl_$lowest_ivl"));
+ return intval($last_run + ( 3600 * $lowest_ivl )) - 30;
}
/**
@@ -4011,53 +4011,53 @@
function install_language($lang_code, $lang_name_neutral, $lang_name_local, $lang_file = false)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $q = $db->sql_query('SELECT 1 FROM '.table_prefix.'language WHERE lang_code = \'' . $db->escape($lang_code) . '\';');
- if ( !$q )
- $db->_die('functions.php - checking for language existence');
-
- if ( $db->numrows() > 0 )
- // Language already exists
- return false;
-
- $q = $db->sql_query('INSERT INTO ' . table_prefix . 'language(lang_code, lang_name_default, lang_name_native)
- VALUES(
- \'' . $db->escape($lang_code) . '\',
- \'' . $db->escape($lang_name_neutral) . '\',
- \'' . $db->escape($lang_name_local) . '\'
- );');
- if ( !$q )
- $db->_die('functions.php - installing language');
-
- if ( ENANO_DBLAYER == 'PGSQL' )
- {
- // exception for Postgres, which doesn't support insert IDs
- // This will cause the Language class to just load by lang code
- // instead of by numeric ID
- $lang_id = $lang_code;
- }
- else
- {
- $lang_id = $db->insert_id();
- if ( empty($lang_id) || $lang_id == 0 )
- {
- $db->_die('functions.php - invalid returned lang_id');
- }
- }
-
- // Do we also need to install a language file?
- if ( is_string($lang_file) && file_exists($lang_file) )
- {
- $lang = new Language($lang_id);
- $lang->import($lang_file);
- }
- else if ( is_string($lang_file) && !file_exists($lang_file) )
- {
- echo 'Notice: Can\'t load language file, so the specified language wasn\'t fully installed.
';
- return false;
- }
- return true;
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $q = $db->sql_query('SELECT 1 FROM '.table_prefix.'language WHERE lang_code = \'' . $db->escape($lang_code) . '\';');
+ if ( !$q )
+ $db->_die('functions.php - checking for language existence');
+
+ if ( $db->numrows() > 0 )
+ // Language already exists
+ return false;
+
+ $q = $db->sql_query('INSERT INTO ' . table_prefix . 'language(lang_code, lang_name_default, lang_name_native)
+ VALUES(
+ \'' . $db->escape($lang_code) . '\',
+ \'' . $db->escape($lang_name_neutral) . '\',
+ \'' . $db->escape($lang_name_local) . '\'
+ );');
+ if ( !$q )
+ $db->_die('functions.php - installing language');
+
+ if ( ENANO_DBLAYER == 'PGSQL' )
+ {
+ // exception for Postgres, which doesn't support insert IDs
+ // This will cause the Language class to just load by lang code
+ // instead of by numeric ID
+ $lang_id = $lang_code;
+ }
+ else
+ {
+ $lang_id = $db->insert_id();
+ if ( empty($lang_id) || $lang_id == 0 )
+ {
+ $db->_die('functions.php - invalid returned lang_id');
+ }
+ }
+
+ // Do we also need to install a language file?
+ if ( is_string($lang_file) && file_exists($lang_file) )
+ {
+ $lang = new Language($lang_id);
+ $lang->import($lang_file);
+ }
+ else if ( is_string($lang_file) && !file_exists($lang_file) )
+ {
+ echo 'Notice: Can\'t load language file, so the specified language wasn\'t fully installed.
';
+ return false;
+ }
+ return true;
}
/**
@@ -4067,43 +4067,43 @@
function list_available_languages()
{
- // Pulled from install/includes/common.php
-
- // Build a list of available languages
- $dir = @opendir( ENANO_ROOT . '/language' );
- if ( !$dir )
- die('CRITICAL: could not open language directory');
-
- $languages = array();
-
- while ( $dh = @readdir($dir) )
- {
- if ( $dh == '.' || $dh == '..' )
- continue;
- if ( file_exists( ENANO_ROOT . "/language/$dh/meta.json" ) )
- {
- // Found a language directory, determine metadata
- $meta = @file_get_contents( ENANO_ROOT . "/language/$dh/meta.json" );
- if ( empty($meta) )
- // Could not read metadata file, continue silently
- continue;
-
- // Do some syntax correction on the metadata
- $meta = enano_clean_json($meta);
-
- $meta = enano_json_decode($meta);
- if ( isset($meta['lang_name_english']) && isset($meta['lang_name_native']) && isset($meta['lang_code']) )
- {
- $languages[$meta['lang_code']] = array(
- 'name' => $meta['lang_name_native'],
- 'name_eng' => $meta['lang_name_english'],
- 'dir' => $dh
- );
- }
- }
- }
-
- return $languages;
+ // Pulled from install/includes/common.php
+
+ // Build a list of available languages
+ $dir = @opendir( ENANO_ROOT . '/language' );
+ if ( !$dir )
+ die('CRITICAL: could not open language directory');
+
+ $languages = array();
+
+ while ( $dh = @readdir($dir) )
+ {
+ if ( $dh == '.' || $dh == '..' )
+ continue;
+ if ( file_exists( ENANO_ROOT . "/language/$dh/meta.json" ) )
+ {
+ // Found a language directory, determine metadata
+ $meta = @file_get_contents( ENANO_ROOT . "/language/$dh/meta.json" );
+ if ( empty($meta) )
+ // Could not read metadata file, continue silently
+ continue;
+
+ // Do some syntax correction on the metadata
+ $meta = enano_clean_json($meta);
+
+ $meta = enano_json_decode($meta);
+ if ( isset($meta['lang_name_english']) && isset($meta['lang_name_native']) && isset($meta['lang_code']) )
+ {
+ $languages[$meta['lang_code']] = array(
+ 'name' => $meta['lang_name_native'],
+ 'name_eng' => $meta['lang_name_english'],
+ 'dir' => $dh
+ );
+ }
+ }
+ }
+
+ return $languages;
}
/**
@@ -4120,154 +4120,154 @@
function scale_image($in_file, $out_file, $width = 225, $height = 225, $unlink = false)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( !is_int($width) || !is_int($height) )
- throw new Exception('Invalid height or width.');
-
- if ( !file_exists($in_file) )
- throw new Exception('Input file does not exist');
-
- $in_file_sh = escapeshellarg($in_file);
- $out_file_sh = escapeshellarg($out_file);
-
- if ( file_exists($out_file) && !$unlink )
- throw new Exception('Refusing to write output file as it already exists and $unlink was not specified.');
- else if ( file_exists($out_file) && $unlink )
- @unlink($out_file);
- if ( file_exists($out_file) )
- // couldn't unlink (delete) the output file
- throw new Exception('Failed to delete existing output file.');
-
- $file_ext = strtolower(substr($in_file, ( strrpos($in_file, '.') + 1)));
- switch($file_ext)
- {
- case 'png':
- $func = 'imagecreatefrompng';
- break;
- case 'jpg':
- case 'jpeg':
- $func = 'imagecreatefromjpeg';
- break;
- case 'gif':
- $func = 'imagecreatefromgif';
- break;
- case 'xpm':
- $func = 'imagecreatefromxpm';
- break;
- default:
- throw new Exception('Invalid extension of input file.');
- }
-
- $magick_path = getConfig('imagemagick_path');
- $can_use_magick = (
- getConfig('enable_imagemagick') == '1' &&
- file_exists($magick_path) &&
- is_executable($magick_path)
- );
- $can_use_gd = (
- function_exists('getimagesize') &&
- function_exists('imagecreatetruecolor') &&
- function_exists('imagecopyresampled') &&
- function_exists($func)
- );
- if ( $can_use_magick )
- {
- if ( !preg_match('/^([\/A-z0-9:\. _-]+)$/', $magick_path) )
- {
- die('SECURITY: ImageMagick path is screwy');
- }
- $cmdline = "$magick_path $in_file_sh -resize \"{$width}x{$height}>\" $out_file_sh";
- system($cmdline, $return);
- if ( !file_exists($out_file) )
- throw new Exception('ImageMagick: did not produce output image file.');
- return true;
- }
- else if ( $can_use_gd )
- {
- @list($width_orig, $height_orig) = @getimagesize($in_file);
- if ( !$width_orig || !$height_orig )
- throw new Exception('GD: Could not get height and width of input file.');
- // calculate new width and height
-
- $ratio = $width_orig / $height_orig;
- if ( $ratio > 1 )
- {
- // orig. width is greater that height
- $new_width = $width;
- $new_height = round( $width / $ratio );
- }
- else if ( $ratio < 1 )
- {
- // orig. height is greater than width
- $new_width = round( $height / $ratio );
- $new_height = $height;
- }
- else if ( $ratio == 1 )
- {
- $new_width = $width;
- $new_height = $width;
- }
- if ( $new_width > $width_orig || $new_height > $height_orig )
- {
- // Too big for our britches here; set it to only convert the file
- $new_width = $width_orig;
- $new_height = $height_orig;
- }
-
- $newimage = @imagecreatetruecolor($new_width, $new_height);
- if ( !$newimage )
- throw new Exception('GD: Request to create new truecolor image refused.');
- $oldimage = @$func($in_file);
- if ( !$oldimage )
- throw new Exception('GD: Request to load input image file failed.');
-
- // Perform scaling
- imagecopyresampled($newimage, $oldimage, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
-
- // Get output format
- $out_ext = strtolower(substr($out_file, ( strrpos($out_file, '.') + 1)));
- switch($out_ext)
- {
- case 'png':
- $outfunc = 'imagepng';
- break;
- case 'jpg':
- case 'jpeg':
- $outfunc = 'imagejpeg';
- break;
- case 'gif':
- $outfunc = 'imagegif';
- break;
- case 'xpm':
- $outfunc = 'imagexpm';
- break;
- default:
- imagedestroy($newimage);
- imagedestroy($oldimage);
- throw new Exception('GD: Invalid extension of output file.');
- }
-
- // Write output
- $outfunc($newimage, $out_file);
-
- // clean up
- imagedestroy($newimage);
- imagedestroy($oldimage);
-
- // done!
- return true;
- }
- // Neither scaling method worked; we'll let plugins try to scale it, and then if the file still doesn't exist, die
- $code = $plugins->setHook('scale_image_failure');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
- if ( file_exists($out_file) )
- return true;
-
- throw new Exception('Failed to find an appropriate method for scaling.');
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( !is_int($width) || !is_int($height) )
+ throw new Exception('Invalid height or width.');
+
+ if ( !file_exists($in_file) )
+ throw new Exception('Input file does not exist');
+
+ $in_file_sh = escapeshellarg($in_file);
+ $out_file_sh = escapeshellarg($out_file);
+
+ if ( file_exists($out_file) && !$unlink )
+ throw new Exception('Refusing to write output file as it already exists and $unlink was not specified.');
+ else if ( file_exists($out_file) && $unlink )
+ @unlink($out_file);
+ if ( file_exists($out_file) )
+ // couldn't unlink (delete) the output file
+ throw new Exception('Failed to delete existing output file.');
+
+ $file_ext = strtolower(substr($in_file, ( strrpos($in_file, '.') + 1)));
+ switch($file_ext)
+ {
+ case 'png':
+ $func = 'imagecreatefrompng';
+ break;
+ case 'jpg':
+ case 'jpeg':
+ $func = 'imagecreatefromjpeg';
+ break;
+ case 'gif':
+ $func = 'imagecreatefromgif';
+ break;
+ case 'xpm':
+ $func = 'imagecreatefromxpm';
+ break;
+ default:
+ throw new Exception('Invalid extension of input file.');
+ }
+
+ $magick_path = getConfig('imagemagick_path');
+ $can_use_magick = (
+ getConfig('enable_imagemagick') == '1' &&
+ file_exists($magick_path) &&
+ is_executable($magick_path)
+ );
+ $can_use_gd = (
+ function_exists('getimagesize') &&
+ function_exists('imagecreatetruecolor') &&
+ function_exists('imagecopyresampled') &&
+ function_exists($func)
+ );
+ if ( $can_use_magick )
+ {
+ if ( !preg_match('/^([\/A-z0-9:\. _-]+)$/', $magick_path) )
+ {
+ die('SECURITY: ImageMagick path is screwy');
+ }
+ $cmdline = "$magick_path $in_file_sh -resize \"{$width}x{$height}>\" $out_file_sh";
+ system($cmdline, $return);
+ if ( !file_exists($out_file) )
+ throw new Exception('ImageMagick: did not produce output image file.');
+ return true;
+ }
+ else if ( $can_use_gd )
+ {
+ @list($width_orig, $height_orig) = @getimagesize($in_file);
+ if ( !$width_orig || !$height_orig )
+ throw new Exception('GD: Could not get height and width of input file.');
+ // calculate new width and height
+
+ $ratio = $width_orig / $height_orig;
+ if ( $ratio > 1 )
+ {
+ // orig. width is greater that height
+ $new_width = $width;
+ $new_height = round( $width / $ratio );
+ }
+ else if ( $ratio < 1 )
+ {
+ // orig. height is greater than width
+ $new_width = round( $height / $ratio );
+ $new_height = $height;
+ }
+ else if ( $ratio == 1 )
+ {
+ $new_width = $width;
+ $new_height = $width;
+ }
+ if ( $new_width > $width_orig || $new_height > $height_orig )
+ {
+ // Too big for our britches here; set it to only convert the file
+ $new_width = $width_orig;
+ $new_height = $height_orig;
+ }
+
+ $newimage = @imagecreatetruecolor($new_width, $new_height);
+ if ( !$newimage )
+ throw new Exception('GD: Request to create new truecolor image refused.');
+ $oldimage = @$func($in_file);
+ if ( !$oldimage )
+ throw new Exception('GD: Request to load input image file failed.');
+
+ // Perform scaling
+ imagecopyresampled($newimage, $oldimage, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
+
+ // Get output format
+ $out_ext = strtolower(substr($out_file, ( strrpos($out_file, '.') + 1)));
+ switch($out_ext)
+ {
+ case 'png':
+ $outfunc = 'imagepng';
+ break;
+ case 'jpg':
+ case 'jpeg':
+ $outfunc = 'imagejpeg';
+ break;
+ case 'gif':
+ $outfunc = 'imagegif';
+ break;
+ case 'xpm':
+ $outfunc = 'imagexpm';
+ break;
+ default:
+ imagedestroy($newimage);
+ imagedestroy($oldimage);
+ throw new Exception('GD: Invalid extension of output file.');
+ }
+
+ // Write output
+ $outfunc($newimage, $out_file);
+
+ // clean up
+ imagedestroy($newimage);
+ imagedestroy($oldimage);
+
+ // done!
+ return true;
+ }
+ // Neither scaling method worked; we'll let plugins try to scale it, and then if the file still doesn't exist, die
+ $code = $plugins->setHook('scale_image_failure');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+ if ( file_exists($out_file) )
+ return true;
+
+ throw new Exception('Failed to find an appropriate method for scaling.');
}
/**
@@ -4280,39 +4280,39 @@
function is_gif_animated($filename)
{
- $filecontents = @file_get_contents($filename);
- if ( empty($filecontents) )
- return false;
-
- $str_loc = 0;
- $count = 0;
- while ( $count < 2 ) // There is no point in continuing after we find a 2nd frame
- {
- $where1 = strpos($filecontents,"\x00\x21\xF9\x04", $str_loc);
- if ( $where1 === false )
- {
- break;
- }
- else
- {
- $str_loc = $where1 + 1;
- $where2 = strpos($filecontents,"\x00\x2C", $str_loc);
- if ( $where2 === false )
- {
- break;
- }
- else
- {
- if ( $where1 + 8 == $where2 )
- {
- $count++;
- }
- $str_loc = $where2 + 1;
- }
- }
- }
-
- return ( $count > 1 ) ? true : false;
+ $filecontents = @file_get_contents($filename);
+ if ( empty($filecontents) )
+ return false;
+
+ $str_loc = 0;
+ $count = 0;
+ while ( $count < 2 ) // There is no point in continuing after we find a 2nd frame
+ {
+ $where1 = strpos($filecontents,"\x00\x21\xF9\x04", $str_loc);
+ if ( $where1 === false )
+ {
+ break;
+ }
+ else
+ {
+ $str_loc = $where1 + 1;
+ $where2 = strpos($filecontents,"\x00\x2C", $str_loc);
+ if ( $where2 === false )
+ {
+ break;
+ }
+ else
+ {
+ if ( $where1 + 8 == $where2 )
+ {
+ $count++;
+ }
+ $str_loc = $where2 + 1;
+ }
+ }
+ }
+
+ return ( $count > 1 ) ? true : false;
}
/**
@@ -4323,17 +4323,17 @@
function gif_get_dimensions($filename)
{
- $filecontents = @file_get_contents($filename);
- if ( empty($filecontents) )
- return false;
- if ( strlen($filecontents) < 10 )
- return false;
-
- $width = substr($filecontents, 6, 2);
- $height = substr($filecontents, 8, 2);
- $width = unpack('v', $width);
- $height = unpack('v', $height);
- return array($width[1], $height[1]);
+ $filecontents = @file_get_contents($filename);
+ if ( empty($filecontents) )
+ return false;
+ if ( strlen($filecontents) < 10 )
+ return false;
+
+ $width = substr($filecontents, 6, 2);
+ $height = substr($filecontents, 8, 2);
+ $width = unpack('v', $width);
+ $height = unpack('v', $height);
+ return array($width[1], $height[1]);
}
/**
@@ -4344,19 +4344,19 @@
function is_png_animated($filename)
{
- $filecontents = @file_get_contents($filename);
- if ( empty($filecontents) )
- return false;
-
- $parsed = parse_png($filecontents);
- if ( !$parsed )
- return false;
-
- if ( !isset($parsed['fdAT']) )
- return false;
-
- if ( count($parsed['fdAT']) > 1 )
- return true;
+ $filecontents = @file_get_contents($filename);
+ if ( empty($filecontents) )
+ return false;
+
+ $parsed = parse_png($filecontents);
+ if ( !$parsed )
+ return false;
+
+ if ( !isset($parsed['fdAT']) )
+ return false;
+
+ if ( count($parsed['fdAT']) > 1 )
+ return true;
}
/**
@@ -4367,22 +4367,22 @@
function png_get_dimensions($filename)
{
- $filecontents = @file_get_contents($filename);
- if ( empty($filecontents) )
- return false;
-
- $parsed = parse_png($filecontents);
- if ( !$parsed )
- return false;
-
- $ihdr_stream = $parsed['IHDR'][0];
- $width = substr($ihdr_stream, 0, 4);
- $height = substr($ihdr_stream, 4, 4);
- $width = unpack('N', $width);
- $height = unpack('N', $height);
- $x = $width[1];
- $y = $height[1];
- return array($x, $y);
+ $filecontents = @file_get_contents($filename);
+ if ( empty($filecontents) )
+ return false;
+
+ $parsed = parse_png($filecontents);
+ if ( !$parsed )
+ return false;
+
+ $ihdr_stream = $parsed['IHDR'][0];
+ $width = substr($ihdr_stream, 0, 4);
+ $height = substr($ihdr_stream, 4, 4);
+ $width = unpack('N', $width);
+ $height = unpack('N', $height);
+ $x = $width[1];
+ $y = $height[1];
+ return array($x, $y);
}
/**
@@ -4393,37 +4393,37 @@
function parse_png($data)
{
- // Trim off first 8 bytes to check for PNG header
- $header = substr($data, 0, 8);
- if ( $header != "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a" )
- {
- return false;
- }
- $return = array();
- $data = substr($data, 8);
- while ( strlen($data) > 0 )
- {
- $chunklen_bin = substr($data, 0, 4);
- $chunk_type = substr($data, 4, 4);
- $chunklen = unpack('N', $chunklen_bin);
- $chunklen = $chunklen[1];
- $chunk_data = substr($data, 8, $chunklen);
-
- // If the chunk type is not valid, this may be a malicious PNG with bad offsets. Break out of the loop.
- if ( !preg_match('/^[A-z]{4}$/', $chunk_type) )
- break;
-
- if ( !isset($return[$chunk_type]) )
- $return[$chunk_type] = array();
- $return[$chunk_type][] = $chunk_data;
-
- $offset_next = 4 // Length
- + 4 // Type
- + $chunklen // Data
- + 4; // CRC
- $data = substr($data, $offset_next);
- }
- return $return;
+ // Trim off first 8 bytes to check for PNG header
+ $header = substr($data, 0, 8);
+ if ( $header != "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a" )
+ {
+ return false;
+ }
+ $return = array();
+ $data = substr($data, 8);
+ while ( strlen($data) > 0 )
+ {
+ $chunklen_bin = substr($data, 0, 4);
+ $chunk_type = substr($data, 4, 4);
+ $chunklen = unpack('N', $chunklen_bin);
+ $chunklen = $chunklen[1];
+ $chunk_data = substr($data, 8, $chunklen);
+
+ // If the chunk type is not valid, this may be a malicious PNG with bad offsets. Break out of the loop.
+ if ( !preg_match('/^[A-z]{4}$/', $chunk_type) )
+ break;
+
+ if ( !isset($return[$chunk_type]) )
+ $return[$chunk_type] = array();
+ $return[$chunk_type][] = $chunk_data;
+
+ $offset_next = 4 // Length
+ + 4 // Type
+ + $chunklen // Data
+ + 4; // CRC
+ $data = substr($data, $offset_next);
+ }
+ return $return;
}
/**
@@ -4436,51 +4436,51 @@
function get_jpeg_intrinsic_values( $jpeg_header_data )
{
- // Create a blank array for the output
- $Outputarray = array( );
-
- //Cycle through the header segments until Start Of Frame (SOF) is found or we run out of segments
- $i = 0;
- while ( ( $i < count( $jpeg_header_data) ) && ( substr( $jpeg_header_data[$i]['SegName'], 0, 3 ) != "SOF" ) )
- {
- $i++;
- }
-
- // Check if a SOF segment has been found
- if ( substr( $jpeg_header_data[$i]['SegName'], 0, 3 ) == "SOF" )
- {
- // SOF segment was found, extract the information
-
- $data = $jpeg_header_data[$i]['SegData'];
-
- // First byte is Bits per component
- $Outputarray['Bits per Component'] = ord( $data{0} );
-
- // Second and third bytes are Image Height
- $Outputarray['Image Height'] = ord( $data{ 1 } ) * 256 + ord( $data{ 2 } );
-
- // Forth and fifth bytes are Image Width
- $Outputarray['Image Width'] = ord( $data{ 3 } ) * 256 + ord( $data{ 4 } );
-
- // Sixth byte is number of components
- $numcomponents = ord( $data{ 5 } );
-
- // Following this is a table containing information about the components
- for( $i = 0; $i < $numcomponents; $i++ )
- {
- $Outputarray['Components'][] = array ( 'Component Identifier' => ord( $data{ 6 + $i * 3 } ),
- 'Horizontal Sampling Factor' => ( ord( $data{ 7 + $i * 3 } ) & 0xF0 ) / 16,
- 'Vertical Sampling Factor' => ( ord( $data{ 7 + $i * 3 } ) & 0x0F ),
- 'Quantization table destination selector' => ord( $data{ 8 + $i * 3 } ) );
- }
- }
- else
- {
- // Couldn't find Start Of Frame segment, hence can't retrieve info
- return FALSE;
- }
-
- return $Outputarray;
+ // Create a blank array for the output
+ $Outputarray = array( );
+
+ //Cycle through the header segments until Start Of Frame (SOF) is found or we run out of segments
+ $i = 0;
+ while ( ( $i < count( $jpeg_header_data) ) && ( substr( $jpeg_header_data[$i]['SegName'], 0, 3 ) != "SOF" ) )
+ {
+ $i++;
+ }
+
+ // Check if a SOF segment has been found
+ if ( substr( $jpeg_header_data[$i]['SegName'], 0, 3 ) == "SOF" )
+ {
+ // SOF segment was found, extract the information
+
+ $data = $jpeg_header_data[$i]['SegData'];
+
+ // First byte is Bits per component
+ $Outputarray['Bits per Component'] = ord( $data{0} );
+
+ // Second and third bytes are Image Height
+ $Outputarray['Image Height'] = ord( $data{ 1 } ) * 256 + ord( $data{ 2 } );
+
+ // Forth and fifth bytes are Image Width
+ $Outputarray['Image Width'] = ord( $data{ 3 } ) * 256 + ord( $data{ 4 } );
+
+ // Sixth byte is number of components
+ $numcomponents = ord( $data{ 5 } );
+
+ // Following this is a table containing information about the components
+ for( $i = 0; $i < $numcomponents; $i++ )
+ {
+ $Outputarray['Components'][] = array ( 'Component Identifier' => ord( $data{ 6 + $i * 3 } ),
+ 'Horizontal Sampling Factor' => ( ord( $data{ 7 + $i * 3 } ) & 0xF0 ) / 16,
+ 'Vertical Sampling Factor' => ( ord( $data{ 7 + $i * 3 } ) & 0x0F ),
+ 'Quantization table destination selector' => ord( $data{ 8 + $i * 3 } ) );
+ }
+ }
+ else
+ {
+ // Couldn't find Start Of Frame segment, hence can't retrieve info
+ return FALSE;
+ }
+
+ return $Outputarray;
}
/**
@@ -4493,103 +4493,103 @@
function get_jpeg_header_data( $filename )
{
- // Attempt to open the jpeg file - the at symbol supresses the error message about
- // not being able to open files. The file_exists would have been used, but it
- // does not work with files fetched over http or ftp.
- $filehnd = @fopen($filename, 'rb');
-
- // Check if the file opened successfully
- if ( ! $filehnd )
- {
- // Could't open the file - exit
- return FALSE;
- }
-
-
- // Read the first two characters
- $data = fread( $filehnd, 2 );
-
- // Check that the first two characters are 0xFF 0xDA (SOI - Start of image)
- if ( $data != "\xFF\xD8" )
- {
- // No SOI (FF D8) at start of file - This probably isn't a JPEG file - close file and return;
- fclose($filehnd);
- return FALSE;
- }
-
-
- // Read the third character
- $data = fread( $filehnd, 2 );
-
- // Check that the third character is 0xFF (Start of first segment header)
- if ( $data{0} != "\xFF" )
- {
- // NO FF found - close file and return - JPEG is probably corrupted
- fclose($filehnd);
- return FALSE;
- }
-
- // Flag that we havent yet hit the compressed image data
- $hit_compressed_image_data = FALSE;
-
-
- // Cycle through the file until, one of: 1) an EOI (End of image) marker is hit,
- // 2) we have hit the compressed image data (no more headers are allowed after data)
- // 3) or end of file is hit
-
- while ( ( $data{1} != "\xD9" ) && (! $hit_compressed_image_data) && ( ! feof( $filehnd ) ))
- {
- // Found a segment to look at.
- // Check that the segment marker is not a Restart marker - restart markers don't have size or data after them
- if ( ( ord($data{1}) < 0xD0 ) || ( ord($data{1}) > 0xD7 ) )
- {
- // Segment isn't a Restart marker
- // Read the next two bytes (size)
- $sizestr = fread( $filehnd, 2 );
-
- // convert the size bytes to an integer
- $decodedsize = unpack ("nsize", $sizestr);
-
- // Save the start position of the data
- $segdatastart = ftell( $filehnd );
-
- // Read the segment data with length indicated by the previously read size
- $segdata = fread( $filehnd, $decodedsize['size'] - 2 );
-
-
- // Store the segment information in the output array
- $headerdata[] = array( "SegType" => ord($data{1}),
- "SegName" => $GLOBALS[ "JPEG_Segment_Names" ][ ord($data{1}) ],
- "SegDataStart" => $segdatastart,
- "SegData" => $segdata );
- }
-
- // If this is a SOS (Start Of Scan) segment, then there is no more header data - the compressed image data follows
- if ( $data{1} == "\xDA" )
- {
- // Flag that we have hit the compressed image data - exit loop as no more headers available.
- $hit_compressed_image_data = TRUE;
- }
- else
- {
- // Not an SOS - Read the next two bytes - should be the segment marker for the next segment
- $data = fread( $filehnd, 2 );
-
- // Check that the first byte of the two is 0xFF as it should be for a marker
- if ( $data{0} != "\xFF" )
- {
- // NO FF found - close file and return - JPEG is probably corrupted
- fclose($filehnd);
- return FALSE;
- }
- }
- }
-
- // Close File
- fclose($filehnd);
-
- // Return the header data retrieved
- return $headerdata;
+ // Attempt to open the jpeg file - the at symbol supresses the error message about
+ // not being able to open files. The file_exists would have been used, but it
+ // does not work with files fetched over http or ftp.
+ $filehnd = @fopen($filename, 'rb');
+
+ // Check if the file opened successfully
+ if ( ! $filehnd )
+ {
+ // Could't open the file - exit
+ return FALSE;
+ }
+
+
+ // Read the first two characters
+ $data = fread( $filehnd, 2 );
+
+ // Check that the first two characters are 0xFF 0xDA (SOI - Start of image)
+ if ( $data != "\xFF\xD8" )
+ {
+ // No SOI (FF D8) at start of file - This probably isn't a JPEG file - close file and return;
+ fclose($filehnd);
+ return FALSE;
+ }
+
+
+ // Read the third character
+ $data = fread( $filehnd, 2 );
+
+ // Check that the third character is 0xFF (Start of first segment header)
+ if ( $data{0} != "\xFF" )
+ {
+ // NO FF found - close file and return - JPEG is probably corrupted
+ fclose($filehnd);
+ return FALSE;
+ }
+
+ // Flag that we havent yet hit the compressed image data
+ $hit_compressed_image_data = FALSE;
+
+
+ // Cycle through the file until, one of: 1) an EOI (End of image) marker is hit,
+ // 2) we have hit the compressed image data (no more headers are allowed after data)
+ // 3) or end of file is hit
+
+ while ( ( $data{1} != "\xD9" ) && (! $hit_compressed_image_data) && ( ! feof( $filehnd ) ))
+ {
+ // Found a segment to look at.
+ // Check that the segment marker is not a Restart marker - restart markers don't have size or data after them
+ if ( ( ord($data{1}) < 0xD0 ) || ( ord($data{1}) > 0xD7 ) )
+ {
+ // Segment isn't a Restart marker
+ // Read the next two bytes (size)
+ $sizestr = fread( $filehnd, 2 );
+
+ // convert the size bytes to an integer
+ $decodedsize = unpack ("nsize", $sizestr);
+
+ // Save the start position of the data
+ $segdatastart = ftell( $filehnd );
+
+ // Read the segment data with length indicated by the previously read size
+ $segdata = fread( $filehnd, $decodedsize['size'] - 2 );
+
+
+ // Store the segment information in the output array
+ $headerdata[] = array( "SegType" => ord($data{1}),
+ "SegName" => $GLOBALS[ "JPEG_Segment_Names" ][ ord($data{1}) ],
+ "SegDataStart" => $segdatastart,
+ "SegData" => $segdata );
+ }
+
+ // If this is a SOS (Start Of Scan) segment, then there is no more header data - the compressed image data follows
+ if ( $data{1} == "\xDA" )
+ {
+ // Flag that we have hit the compressed image data - exit loop as no more headers available.
+ $hit_compressed_image_data = TRUE;
+ }
+ else
+ {
+ // Not an SOS - Read the next two bytes - should be the segment marker for the next segment
+ $data = fread( $filehnd, 2 );
+
+ // Check that the first byte of the two is 0xFF as it should be for a marker
+ if ( $data{0} != "\xFF" )
+ {
+ // NO FF found - close file and return - JPEG is probably corrupted
+ fclose($filehnd);
+ return FALSE;
+ }
+ }
+ }
+
+ // Close File
+ fclose($filehnd);
+
+ // Return the header data retrieved
+ return $headerdata;
}
/**
@@ -4600,33 +4600,33 @@
function jpg_get_dimensions($filename)
{
- if ( !file_exists($filename) )
- {
- echo "Doesn't exist
";
- return false;
- }
-
- $headers = get_jpeg_header_data($filename);
- if ( !$headers )
- {
- echo "Bad headers
";
- return false;
- }
-
- $metadata = get_jpeg_intrinsic_values($headers);
- if ( !$metadata )
- {
- echo "Bad metadata: " . print_r($metadata, true) . "
";
- return false;
- }
-
- if ( !isset($metadata['Image Width']) || !isset($metadata['Image Height']) )
- {
- echo "No metadata
";
- return false;
- }
-
- return array($metadata['Image Width'], $metadata['Image Height']);
+ if ( !file_exists($filename) )
+ {
+ echo "Doesn't exist
";
+ return false;
+ }
+
+ $headers = get_jpeg_header_data($filename);
+ if ( !$headers )
+ {
+ echo "Bad headers
";
+ return false;
+ }
+
+ $metadata = get_jpeg_intrinsic_values($headers);
+ if ( !$metadata )
+ {
+ echo "Bad metadata: " . print_r($metadata, true) . "
";
+ return false;
+ }
+
+ if ( !isset($metadata['Image Width']) || !isset($metadata['Image Height']) )
+ {
+ echo "No metadata
";
+ return false;
+ }
+
+ return array($metadata['Image Width'], $metadata['Image Height']);
}
/**
@@ -4639,42 +4639,42 @@
function make_avatar_url($user_id, $avi_type, $user_email = false)
{
- static $img_types = array(
- 'png' => IMAGE_TYPE_PNG,
- 'gif' => IMAGE_TYPE_GIF,
- 'jpg' => IMAGE_TYPE_JPG,
- 'grv' => IMAGE_TYPE_GRV
- );
-
- if ( !is_int($user_id) )
- return false;
- if ( !isset($img_types[$avi_type]) )
- return false;
-
- if ( $avi_type == 'grv' )
- {
- if ( $user_email )
- {
- return make_gravatar_url($user_email);
- }
- }
- else
- {
- $avi_relative_path = '/' . getConfig('avatar_directory') . '/' . $user_id . '.' . $avi_type;
- if ( !file_exists(ENANO_ROOT . $avi_relative_path) )
- {
- return '';
- }
- }
-
- $img_type = $img_types[$avi_type];
-
- $dateline = @filemtime(ENANO_ROOT . $avi_relative_path);
- $avi_id = pack('VVv', $dateline, $user_id, $img_type);
- $avi_id = hexencode($avi_id, '', '');
-
- // return scriptPath . $avi_relative_path;
- return makeUrlNS('Special', "Avatar/$avi_id");
+ static $img_types = array(
+ 'png' => IMAGE_TYPE_PNG,
+ 'gif' => IMAGE_TYPE_GIF,
+ 'jpg' => IMAGE_TYPE_JPG,
+ 'grv' => IMAGE_TYPE_GRV
+ );
+
+ if ( !is_int($user_id) )
+ return false;
+ if ( !isset($img_types[$avi_type]) )
+ return false;
+
+ if ( $avi_type == 'grv' )
+ {
+ if ( $user_email )
+ {
+ return make_gravatar_url($user_email);
+ }
+ }
+ else
+ {
+ $avi_relative_path = '/' . getConfig('avatar_directory') . '/' . $user_id . '.' . $avi_type;
+ if ( !file_exists(ENANO_ROOT . $avi_relative_path) )
+ {
+ return '';
+ }
+ }
+
+ $img_type = $img_types[$avi_type];
+
+ $dateline = @filemtime(ENANO_ROOT . $avi_relative_path);
+ $avi_id = pack('VVv', $dateline, $user_id, $img_type);
+ $avi_id = hexencode($avi_id, '', '');
+
+ // return scriptPath . $avi_relative_path;
+ return makeUrlNS('Special', "Avatar/$avi_id");
}
/**
@@ -4686,28 +4686,28 @@
function make_gravatar_url($email, $size = false)
{
- $email = md5($email);
-
- // gravatar parameters
- if ( $size )
- {
- $max_size = intval($size);
- }
- else
- {
- $max_x = intval(getConfig('avatar_max_width', '150'));
- $max_y = intval(getConfig('avatar_max_height', '150'));
- // ?s=
- $max_size = ( $max_x > $max_y ) ? $max_y : $max_x;
- }
-
- // ?r=
- $rating = getConfig('gravatar_rating', 'g');
-
- // final URL
- $url = "http://www.gravatar.com/avatar/$email?r=$rating&s=$max_size";
-
- return $url;
+ $email = md5($email);
+
+ // gravatar parameters
+ if ( $size )
+ {
+ $max_size = intval($size);
+ }
+ else
+ {
+ $max_x = intval(getConfig('avatar_max_width', '150'));
+ $max_y = intval(getConfig('avatar_max_height', '150'));
+ // ?s=
+ $max_size = ( $max_x > $max_y ) ? $max_y : $max_x;
+ }
+
+ // ?r=
+ $rating = getConfig('gravatar_rating', 'g');
+
+ // final URL
+ $url = "http://www.gravatar.com/avatar/$email?r=$rating&s=$max_size";
+
+ return $url;
}
/**
@@ -4718,20 +4718,20 @@
function get_image_filetype($filename)
{
- $filecontents = @file_get_contents($filename);
- if ( empty($filecontents) )
- return false;
-
- if ( substr($filecontents, 0, 8) == "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a" )
- return 'png';
-
- if ( substr($filecontents, 0, 6) == 'GIF87a' || substr($filecontents, 0, 6) == 'GIF89a' )
- return 'gif';
-
- if ( substr($filecontents, 0, 2) == "\xFF\xD8" )
- return 'jpg';
-
- return false;
+ $filecontents = @file_get_contents($filename);
+ if ( empty($filecontents) )
+ return false;
+
+ if ( substr($filecontents, 0, 8) == "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a" )
+ return 'png';
+
+ if ( substr($filecontents, 0, 6) == 'GIF87a' || substr($filecontents, 0, 6) == 'GIF89a' )
+ return 'gif';
+
+ if ( substr($filecontents, 0, 2) == "\xFF\xD8" )
+ return 'jpg';
+
+ return false;
}
/**
@@ -4741,11 +4741,11 @@
function enano_json_singleton()
{
- static $json_obj;
- if ( !is_object($json_obj) )
- $json_obj = new Services_JSON(SERVICES_JSON_LOOSE_TYPE | SERVICES_JSON_SUPPRESS_ERRORS);
-
- return $json_obj;
+ static $json_obj;
+ if ( !is_object($json_obj) )
+ $json_obj = new Services_JSON(SERVICES_JSON_LOOSE_TYPE | SERVICES_JSON_SUPPRESS_ERRORS);
+
+ return $json_obj;
}
/**
@@ -4756,15 +4756,15 @@
function enano_json_encode($data)
{
- /*
- if ( function_exists('json_encode') )
- {
- // using PHP5 with JSON support
- return json_encode($data);
- }
- */
-
- return Zend_Json::encode($data, true);
+ /*
+ if ( function_exists('json_encode') )
+ {
+ // using PHP5 with JSON support
+ return json_encode($data);
+ }
+ */
+
+ return Zend_Json::encode($data, true);
}
/**
@@ -4775,15 +4775,15 @@
function enano_json_decode($data)
{
- /*
- if ( function_exists('json_decode') )
- {
- // using PHP5 with JSON support
- return json_decode($data);
- }
- */
-
- return Zend_Json::decode($data, Zend_Json::TYPE_ARRAY);
+ /*
+ if ( function_exists('json_decode') )
+ {
+ // using PHP5 with JSON support
+ return json_decode($data);
+ }
+ */
+
+ return Zend_Json::decode($data, Zend_Json::TYPE_ARRAY);
}
/**
@@ -4794,19 +4794,19 @@
function enano_clean_json($json)
{
- // eliminate comments
- $json = preg_replace(array(
- // eliminate single line comments in '// ...' form
- '#^\s*//(.*)$#m',
- // eliminate multi-line comments in '/* ... */' form, at start of string
- '#^\s*/\*(.+)\*/#Us',
- // eliminate multi-line comments in '/* ... */' form, at end of string
- '#/\*(.+)\*/\s*$#Us'
- ), '', $json);
-
- $json = preg_replace('/([,\{\[])(?:[\r\n]+)([\s]*?)([a-z0-9_]+)([\s]*?):/', '\\1\\2"\\3" :', $json);
-
- return $json;
+ // eliminate comments
+ $json = preg_replace(array(
+ // eliminate single line comments in '// ...' form
+ '#^\s*//(.*)$#m',
+ // eliminate multi-line comments in '/* ... */' form, at start of string
+ '#^\s*/\*(.+)\*/#Us',
+ // eliminate multi-line comments in '/* ... */' form, at end of string
+ '#/\*(.+)\*/\s*$#Us'
+ ), '', $json);
+
+ $json = preg_replace('/([,\{\[])(?:[\r\n]+)([\s]*?)([a-z0-9_]+)([\s]*?):/', '\\1\\2"\\3" :', $json);
+
+ return $json;
}
/**
@@ -4817,7 +4817,7 @@
function enano_trim_json($json)
{
- return preg_replace('/^([^{]+)\{/', '{', preg_replace('/\}([^}]+)$/', '}', $json));
+ return preg_replace('/^([^{]+)\{/', '{', preg_replace('/\}([^}]+)$/', '}', $json));
}
/**
@@ -4826,22 +4826,22 @@
function profiler_start()
{
- global $_profiler;
- $_profiler = array();
-
- if ( !defined('ENANO_DEBUG') )
- return false;
-
- $_profiler[] = array(
- 'point' => 'Profiling started',
- 'time' => microtime_float(),
- 'backtrace' => false,
- 'mem' => false
- );
- if ( function_exists('memory_get_usage') )
- {
- $_profiler[ count($_profiler) - 1 ]['mem'] = memory_get_usage();
- }
+ global $_profiler;
+ $_profiler = array();
+
+ if ( !defined('ENANO_DEBUG') )
+ return false;
+
+ $_profiler[] = array(
+ 'point' => 'Profiling started',
+ 'time' => microtime_float(),
+ 'backtrace' => false,
+ 'mem' => false
+ );
+ if ( function_exists('memory_get_usage') )
+ {
+ $_profiler[ count($_profiler) - 1 ]['mem'] = memory_get_usage();
+ }
}
/**
@@ -4854,27 +4854,27 @@
function profiler_log($point, $allow_backtrace = true, $parent_event = false)
{
- if ( !defined('ENANO_DEBUG') )
- return false;
-
- global $_profiler;
- $backtrace = false;
- if ( $allow_backtrace && function_exists('debug_print_backtrace') )
- {
- list(, $backtrace) = explode("\n", enano_debug_print_backtrace(true));
- }
- $_profiler[] = array(
- 'point' => $point,
- 'time' => microtime_float(),
- 'backtrace' => $backtrace,
- 'mem' => false,
- 'parent_event' => $parent_event
- );
- if ( function_exists('memory_get_usage') )
- {
- $_profiler[ count($_profiler) - 1 ]['mem'] = memory_get_usage();
- }
- return count($_profiler) - 1;
+ if ( !defined('ENANO_DEBUG') )
+ return false;
+
+ global $_profiler;
+ $backtrace = false;
+ if ( $allow_backtrace && function_exists('debug_print_backtrace') )
+ {
+ list(, $backtrace) = explode("\n", enano_debug_print_backtrace(true));
+ }
+ $_profiler[] = array(
+ 'point' => $point,
+ 'time' => microtime_float(),
+ 'backtrace' => $backtrace,
+ 'mem' => false,
+ 'parent_event' => $parent_event
+ );
+ if ( function_exists('memory_get_usage') )
+ {
+ $_profiler[ count($_profiler) - 1 ]['mem'] = memory_get_usage();
+ }
+ return count($_profiler) - 1;
}
/**
@@ -4884,14 +4884,14 @@
function profiler_message($message)
{
- if ( !defined('ENANO_DEBUG') )
- return false;
-
- global $_profiler;
-
- $_profiler[] = array(
- 'message' => $message,
- );
+ if ( !defined('ENANO_DEBUG') )
+ return false;
+
+ global $_profiler;
+
+ $_profiler[] = array(
+ 'message' => $message,
+ );
}
/**
@@ -4901,7 +4901,7 @@
function profiler_dump()
{
- return $GLOBALS['_profiler'];
+ return $GLOBALS['_profiler'];
}
/**
@@ -4911,91 +4911,91 @@
function profiler_make_html()
{
- if ( !defined('ENANO_DEBUG') )
- return '';
-
- $profile = profiler_dump();
-
- $html = '';
- $html .= '';
-
- $time_start = $time_last = $profile[0]['time'];
-
- foreach ( $profile as $i => $entry )
- {
- // $time_since_last = $entry['time'] - $time_last;
- // if ( $time_since_last < 0.01 )
- // continue;
-
- if ( isset($entry['message']) )
- {
- $html .= "\n\n Message $i \n ";
-
- $html .= '' . "\n";
- $html .= ' Message: ' . "\n";
- $html .= ' ' . htmlspecialchars($entry['message']) . ' ' . "\n";
- $html .= ' ' . "\n";
- continue;
- }
-
- $html .= "\n\n Event $i \n ";
-
- $html .= '' . "\n";
- $html .= ' Event: ' . "\n";
- $html .= ' ' . htmlspecialchars($entry['point']) . ' ' . "\n";
- $html .= ' ' . "\n";
-
- $time = $entry['time'] - $time_start;
-
- $html .= '' . "\n";
- $html .= ' Time since start: ' . "\n";
- $html .= ' ' . $time . 's ' . "\n";
- $html .= ' ' . "\n";
-
- $time_label = 'Time since last event:';
- if ( $entry['parent_event'] && is_int($entry['parent_event']) && isset($profile[$entry['parent_event']]) )
- {
- $time_last = $profile[$entry['parent_event']]['time'];
- $time_label = "Time since event #{$entry['parent_event']}:";
- }
-
- $time = $entry['time'] - $time_last;
- if ( $time < 0.0001 )
- $time_html = 'Marginal';
- else
- $time_html = number_format($time, 6) . "s";
-
- if ( $time > 0.02 )
- $time_html = "$time_html";
-
- $html .= '' . "\n";
- $html .= ' ' . $time_label . ' ' . "\n";
- $html .= ' ' . $time_html . ' ' . "\n";
- $html .= ' ' . "\n";
-
- if ( $entry['backtrace'] )
- {
- $html .= '' . "\n";
- $html .= ' Called from: ' . "\n";
- $html .= ' ' . htmlspecialchars($entry['backtrace']) . ' ' . "\n";
- $html .= ' ' . "\n";
- }
-
- if ( $entry['mem'] )
- {
- $html .= '' . "\n";
- $html .= ' Total mem usage: ' . "\n";
- $html .= ' ' . htmlspecialchars($entry['mem']) . ' (bytes) ' . "\n";
- $html .= ' ' . "\n";
- }
-
- $html .= "\n";
-
- $time_last = $entry['time'];
- }
- $html .= '
';
-
- return $html;
+ if ( !defined('ENANO_DEBUG') )
+ return '';
+
+ $profile = profiler_dump();
+
+ $html = '';
+ $html .= '';
+
+ $time_start = $time_last = $profile[0]['time'];
+
+ foreach ( $profile as $i => $entry )
+ {
+ // $time_since_last = $entry['time'] - $time_last;
+ // if ( $time_since_last < 0.01 )
+ // continue;
+
+ if ( isset($entry['message']) )
+ {
+ $html .= "\n\n Message $i \n ";
+
+ $html .= '' . "\n";
+ $html .= ' Message: ' . "\n";
+ $html .= ' ' . htmlspecialchars($entry['message']) . ' ' . "\n";
+ $html .= ' ' . "\n";
+ continue;
+ }
+
+ $html .= "\n\n Event $i \n ";
+
+ $html .= '' . "\n";
+ $html .= ' Event: ' . "\n";
+ $html .= ' ' . htmlspecialchars($entry['point']) . ' ' . "\n";
+ $html .= ' ' . "\n";
+
+ $time = $entry['time'] - $time_start;
+
+ $html .= '' . "\n";
+ $html .= ' Time since start: ' . "\n";
+ $html .= ' ' . $time . 's ' . "\n";
+ $html .= ' ' . "\n";
+
+ $time_label = 'Time since last event:';
+ if ( $entry['parent_event'] && is_int($entry['parent_event']) && isset($profile[$entry['parent_event']]) )
+ {
+ $time_last = $profile[$entry['parent_event']]['time'];
+ $time_label = "Time since event #{$entry['parent_event']}:";
+ }
+
+ $time = $entry['time'] - $time_last;
+ if ( $time < 0.0001 )
+ $time_html = 'Marginal';
+ else
+ $time_html = number_format($time, 6) . "s";
+
+ if ( $time > 0.02 )
+ $time_html = "$time_html";
+
+ $html .= '' . "\n";
+ $html .= ' ' . $time_label . ' ' . "\n";
+ $html .= ' ' . $time_html . ' ' . "\n";
+ $html .= ' ' . "\n";
+
+ if ( $entry['backtrace'] )
+ {
+ $html .= '' . "\n";
+ $html .= ' Called from: ' . "\n";
+ $html .= ' ' . htmlspecialchars($entry['backtrace']) . ' ' . "\n";
+ $html .= ' ' . "\n";
+ }
+
+ if ( $entry['mem'] )
+ {
+ $html .= '' . "\n";
+ $html .= ' Total mem usage: ' . "\n";
+ $html .= ' ' . htmlspecialchars($entry['mem']) . ' (bytes) ' . "\n";
+ $html .= ' ' . "\n";
+ }
+
+ $html .= "\n";
+
+ $time_last = $entry['time'];
+ }
+ $html .= '
';
+
+ return $html;
}
// Might as well start the profiler, it has no external dependencies except from this file.
@@ -5010,14 +5010,14 @@
function get_char_count($string, $char)
{
- $char = substr($char, 0, 1);
- $count = 0;
- for ( $i = 0; $i < strlen($string); $i++ )
- {
- if ( $string{$i} == $char )
- $count++;
- }
- return $count;
+ $char = substr($char, 0, 1);
+ $count = 0;
+ for ( $i = 0; $i < strlen($string); $i++ )
+ {
+ if ( $string{$i} == $char )
+ $count++;
+ }
+ return $count;
}
/**
@@ -5028,52 +5028,52 @@
function get_line_count($string)
{
- return ( get_char_count($string, "\n") ) + 1;
+ return ( get_char_count($string, "\n") ) + 1;
}
if ( !function_exists('sys_get_temp_dir') )
{
- // Based on http://www.phpit.net/
- // article/creating-zip-tar-archives-dynamically-php/2/
- /**
- * Attempt to get the system's temp directory.
- * @return string or bool false on failure
- */
-
- function sys_get_temp_dir()
- {
- // Try to get from environment variable
- if ( !empty($_ENV['TMP']) )
- {
- return realpath( $_ENV['TMP'] );
- }
- else if ( !empty($_ENV['TMPDIR']) )
- {
- return realpath( $_ENV['TMPDIR'] );
- }
- else if ( !empty($_ENV['TEMP']) )
- {
- return realpath( $_ENV['TEMP'] );
- }
-
- // Detect by creating a temporary file
- else
- {
- // Try to use system's temporary directory
- // as random name shouldn't exist
- $temp_file = tempnam( md5(uniqid(rand(), TRUE)), '' );
- if ( $temp_file )
- {
- $temp_dir = realpath( dirname($temp_file) );
- unlink( $temp_file );
- return $temp_dir;
- }
- else
- {
- return FALSE;
- }
- }
- }
+ // Based on http://www.phpit.net/
+ // article/creating-zip-tar-archives-dynamically-php/2/
+ /**
+ * Attempt to get the system's temp directory.
+ * @return string or bool false on failure
+ */
+
+ function sys_get_temp_dir()
+ {
+ // Try to get from environment variable
+ if ( !empty($_ENV['TMP']) )
+ {
+ return realpath( $_ENV['TMP'] );
+ }
+ else if ( !empty($_ENV['TMPDIR']) )
+ {
+ return realpath( $_ENV['TMPDIR'] );
+ }
+ else if ( !empty($_ENV['TEMP']) )
+ {
+ return realpath( $_ENV['TEMP'] );
+ }
+
+ // Detect by creating a temporary file
+ else
+ {
+ // Try to use system's temporary directory
+ // as random name shouldn't exist
+ $temp_file = tempnam( md5(uniqid(rand(), TRUE)), '' );
+ if ( $temp_file )
+ {
+ $temp_dir = realpath( dirname($temp_file) );
+ unlink( $temp_file );
+ return $temp_dir;
+ }
+ else
+ {
+ return FALSE;
+ }
+ }
+ }
}
/**
@@ -5082,25 +5082,25 @@
function fetch_rank_data()
{
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- $sql = $session->generate_rank_sql();
- $q = $db->sql_query($sql);
- if ( !$q )
- $db->_die();
-
- $GLOBALS['user_ranks'] = array();
- global $user_ranks;
-
- while ( $row = $db->fetchrow($q) )
- {
- $user_id = $row['user_id'];
- $username = $row['username'];
- $row = $session->calculate_user_rank($row);
- $user_ranks[$username] = $row;
- $user_ranks[$user_id] =& $user_ranks[$username];
- }
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ $sql = $session->generate_rank_sql();
+ $q = $db->sql_query($sql);
+ if ( !$q )
+ $db->_die();
+
+ $GLOBALS['user_ranks'] = array();
+ global $user_ranks;
+
+ while ( $row = $db->fetchrow($q) )
+ {
+ $user_id = $row['user_id'];
+ $username = $row['username'];
+ $row = $session->calculate_user_rank($row);
+ $user_ranks[$username] = $row;
+ $user_ranks[$user_id] =& $user_ranks[$username];
+ }
}
/**
@@ -5109,42 +5109,42 @@
function generate_cache_userranks()
{
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- global $user_ranks;
-
- fetch_rank_data();
-
- $user_ranks_stripped = array();
- foreach ( $user_ranks as $key => $value )
- {
- if ( is_int($key) )
- $user_ranks_stripped[$key] = $value;
- }
-
- $ranks_exported = "var_export_string($user_ranks_stripped) . ';';
- $uid_map = array();
- foreach ( $user_ranks as $id => $row )
- {
- if ( !is_int($id) )
- {
- $username = $id;
- continue;
- }
-
- $un_san = addslashes($username);
- $ranks_exported .= "\n\$user_ranks['$un_san'] =& \$user_ranks[{$row['user_id']}];";
- }
- $ranks_exported .= "\n\ndefine('ENANO_RANKS_CACHE_LOADED', 1); \n?>";
-
- // open ranks cache file
- $fh = @fopen( ENANO_ROOT . '/cache/cache_ranks.php', 'w' );
- if ( !$fh )
- return false;
- fwrite($fh, $ranks_exported);
- fclose($fh);
-
- return true;
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+ global $user_ranks;
+
+ fetch_rank_data();
+
+ $user_ranks_stripped = array();
+ foreach ( $user_ranks as $key => $value )
+ {
+ if ( is_int($key) )
+ $user_ranks_stripped[$key] = $value;
+ }
+
+ $ranks_exported = "var_export_string($user_ranks_stripped) . ';';
+ $uid_map = array();
+ foreach ( $user_ranks as $id => $row )
+ {
+ if ( !is_int($id) )
+ {
+ $username = $id;
+ continue;
+ }
+
+ $un_san = addslashes($username);
+ $ranks_exported .= "\n\$user_ranks['$un_san'] =& \$user_ranks[{$row['user_id']}];";
+ }
+ $ranks_exported .= "\n\ndefine('ENANO_RANKS_CACHE_LOADED', 1); \n?>";
+
+ // open ranks cache file
+ $fh = @fopen( ENANO_ROOT . '/cache/cache_ranks.php', 'w' );
+ if ( !$fh )
+ return false;
+ fwrite($fh, $ranks_exported);
+ fclose($fh);
+
+ return true;
}
/**
@@ -5153,14 +5153,14 @@
function load_rank_data()
{
- if ( file_exists( ENANO_ROOT . '/cache/cache_ranks.php' ) )
- {
- @include(ENANO_ROOT . '/cache/cache_ranks.php');
- }
- if ( !defined('ENANO_RANKS_CACHE_LOADED') )
- {
- fetch_rank_data();
- }
+ if ( file_exists( ENANO_ROOT . '/cache/cache_ranks.php' ) )
+ {
+ @include(ENANO_ROOT . '/cache/cache_ranks.php');
+ }
+ if ( !defined('ENANO_RANKS_CACHE_LOADED') )
+ {
+ fetch_rank_data();
+ }
}
/**
@@ -5169,45 +5169,45 @@
function purge_all_caches()
{
- global $cache;
- if ( $dh = opendir(ENANO_ROOT . '/cache') )
- {
- $cache->purge('page_meta');
- $cache->purge('anon_sidebar');
- $cache->purge('plugins');
- $cache->purge('wiki_edit_notice');
-
- $data_files = array(
- 'aes_decrypt.php',
- // ranks cache is stored using a custom engine (not enano's default cache)
- 'cache_ranks.php'
- );
- while ( $file = @readdir($dh) )
- {
- $fullpath = ENANO_ROOT . "/cache/$file";
- // we don't want to mess with directories
- if ( !is_file($fullpath) )
- continue;
-
- // data files
- if ( in_array($file, $data_files) )
- unlink($fullpath);
- // template files
- else if ( preg_match('/\.(?:tpl|css)\.php$/', $file) )
- unlink($fullpath);
- // compressed javascript
- else if ( preg_match('/^jsres_(?:[A-z0-9_-]+)\.js\.json$/', $file) )
- unlink($fullpath);
- // tinymce stuff
- else if ( preg_match('/^tiny_mce_(?:[a-f0-9]+)\.gz$/', $file) )
- unlink($fullpath);
- // language files
- else if ( preg_match('/^lang_json_(?:[a-f0-9]+?)\.php$/', $file) || preg_match('/^(?:cache_)?lang_(?:[0-9]+?)\.php$/', $file) )
- unlink($fullpath);
- }
- return true;
- }
- return false;
+ global $cache;
+ if ( $dh = opendir(ENANO_ROOT . '/cache') )
+ {
+ $cache->purge('page_meta');
+ $cache->purge('anon_sidebar');
+ $cache->purge('plugins');
+ $cache->purge('wiki_edit_notice');
+
+ $data_files = array(
+ 'aes_decrypt.php',
+ // ranks cache is stored using a custom engine (not enano's default cache)
+ 'cache_ranks.php'
+ );
+ while ( $file = @readdir($dh) )
+ {
+ $fullpath = ENANO_ROOT . "/cache/$file";
+ // we don't want to mess with directories
+ if ( !is_file($fullpath) )
+ continue;
+
+ // data files
+ if ( in_array($file, $data_files) )
+ unlink($fullpath);
+ // template files
+ else if ( preg_match('/\.(?:tpl|css)\.php$/', $file) )
+ unlink($fullpath);
+ // compressed javascript
+ else if ( preg_match('/^jsres_(?:[A-z0-9_-]+)\.js\.json$/', $file) )
+ unlink($fullpath);
+ // tinymce stuff
+ else if ( preg_match('/^tiny_mce_(?:[a-f0-9]+)\.gz$/', $file) )
+ unlink($fullpath);
+ // language files
+ else if ( preg_match('/^lang_json_(?:[a-f0-9]+?)\.php$/', $file) || preg_match('/^(?:cache_)?lang_(?:[0-9]+?)\.php$/', $file) )
+ unlink($fullpath);
+ }
+ return true;
+ }
+ return false;
}
/**
@@ -5218,27 +5218,27 @@
function which($executable)
{
- $path = ( isset($_ENV['PATH']) ) ? $_ENV['PATH'] : ( isset($_SERVER['PATH']) ? $_SERVER['PATH'] : false );
- if ( !$path )
- // couldn't get OS's PATH
- return false;
-
- $win32 = ( PHP_OS == 'WINNT' || PHP_OS == 'WIN32' );
- $extensions = $win32 ? array('.exe', '.com', '.bat') : array('');
- $separator = $win32 ? ';' : ':';
- $paths = explode($separator, $path);
- foreach ( $paths as $dir )
- {
- foreach ( $extensions as $ext )
- {
- $fullpath = "$dir/{$executable}{$ext}";
- if ( @file_exists($fullpath) && @is_executable($fullpath) )
- {
- return $fullpath;
- }
- }
- }
- return false;
+ $path = ( isset($_ENV['PATH']) ) ? $_ENV['PATH'] : ( isset($_SERVER['PATH']) ? $_SERVER['PATH'] : false );
+ if ( !$path )
+ // couldn't get OS's PATH
+ return false;
+
+ $win32 = ( PHP_OS == 'WINNT' || PHP_OS == 'WIN32' );
+ $extensions = $win32 ? array('.exe', '.com', '.bat') : array('');
+ $separator = $win32 ? ';' : ':';
+ $paths = explode($separator, $path);
+ foreach ( $paths as $dir )
+ {
+ foreach ( $extensions as $ext )
+ {
+ $fullpath = "$dir/{$executable}{$ext}";
+ if ( @file_exists($fullpath) && @is_executable($fullpath) )
+ {
+ return $fullpath;
+ }
+ }
+ }
+ return false;
}
/**
@@ -5249,51 +5249,51 @@
function write_test($filename)
{
- // We need to actually _open_ the file to make sure it can be written, because sometimes this fails even when is_writable() returns
- // true on Windows/IIS servers. Don't ask me why.
-
- $file = ENANO_ROOT . '/' . $filename;
- if ( is_dir($file) )
- {
- $file = rtrim($file, '/') . '/' . 'enanoinstalltest.txt';
- if ( file_exists($file) )
- {
- $fp = @fopen($file, 'a+');
- if ( !$fp )
- return false;
- fclose($fp);
- unlink($file);
- return true;
- }
- else
- {
- $fp = @fopen($file, 'w');
- if ( !$fp )
- return false;
- fclose($fp);
- unlink($file);
- return true;
- }
- }
- else
- {
- if ( file_exists($file) )
- {
- $fp = @fopen($file, 'a+');
- if ( !$fp )
- return false;
- fclose($fp);
- return true;
- }
- else
- {
- $fp = @fopen($file, 'w');
- if ( !$fp )
- return false;
- fclose($fp);
- return true;
- }
- }
+ // We need to actually _open_ the file to make sure it can be written, because sometimes this fails even when is_writable() returns
+ // true on Windows/IIS servers. Don't ask me why.
+
+ $file = ENANO_ROOT . '/' . $filename;
+ if ( is_dir($file) )
+ {
+ $file = rtrim($file, '/') . '/' . 'enanoinstalltest.txt';
+ if ( file_exists($file) )
+ {
+ $fp = @fopen($file, 'a+');
+ if ( !$fp )
+ return false;
+ fclose($fp);
+ unlink($file);
+ return true;
+ }
+ else
+ {
+ $fp = @fopen($file, 'w');
+ if ( !$fp )
+ return false;
+ fclose($fp);
+ unlink($file);
+ return true;
+ }
+ }
+ else
+ {
+ if ( file_exists($file) )
+ {
+ $fp = @fopen($file, 'a+');
+ if ( !$fp )
+ return false;
+ fclose($fp);
+ return true;
+ }
+ else
+ {
+ $fp = @fopen($file, 'w');
+ if ( !$fp )
+ return false;
+ fclose($fp);
+ return true;
+ }
+ }
}
/**
@@ -5303,20 +5303,20 @@
function install_get_crypto_backend()
{
- $crypto_backend = 'none';
-
- // Extension test: BCMath
- if ( function_exists('bcadd') )
- $crypto_backend = 'bcmath';
-
- // Extension test: Big_Int
- if ( function_exists('bi_from_str') )
- $crypto_backend = 'bigint';
-
- // Extension test: GMP
- if ( function_exists('gmp_init') )
- $crypto_backend = 'gmp';
-
- return $crypto_backend;
+ $crypto_backend = 'none';
+
+ // Extension test: BCMath
+ if ( function_exists('bcadd') )
+ $crypto_backend = 'bcmath';
+
+ // Extension test: Big_Int
+ if ( function_exists('bi_from_str') )
+ $crypto_backend = 'bigint';
+
+ // Extension test: GMP
+ if ( function_exists('gmp_init') )
+ $crypto_backend = 'gmp';
+
+ return $crypto_backend;
}
diff -r de56132c008d -r bdac73ed481e includes/hmac.php
--- a/includes/hmac.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/hmac.php Sun Mar 28 23:10:46 2010 -0400
@@ -14,68 +14,68 @@
function hmac_core($message, $key, $hashfunc)
{
- if ( strlen($key) % 2 == 1 )
- $key .= '0';
-
- if ( strlen($key) > 128 )
- $key = $hashfunc($key);
-
- while ( strlen($key) < 128 )
- {
- $key .= '00';
- }
- $opad = hmac_hexbytearray($key);
- $ipad = $opad;
- for ( $i = 0; $i < count($ipad); $i++ )
- {
- $opad[$i] = $opad[$i] ^ 0x5c;
- $ipad[$i] = $ipad[$i] ^ 0x36;
- }
- $opad = hmac_bytearraytostring($opad);
- $ipad = hmac_bytearraytostring($ipad);
- return $hashfunc($opad . hexdecode($hashfunc($ipad . $message)));
+ if ( strlen($key) % 2 == 1 )
+ $key .= '0';
+
+ if ( strlen($key) > 128 )
+ $key = $hashfunc($key);
+
+ while ( strlen($key) < 128 )
+ {
+ $key .= '00';
+ }
+ $opad = hmac_hexbytearray($key);
+ $ipad = $opad;
+ for ( $i = 0; $i < count($ipad); $i++ )
+ {
+ $opad[$i] = $opad[$i] ^ 0x5c;
+ $ipad[$i] = $ipad[$i] ^ 0x36;
+ }
+ $opad = hmac_bytearraytostring($opad);
+ $ipad = hmac_bytearraytostring($ipad);
+ return $hashfunc($opad . hexdecode($hashfunc($ipad . $message)));
}
function hmac_hexbytearray($val)
{
- $val = hexdecode($val);
- return hmac_bytearray($val);
+ $val = hexdecode($val);
+ return hmac_bytearray($val);
}
function hmac_bytearray($val)
{
- $val = str_split($val, 1);
- foreach ( $val as &$char )
- {
- $char = ord($char);
- }
- return $val;
+ $val = str_split($val, 1);
+ foreach ( $val as &$char )
+ {
+ $char = ord($char);
+ }
+ return $val;
}
function hmac_bytearraytostring($val)
{
- foreach ( $val as &$char )
- {
- $char = chr($char);
- }
- return implode('', $val);
+ foreach ( $val as &$char )
+ {
+ $char = chr($char);
+ }
+ return implode('', $val);
}
function hmac_md5($message, $key)
{
- return hmac_core($message, $key, 'md5');
+ return hmac_core($message, $key, 'md5');
}
function hmac_sha1($message, $key)
{
- return hmac_core($message, $key, 'sha1');
+ return hmac_core($message, $key, 'sha1');
}
function hmac_sha256($message, $key)
{
- require_once(ENANO_ROOT . '/includes/math.php');
- require_once(ENANO_ROOT . '/includes/diffiehellman.php');
- return hmac_core($message, $key, 'sha256');
+ require_once(ENANO_ROOT . '/includes/math.php');
+ require_once(ENANO_ROOT . '/includes/diffiehellman.php');
+ return hmac_core($message, $key, 'sha256');
}
?>
diff -r de56132c008d -r bdac73ed481e includes/http.php
--- a/includes/http.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/http.php Sun Mar 28 23:10:46 2010 -0400
@@ -88,844 +88,844 @@
class Request_HTTP
{
-
- /**
- * Switch to enable or disable debugging. You want this off on production sites.
- * @var bool
- */
-
- var $debug = false;
-
- /**
- * The host the request will be sent to.
- * @var string
- */
-
- var $host = '';
-
- /**
- * The TCP port our connection is (will be) on.
- * @var int
- */
-
- var $port = 80;
-
- /**
- * The request method. Can be GET or POST, defaults to GET.
- * @var string
- */
-
- var $method = 'GET';
-
- /**
- * The URI to the remote script.
- * @var string
- */
-
- var $uri = '';
-
- /**
- * The parameters to be sent on GET.
- * @var array (associative)
- */
-
- var $parms_get = array();
-
- /**
- * The parameters to be sent on POST. Ignored if $this->method == GET.
- * @var array (associative)
- */
-
- var $parms_post = array();
-
- /**
- * The list of cookies that will be sent.
- * @var array (associative)
- */
-
- var $cookies_out = array();
-
- /**
- * Additional request headers.
- * @var array (associative)
- */
-
- var $headers = array();
-
- /**
- * Follow server-side redirects; defaults to true.
- * @var bool
- */
-
- var $follow_redirects = true;
-
- /**
- * Cached response.
- * @var string, or bool:false if the request hasn't been sent yet
- */
-
- var $response = false;
-
- /**
- * Cached response code
- * @var int set to -1 if request hasn't been sent yet
- */
-
- var $response_code = -1;
-
- /**
- * Cached response code string
- * @var string or bool:false if the request hasn't been sent yet
- */
-
- var $response_string = false;
-
- /**
- * Resource for the socket. False if a connection currently isn't going.
- * @var resource
- */
-
- var $socket = false;
-
- /**
- * True if SSL is on, defaults to false
- * @var bool
- */
-
- var $ssl = false;
-
- /**
- * The state of our request. 0 means it hasn't been made yet. 1 means the socket is open, 2 means the socket is open and the request has been written, 3 means the headers have been fetched, and 4 means the request is completed.
- * @var int
- */
-
- var $state = 0;
-
- /**
- * Constructor.
- * @param string Hostname to send to
- * @param string URI (/index.php)
- * @param string Request method - GET or POST.
- * @param int Optional. The port to open the request on. Defaults to 80.
- * @param bool If true, uses SSL (and defaults the port to 443)
- */
-
- function Request_HTTP($host, $uri, $method = 'GET', $port = 'default', $ssl = false)
- {
- if ( !preg_match('/^(?:(([a-z0-9-]+\.)*?)([a-z0-9-]+)|\[[a-f0-9:]+\])$/', $host) )
- throw new Exception(__CLASS__ . ': Invalid hostname');
- if ( $ssl )
- {
- $this->ssl = true;
- $port = ( $port === 'default' ) ? 443 : $port;
- }
- else
- {
- $this->ssl = false;
- $port = ( $port === 'default' ) ? 80 : $port;
- }
- // Yes - this really does support IPv6 URLs!
- $this->host = $host;
- $this->uri = $uri;
- if ( is_int($port) && $port >= 1 && $port <= 65535 )
- $this->port = $port;
- else
- throw new Exception(__CLASS__ . ': Invalid port');
- $method = strtoupper($method);
- if ( $method == 'GET' || $method == 'POST' )
- $this->method = $method;
- else
- throw new Exception(__CLASS__ . ': Invalid request method');
-
- $newline = "\r\n";
- $php_ver = PHP_VERSION;
- $server = ( isset($_SERVER['SERVER_SOFTWARE']) ) ? "Server: {$_SERVER['SERVER_SOFTWARE']}" : "CLI";
- $this->add_header('User-Agent', "PHP/$php_ver ({$server}; automated bot request)");
- }
-
- /**
- * Sets one or more cookies to be sent to the server.
- * @param string or array If a string, the cookie name. If an array, associative array in the form of cookiename => cookievalue
- * @param string or bool If a string, the cookie value. If boolean, defaults to false, param 1 should be an array, and this should not be passed.
- */
-
- function add_cookie($cookiename, $cookievalue = false)
- {
- if ( is_array($cookiename) && !$cookievalue )
- {
- foreach ( $cookiename as $name => $value )
- {
- $this->cookies_out[$name] = $value;
- }
- }
- else if ( is_string($cookiename) && is_string($cookievalue) )
- {
- $this->cookies_out[$cookiename] = $cookievalue;
- }
- else
- {
- throw new Exception(__METHOD__ . ': Invalid argument(s)');
- }
- }
-
- /**
- * Sets one or more request header values.
- * @param string or array If a string, the header name. If an array, associative array in the form of headername => headervalue
- * @param string or bool If a string, the header value. If boolean, defaults to false, param 1 should be an array, and this should not be passed.
- */
-
- function add_header($headername, $headervalue = false)
- {
- if ( is_array($headername) && !$headervalue )
- {
- foreach ( $headername as $name => $value )
- {
- $this->headers[$name] = $value;
- }
- }
- else if ( is_string($headername) && is_string($headervalue) )
- {
- $this->headers[$headername] = $headervalue;
- }
- else
- {
- throw new Exception(__METHOD__ . ': Invalid argument(s)');
- }
- }
-
- /**
- * Adds one or more values to be passed on GET.
- * @param string or array If a string, the parameter name. If an array, associative array in the form of parametername => parametervalue
- * @param string or bool If a string, the parameter value. If boolean, defaults to false, param 1 should be an array, and this should not be passed.
- */
-
- function add_get($getname, $getvalue = false)
- {
- if ( is_array($getname) && !$getvalue )
- {
- foreach ( $getname as $name => $value )
- {
- $this->parms_get[$name] = $value;
- }
- }
- else if ( is_string($getname) && is_string($getvalue) )
- {
- $this->parms_get[$getname] = $getvalue;
- }
- else
- {
- throw new Exception(__METHOD__ . ': Invalid argument(s)');
- }
- }
-
- /**
- * Adds one or more values to be passed on POST.
- * @param string or array If a string, the header name. If an array, associative array in the form of headername => headervalue
- * @param string or bool If a string, the header value. If boolean, defaults to false, param 1 should be an array, and this should not be passed.
- */
-
- function add_post($postname, $postvalue = false)
- {
- if ( is_array($postname) && !$postvalue )
- {
- foreach ( $postname as $name => $value )
- {
- $this->parms_post[$name] = $value;
- }
- }
- else if ( is_string($postname) && is_string($postvalue) )
- {
- $this->parms_post[$postname] = $postvalue;
- }
- else
- {
- throw new Exception(__METHOD__ . ': Invalid argument(s)');
- }
- }
-
- /**
- * Internal function to open up the socket.
- * @access private
- */
-
- function _sock_open(&$connection)
- {
- // Open connection
- $ssl_prepend = ( $this->ssl ) ? 'ssl://' : '';
- $connection = fsockopen($ssl_prepend . $this->host, $this->port, $errno, $errstr);
- if ( !$connection )
- throw new Exception(__METHOD__ . ": Could not make connection"); // to {$this->host}:{$this->port}: error $errno: $errstr");
-
- // 1 = socket open
- $this->state = 1;
- }
-
- /**
- * Internal function to actually write the request into the socket.
- * @access private
- */
-
- function _write_request(&$connection, &$headers, &$cookies, &$get, &$post)
- {
- $newline = "\r\n";
-
- if ( $this->debug )
- echo 'Connection opened. Writing main request to socket. Raw socket data follows.
';
-
- if ( $this->debug )
- {
- echo '
';
- echo '' . __CLASS__ . ': Sending request
Request parameters:
';
- echo "Headers:
$headers
";
- echo "Cookies: $cookies
";
- echo "GET URI: " . htmlspecialchars($this->uri . $get) . "
";
- echo "POST DATA: " . htmlspecialchars($post) . "
";
- echo "";
- }
-
- $portline = ( $this->port == 80 ) ? '' : ":$this->port";
-
- $this->_fputs($connection, "{$this->method} {$this->uri}{$get} HTTP/1.1{$newline}");
- $this->_fputs($connection, "Host: {$this->host}$portline{$newline}");
- $this->_fputs($connection, $headers);
- $this->_fputs($connection, $cookies);
-
- if ( $this->method == 'POST' )
- {
- // POST-specific parameters
- $post_length = strlen($post);
- $this->_fputs($connection, "Content-type: application/x-www-form-urlencoded{$newline}");
- $this->_fputs($connection, "Content-length: {$post_length}{$newline}");
- }
-
- $this->_fputs($connection, "Connection: close{$newline}");
- $this->_fputs($connection, "{$newline}");
-
- if ( $this->method == 'POST' )
- {
- $this->_fputs($connection, $post);
- }
-
- if ( $this->debug )
- echo 'Request written. Fetching response.
';
-
- // 2 = request written
- $this->state = 2;
- }
-
- /**
- * Wrap up and close the socket. Nothing more than a call to fsockclose() except in debug mode.
- * @access private
- */
-
- function sock_close(&$connection)
- {
- if ( $this->debug )
- {
- echo 'Response fetched. Closing connection. Response text follows.
';
- echo htmlspecialchars($this->response);
- echo '
';
- }
-
- fclose($connection);
- $this->state = 0;
- }
-
- /**
- * Internal function to grab the response code and status string
- * @access string
- */
-
- function _parse_response_code($buffer)
- {
- // Retrieve response code and status
- $pos_newline = strpos($buffer, "\n");
- $pos_carriage_return = strpos($buffer, "\r");
- $pos_end_first_line = ( $pos_carriage_return < $pos_newline && $pos_carriage_return > 0 ) ? $pos_carriage_return : $pos_newline;
-
- // First line is in format of:
- // HTTP/1.1 ### Blah blah blah(\r?)\n
- $response_code = substr($buffer, 9, 3);
- $response_string = substr($buffer, 13, ( $pos_end_first_line - 13 ) );
- $this->response_code = intval($response_code);
- $this->response_string = $response_string;
- }
-
- /**
- * Internal function to send the request.
- * @access private
- */
-
- function _send_request()
- {
- $this->concat_headers($headers, $cookies, $get, $post);
-
- if ( $this->state < 1 )
- {
- $this->_sock_open($this->socket);
- }
- if ( $this->state < 2 )
- {
- $this->_write_request($this->socket, $headers, $cookies, $get, $post);
- }
- if ( $this->state == 2 )
- {
- $buffer = $this->_read_until_newlines($this->socket);
- $this->state = 3;
- $this->_parse_response_code($buffer);
- $this->response = $buffer;
- }
- // obey redirects
- $i = 0;
- while ( $i < 20 && $this->follow_redirects )
- {
- $incoming_headers = $this->get_response_headers_array();
- if ( !$incoming_headers )
- break;
- if ( isset($incoming_headers['Location']) )
- {
- // we've been redirected...
- $new_uri = $this->_resolve_uri($incoming_headers['Location']);
- if ( !$new_uri )
- {
- // ... bad URI, ignore Location header.
- break;
- }
- // change location
- $this->host = $new_uri['host'];
- $this->port = $new_uri['port'];
- $this->uri = $new_uri['uri'];
- $get = '';
-
- // reset
- $this->sock_close($this->socket);
- $this->_sock_open($this->socket);
- $this->_write_request($this->socket, $headers, $cookies, $get, $post);
- $buffer = $this->_read_until_newlines($this->socket);
- $this->state = 3;
- $this->_parse_response_code($buffer);
- $this->response = $buffer;
- $i++;
- }
- else
- {
- break;
- }
- }
- if ( $i == 20 )
- {
- throw new Exception(__METHOD__ . ": Redirect trap. Request_HTTP doesn't do cookies, btw.");
- }
-
- if ( $this->state == 3 )
- {
- // Determine transfer encoding
- $is_chunked = preg_match("/Transfer-Encoding: (chunked)\r?\n/", $this->response);
- if ( preg_match("/^Content-Length: ([0-9]+)[\s]*$/mi", $this->response, $match) && !$is_chunked )
- {
- $size = intval($match[1]);
- if ( $this->debug )
- {
- echo "Pulling response using fread(), size $size\n";
- }
- $this->response .= fread($this->socket, $size);
- }
- else
- {
- if ( $this->debug )
- echo "Pulling response using chunked handler\n";
-
- $buffer = '';
- while ( !feof($this->socket) )
- {
- $part = fgets($this->socket, 1024);
- if ( $is_chunked && preg_match("/^([a-f0-9]+)\x0D\x0A$/", $part, $match) )
- {
- $chunklen = hexdec($match[1]);
- $part = ( $chunklen > 0 ) ? fread($this->socket, $chunklen) : '';
- // remove the last newline from $part
- $part = preg_replace("/\r?\n\$/", "", $part);
- }
- $buffer .= $part;
- }
- $this->response .= $buffer;
- }
- }
- $this->state = 4;
-
- $this->sock_close($this->socket);
- $this->socket = false;
- }
-
- /**
- * Internal function to send the request but only fetch the headers. Leaves a connection open for a finish-up function.
- * @access private
- */
-
- function _send_request_headers_only()
- {
- $this->concat_headers($headers, $cookies, $get, $post);
-
- if ( $this->state < 1 )
- {
- $this->_sock_open($this->socket);
- }
- if ( $this->state < 2 )
- {
- $this->_write_request($this->socket, $headers, $cookies, $get, $post);
- }
- if ( $this->state == 2 )
- {
- $buffer = $this->_read_until_newlines($this->socket);
- $this->state = 3;
- $this->_parse_response_code($buffer);
- $this->response = $buffer;
- }
- }
-
- /**
- * Internal function to read from a socket until two consecutive newlines are hit.
- * @access private
- */
-
- function _read_until_newlines($sock)
- {
- $prev_char = '';
- $prev1_char = '';
- $prev2_char = '';
- $buf = '';
- while ( !feof($sock) )
- {
- $chr = fread($sock, 1);
- $buf .= $chr;
- if ( ( $chr == "\n" && $prev_char == "\n" ) ||
- ( $chr == "\n" && $prev_char == "\r" && $prev1_char == "\n" && $prev2_char == "\r" ) )
- {
- return $buf;
- }
- $prev2_char = $prev1_char;
- $prev1_char = $prev_char;
- $prev_char = $chr;
- }
- return $buf;
- }
-
- /**
- * Returns the response text. If the request hasn't been sent, it will be sent here.
- * @return string
- */
-
- function get_response()
- {
- if ( $this->state == 4 )
- return $this->response;
- $this->_send_request();
- return $this->response;
- }
-
- /**
- * Writes the response body to a file. This is good for conserving memory when downloading large files. If the file already exists it will be overwritten.
- * @param string File to write to
- * @param int Chunk size in KB to read from the socket. Optional and should only be needed in circumstances when extreme memory conservation is needed. Defaults to 768.
- * @param int Maximum file size. Defaults to 0, which means no limit.
- * @return bool True on success, false on failure
- */
-
- function write_response_to_file($file, $chunklen = 768, $max_file_size = 0)
- {
- if ( !is_writeable( dirname($file) ) || !file_exists( dirname($file) ) )
- {
- return false;
- }
- $handle = @fopen($file, 'w');
- if ( !$handle )
- return false;
- $chunklen = intval($chunklen);
- if ( $chunklen < 1 )
- return false;
- if ( $this->state == 4 )
- {
- // we already have the response, so cheat
- $response = $this->get_response_body();
- fwrite($handle, $response);
- }
- else
- {
- // read data from the socket, write it immediately, and unset to free memory
- $headers = $this->get_response_headers();
- $transferred_bytes = 0;
- $bandwidth_exceeded = false;
- // if transfer-encoding is chunked, read using chunk sizes the server specifies
- $is_chunked = preg_match("/Transfer-Encoding: (chunked)\r?\n/", $this->response);
- if ( $is_chunked )
- {
- $buffer = '';
- while ( !feof($this->socket) )
- {
- $part = fgets($this->socket, ( 1024 * $chunklen ));
- // Theoretically if the encoding is really chunked then this should always match.
- if ( $is_chunked && preg_match("/^([a-f0-9]+)\x0D\x0A$/", $part, $match) )
- {
- $chunk_length = hexdec($match[1]);
- $part = ( $chunk_length > 0 ) ? fread($this->socket, $chunk_length) : '';
- // remove the last newline from $part
- $part = preg_replace("/\r?\n\$/m", "", $part);
- }
-
- $transferred_bytes += strlen($part);
- if ( $max_file_size && $transferred_bytes > $max_file_size )
- {
- // truncate output to $max_file_size bytes
- $partlen = $max_file_size - ( $transferred_bytes - strlen($part) );
- $part = substr($part, 0, $partlen);
- $bandwidth_exceeded = true;
- }
- fwrite($handle, $part);
- if ( $bandwidth_exceeded )
- {
- break;
- }
- }
- }
- else
- {
- $first_chunk = fread($this->socket, ( 1024 * $chunklen ));
- fwrite($handle, $first_chunk);
- while ( !feof($this->socket) )
- {
- $chunk = fread($this->socket, ( 1024 * $chunklen ));
-
- $transferred_bytes += strlen($chunk);
- if ( $max_file_size && $transferred_bytes > $max_file_size )
- {
- // truncate output to $max_file_size bytes
- $partlen = $max_file_size - ( $transferred_bytes - strlen($chunk) );
- $chunk = substr($chunk, 0, $partlen);
- $bandwidth_exceeded = true;
- }
-
- fwrite($handle, $chunk);
- unset($chunk);
-
- if ( $bandwidth_exceeded )
- {
- break;
- }
- }
- }
- }
- fclose($handle);
- // close socket and reset state, since we haven't cached the response
- $this->sock_close($this->socket);
- $this->state = 0;
- return ($bandwidth_exceeded) ? false : true;
- }
-
- /**
- * Resolves, based on current settings and URI, a URI string to an array consisting of a host, port, and new URI. Returns false on error.
- * @param string
- * @return array
- */
-
- function _resolve_uri($uri)
- {
- // long ass regexp w00t
- if ( !preg_match('#^(?:https?://((?:(?:[a-z0-9-]+\.)*)(?:[a-z0-9-]+)|\[[a-f0-9:]+\])(?::([0-9]+))?)?(/)(.*)$#i', $uri, $match) )
- {
- // bad target URI
- return false;
- }
- $hostpart = $match[1];
- if ( empty($hostpart) )
- {
- // use existing host
- $host = $this->host;
- $port = $this->port;
- }
- else
- {
- $host = $match[1];
- $port = empty($match[2]) ? 80 : intval($match[2]);
- }
- // is this an absolute URI, or relative?
- if ( empty($match[3]) )
- {
- // relative
- $uri = dirname($this->uri) . $match[4];
- }
- else
- {
- // absolute
- $uri = '/' . $match[4];
- }
- return array(
- 'host' => $host,
- 'port' => $port,
- 'uri' => $uri
- );
- }
-
- /**
- * Returns only the response headers.
- * @return string
- */
-
- function get_response_headers()
- {
- if ( $this->state == 3 )
- {
- return $this->response;
- }
- else if ( $this->state == 4 )
- {
- $pos_end = strpos($this->response, "\r\n\r\n");
- if ( empty($pos_end) )
- {
- $pos_end = strpos($this->response, "\n\n");
- }
- $data = substr($this->response, 0, $pos_end);
- return $data;
- }
- else
- {
- $this->_send_request_headers_only();
- return $this->response;
- }
- }
-
- /**
- * Returns only the response headers, as an associative array.
- * @return array
- */
-
- function get_response_headers_array()
- {
- $data = $this->get_response_headers();
- preg_match_all("/(^|\n)([A-z0-9_-]+?): (.+?)(\r|\n|\$)/", $data, $matches);
- $headers = array();
- for ( $i = 0; $i < count($matches[0]); $i++ )
- {
- $headers[ $matches[2][$i] ] = $matches[3][$i];
- }
- return $headers;
- }
-
- /**
- * Returns only the body (not the headers) of the response. If the request hasn't been sent, it will be sent here.
- * @return string
- */
-
- function get_response_body()
- {
- $data = $this->get_response();
- $pos_start = strpos($data, "\r\n\r\n") + 4;
- if ( $pos_start == 4 )
- {
- $pos_start = strpos($data, "\n\n") + 4;
- }
- $data = substr($data, $pos_start);
- return $data;
- }
-
- /**
- * Returns all cookies requested to be set by the server as an associative array. If the request hasn't been sent, it will be sent here.
- * @return array
- */
-
- function get_cookies()
- {
- $data = $this->get_response();
- $data = str_replace("\r\n", "\n", $data);
- $pos = strpos($data, "\n\n");
- $headers = substr($data, 0, $pos);
- preg_match_all("/Set-Cookie: ([a-z0-9_]+)=([^;]+);( expires=([^;]+);)?( path=(.*?))?\n/", $headers, $cookiematch);
- if ( count($cookiematch[0]) < 1 )
- return array();
- $cookies = array();
- foreach ( $cookiematch[0] as $i => $cookie )
- {
- $cookies[$cookiematch[1][$i]] = $cookiematch[2][$i];
- }
- return $cookies;
- }
-
- /**
- * Internal method to write data to a socket with debugging possibility.
- * @access private
- */
-
- function _fputs($socket, $data)
- {
- if ( $this->debug )
- echo htmlspecialchars($data);
-
- return fputs($socket, $data);
- }
-
- /**
- * Internal function to stringify cookies, headers, get, and post.
- * @access private
- */
-
- function concat_headers(&$headers, &$cookies, &$get, &$post)
- {
- $headers = '';
- $cookies = '';
- foreach ( $this->headers as $name => $value )
- {
- $value = str_replace('\\n', '\\\\n', $value);
- $value = str_replace("\n", '\\n', $value);
- $headers .= "$name: $value\r\n";
- }
- unset($value);
- if ( count($this->cookies_out) > 0 )
- {
- $i = 0;
- $cookie_header = 'Cookie: ';
- foreach ( $this->cookies_out as $name => $value )
- {
- $i++;
- if ( $i > 1 )
- $cookie_header .= '; ';
- $value = str_replace(';', rawurlencode(';'), $value);
- $value = str_replace('\\n', '\\\\n', $value);
- $value = str_replace("\n", '\\n', $value);
- $cookie_header .= "$name=$value";
- }
- $cookie_header .= "\r\n";
- $cookies = $cookie_header;
- unset($value, $cookie_header);
- }
- if ( count($this->parms_get) > 0 )
- {
- $get = '?';
- $i = 0;
- foreach ( $this->parms_get as $name => $value )
- {
- $i++;
- if ( $i > 1 )
- $get .= '&';
- $value = urlencode($value);
- if ( !empty($value) || is_string($value) )
- $get .= "$name=$value";
- else
- $get .= "$name";
- }
- }
- if ( count($this->parms_post) > 0 )
- {
- $post = '';
- $i = 0;
- foreach ( $this->parms_post as $name => $value )
- {
- $i++;
- if ( $i > 1 )
- $post .= '&';
- $value = urlencode($value);
- $post .= "$name=$value";
- }
- }
- }
-
+
+ /**
+ * Switch to enable or disable debugging. You want this off on production sites.
+ * @var bool
+ */
+
+ var $debug = false;
+
+ /**
+ * The host the request will be sent to.
+ * @var string
+ */
+
+ var $host = '';
+
+ /**
+ * The TCP port our connection is (will be) on.
+ * @var int
+ */
+
+ var $port = 80;
+
+ /**
+ * The request method. Can be GET or POST, defaults to GET.
+ * @var string
+ */
+
+ var $method = 'GET';
+
+ /**
+ * The URI to the remote script.
+ * @var string
+ */
+
+ var $uri = '';
+
+ /**
+ * The parameters to be sent on GET.
+ * @var array (associative)
+ */
+
+ var $parms_get = array();
+
+ /**
+ * The parameters to be sent on POST. Ignored if $this->method == GET.
+ * @var array (associative)
+ */
+
+ var $parms_post = array();
+
+ /**
+ * The list of cookies that will be sent.
+ * @var array (associative)
+ */
+
+ var $cookies_out = array();
+
+ /**
+ * Additional request headers.
+ * @var array (associative)
+ */
+
+ var $headers = array();
+
+ /**
+ * Follow server-side redirects; defaults to true.
+ * @var bool
+ */
+
+ var $follow_redirects = true;
+
+ /**
+ * Cached response.
+ * @var string, or bool:false if the request hasn't been sent yet
+ */
+
+ var $response = false;
+
+ /**
+ * Cached response code
+ * @var int set to -1 if request hasn't been sent yet
+ */
+
+ var $response_code = -1;
+
+ /**
+ * Cached response code string
+ * @var string or bool:false if the request hasn't been sent yet
+ */
+
+ var $response_string = false;
+
+ /**
+ * Resource for the socket. False if a connection currently isn't going.
+ * @var resource
+ */
+
+ var $socket = false;
+
+ /**
+ * True if SSL is on, defaults to false
+ * @var bool
+ */
+
+ var $ssl = false;
+
+ /**
+ * The state of our request. 0 means it hasn't been made yet. 1 means the socket is open, 2 means the socket is open and the request has been written, 3 means the headers have been fetched, and 4 means the request is completed.
+ * @var int
+ */
+
+ var $state = 0;
+
+ /**
+ * Constructor.
+ * @param string Hostname to send to
+ * @param string URI (/index.php)
+ * @param string Request method - GET or POST.
+ * @param int Optional. The port to open the request on. Defaults to 80.
+ * @param bool If true, uses SSL (and defaults the port to 443)
+ */
+
+ function Request_HTTP($host, $uri, $method = 'GET', $port = 'default', $ssl = false)
+ {
+ if ( !preg_match('/^(?:(([a-z0-9-]+\.)*?)([a-z0-9-]+)|\[[a-f0-9:]+\])$/', $host) )
+ throw new Exception(__CLASS__ . ': Invalid hostname');
+ if ( $ssl )
+ {
+ $this->ssl = true;
+ $port = ( $port === 'default' ) ? 443 : $port;
+ }
+ else
+ {
+ $this->ssl = false;
+ $port = ( $port === 'default' ) ? 80 : $port;
+ }
+ // Yes - this really does support IPv6 URLs!
+ $this->host = $host;
+ $this->uri = $uri;
+ if ( is_int($port) && $port >= 1 && $port <= 65535 )
+ $this->port = $port;
+ else
+ throw new Exception(__CLASS__ . ': Invalid port');
+ $method = strtoupper($method);
+ if ( $method == 'GET' || $method == 'POST' )
+ $this->method = $method;
+ else
+ throw new Exception(__CLASS__ . ': Invalid request method');
+
+ $newline = "\r\n";
+ $php_ver = PHP_VERSION;
+ $server = ( isset($_SERVER['SERVER_SOFTWARE']) ) ? "Server: {$_SERVER['SERVER_SOFTWARE']}" : "CLI";
+ $this->add_header('User-Agent', "PHP/$php_ver ({$server}; automated bot request)");
+ }
+
+ /**
+ * Sets one or more cookies to be sent to the server.
+ * @param string or array If a string, the cookie name. If an array, associative array in the form of cookiename => cookievalue
+ * @param string or bool If a string, the cookie value. If boolean, defaults to false, param 1 should be an array, and this should not be passed.
+ */
+
+ function add_cookie($cookiename, $cookievalue = false)
+ {
+ if ( is_array($cookiename) && !$cookievalue )
+ {
+ foreach ( $cookiename as $name => $value )
+ {
+ $this->cookies_out[$name] = $value;
+ }
+ }
+ else if ( is_string($cookiename) && is_string($cookievalue) )
+ {
+ $this->cookies_out[$cookiename] = $cookievalue;
+ }
+ else
+ {
+ throw new Exception(__METHOD__ . ': Invalid argument(s)');
+ }
+ }
+
+ /**
+ * Sets one or more request header values.
+ * @param string or array If a string, the header name. If an array, associative array in the form of headername => headervalue
+ * @param string or bool If a string, the header value. If boolean, defaults to false, param 1 should be an array, and this should not be passed.
+ */
+
+ function add_header($headername, $headervalue = false)
+ {
+ if ( is_array($headername) && !$headervalue )
+ {
+ foreach ( $headername as $name => $value )
+ {
+ $this->headers[$name] = $value;
+ }
+ }
+ else if ( is_string($headername) && is_string($headervalue) )
+ {
+ $this->headers[$headername] = $headervalue;
+ }
+ else
+ {
+ throw new Exception(__METHOD__ . ': Invalid argument(s)');
+ }
+ }
+
+ /**
+ * Adds one or more values to be passed on GET.
+ * @param string or array If a string, the parameter name. If an array, associative array in the form of parametername => parametervalue
+ * @param string or bool If a string, the parameter value. If boolean, defaults to false, param 1 should be an array, and this should not be passed.
+ */
+
+ function add_get($getname, $getvalue = false)
+ {
+ if ( is_array($getname) && !$getvalue )
+ {
+ foreach ( $getname as $name => $value )
+ {
+ $this->parms_get[$name] = $value;
+ }
+ }
+ else if ( is_string($getname) && is_string($getvalue) )
+ {
+ $this->parms_get[$getname] = $getvalue;
+ }
+ else
+ {
+ throw new Exception(__METHOD__ . ': Invalid argument(s)');
+ }
+ }
+
+ /**
+ * Adds one or more values to be passed on POST.
+ * @param string or array If a string, the header name. If an array, associative array in the form of headername => headervalue
+ * @param string or bool If a string, the header value. If boolean, defaults to false, param 1 should be an array, and this should not be passed.
+ */
+
+ function add_post($postname, $postvalue = false)
+ {
+ if ( is_array($postname) && !$postvalue )
+ {
+ foreach ( $postname as $name => $value )
+ {
+ $this->parms_post[$name] = $value;
+ }
+ }
+ else if ( is_string($postname) && is_string($postvalue) )
+ {
+ $this->parms_post[$postname] = $postvalue;
+ }
+ else
+ {
+ throw new Exception(__METHOD__ . ': Invalid argument(s)');
+ }
+ }
+
+ /**
+ * Internal function to open up the socket.
+ * @access private
+ */
+
+ function _sock_open(&$connection)
+ {
+ // Open connection
+ $ssl_prepend = ( $this->ssl ) ? 'ssl://' : '';
+ $connection = fsockopen($ssl_prepend . $this->host, $this->port, $errno, $errstr);
+ if ( !$connection )
+ throw new Exception(__METHOD__ . ": Could not make connection"); // to {$this->host}:{$this->port}: error $errno: $errstr");
+
+ // 1 = socket open
+ $this->state = 1;
+ }
+
+ /**
+ * Internal function to actually write the request into the socket.
+ * @access private
+ */
+
+ function _write_request(&$connection, &$headers, &$cookies, &$get, &$post)
+ {
+ $newline = "\r\n";
+
+ if ( $this->debug )
+ echo 'Connection opened. Writing main request to socket. Raw socket data follows.
';
+
+ if ( $this->debug )
+ {
+ echo '
';
+ echo '' . __CLASS__ . ': Sending request
Request parameters:
';
+ echo "Headers:
$headers
";
+ echo "Cookies: $cookies
";
+ echo "GET URI: " . htmlspecialchars($this->uri . $get) . "
";
+ echo "POST DATA: " . htmlspecialchars($post) . "
";
+ echo "";
+ }
+
+ $portline = ( $this->port == 80 ) ? '' : ":$this->port";
+
+ $this->_fputs($connection, "{$this->method} {$this->uri}{$get} HTTP/1.1{$newline}");
+ $this->_fputs($connection, "Host: {$this->host}$portline{$newline}");
+ $this->_fputs($connection, $headers);
+ $this->_fputs($connection, $cookies);
+
+ if ( $this->method == 'POST' )
+ {
+ // POST-specific parameters
+ $post_length = strlen($post);
+ $this->_fputs($connection, "Content-type: application/x-www-form-urlencoded{$newline}");
+ $this->_fputs($connection, "Content-length: {$post_length}{$newline}");
+ }
+
+ $this->_fputs($connection, "Connection: close{$newline}");
+ $this->_fputs($connection, "{$newline}");
+
+ if ( $this->method == 'POST' )
+ {
+ $this->_fputs($connection, $post);
+ }
+
+ if ( $this->debug )
+ echo 'Request written. Fetching response.
';
+
+ // 2 = request written
+ $this->state = 2;
+ }
+
+ /**
+ * Wrap up and close the socket. Nothing more than a call to fsockclose() except in debug mode.
+ * @access private
+ */
+
+ function sock_close(&$connection)
+ {
+ if ( $this->debug )
+ {
+ echo 'Response fetched. Closing connection. Response text follows.
';
+ echo htmlspecialchars($this->response);
+ echo '
';
+ }
+
+ fclose($connection);
+ $this->state = 0;
+ }
+
+ /**
+ * Internal function to grab the response code and status string
+ * @access string
+ */
+
+ function _parse_response_code($buffer)
+ {
+ // Retrieve response code and status
+ $pos_newline = strpos($buffer, "\n");
+ $pos_carriage_return = strpos($buffer, "\r");
+ $pos_end_first_line = ( $pos_carriage_return < $pos_newline && $pos_carriage_return > 0 ) ? $pos_carriage_return : $pos_newline;
+
+ // First line is in format of:
+ // HTTP/1.1 ### Blah blah blah(\r?)\n
+ $response_code = substr($buffer, 9, 3);
+ $response_string = substr($buffer, 13, ( $pos_end_first_line - 13 ) );
+ $this->response_code = intval($response_code);
+ $this->response_string = $response_string;
+ }
+
+ /**
+ * Internal function to send the request.
+ * @access private
+ */
+
+ function _send_request()
+ {
+ $this->concat_headers($headers, $cookies, $get, $post);
+
+ if ( $this->state < 1 )
+ {
+ $this->_sock_open($this->socket);
+ }
+ if ( $this->state < 2 )
+ {
+ $this->_write_request($this->socket, $headers, $cookies, $get, $post);
+ }
+ if ( $this->state == 2 )
+ {
+ $buffer = $this->_read_until_newlines($this->socket);
+ $this->state = 3;
+ $this->_parse_response_code($buffer);
+ $this->response = $buffer;
+ }
+ // obey redirects
+ $i = 0;
+ while ( $i < 20 && $this->follow_redirects )
+ {
+ $incoming_headers = $this->get_response_headers_array();
+ if ( !$incoming_headers )
+ break;
+ if ( isset($incoming_headers['Location']) )
+ {
+ // we've been redirected...
+ $new_uri = $this->_resolve_uri($incoming_headers['Location']);
+ if ( !$new_uri )
+ {
+ // ... bad URI, ignore Location header.
+ break;
+ }
+ // change location
+ $this->host = $new_uri['host'];
+ $this->port = $new_uri['port'];
+ $this->uri = $new_uri['uri'];
+ $get = '';
+
+ // reset
+ $this->sock_close($this->socket);
+ $this->_sock_open($this->socket);
+ $this->_write_request($this->socket, $headers, $cookies, $get, $post);
+ $buffer = $this->_read_until_newlines($this->socket);
+ $this->state = 3;
+ $this->_parse_response_code($buffer);
+ $this->response = $buffer;
+ $i++;
+ }
+ else
+ {
+ break;
+ }
+ }
+ if ( $i == 20 )
+ {
+ throw new Exception(__METHOD__ . ": Redirect trap. Request_HTTP doesn't do cookies, btw.");
+ }
+
+ if ( $this->state == 3 )
+ {
+ // Determine transfer encoding
+ $is_chunked = preg_match("/Transfer-Encoding: (chunked)\r?\n/", $this->response);
+ if ( preg_match("/^Content-Length: ([0-9]+)[\s]*$/mi", $this->response, $match) && !$is_chunked )
+ {
+ $size = intval($match[1]);
+ if ( $this->debug )
+ {
+ echo "Pulling response using fread(), size $size\n";
+ }
+ $this->response .= fread($this->socket, $size);
+ }
+ else
+ {
+ if ( $this->debug )
+ echo "Pulling response using chunked handler\n";
+
+ $buffer = '';
+ while ( !feof($this->socket) )
+ {
+ $part = fgets($this->socket, 1024);
+ if ( $is_chunked && preg_match("/^([a-f0-9]+)\x0D\x0A$/", $part, $match) )
+ {
+ $chunklen = hexdec($match[1]);
+ $part = ( $chunklen > 0 ) ? fread($this->socket, $chunklen) : '';
+ // remove the last newline from $part
+ $part = preg_replace("/\r?\n\$/", "", $part);
+ }
+ $buffer .= $part;
+ }
+ $this->response .= $buffer;
+ }
+ }
+ $this->state = 4;
+
+ $this->sock_close($this->socket);
+ $this->socket = false;
+ }
+
+ /**
+ * Internal function to send the request but only fetch the headers. Leaves a connection open for a finish-up function.
+ * @access private
+ */
+
+ function _send_request_headers_only()
+ {
+ $this->concat_headers($headers, $cookies, $get, $post);
+
+ if ( $this->state < 1 )
+ {
+ $this->_sock_open($this->socket);
+ }
+ if ( $this->state < 2 )
+ {
+ $this->_write_request($this->socket, $headers, $cookies, $get, $post);
+ }
+ if ( $this->state == 2 )
+ {
+ $buffer = $this->_read_until_newlines($this->socket);
+ $this->state = 3;
+ $this->_parse_response_code($buffer);
+ $this->response = $buffer;
+ }
+ }
+
+ /**
+ * Internal function to read from a socket until two consecutive newlines are hit.
+ * @access private
+ */
+
+ function _read_until_newlines($sock)
+ {
+ $prev_char = '';
+ $prev1_char = '';
+ $prev2_char = '';
+ $buf = '';
+ while ( !feof($sock) )
+ {
+ $chr = fread($sock, 1);
+ $buf .= $chr;
+ if ( ( $chr == "\n" && $prev_char == "\n" ) ||
+ ( $chr == "\n" && $prev_char == "\r" && $prev1_char == "\n" && $prev2_char == "\r" ) )
+ {
+ return $buf;
+ }
+ $prev2_char = $prev1_char;
+ $prev1_char = $prev_char;
+ $prev_char = $chr;
+ }
+ return $buf;
+ }
+
+ /**
+ * Returns the response text. If the request hasn't been sent, it will be sent here.
+ * @return string
+ */
+
+ function get_response()
+ {
+ if ( $this->state == 4 )
+ return $this->response;
+ $this->_send_request();
+ return $this->response;
+ }
+
+ /**
+ * Writes the response body to a file. This is good for conserving memory when downloading large files. If the file already exists it will be overwritten.
+ * @param string File to write to
+ * @param int Chunk size in KB to read from the socket. Optional and should only be needed in circumstances when extreme memory conservation is needed. Defaults to 768.
+ * @param int Maximum file size. Defaults to 0, which means no limit.
+ * @return bool True on success, false on failure
+ */
+
+ function write_response_to_file($file, $chunklen = 768, $max_file_size = 0)
+ {
+ if ( !is_writeable( dirname($file) ) || !file_exists( dirname($file) ) )
+ {
+ return false;
+ }
+ $handle = @fopen($file, 'w');
+ if ( !$handle )
+ return false;
+ $chunklen = intval($chunklen);
+ if ( $chunklen < 1 )
+ return false;
+ if ( $this->state == 4 )
+ {
+ // we already have the response, so cheat
+ $response = $this->get_response_body();
+ fwrite($handle, $response);
+ }
+ else
+ {
+ // read data from the socket, write it immediately, and unset to free memory
+ $headers = $this->get_response_headers();
+ $transferred_bytes = 0;
+ $bandwidth_exceeded = false;
+ // if transfer-encoding is chunked, read using chunk sizes the server specifies
+ $is_chunked = preg_match("/Transfer-Encoding: (chunked)\r?\n/", $this->response);
+ if ( $is_chunked )
+ {
+ $buffer = '';
+ while ( !feof($this->socket) )
+ {
+ $part = fgets($this->socket, ( 1024 * $chunklen ));
+ // Theoretically if the encoding is really chunked then this should always match.
+ if ( $is_chunked && preg_match("/^([a-f0-9]+)\x0D\x0A$/", $part, $match) )
+ {
+ $chunk_length = hexdec($match[1]);
+ $part = ( $chunk_length > 0 ) ? fread($this->socket, $chunk_length) : '';
+ // remove the last newline from $part
+ $part = preg_replace("/\r?\n\$/m", "", $part);
+ }
+
+ $transferred_bytes += strlen($part);
+ if ( $max_file_size && $transferred_bytes > $max_file_size )
+ {
+ // truncate output to $max_file_size bytes
+ $partlen = $max_file_size - ( $transferred_bytes - strlen($part) );
+ $part = substr($part, 0, $partlen);
+ $bandwidth_exceeded = true;
+ }
+ fwrite($handle, $part);
+ if ( $bandwidth_exceeded )
+ {
+ break;
+ }
+ }
+ }
+ else
+ {
+ $first_chunk = fread($this->socket, ( 1024 * $chunklen ));
+ fwrite($handle, $first_chunk);
+ while ( !feof($this->socket) )
+ {
+ $chunk = fread($this->socket, ( 1024 * $chunklen ));
+
+ $transferred_bytes += strlen($chunk);
+ if ( $max_file_size && $transferred_bytes > $max_file_size )
+ {
+ // truncate output to $max_file_size bytes
+ $partlen = $max_file_size - ( $transferred_bytes - strlen($chunk) );
+ $chunk = substr($chunk, 0, $partlen);
+ $bandwidth_exceeded = true;
+ }
+
+ fwrite($handle, $chunk);
+ unset($chunk);
+
+ if ( $bandwidth_exceeded )
+ {
+ break;
+ }
+ }
+ }
+ }
+ fclose($handle);
+ // close socket and reset state, since we haven't cached the response
+ $this->sock_close($this->socket);
+ $this->state = 0;
+ return ($bandwidth_exceeded) ? false : true;
+ }
+
+ /**
+ * Resolves, based on current settings and URI, a URI string to an array consisting of a host, port, and new URI. Returns false on error.
+ * @param string
+ * @return array
+ */
+
+ function _resolve_uri($uri)
+ {
+ // long ass regexp w00t
+ if ( !preg_match('#^(?:https?://((?:(?:[a-z0-9-]+\.)*)(?:[a-z0-9-]+)|\[[a-f0-9:]+\])(?::([0-9]+))?)?(/)(.*)$#i', $uri, $match) )
+ {
+ // bad target URI
+ return false;
+ }
+ $hostpart = $match[1];
+ if ( empty($hostpart) )
+ {
+ // use existing host
+ $host = $this->host;
+ $port = $this->port;
+ }
+ else
+ {
+ $host = $match[1];
+ $port = empty($match[2]) ? 80 : intval($match[2]);
+ }
+ // is this an absolute URI, or relative?
+ if ( empty($match[3]) )
+ {
+ // relative
+ $uri = dirname($this->uri) . $match[4];
+ }
+ else
+ {
+ // absolute
+ $uri = '/' . $match[4];
+ }
+ return array(
+ 'host' => $host,
+ 'port' => $port,
+ 'uri' => $uri
+ );
+ }
+
+ /**
+ * Returns only the response headers.
+ * @return string
+ */
+
+ function get_response_headers()
+ {
+ if ( $this->state == 3 )
+ {
+ return $this->response;
+ }
+ else if ( $this->state == 4 )
+ {
+ $pos_end = strpos($this->response, "\r\n\r\n");
+ if ( empty($pos_end) )
+ {
+ $pos_end = strpos($this->response, "\n\n");
+ }
+ $data = substr($this->response, 0, $pos_end);
+ return $data;
+ }
+ else
+ {
+ $this->_send_request_headers_only();
+ return $this->response;
+ }
+ }
+
+ /**
+ * Returns only the response headers, as an associative array.
+ * @return array
+ */
+
+ function get_response_headers_array()
+ {
+ $data = $this->get_response_headers();
+ preg_match_all("/(^|\n)([A-z0-9_-]+?): (.+?)(\r|\n|\$)/", $data, $matches);
+ $headers = array();
+ for ( $i = 0; $i < count($matches[0]); $i++ )
+ {
+ $headers[ $matches[2][$i] ] = $matches[3][$i];
+ }
+ return $headers;
+ }
+
+ /**
+ * Returns only the body (not the headers) of the response. If the request hasn't been sent, it will be sent here.
+ * @return string
+ */
+
+ function get_response_body()
+ {
+ $data = $this->get_response();
+ $pos_start = strpos($data, "\r\n\r\n") + 4;
+ if ( $pos_start == 4 )
+ {
+ $pos_start = strpos($data, "\n\n") + 4;
+ }
+ $data = substr($data, $pos_start);
+ return $data;
+ }
+
+ /**
+ * Returns all cookies requested to be set by the server as an associative array. If the request hasn't been sent, it will be sent here.
+ * @return array
+ */
+
+ function get_cookies()
+ {
+ $data = $this->get_response();
+ $data = str_replace("\r\n", "\n", $data);
+ $pos = strpos($data, "\n\n");
+ $headers = substr($data, 0, $pos);
+ preg_match_all("/Set-Cookie: ([a-z0-9_]+)=([^;]+);( expires=([^;]+);)?( path=(.*?))?\n/", $headers, $cookiematch);
+ if ( count($cookiematch[0]) < 1 )
+ return array();
+ $cookies = array();
+ foreach ( $cookiematch[0] as $i => $cookie )
+ {
+ $cookies[$cookiematch[1][$i]] = $cookiematch[2][$i];
+ }
+ return $cookies;
+ }
+
+ /**
+ * Internal method to write data to a socket with debugging possibility.
+ * @access private
+ */
+
+ function _fputs($socket, $data)
+ {
+ if ( $this->debug )
+ echo htmlspecialchars($data);
+
+ return fputs($socket, $data);
+ }
+
+ /**
+ * Internal function to stringify cookies, headers, get, and post.
+ * @access private
+ */
+
+ function concat_headers(&$headers, &$cookies, &$get, &$post)
+ {
+ $headers = '';
+ $cookies = '';
+ foreach ( $this->headers as $name => $value )
+ {
+ $value = str_replace('\\n', '\\\\n', $value);
+ $value = str_replace("\n", '\\n', $value);
+ $headers .= "$name: $value\r\n";
+ }
+ unset($value);
+ if ( count($this->cookies_out) > 0 )
+ {
+ $i = 0;
+ $cookie_header = 'Cookie: ';
+ foreach ( $this->cookies_out as $name => $value )
+ {
+ $i++;
+ if ( $i > 1 )
+ $cookie_header .= '; ';
+ $value = str_replace(';', rawurlencode(';'), $value);
+ $value = str_replace('\\n', '\\\\n', $value);
+ $value = str_replace("\n", '\\n', $value);
+ $cookie_header .= "$name=$value";
+ }
+ $cookie_header .= "\r\n";
+ $cookies = $cookie_header;
+ unset($value, $cookie_header);
+ }
+ if ( count($this->parms_get) > 0 )
+ {
+ $get = '?';
+ $i = 0;
+ foreach ( $this->parms_get as $name => $value )
+ {
+ $i++;
+ if ( $i > 1 )
+ $get .= '&';
+ $value = urlencode($value);
+ if ( !empty($value) || is_string($value) )
+ $get .= "$name=$value";
+ else
+ $get .= "$name";
+ }
+ }
+ if ( count($this->parms_post) > 0 )
+ {
+ $post = '';
+ $i = 0;
+ foreach ( $this->parms_post as $name => $value )
+ {
+ $i++;
+ if ( $i > 1 )
+ $post .= '&';
+ $value = urlencode($value);
+ $post .= "$name=$value";
+ }
+ }
+ }
+
}
diff -r de56132c008d -r bdac73ed481e includes/js-compressor.php
--- a/includes/js-compressor.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/js-compressor.php Sun Mar 28 23:10:46 2010 -0400
@@ -84,8 +84,8 @@
/**
* public variables
- * stats:string after every compression has some informations
- * version:string version of this class
+ * stats:string after every compression has some informations
+ * version:string version of this class
*/
var $stats = '',
$version = '0.8';
@@ -104,7 +104,7 @@
/**
* public constructor
- * creates a new BaseConvert class variable (base 36)
+ * creates a new BaseConvert class variable (base 36)
*/
function __construct() {
$this->__SourceMap = new SourceMap();
@@ -120,9 +120,9 @@
/**
* public method
- * getClean(mixed [, bool]):string
- * compress JavaScript removing comments and somespaces (on by default)
- * @param mixed view example and notes on class comments
+ * getClean(mixed [, bool]):string
+ * compress JavaScript removing comments and somespaces (on by default)
+ * @param mixed view example and notes on class comments
*/
function getClean($jsSource) {
return $this->__commonInitMethods($jsSource, false);
@@ -130,9 +130,9 @@
/**
* public method
- * getPacked(mixed):string
- * compress JavaScript replaceing words and removing comments and some spaces
- * @param mixed view example and notes on class comments
+ * getPacked(mixed):string
+ * compress JavaScript replaceing words and removing comments and some spaces
+ * @param mixed view example and notes on class comments
*/
function getPacked($jsSource) {
return $this->__commonInitMethods($jsSource, true);
@@ -373,124 +373,124 @@
* @Application Last version of JavaScriptCompressor class use this one to map source code.
*/
class SourceMap {
-
- /**
- * public method
- * getMap(&$source:string, &$delimeters:array):array
- * Maps the source code using $delimeters rules and returns map as an array
- * NOTE: read comments to know more about map and delimeter
- *
- * @param string generic source code
- * @param array array with nested array with code rules
- */
- function getMap(&$source, &$delimeters) {
-
- # "unsigned" integer variables
- $sourcePosition = 0;
- $delimetersPosition = 0;
- $findLength = 0;
- $len = 0;
- $tempIndex = 0;
- $sourceLength = strlen($source);
- $delimetersLength = count($delimeters);
-
- # integer variables
- $tempPosition = -1;
- $endPosition = -1;
-
- # array variables
- $map = array();
- $tempMap = array();
- $tempDelimeter = array();
-
- while($sourcePosition < $sourceLength) {
- $endPosition = -1;
- for($delimetersPosition = 0; $delimetersPosition < $delimetersLength; $delimetersPosition++) {
- $tempPosition = strpos($source, $delimeters[$delimetersPosition]['start'], $sourcePosition);
- if($tempPosition !== false && ($tempPosition < $endPosition || $endPosition === -1)) {
- $endPosition = $tempPosition;
- $tempIndex = $delimetersPosition;
- }
- }
- if($endPosition !== -1) {
- $sourcePosition = $endPosition;
- $tempDelimeter = &$delimeters[$tempIndex];
- $findLength = strlen($tempDelimeter['start']);
- if(is_array($tempDelimeter['end'])) {
- $delimetersPosition = 0;
- $endPosition = -1;
- for($len = count($tempDelimeter['end']); $delimetersPosition < $len; $delimetersPosition++) {
- $tempPosition = strpos($source, $tempDelimeter['end'][$delimetersPosition], $sourcePosition + $findLength);
- if($tempPosition !== false && ($tempPosition < $endPosition || $endPosition === -1)) {
- $endPosition = $tempPosition;
- $tempIndex = $delimetersPosition;
- }
- }
- if($endPosition !== -1)
- $endPosition = $endPosition + strlen($tempDelimeter['end'][$tempIndex]);
- else
- $endPosition = $sourceLength;
- array_push($map, array('name'=>$tempDelimeter['name'], 'start'=>$sourcePosition, 'end'=>$endPosition));
- $sourcePosition = $endPosition - 1;
- }
- elseif(isset($tempDelimeter['match'])) {
- $tempPosition = strpos($source, $tempDelimeter['end'], $sourcePosition + $findLength);
- $len = strlen($tempDelimeter['end']);
- if($tempPosition !== false && preg_match($tempDelimeter['match'], substr($source, $sourcePosition, $tempPosition - $sourcePosition + $len))) {
- $endPosition = isset($tempDelimeter['noslash']) ? $this->__endCharNoSlash($source, $sourcePosition, $tempDelimeter['end'], $sourceLength) : $tempPosition + $len;
- array_push($map, array('name'=>$tempDelimeter['name'], 'start'=>$sourcePosition, 'end'=>$endPosition));
- $sourcePosition = $endPosition - 1;
- }
- }
- else {
- if(isset($tempDelimeter['noslash']))
- $endPosition = $this->__endCharNoSlash($source, $sourcePosition, $tempDelimeter['end'], $sourceLength);
- else {
- $tempPosition = strpos($source, $tempDelimeter['end'], $sourcePosition + $findLength);
- if($tempPosition !== false)
- $endPosition = $tempPosition + strlen($tempDelimeter['end']);
- else
- $endPosition = $sourceLength;
- }
- array_push($map, array('name'=>$tempDelimeter['name'], 'start'=>$sourcePosition, 'end'=>$endPosition));
- $sourcePosition = $endPosition - 1;
- }
- }
- else
- $sourcePosition = $sourceLength - 1;
- ++$sourcePosition;
- }
- $len = count($map);
- if($len === 0)
- array_push($tempMap, array('name'=>'code', 'start'=>0, 'end'=>$sourceLength));
- else {
- for($tempIndex = 0; $tempIndex < $len; $tempIndex++) {
- if($tempIndex === 0 && $map[$tempIndex]['start'] > 0)
- array_push($tempMap, array('name'=>'code', 'start'=>0, 'end'=>$map[$tempIndex]['start']));
- elseif($tempIndex > 0 && $map[$tempIndex]['start'] > $map[$tempIndex-1]['end'])
- array_push($tempMap, array('name'=>'code', 'start'=>$map[$tempIndex-1]['end'], 'end'=>$map[$tempIndex]['start']));
- array_push($tempMap, array('name'=>$map[$tempIndex]['name'], 'start'=>$map[$tempIndex]['start'], 'end'=>$map[$tempIndex]['end']));
- if($tempIndex + 1 === $len && $map[$tempIndex]['end'] < $sourceLength)
- array_push($tempMap, array('name'=>'code', 'start'=>$map[$tempIndex]['end'], 'end'=>$sourceLength));
- }
- }
- return $tempMap;
- }
-
- function __endCharNoSlash(&$source, $position, &$find, &$len) {
- $temp = strlen($find);
- do {
- $position = strpos($source, $find, $position + 1);
- }while($position !== false && !$this->__charNoSlash($source, $position));
- if($position === false) $position = $len - $temp;
- return $position + $temp;
- }
-
- function __charNoSlash(&$source, &$position) {
- $next = 1; $len = $position - $next;
- while($len > 0 && $source{$len} === '\\') $len = $position - (++$next);
- return (($next - 1) % 2 === 0);
- }
+
+ /**
+ * public method
+ * getMap(&$source:string, &$delimeters:array):array
+ * Maps the source code using $delimeters rules and returns map as an array
+ * NOTE: read comments to know more about map and delimeter
+ *
+ * @param string generic source code
+ * @param array array with nested array with code rules
+ */
+ function getMap(&$source, &$delimeters) {
+
+ # "unsigned" integer variables
+ $sourcePosition = 0;
+ $delimetersPosition = 0;
+ $findLength = 0;
+ $len = 0;
+ $tempIndex = 0;
+ $sourceLength = strlen($source);
+ $delimetersLength = count($delimeters);
+
+ # integer variables
+ $tempPosition = -1;
+ $endPosition = -1;
+
+ # array variables
+ $map = array();
+ $tempMap = array();
+ $tempDelimeter = array();
+
+ while($sourcePosition < $sourceLength) {
+ $endPosition = -1;
+ for($delimetersPosition = 0; $delimetersPosition < $delimetersLength; $delimetersPosition++) {
+ $tempPosition = strpos($source, $delimeters[$delimetersPosition]['start'], $sourcePosition);
+ if($tempPosition !== false && ($tempPosition < $endPosition || $endPosition === -1)) {
+ $endPosition = $tempPosition;
+ $tempIndex = $delimetersPosition;
+ }
+ }
+ if($endPosition !== -1) {
+ $sourcePosition = $endPosition;
+ $tempDelimeter = &$delimeters[$tempIndex];
+ $findLength = strlen($tempDelimeter['start']);
+ if(is_array($tempDelimeter['end'])) {
+ $delimetersPosition = 0;
+ $endPosition = -1;
+ for($len = count($tempDelimeter['end']); $delimetersPosition < $len; $delimetersPosition++) {
+ $tempPosition = strpos($source, $tempDelimeter['end'][$delimetersPosition], $sourcePosition + $findLength);
+ if($tempPosition !== false && ($tempPosition < $endPosition || $endPosition === -1)) {
+ $endPosition = $tempPosition;
+ $tempIndex = $delimetersPosition;
+ }
+ }
+ if($endPosition !== -1)
+ $endPosition = $endPosition + strlen($tempDelimeter['end'][$tempIndex]);
+ else
+ $endPosition = $sourceLength;
+ array_push($map, array('name'=>$tempDelimeter['name'], 'start'=>$sourcePosition, 'end'=>$endPosition));
+ $sourcePosition = $endPosition - 1;
+ }
+ elseif(isset($tempDelimeter['match'])) {
+ $tempPosition = strpos($source, $tempDelimeter['end'], $sourcePosition + $findLength);
+ $len = strlen($tempDelimeter['end']);
+ if($tempPosition !== false && preg_match($tempDelimeter['match'], substr($source, $sourcePosition, $tempPosition - $sourcePosition + $len))) {
+ $endPosition = isset($tempDelimeter['noslash']) ? $this->__endCharNoSlash($source, $sourcePosition, $tempDelimeter['end'], $sourceLength) : $tempPosition + $len;
+ array_push($map, array('name'=>$tempDelimeter['name'], 'start'=>$sourcePosition, 'end'=>$endPosition));
+ $sourcePosition = $endPosition - 1;
+ }
+ }
+ else {
+ if(isset($tempDelimeter['noslash']))
+ $endPosition = $this->__endCharNoSlash($source, $sourcePosition, $tempDelimeter['end'], $sourceLength);
+ else {
+ $tempPosition = strpos($source, $tempDelimeter['end'], $sourcePosition + $findLength);
+ if($tempPosition !== false)
+ $endPosition = $tempPosition + strlen($tempDelimeter['end']);
+ else
+ $endPosition = $sourceLength;
+ }
+ array_push($map, array('name'=>$tempDelimeter['name'], 'start'=>$sourcePosition, 'end'=>$endPosition));
+ $sourcePosition = $endPosition - 1;
+ }
+ }
+ else
+ $sourcePosition = $sourceLength - 1;
+ ++$sourcePosition;
+ }
+ $len = count($map);
+ if($len === 0)
+ array_push($tempMap, array('name'=>'code', 'start'=>0, 'end'=>$sourceLength));
+ else {
+ for($tempIndex = 0; $tempIndex < $len; $tempIndex++) {
+ if($tempIndex === 0 && $map[$tempIndex]['start'] > 0)
+ array_push($tempMap, array('name'=>'code', 'start'=>0, 'end'=>$map[$tempIndex]['start']));
+ elseif($tempIndex > 0 && $map[$tempIndex]['start'] > $map[$tempIndex-1]['end'])
+ array_push($tempMap, array('name'=>'code', 'start'=>$map[$tempIndex-1]['end'], 'end'=>$map[$tempIndex]['start']));
+ array_push($tempMap, array('name'=>$map[$tempIndex]['name'], 'start'=>$map[$tempIndex]['start'], 'end'=>$map[$tempIndex]['end']));
+ if($tempIndex + 1 === $len && $map[$tempIndex]['end'] < $sourceLength)
+ array_push($tempMap, array('name'=>'code', 'start'=>$map[$tempIndex]['end'], 'end'=>$sourceLength));
+ }
+ }
+ return $tempMap;
+ }
+
+ function __endCharNoSlash(&$source, $position, &$find, &$len) {
+ $temp = strlen($find);
+ do {
+ $position = strpos($source, $find, $position + 1);
+ }while($position !== false && !$this->__charNoSlash($source, $position));
+ if($position === false) $position = $len - $temp;
+ return $position + $temp;
+ }
+
+ function __charNoSlash(&$source, &$position) {
+ $next = 1; $len = $position - $next;
+ while($len > 0 && $source{$len} === '\\') $len = $position - (++$next);
+ return (($next - 1) % 2 === 0);
+ }
}
/**
@@ -502,25 +502,25 @@
function perform_js_compress($text_or_file, $aggressive = false)
{
- static $compressor = false;
-
- if ( !is_object($compressor) )
- $compressor = new JavaScriptCompressor();
-
- if ( strpos($text_or_file, "\n") )
- {
- $text =& $text_or_file;
- }
- else if ( file_exists($text_or_file) )
- {
- $text = file_get_contents($text_or_file);
- }
- else
- {
- $text =& $text_or_file;
- }
-
- return ( $aggressive ) ? $compressor->getPacked($text) : $compressor->getClean($text);
+ static $compressor = false;
+
+ if ( !is_object($compressor) )
+ $compressor = new JavaScriptCompressor();
+
+ if ( strpos($text_or_file, "\n") )
+ {
+ $text =& $text_or_file;
+ }
+ else if ( file_exists($text_or_file) )
+ {
+ $text = file_get_contents($text_or_file);
+ }
+ else
+ {
+ $text =& $text_or_file;
+ }
+
+ return ( $aggressive ) ? $compressor->getPacked($text) : $compressor->getClean($text);
}
?>
\ No newline at end of file
diff -r de56132c008d -r bdac73ed481e includes/json.php
--- a/includes/json.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/json.php Sun Mar 28 23:10:46 2010 -0400
@@ -95,711 +95,711 @@
* Converts to and from JSON format.
*
* @example
- // create a new instance of Services_JSON
- $json = new Services_JSON();
-
- // convert a complexe value to JSON notation, and send it to the browser
- $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
- $output = $json->encode($value);
-
- print($output);
- // prints: ["foo","bar",[1,2,"baz"],[3,[4]]]
-
- // accept incoming POST data, assumed to be in JSON notation
- $input = file_get_contents('php://input', 1000000);
- $value = $json->decode($input);
-
+ // create a new instance of Services_JSON
+ $json = new Services_JSON();
+
+ // convert a complexe value to JSON notation, and send it to the browser
+ $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
+ $output = $json->encode($value);
+
+ print($output);
+ // prints: ["foo","bar",[1,2,"baz"],[3,[4]]]
+
+ // accept incoming POST data, assumed to be in JSON notation
+ $input = file_get_contents('php://input', 1000000);
+ $value = $json->decode($input);
+
*
*/
class Services_JSON
{
- /**
- * constructs a new JSON instance
- *
- * @param int $use object behavior flags; combine with boolean-OR
- *
- * possible values:
- * - SERVICES_JSON_LOOSE_TYPE: loose typing.
- * "{...}" syntax creates associative arrays
- * instead of objects in decode().
- * - SERVICES_JSON_SUPPRESS_ERRORS: error suppression.
- * Values which can't be encoded (e.g. resources)
- * appear as NULL instead of throwing errors.
- * By default, a deeply-nested resource will
- * bubble up with an error, so all return values
- * from encode() should be checked with isError()
- */
- function Services_JSON($use = 0)
- {
- $this->use = $use;
- }
+ /**
+ * constructs a new JSON instance
+ *
+ * @param int $use object behavior flags; combine with boolean-OR
+ *
+ * possible values:
+ * - SERVICES_JSON_LOOSE_TYPE: loose typing.
+ * "{...}" syntax creates associative arrays
+ * instead of objects in decode().
+ * - SERVICES_JSON_SUPPRESS_ERRORS: error suppression.
+ * Values which can't be encoded (e.g. resources)
+ * appear as NULL instead of throwing errors.
+ * By default, a deeply-nested resource will
+ * bubble up with an error, so all return values
+ * from encode() should be checked with isError()
+ */
+ function Services_JSON($use = 0)
+ {
+ $this->use = $use;
+ }
- /**
- * convert a string from one UTF-16 char to one UTF-8 char
- *
- * Normally should be handled by mb_convert_encoding, but
- * provides a slower PHP-only method for installations
- * that lack the multibye string extension.
- *
- * @param string $utf16 UTF-16 character
- * @return string UTF-8 character
- * @access private
- */
- function utf162utf8($utf16)
- {
- // oh please oh please oh please oh please oh please
- if(function_exists('mb_convert_encoding')) {
- return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
- }
+ /**
+ * convert a string from one UTF-16 char to one UTF-8 char
+ *
+ * Normally should be handled by mb_convert_encoding, but
+ * provides a slower PHP-only method for installations
+ * that lack the multibye string extension.
+ *
+ * @param string $utf16 UTF-16 character
+ * @return string UTF-8 character
+ * @access private
+ */
+ function utf162utf8($utf16)
+ {
+ // oh please oh please oh please oh please oh please
+ if(function_exists('mb_convert_encoding')) {
+ return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
+ }
- $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
+ $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
- switch(true) {
- case ((0x7F & $bytes) == $bytes):
- // this case should never be reached, because we are in ASCII range
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr(0x7F & $bytes);
+ switch(true) {
+ case ((0x7F & $bytes) == $bytes):
+ // this case should never be reached, because we are in ASCII range
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return chr(0x7F & $bytes);
- case (0x07FF & $bytes) == $bytes:
- // return a 2-byte UTF-8 character
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr(0xC0 | (($bytes >> 6) & 0x1F))
- . chr(0x80 | ($bytes & 0x3F));
+ case (0x07FF & $bytes) == $bytes:
+ // return a 2-byte UTF-8 character
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return chr(0xC0 | (($bytes >> 6) & 0x1F))
+ . chr(0x80 | ($bytes & 0x3F));
- case (0xFFFF & $bytes) == $bytes:
- // return a 3-byte UTF-8 character
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr(0xE0 | (($bytes >> 12) & 0x0F))
- . chr(0x80 | (($bytes >> 6) & 0x3F))
- . chr(0x80 | ($bytes & 0x3F));
- }
+ case (0xFFFF & $bytes) == $bytes:
+ // return a 3-byte UTF-8 character
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return chr(0xE0 | (($bytes >> 12) & 0x0F))
+ . chr(0x80 | (($bytes >> 6) & 0x3F))
+ . chr(0x80 | ($bytes & 0x3F));
+ }
- // ignoring UTF-32 for now, sorry
- return '';
- }
+ // ignoring UTF-32 for now, sorry
+ return '';
+ }
- /**
- * convert a string from one UTF-8 char to one UTF-16 char
- *
- * Normally should be handled by mb_convert_encoding, but
- * provides a slower PHP-only method for installations
- * that lack the multibye string extension.
- *
- * @param string $utf8 UTF-8 character
- * @return string UTF-16 character
- * @access private
- */
- function utf82utf16($utf8)
- {
- // oh please oh please oh please oh please oh please
- if(function_exists('mb_convert_encoding')) {
- return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
- }
+ /**
+ * convert a string from one UTF-8 char to one UTF-16 char
+ *
+ * Normally should be handled by mb_convert_encoding, but
+ * provides a slower PHP-only method for installations
+ * that lack the multibye string extension.
+ *
+ * @param string $utf8 UTF-8 character
+ * @return string UTF-16 character
+ * @access private
+ */
+ function utf82utf16($utf8)
+ {
+ // oh please oh please oh please oh please oh please
+ if(function_exists('mb_convert_encoding')) {
+ return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+ }
- switch(strlen($utf8)) {
- case 1:
- // this case should never be reached, because we are in ASCII range
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return $utf8;
+ switch(strlen($utf8)) {
+ case 1:
+ // this case should never be reached, because we are in ASCII range
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return $utf8;
- case 2:
- // return a UTF-16 character from a 2-byte UTF-8 char
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr(0x07 & (ord($utf8{0}) >> 2))
- . chr((0xC0 & (ord($utf8{0}) << 6))
- | (0x3F & ord($utf8{1})));
+ case 2:
+ // return a UTF-16 character from a 2-byte UTF-8 char
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return chr(0x07 & (ord($utf8{0}) >> 2))
+ . chr((0xC0 & (ord($utf8{0}) << 6))
+ | (0x3F & ord($utf8{1})));
- case 3:
- // return a UTF-16 character from a 3-byte UTF-8 char
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr((0xF0 & (ord($utf8{0}) << 4))
- | (0x0F & (ord($utf8{1}) >> 2)))
- . chr((0xC0 & (ord($utf8{1}) << 6))
- | (0x7F & ord($utf8{2})));
- }
+ case 3:
+ // return a UTF-16 character from a 3-byte UTF-8 char
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return chr((0xF0 & (ord($utf8{0}) << 4))
+ | (0x0F & (ord($utf8{1}) >> 2)))
+ . chr((0xC0 & (ord($utf8{1}) << 6))
+ | (0x7F & ord($utf8{2})));
+ }
- // ignoring UTF-32 for now, sorry
- return '';
- }
+ // ignoring UTF-32 for now, sorry
+ return '';
+ }
- /**
- * encodes an arbitrary variable into JSON format
- *
- * @param mixed $var any number, boolean, string, array, or object to be encoded.
- * see argument 1 to Services_JSON() above for array-parsing behavior.
- * if var is a strng, note that encode() always expects it
- * to be in ASCII or UTF-8 format!
- *
- * @return mixed JSON string representation of input var or an error if a problem occurs
- * @access public
- */
- function encode($var)
- {
- switch (gettype($var)) {
- case 'boolean':
- return $var ? 'true' : 'false';
+ /**
+ * encodes an arbitrary variable into JSON format
+ *
+ * @param mixed $var any number, boolean, string, array, or object to be encoded.
+ * see argument 1 to Services_JSON() above for array-parsing behavior.
+ * if var is a strng, note that encode() always expects it
+ * to be in ASCII or UTF-8 format!
+ *
+ * @return mixed JSON string representation of input var or an error if a problem occurs
+ * @access public
+ */
+ function encode($var)
+ {
+ switch (gettype($var)) {
+ case 'boolean':
+ return $var ? 'true' : 'false';
- case 'NULL':
- return 'null';
+ case 'NULL':
+ return 'null';
- case 'integer':
- return (int) $var;
+ case 'integer':
+ return (int) $var;
- case 'double':
- case 'float':
- return (float) $var;
+ case 'double':
+ case 'float':
+ return (float) $var;
- case 'string':
- // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
- $ascii = '';
- $strlen_var = strlen($var);
+ case 'string':
+ // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+ $ascii = '';
+ $strlen_var = strlen($var);
- /*
- * Iterate over every character in the string,
- * escaping with a slash or encoding to UTF-8 where necessary
- */
- for ($c = 0; $c < $strlen_var; ++$c) {
+ /*
+ * Iterate over every character in the string,
+ * escaping with a slash or encoding to UTF-8 where necessary
+ */
+ for ($c = 0; $c < $strlen_var; ++$c) {
- $ord_var_c = ord($var{$c});
+ $ord_var_c = ord($var{$c});
- switch (true) {
- case $ord_var_c == 0x08:
- $ascii .= '\b';
- break;
- case $ord_var_c == 0x09:
- $ascii .= '\t';
- break;
- case $ord_var_c == 0x0A:
- $ascii .= '\n';
- break;
- case $ord_var_c == 0x0C:
- $ascii .= '\f';
- break;
- case $ord_var_c == 0x0D:
- $ascii .= '\r';
- break;
+ switch (true) {
+ case $ord_var_c == 0x08:
+ $ascii .= '\b';
+ break;
+ case $ord_var_c == 0x09:
+ $ascii .= '\t';
+ break;
+ case $ord_var_c == 0x0A:
+ $ascii .= '\n';
+ break;
+ case $ord_var_c == 0x0C:
+ $ascii .= '\f';
+ break;
+ case $ord_var_c == 0x0D:
+ $ascii .= '\r';
+ break;
- case $ord_var_c == 0x22:
- case $ord_var_c == 0x2F:
- case $ord_var_c == 0x5C:
- // double quote, slash, slosh
- $ascii .= '\\'.$var{$c};
- break;
+ case $ord_var_c == 0x22:
+ case $ord_var_c == 0x2F:
+ case $ord_var_c == 0x5C:
+ // double quote, slash, slosh
+ $ascii .= '\\'.$var{$c};
+ break;
- case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
- // characters U-00000000 - U-0000007F (same as ASCII)
- $ascii .= $var{$c};
- break;
+ case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+ // characters U-00000000 - U-0000007F (same as ASCII)
+ $ascii .= $var{$c};
+ break;
- case (($ord_var_c & 0xE0) == 0xC0):
- // characters U-00000080 - U-000007FF, mask 110XXXXX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
- $c += 1;
- $utf16 = $this->utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
+ case (($ord_var_c & 0xE0) == 0xC0):
+ // characters U-00000080 - U-000007FF, mask 110XXXXX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
+ $c += 1;
+ $utf16 = $this->utf82utf16($char);
+ $ascii .= sprintf('\u%04s', bin2hex($utf16));
+ break;
- case (($ord_var_c & 0xF0) == 0xE0):
- // characters U-00000800 - U-0000FFFF, mask 1110XXXX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ord_var_c,
- ord($var{$c + 1}),
- ord($var{$c + 2}));
- $c += 2;
- $utf16 = $this->utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
+ case (($ord_var_c & 0xF0) == 0xE0):
+ // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $char = pack('C*', $ord_var_c,
+ ord($var{$c + 1}),
+ ord($var{$c + 2}));
+ $c += 2;
+ $utf16 = $this->utf82utf16($char);
+ $ascii .= sprintf('\u%04s', bin2hex($utf16));
+ break;
- case (($ord_var_c & 0xF8) == 0xF0):
- // characters U-00010000 - U-001FFFFF, mask 11110XXX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ord_var_c,
- ord($var{$c + 1}),
- ord($var{$c + 2}),
- ord($var{$c + 3}));
- $c += 3;
- $utf16 = $this->utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
+ case (($ord_var_c & 0xF8) == 0xF0):
+ // characters U-00010000 - U-001FFFFF, mask 11110XXX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $char = pack('C*', $ord_var_c,
+ ord($var{$c + 1}),
+ ord($var{$c + 2}),
+ ord($var{$c + 3}));
+ $c += 3;
+ $utf16 = $this->utf82utf16($char);
+ $ascii .= sprintf('\u%04s', bin2hex($utf16));
+ break;
- case (($ord_var_c & 0xFC) == 0xF8):
- // characters U-00200000 - U-03FFFFFF, mask 111110XX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ord_var_c,
- ord($var{$c + 1}),
- ord($var{$c + 2}),
- ord($var{$c + 3}),
- ord($var{$c + 4}));
- $c += 4;
- $utf16 = $this->utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
+ case (($ord_var_c & 0xFC) == 0xF8):
+ // characters U-00200000 - U-03FFFFFF, mask 111110XX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $char = pack('C*', $ord_var_c,
+ ord($var{$c + 1}),
+ ord($var{$c + 2}),
+ ord($var{$c + 3}),
+ ord($var{$c + 4}));
+ $c += 4;
+ $utf16 = $this->utf82utf16($char);
+ $ascii .= sprintf('\u%04s', bin2hex($utf16));
+ break;
- case (($ord_var_c & 0xFE) == 0xFC):
- // characters U-04000000 - U-7FFFFFFF, mask 1111110X
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ord_var_c,
- ord($var{$c + 1}),
- ord($var{$c + 2}),
- ord($var{$c + 3}),
- ord($var{$c + 4}),
- ord($var{$c + 5}));
- $c += 5;
- $utf16 = $this->utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
- }
- }
+ case (($ord_var_c & 0xFE) == 0xFC):
+ // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $char = pack('C*', $ord_var_c,
+ ord($var{$c + 1}),
+ ord($var{$c + 2}),
+ ord($var{$c + 3}),
+ ord($var{$c + 4}),
+ ord($var{$c + 5}));
+ $c += 5;
+ $utf16 = $this->utf82utf16($char);
+ $ascii .= sprintf('\u%04s', bin2hex($utf16));
+ break;
+ }
+ }
- return '"'.$ascii.'"';
+ return '"'.$ascii.'"';
- case 'array':
- /*
- * As per JSON spec if any array key is not an integer
- * we must treat the the whole array as an object. We
- * also try to catch a sparsely populated associative
- * array with numeric keys here because some JS engines
- * will create an array with empty indexes up to
- * max_index which can cause memory issues and because
- * the keys, which may be relevant, will be remapped
- * otherwise.
- *
- * As per the ECMA and JSON specification an object may
- * have any string as a property. Unfortunately due to
- * a hole in the ECMA specification if the key is a
- * ECMA reserved word or starts with a digit the
- * parameter is only accessible using ECMAScript's
- * bracket notation.
- */
+ case 'array':
+ /*
+ * As per JSON spec if any array key is not an integer
+ * we must treat the the whole array as an object. We
+ * also try to catch a sparsely populated associative
+ * array with numeric keys here because some JS engines
+ * will create an array with empty indexes up to
+ * max_index which can cause memory issues and because
+ * the keys, which may be relevant, will be remapped
+ * otherwise.
+ *
+ * As per the ECMA and JSON specification an object may
+ * have any string as a property. Unfortunately due to
+ * a hole in the ECMA specification if the key is a
+ * ECMA reserved word or starts with a digit the
+ * parameter is only accessible using ECMAScript's
+ * bracket notation.
+ */
- // treat as a JSON object
- if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
- $properties = array_map(array($this, 'name_value'),
- array_keys($var),
- array_values($var));
+ // treat as a JSON object
+ if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
+ $properties = array_map(array($this, 'name_value'),
+ array_keys($var),
+ array_values($var));
- foreach($properties as $property) {
- if(Services_JSON::isError($property)) {
- return $property;
- }
- }
+ foreach($properties as $property) {
+ if(Services_JSON::isError($property)) {
+ return $property;
+ }
+ }
- return '{' . join(',', $properties) . '}';
- }
+ return '{' . join(',', $properties) . '}';
+ }
- // treat it like a regular array
- $elements = array_map(array($this, 'encode'), $var);
+ // treat it like a regular array
+ $elements = array_map(array($this, 'encode'), $var);
- foreach($elements as $element) {
- if(Services_JSON::isError($element)) {
- return $element;
- }
- }
+ foreach($elements as $element) {
+ if(Services_JSON::isError($element)) {
+ return $element;
+ }
+ }
- return '[' . join(',', $elements) . ']';
+ return '[' . join(',', $elements) . ']';
- case 'object':
- $vars = get_object_vars($var);
+ case 'object':
+ $vars = get_object_vars($var);
- $properties = array_map(array($this, 'name_value'),
- array_keys($vars),
- array_values($vars));
+ $properties = array_map(array($this, 'name_value'),
+ array_keys($vars),
+ array_values($vars));
- foreach($properties as $property) {
- if(Services_JSON::isError($property)) {
- return $property;
- }
- }
+ foreach($properties as $property) {
+ if(Services_JSON::isError($property)) {
+ return $property;
+ }
+ }
- return '{' . join(',', $properties) . '}';
+ return '{' . join(',', $properties) . '}';
- default:
- return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
- ? 'null'
- : new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
- }
- }
+ default:
+ return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
+ ? 'null'
+ : new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
+ }
+ }
- /**
- * array-walking function for use in generating JSON-formatted name-value pairs
- *
- * @param string $name name of key to use
- * @param mixed $value reference to an array element to be encoded
- *
- * @return string JSON-formatted name-value pair, like '"name":value'
- * @access private
- */
- function name_value($name, $value)
- {
- $encoded_value = $this->encode($value);
+ /**
+ * array-walking function for use in generating JSON-formatted name-value pairs
+ *
+ * @param string $name name of key to use
+ * @param mixed $value reference to an array element to be encoded
+ *
+ * @return string JSON-formatted name-value pair, like '"name":value'
+ * @access private
+ */
+ function name_value($name, $value)
+ {
+ $encoded_value = $this->encode($value);
- if(Services_JSON::isError($encoded_value)) {
- return $encoded_value;
- }
+ if(Services_JSON::isError($encoded_value)) {
+ return $encoded_value;
+ }
- return $this->encode(strval($name)) . ':' . $encoded_value;
- }
+ return $this->encode(strval($name)) . ':' . $encoded_value;
+ }
- /**
- * reduce a string by removing leading and trailing comments and whitespace
- *
- * @param $str string string value to strip of comments and whitespace
- *
- * @return string string value stripped of comments and whitespace
- * @access private
- */
- function reduce_string($str)
- {
- $str = preg_replace(array(
+ /**
+ * reduce a string by removing leading and trailing comments and whitespace
+ *
+ * @param $str string string value to strip of comments and whitespace
+ *
+ * @return string string value stripped of comments and whitespace
+ * @access private
+ */
+ function reduce_string($str)
+ {
+ $str = preg_replace(array(
- // eliminate single line comments in '// ...' form
- '#^\s*//(.+)$#m',
+ // eliminate single line comments in '// ...' form
+ '#^\s*//(.+)$#m',
- // eliminate multi-line comments in '/* ... */' form, at start of string
- '#^\s*/\*(.+)\*/#Us',
+ // eliminate multi-line comments in '/* ... */' form, at start of string
+ '#^\s*/\*(.+)\*/#Us',
- // eliminate multi-line comments in '/* ... */' form, at end of string
- '#/\*(.+)\*/\s*$#Us'
+ // eliminate multi-line comments in '/* ... */' form, at end of string
+ '#/\*(.+)\*/\s*$#Us'
- ), '', $str);
+ ), '', $str);
- // eliminate extraneous space
- return trim($str);
- }
+ // eliminate extraneous space
+ return trim($str);
+ }
- /**
- * decodes a JSON string into appropriate variable
- *
- * @param string $str JSON-formatted string
- *
- * @return mixed number, boolean, string, array, or object
- * corresponding to given JSON input string.
- * See argument 1 to Services_JSON() above for object-output behavior.
- * Note that decode() always returns strings
- * in ASCII or UTF-8 format!
- * @access public
- */
- function decode($str)
- {
- $str = $this->reduce_string($str);
+ /**
+ * decodes a JSON string into appropriate variable
+ *
+ * @param string $str JSON-formatted string
+ *
+ * @return mixed number, boolean, string, array, or object
+ * corresponding to given JSON input string.
+ * See argument 1 to Services_JSON() above for object-output behavior.
+ * Note that decode() always returns strings
+ * in ASCII or UTF-8 format!
+ * @access public
+ */
+ function decode($str)
+ {
+ $str = $this->reduce_string($str);
- switch (strtolower($str)) {
- case 'true':
- return true;
+ switch (strtolower($str)) {
+ case 'true':
+ return true;
- case 'false':
- return false;
+ case 'false':
+ return false;
- case 'null':
- return null;
+ case 'null':
+ return null;
- default:
- $m = array();
+ default:
+ $m = array();
- if (is_numeric($str)) {
- // Lookie-loo, it's a number
+ if (is_numeric($str)) {
+ // Lookie-loo, it's a number
- // This would work on its own, but I'm trying to be
- // good about returning integers where appropriate:
- // return (float)$str;
+ // This would work on its own, but I'm trying to be
+ // good about returning integers where appropriate:
+ // return (float)$str;
- // Return float or int, as appropriate
- return ((float)$str == (integer)$str)
- ? (integer)$str
- : (float)$str;
+ // Return float or int, as appropriate
+ return ((float)$str == (integer)$str)
+ ? (integer)$str
+ : (float)$str;
- } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
- // STRINGS RETURNED IN UTF-8 FORMAT
- $delim = substr($str, 0, 1);
- $chrs = substr($str, 1, -1);
- $utf8 = '';
- $strlen_chrs = strlen($chrs);
+ } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
+ // STRINGS RETURNED IN UTF-8 FORMAT
+ $delim = substr($str, 0, 1);
+ $chrs = substr($str, 1, -1);
+ $utf8 = '';
+ $strlen_chrs = strlen($chrs);
- for ($c = 0; $c < $strlen_chrs; ++$c) {
+ for ($c = 0; $c < $strlen_chrs; ++$c) {
- $substr_chrs_c_2 = substr($chrs, $c, 2);
- $ord_chrs_c = ord($chrs{$c});
+ $substr_chrs_c_2 = substr($chrs, $c, 2);
+ $ord_chrs_c = ord($chrs{$c});
- switch (true) {
- case $substr_chrs_c_2 == '\b':
- $utf8 .= chr(0x08);
- ++$c;
- break;
- case $substr_chrs_c_2 == '\t':
- $utf8 .= chr(0x09);
- ++$c;
- break;
- case $substr_chrs_c_2 == '\n':
- $utf8 .= chr(0x0A);
- ++$c;
- break;
- case $substr_chrs_c_2 == '\f':
- $utf8 .= chr(0x0C);
- ++$c;
- break;
- case $substr_chrs_c_2 == '\r':
- $utf8 .= chr(0x0D);
- ++$c;
- break;
+ switch (true) {
+ case $substr_chrs_c_2 == '\b':
+ $utf8 .= chr(0x08);
+ ++$c;
+ break;
+ case $substr_chrs_c_2 == '\t':
+ $utf8 .= chr(0x09);
+ ++$c;
+ break;
+ case $substr_chrs_c_2 == '\n':
+ $utf8 .= chr(0x0A);
+ ++$c;
+ break;
+ case $substr_chrs_c_2 == '\f':
+ $utf8 .= chr(0x0C);
+ ++$c;
+ break;
+ case $substr_chrs_c_2 == '\r':
+ $utf8 .= chr(0x0D);
+ ++$c;
+ break;
- case $substr_chrs_c_2 == '\\"':
- case $substr_chrs_c_2 == '\\\'':
- case $substr_chrs_c_2 == '\\\\':
- case $substr_chrs_c_2 == '\\/':
- if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
- ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
- $utf8 .= $chrs{++$c};
- }
- break;
+ case $substr_chrs_c_2 == '\\"':
+ case $substr_chrs_c_2 == '\\\'':
+ case $substr_chrs_c_2 == '\\\\':
+ case $substr_chrs_c_2 == '\\/':
+ if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
+ ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
+ $utf8 .= $chrs{++$c};
+ }
+ break;
- case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)):
- // single, escaped unicode character
- $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
- . chr(hexdec(substr($chrs, ($c + 4), 2)));
- $utf8 .= $this->utf162utf8($utf16);
- $c += 5;
- break;
+ case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)):
+ // single, escaped unicode character
+ $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
+ . chr(hexdec(substr($chrs, ($c + 4), 2)));
+ $utf8 .= $this->utf162utf8($utf16);
+ $c += 5;
+ break;
- case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
- $utf8 .= $chrs{$c};
- break;
+ case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
+ $utf8 .= $chrs{$c};
+ break;
- case ($ord_chrs_c & 0xE0) == 0xC0:
- // characters U-00000080 - U-000007FF, mask 110XXXXX
- //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $utf8 .= substr($chrs, $c, 2);
- ++$c;
- break;
+ case ($ord_chrs_c & 0xE0) == 0xC0:
+ // characters U-00000080 - U-000007FF, mask 110XXXXX
+ //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $utf8 .= substr($chrs, $c, 2);
+ ++$c;
+ break;
- case ($ord_chrs_c & 0xF0) == 0xE0:
- // characters U-00000800 - U-0000FFFF, mask 1110XXXX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $utf8 .= substr($chrs, $c, 3);
- $c += 2;
- break;
+ case ($ord_chrs_c & 0xF0) == 0xE0:
+ // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $utf8 .= substr($chrs, $c, 3);
+ $c += 2;
+ break;
- case ($ord_chrs_c & 0xF8) == 0xF0:
- // characters U-00010000 - U-001FFFFF, mask 11110XXX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $utf8 .= substr($chrs, $c, 4);
- $c += 3;
- break;
+ case ($ord_chrs_c & 0xF8) == 0xF0:
+ // characters U-00010000 - U-001FFFFF, mask 11110XXX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $utf8 .= substr($chrs, $c, 4);
+ $c += 3;
+ break;
- case ($ord_chrs_c & 0xFC) == 0xF8:
- // characters U-00200000 - U-03FFFFFF, mask 111110XX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $utf8 .= substr($chrs, $c, 5);
- $c += 4;
- break;
+ case ($ord_chrs_c & 0xFC) == 0xF8:
+ // characters U-00200000 - U-03FFFFFF, mask 111110XX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $utf8 .= substr($chrs, $c, 5);
+ $c += 4;
+ break;
- case ($ord_chrs_c & 0xFE) == 0xFC:
- // characters U-04000000 - U-7FFFFFFF, mask 1111110X
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $utf8 .= substr($chrs, $c, 6);
- $c += 5;
- break;
+ case ($ord_chrs_c & 0xFE) == 0xFC:
+ // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $utf8 .= substr($chrs, $c, 6);
+ $c += 5;
+ break;
- }
+ }
- }
+ }
- return $utf8;
+ return $utf8;
- } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
- // array, or object notation
+ } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
+ // array, or object notation
- if ($str{0} == '[') {
- $stk = array(SERVICES_JSON_IN_ARR);
- $arr = array();
- } else {
- if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
- $stk = array(SERVICES_JSON_IN_OBJ);
- $obj = array();
- } else {
- $stk = array(SERVICES_JSON_IN_OBJ);
- $obj = new stdClass();
- }
- }
+ if ($str{0} == '[') {
+ $stk = array(SERVICES_JSON_IN_ARR);
+ $arr = array();
+ } else {
+ if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+ $stk = array(SERVICES_JSON_IN_OBJ);
+ $obj = array();
+ } else {
+ $stk = array(SERVICES_JSON_IN_OBJ);
+ $obj = new stdClass();
+ }
+ }
- array_push($stk, array('what' => SERVICES_JSON_SLICE,
- 'where' => 0,
- 'delim' => false));
+ array_push($stk, array('what' => SERVICES_JSON_SLICE,
+ 'where' => 0,
+ 'delim' => false));
- $chrs = substr($str, 1, -1);
- $chrs = $this->reduce_string($chrs);
+ $chrs = substr($str, 1, -1);
+ $chrs = $this->reduce_string($chrs);
- if ($chrs == '') {
- if (reset($stk) == SERVICES_JSON_IN_ARR) {
- return $arr;
+ if ($chrs == '') {
+ if (reset($stk) == SERVICES_JSON_IN_ARR) {
+ return $arr;
- } else {
- return $obj;
+ } else {
+ return $obj;
- }
- }
+ }
+ }
- //print("\nparsing {$chrs}\n");
+ //print("\nparsing {$chrs}\n");
- $strlen_chrs = strlen($chrs);
+ $strlen_chrs = strlen($chrs);
- for ($c = 0; $c <= $strlen_chrs; ++$c) {
+ for ($c = 0; $c <= $strlen_chrs; ++$c) {
- $top = end($stk);
- $substr_chrs_c_2 = substr($chrs, $c, 2);
+ $top = end($stk);
+ $substr_chrs_c_2 = substr($chrs, $c, 2);
- if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
- // found a comma that is not inside a string, array, etc.,
- // OR we've reached the end of the character list
- $slice = substr($chrs, $top['where'], ($c - $top['where']));
- array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
- //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+ if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
+ // found a comma that is not inside a string, array, etc.,
+ // OR we've reached the end of the character list
+ $slice = substr($chrs, $top['where'], ($c - $top['where']));
+ array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
+ //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
- if (reset($stk) == SERVICES_JSON_IN_ARR) {
- // we are in an array, so just push an element onto the stack
- array_push($arr, $this->decode($slice));
+ if (reset($stk) == SERVICES_JSON_IN_ARR) {
+ // we are in an array, so just push an element onto the stack
+ array_push($arr, $this->decode($slice));
- } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
- // we are in an object, so figure
- // out the property name and set an
- // element in an associative array,
- // for now
- $parts = array();
-
- if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
- // "name":value pair
- $key = $this->decode($parts[1]);
- $val = $this->decode($parts[2]);
+ } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
+ // we are in an object, so figure
+ // out the property name and set an
+ // element in an associative array,
+ // for now
+ $parts = array();
+
+ if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+ // "name":value pair
+ $key = $this->decode($parts[1]);
+ $val = $this->decode($parts[2]);
- if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
- $obj[$key] = $val;
- } else {
- $obj->$key = $val;
- }
- } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
- // name:value pair, where name is unquoted
- $key = $parts[1];
- $val = $this->decode($parts[2]);
+ if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+ $obj[$key] = $val;
+ } else {
+ $obj->$key = $val;
+ }
+ } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+ // name:value pair, where name is unquoted
+ $key = $parts[1];
+ $val = $this->decode($parts[2]);
- if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
- $obj[$key] = $val;
- } else {
- $obj->$key = $val;
- }
- }
+ if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+ $obj[$key] = $val;
+ } else {
+ $obj->$key = $val;
+ }
+ }
- }
+ }
- } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
- // found a quote, and we are not inside a string
- array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
- //print("Found start of string at {$c}\n");
+ } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
+ // found a quote, and we are not inside a string
+ array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
+ //print("Found start of string at {$c}\n");
- } elseif (($chrs{$c} == $top['delim']) &&
- ($top['what'] == SERVICES_JSON_IN_STR) &&
- ((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
- // found a quote, we're in a string, and it's not escaped
- // we know that it's not escaped becase there is _not_ an
- // odd number of backslashes at the end of the string so far
- array_pop($stk);
- //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
+ } elseif (($chrs{$c} == $top['delim']) &&
+ ($top['what'] == SERVICES_JSON_IN_STR) &&
+ ((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
+ // found a quote, we're in a string, and it's not escaped
+ // we know that it's not escaped becase there is _not_ an
+ // odd number of backslashes at the end of the string so far
+ array_pop($stk);
+ //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
- } elseif (($chrs{$c} == '[') &&
- in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
- // found a left-bracket, and we are in an array, object, or slice
- array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
- //print("Found start of array at {$c}\n");
+ } elseif (($chrs{$c} == '[') &&
+ in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+ // found a left-bracket, and we are in an array, object, or slice
+ array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
+ //print("Found start of array at {$c}\n");
- } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
- // found a right-bracket, and we're in an array
- array_pop($stk);
- //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+ } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
+ // found a right-bracket, and we're in an array
+ array_pop($stk);
+ //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
- } elseif (($chrs{$c} == '{') &&
- in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
- // found a left-brace, and we are in an array, object, or slice
- array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
- //print("Found start of object at {$c}\n");
+ } elseif (($chrs{$c} == '{') &&
+ in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+ // found a left-brace, and we are in an array, object, or slice
+ array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
+ //print("Found start of object at {$c}\n");
- } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
- // found a right-brace, and we're in an object
- array_pop($stk);
- //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+ } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
+ // found a right-brace, and we're in an object
+ array_pop($stk);
+ //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
- } elseif (($substr_chrs_c_2 == '/*') &&
- in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
- // found a comment start, and we are in an array, object, or slice
- array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
- $c++;
- //print("Found start of comment at {$c}\n");
+ } elseif (($substr_chrs_c_2 == '/*') &&
+ in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+ // found a comment start, and we are in an array, object, or slice
+ array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
+ $c++;
+ //print("Found start of comment at {$c}\n");
- } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
- // found a comment end, and we're in one now
- array_pop($stk);
- $c++;
+ } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
+ // found a comment end, and we're in one now
+ array_pop($stk);
+ $c++;
- for ($i = $top['where']; $i <= $c; ++$i)
- $chrs = substr_replace($chrs, ' ', $i, 1);
+ for ($i = $top['where']; $i <= $c; ++$i)
+ $chrs = substr_replace($chrs, ' ', $i, 1);
- //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+ //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
- }
+ }
- }
+ }
- if (reset($stk) == SERVICES_JSON_IN_ARR) {
- return $arr;
+ if (reset($stk) == SERVICES_JSON_IN_ARR) {
+ return $arr;
- } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
- return $obj;
+ } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
+ return $obj;
- }
+ }
- }
- }
- }
+ }
+ }
+ }
- /**
- * @todo Ultimately, this should just call PEAR::isError()
- */
- function isError($data, $code = null)
- {
- if (class_exists('pear')) {
- return PEAR::isError($data, $code);
- } elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
- is_subclass_of($data, 'services_json_error'))) {
- return true;
- }
+ /**
+ * @todo Ultimately, this should just call PEAR::isError()
+ */
+ function isError($data, $code = null)
+ {
+ if (class_exists('pear')) {
+ return PEAR::isError($data, $code);
+ } elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
+ is_subclass_of($data, 'services_json_error'))) {
+ return true;
+ }
- return false;
- }
+ return false;
+ }
}
if (class_exists('PEAR_Error')) {
- class Services_JSON_Error extends PEAR_Error
- {
- function Services_JSON_Error($message = 'unknown error', $code = null,
- $mode = null, $options = null, $userinfo = null)
- {
- parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
- }
- }
+ class Services_JSON_Error extends PEAR_Error
+ {
+ function Services_JSON_Error($message = 'unknown error', $code = null,
+ $mode = null, $options = null, $userinfo = null)
+ {
+ parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
+ }
+ }
} else {
- /**
- * @todo Ultimately, this class shall be descended from PEAR_Error
- */
- class Services_JSON_Error
- {
- function Services_JSON_Error($message = 'unknown error', $code = null,
- $mode = null, $options = null, $userinfo = null)
- {
+ /**
+ * @todo Ultimately, this class shall be descended from PEAR_Error
+ */
+ class Services_JSON_Error
+ {
+ function Services_JSON_Error($message = 'unknown error', $code = null,
+ $mode = null, $options = null, $userinfo = null)
+ {
- }
- }
+ }
+ }
}
-
+
?>
\ No newline at end of file
diff -r de56132c008d -r bdac73ed481e includes/json2.php
--- a/includes/json2.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/json2.php Sun Mar 28 23:10:46 2010 -0400
@@ -29,379 +29,379 @@
*/
class Zend_Json_Encoder
{
- /**
- * Whether or not to check for possible cycling
- *
- * @var boolean
- */
- protected $_cycleCheck;
+ /**
+ * Whether or not to check for possible cycling
+ *
+ * @var boolean
+ */
+ protected $_cycleCheck;
- /**
- * Array of visited objects; used to prevent cycling.
- *
- * @var array
- */
- protected $_visited = array();
+ /**
+ * Array of visited objects; used to prevent cycling.
+ *
+ * @var array
+ */
+ protected $_visited = array();
- /**
- * Constructor
- *
- * @param boolean $cycleCheck Whether or not to check for recursion when encoding
- * @return void
- */
- protected function __construct($cycleCheck = false)
- {
- $this->_cycleCheck = $cycleCheck;
- }
+ /**
+ * Constructor
+ *
+ * @param boolean $cycleCheck Whether or not to check for recursion when encoding
+ * @return void
+ */
+ protected function __construct($cycleCheck = false)
+ {
+ $this->_cycleCheck = $cycleCheck;
+ }
- /**
- * Use the JSON encoding scheme for the value specified
- *
- * @param mixed $value The value to be encoded
- * @param boolean $cycleCheck Whether or not to check for possible object recursion when encoding
- * @return string The encoded value
- */
- public static function encode($value, $cycleCheck = false)
- {
- $encoder = new Zend_Json_Encoder(($cycleCheck) ? true : false);
+ /**
+ * Use the JSON encoding scheme for the value specified
+ *
+ * @param mixed $value The value to be encoded
+ * @param boolean $cycleCheck Whether or not to check for possible object recursion when encoding
+ * @return string The encoded value
+ */
+ public static function encode($value, $cycleCheck = false)
+ {
+ $encoder = new Zend_Json_Encoder(($cycleCheck) ? true : false);
- return $encoder->_encodeValue($value);
- }
+ return $encoder->_encodeValue($value);
+ }
- /**
- * Recursive driver which determines the type of value to be encoded
- * and then dispatches to the appropriate method. $values are either
- * - objects (returns from {@link _encodeObject()})
- * - arrays (returns from {@link _encodeArray()})
- * - basic datums (e.g. numbers or strings) (returns from {@link _encodeDatum()})
- *
- * @param $value mixed The value to be encoded
- * @return string Encoded value
- */
- protected function _encodeValue(&$value)
- {
- if (is_object($value)) {
- return $this->_encodeObject($value);
- } else if (is_array($value)) {
- return $this->_encodeArray($value);
- }
+ /**
+ * Recursive driver which determines the type of value to be encoded
+ * and then dispatches to the appropriate method. $values are either
+ * - objects (returns from {@link _encodeObject()})
+ * - arrays (returns from {@link _encodeArray()})
+ * - basic datums (e.g. numbers or strings) (returns from {@link _encodeDatum()})
+ *
+ * @param $value mixed The value to be encoded
+ * @return string Encoded value
+ */
+ protected function _encodeValue(&$value)
+ {
+ if (is_object($value)) {
+ return $this->_encodeObject($value);
+ } else if (is_array($value)) {
+ return $this->_encodeArray($value);
+ }
- return $this->_encodeDatum($value);
- }
+ return $this->_encodeDatum($value);
+ }
- /**
- * Encode an object to JSON by encoding each of the public properties
- *
- * A special property is added to the JSON object called '__className'
- * that contains the name of the class of $value. This is used to decode
- * the object on the client into a specific class.
- *
- * @param $value object
- * @return string
- * @throws Zend_Json_Exception If recursive checks are enabled and the object has been serialized previously
- */
- protected function _encodeObject(&$value)
- {
- if ($this->_cycleCheck) {
- if ($this->_wasVisited($value)) {
- throw new Zend_Json_Exception(
- 'Cycles not supported in JSON encoding, cycle introduced by '
- . 'class "' . get_class($value) . '"'
- );
- }
+ /**
+ * Encode an object to JSON by encoding each of the public properties
+ *
+ * A special property is added to the JSON object called '__className'
+ * that contains the name of the class of $value. This is used to decode
+ * the object on the client into a specific class.
+ *
+ * @param $value object
+ * @return string
+ * @throws Zend_Json_Exception If recursive checks are enabled and the object has been serialized previously
+ */
+ protected function _encodeObject(&$value)
+ {
+ if ($this->_cycleCheck) {
+ if ($this->_wasVisited($value)) {
+ throw new Zend_Json_Exception(
+ 'Cycles not supported in JSON encoding, cycle introduced by '
+ . 'class "' . get_class($value) . '"'
+ );
+ }
- $this->_visited[] = $value;
- }
+ $this->_visited[] = $value;
+ }
- $props = '';
- foreach (get_object_vars($value) as $name => $propValue) {
- if (isset($propValue)) {
- $props .= ','
- . $this->_encodeValue($name)
- . ':'
- . $this->_encodeValue($propValue);
- }
- }
+ $props = '';
+ foreach (get_object_vars($value) as $name => $propValue) {
+ if (isset($propValue)) {
+ $props .= ','
+ . $this->_encodeValue($name)
+ . ':'
+ . $this->_encodeValue($propValue);
+ }
+ }
- return '{"__className":"' . get_class($value) . '"'
- . $props . '}';
- }
+ return '{"__className":"' . get_class($value) . '"'
+ . $props . '}';
+ }
- /**
- * Determine if an object has been serialized already
- *
- * @param mixed $value
- * @return boolean
- */
- protected function _wasVisited(&$value)
- {
- if (in_array($value, $this->_visited, true)) {
- return true;
- }
+ /**
+ * Determine if an object has been serialized already
+ *
+ * @param mixed $value
+ * @return boolean
+ */
+ protected function _wasVisited(&$value)
+ {
+ if (in_array($value, $this->_visited, true)) {
+ return true;
+ }
- return false;
- }
+ return false;
+ }
- /**
- * JSON encode an array value
- *
- * Recursively encodes each value of an array and returns a JSON encoded
- * array string.
- *
- * Arrays are defined as integer-indexed arrays starting at index 0, where
- * the last index is (count($array) -1); any deviation from that is
- * considered an associative array, and will be encoded as such.
- *
- * @param $array array
- * @return string
- */
- protected function _encodeArray(&$array)
- {
- $tmpArray = array();
+ /**
+ * JSON encode an array value
+ *
+ * Recursively encodes each value of an array and returns a JSON encoded
+ * array string.
+ *
+ * Arrays are defined as integer-indexed arrays starting at index 0, where
+ * the last index is (count($array) -1); any deviation from that is
+ * considered an associative array, and will be encoded as such.
+ *
+ * @param $array array
+ * @return string
+ */
+ protected function _encodeArray(&$array)
+ {
+ $tmpArray = array();
- // Check for associative array
- if (!empty($array) && (array_keys($array) !== range(0, count($array) - 1))) {
- // Associative array
- $result = '{';
- foreach ($array as $key => $value) {
- $key = (string) $key;
- $tmpArray[] = $this->_encodeString($key)
- . ':'
- . $this->_encodeValue($value);
- }
- $result .= implode(',', $tmpArray);
- $result .= '}';
- } else {
- // Indexed array
- $result = '[';
- $length = count($array);
- for ($i = 0; $i < $length; $i++) {
- $tmpArray[] = $this->_encodeValue($array[$i]);
- }
- $result .= implode(',', $tmpArray);
- $result .= ']';
- }
+ // Check for associative array
+ if (!empty($array) && (array_keys($array) !== range(0, count($array) - 1))) {
+ // Associative array
+ $result = '{';
+ foreach ($array as $key => $value) {
+ $key = (string) $key;
+ $tmpArray[] = $this->_encodeString($key)
+ . ':'
+ . $this->_encodeValue($value);
+ }
+ $result .= implode(',', $tmpArray);
+ $result .= '}';
+ } else {
+ // Indexed array
+ $result = '[';
+ $length = count($array);
+ for ($i = 0; $i < $length; $i++) {
+ $tmpArray[] = $this->_encodeValue($array[$i]);
+ }
+ $result .= implode(',', $tmpArray);
+ $result .= ']';
+ }
- return $result;
- }
+ return $result;
+ }
- /**
- * JSON encode a basic data type (string, number, boolean, null)
- *
- * If value type is not a string, number, boolean, or null, the string
- * 'null' is returned.
- *
- * @param $value mixed
- * @return string
- */
- protected function _encodeDatum(&$value)
- {
- $result = 'null';
+ /**
+ * JSON encode a basic data type (string, number, boolean, null)
+ *
+ * If value type is not a string, number, boolean, or null, the string
+ * 'null' is returned.
+ *
+ * @param $value mixed
+ * @return string
+ */
+ protected function _encodeDatum(&$value)
+ {
+ $result = 'null';
- if (is_int($value) || is_float($value)) {
- $result = (string)$value;
- } elseif (is_string($value)) {
- $result = $this->_encodeString($value);
- } elseif (is_bool($value)) {
- $result = $value ? 'true' : 'false';
- }
+ if (is_int($value) || is_float($value)) {
+ $result = (string)$value;
+ } elseif (is_string($value)) {
+ $result = $this->_encodeString($value);
+ } elseif (is_bool($value)) {
+ $result = $value ? 'true' : 'false';
+ }
- return $result;
- }
+ return $result;
+ }
- /**
- * JSON encode a string value by escaping characters as necessary
- *
- * @param $value string
- * @return string
- */
- protected function _encodeString(&$string)
- {
- // Escape these characters with a backslash:
- // " \ / \n \r \t \b \f
- $search = array('\\', "\n", "\t", "\r", "\b", "\f", '"');
- $replace = array('\\\\', '\\n', '\\t', '\\r', '\\b', '\\f', '\"');
- $string = str_replace($search, $replace, $string);
+ /**
+ * JSON encode a string value by escaping characters as necessary
+ *
+ * @param $value string
+ * @return string
+ */
+ protected function _encodeString(&$string)
+ {
+ // Escape these characters with a backslash:
+ // " \ / \n \r \t \b \f
+ $search = array('\\', "\n", "\t", "\r", "\b", "\f", '"');
+ $replace = array('\\\\', '\\n', '\\t', '\\r', '\\b', '\\f', '\"');
+ $string = str_replace($search, $replace, $string);
- // Escape certain ASCII characters:
- // 0x08 => \b
- // 0x0c => \f
- $string = str_replace(array(chr(0x08), chr(0x0C)), array('\b', '\f'), $string);
+ // Escape certain ASCII characters:
+ // 0x08 => \b
+ // 0x0c => \f
+ $string = str_replace(array(chr(0x08), chr(0x0C)), array('\b', '\f'), $string);
- return '"' . $string . '"';
- }
+ return '"' . $string . '"';
+ }
- /**
- * Encode the constants associated with the ReflectionClass
- * parameter. The encoding format is based on the class2 format
- *
- * @param $cls ReflectionClass
- * @return string Encoded constant block in class2 format
- */
- private static function _encodeConstants(ReflectionClass $cls)
- {
- $result = "constants : {";
- $constants = $cls->getConstants();
+ /**
+ * Encode the constants associated with the ReflectionClass
+ * parameter. The encoding format is based on the class2 format
+ *
+ * @param $cls ReflectionClass
+ * @return string Encoded constant block in class2 format
+ */
+ private static function _encodeConstants(ReflectionClass $cls)
+ {
+ $result = "constants : {";
+ $constants = $cls->getConstants();
- $tmpArray = array();
- if (!empty($constants)) {
- foreach ($constants as $key => $value) {
- $tmpArray[] = "$key: " . self::encode($value);
- }
+ $tmpArray = array();
+ if (!empty($constants)) {
+ foreach ($constants as $key => $value) {
+ $tmpArray[] = "$key: " . self::encode($value);
+ }
- $result .= implode(', ', $tmpArray);
- }
+ $result .= implode(', ', $tmpArray);
+ }
- return $result . "}";
- }
+ return $result . "}";
+ }
- /**
- * Encode the public methods of the ReflectionClass in the
- * class2 format
- *
- * @param $cls ReflectionClass
- * @return string Encoded method fragment
- *
- */
- private static function _encodeMethods(ReflectionClass $cls)
- {
- $methods = $cls->getMethods();
- $result = 'methods:{';
+ /**
+ * Encode the public methods of the ReflectionClass in the
+ * class2 format
+ *
+ * @param $cls ReflectionClass
+ * @return string Encoded method fragment
+ *
+ */
+ private static function _encodeMethods(ReflectionClass $cls)
+ {
+ $methods = $cls->getMethods();
+ $result = 'methods:{';
- $started = false;
- foreach ($methods as $method) {
- if (! $method->isPublic() || !$method->isUserDefined()) {
- continue;
- }
+ $started = false;
+ foreach ($methods as $method) {
+ if (! $method->isPublic() || !$method->isUserDefined()) {
+ continue;
+ }
- if ($started) {
- $result .= ',';
- }
- $started = true;
+ if ($started) {
+ $result .= ',';
+ }
+ $started = true;
- $result .= '' . $method->getName(). ':function(';
+ $result .= '' . $method->getName(). ':function(';
- if ('__construct' != $method->getName()) {
- $parameters = $method->getParameters();
- $paramCount = count($parameters);
- $argsStarted = false;
+ if ('__construct' != $method->getName()) {
+ $parameters = $method->getParameters();
+ $paramCount = count($parameters);
+ $argsStarted = false;
- $argNames = "var argNames=[";
- foreach ($parameters as $param) {
- if ($argsStarted) {
- $result .= ',';
- }
+ $argNames = "var argNames=[";
+ foreach ($parameters as $param) {
+ if ($argsStarted) {
+ $result .= ',';
+ }
- $result .= $param->getName();
+ $result .= $param->getName();
- if ($argsStarted) {
- $argNames .= ',';
- }
+ if ($argsStarted) {
+ $argNames .= ',';
+ }
- $argNames .= '"' . $param->getName() . '"';
+ $argNames .= '"' . $param->getName() . '"';
- $argsStarted = true;
- }
- $argNames .= "];";
+ $argsStarted = true;
+ }
+ $argNames .= "];";
- $result .= "){"
- . $argNames
- . 'var result = ZAjaxEngine.invokeRemoteMethod('
- . "this, '" . $method->getName()
- . "',argNames,arguments);"
- . 'return(result);}';
- } else {
- $result .= "){}";
- }
- }
+ $result .= "){"
+ . $argNames
+ . 'var result = ZAjaxEngine.invokeRemoteMethod('
+ . "this, '" . $method->getName()
+ . "',argNames,arguments);"
+ . 'return(result);}';
+ } else {
+ $result .= "){}";
+ }
+ }
- return $result . "}";
- }
+ return $result . "}";
+ }
- /**
- * Encode the public properties of the ReflectionClass in the class2
- * format.
- *
- * @param $cls ReflectionClass
- * @return string Encode properties list
- *
- */
- private static function _encodeVariables(ReflectionClass $cls)
- {
- $properties = $cls->getProperties();
- $propValues = get_class_vars($cls->getName());
- $result = "variables:{";
- $cnt = 0;
+ /**
+ * Encode the public properties of the ReflectionClass in the class2
+ * format.
+ *
+ * @param $cls ReflectionClass
+ * @return string Encode properties list
+ *
+ */
+ private static function _encodeVariables(ReflectionClass $cls)
+ {
+ $properties = $cls->getProperties();
+ $propValues = get_class_vars($cls->getName());
+ $result = "variables:{";
+ $cnt = 0;
- $tmpArray = array();
- foreach ($properties as $prop) {
- if (! $prop->isPublic()) {
- continue;
- }
+ $tmpArray = array();
+ foreach ($properties as $prop) {
+ if (! $prop->isPublic()) {
+ continue;
+ }
- $tmpArray[] = $prop->getName()
- . ':'
- . self::encode($propValues[$prop->getName()]);
- }
- $result .= implode(',', $tmpArray);
+ $tmpArray[] = $prop->getName()
+ . ':'
+ . self::encode($propValues[$prop->getName()]);
+ }
+ $result .= implode(',', $tmpArray);
- return $result . "}";
- }
+ return $result . "}";
+ }
- /**
- * Encodes the given $className into the class2 model of encoding PHP
- * classes into JavaScript class2 classes.
- * NOTE: Currently only public methods and variables are proxied onto
- * the client machine
- *
- * @param $className string The name of the class, the class must be
- * instantiable using a null constructor
- * @param $package string Optional package name appended to JavaScript
- * proxy class name
- * @return string The class2 (JavaScript) encoding of the class
- * @throws Zend_Json_Exception
- */
- public static function encodeClass($className, $package = '')
- {
- $cls = new ReflectionClass($className);
- if (! $cls->isInstantiable()) {
- throw new Zend_Json_Exception("$className must be instantiable");
- }
+ /**
+ * Encodes the given $className into the class2 model of encoding PHP
+ * classes into JavaScript class2 classes.
+ * NOTE: Currently only public methods and variables are proxied onto
+ * the client machine
+ *
+ * @param $className string The name of the class, the class must be
+ * instantiable using a null constructor
+ * @param $package string Optional package name appended to JavaScript
+ * proxy class name
+ * @return string The class2 (JavaScript) encoding of the class
+ * @throws Zend_Json_Exception
+ */
+ public static function encodeClass($className, $package = '')
+ {
+ $cls = new ReflectionClass($className);
+ if (! $cls->isInstantiable()) {
+ throw new Zend_Json_Exception("$className must be instantiable");
+ }
- return "Class.create('$package$className',{"
- . self::_encodeConstants($cls) .","
- . self::_encodeMethods($cls) .","
- . self::_encodeVariables($cls) .'});';
- }
+ return "Class.create('$package$className',{"
+ . self::_encodeConstants($cls) .","
+ . self::_encodeMethods($cls) .","
+ . self::_encodeVariables($cls) .'});';
+ }
- /**
- * Encode several classes at once
- *
- * Returns JSON encoded classes, using {@link encodeClass()}.
- *
- * @param array $classNames
- * @param string $package
- * @return string
- */
- public static function encodeClasses(array $classNames, $package = '')
- {
- $result = '';
- foreach ($classNames as $className) {
- $result .= self::encodeClass($className, $package);
- }
+ /**
+ * Encode several classes at once
+ *
+ * Returns JSON encoded classes, using {@link encodeClass()}.
+ *
+ * @param array $classNames
+ * @param string $package
+ * @return string
+ */
+ public static function encodeClasses(array $classNames, $package = '')
+ {
+ $result = '';
+ foreach ($classNames as $className) {
+ $result .= self::encodeClass($className, $package);
+ }
- return $result;
- }
+ return $result;
+ }
}
@@ -415,536 +415,536 @@
*/
class Zend_Json_Decoder
{
- /**
- * Parse tokens used to decode the JSON object. These are not
- * for public consumption, they are just used internally to the
- * class.
- */
- const EOF = 0;
- const DATUM = 1;
- const LBRACE = 2;
- const LBRACKET = 3;
- const RBRACE = 4;
- const RBRACKET = 5;
- const COMMA = 6;
- const COLON = 7;
+ /**
+ * Parse tokens used to decode the JSON object. These are not
+ * for public consumption, they are just used internally to the
+ * class.
+ */
+ const EOF = 0;
+ const DATUM = 1;
+ const LBRACE = 2;
+ const LBRACKET = 3;
+ const RBRACE = 4;
+ const RBRACKET = 5;
+ const COMMA = 6;
+ const COLON = 7;
- /**
- * Use to maintain a "pointer" to the source being decoded
- *
- * @var string
- */
- protected $_source;
+ /**
+ * Use to maintain a "pointer" to the source being decoded
+ *
+ * @var string
+ */
+ protected $_source;
- /**
- * Caches the source length
- *
- * @var int
- */
- protected $_sourceLength;
+ /**
+ * Caches the source length
+ *
+ * @var int
+ */
+ protected $_sourceLength;
- /**
- * The offset within the souce being decoded
- *
- * @var int
- *
- */
- protected $_offset;
+ /**
+ * The offset within the souce being decoded
+ *
+ * @var int
+ *
+ */
+ protected $_offset;
- /**
- * The current token being considered in the parser cycle
- *
- * @var int
- */
- protected $_token;
+ /**
+ * The current token being considered in the parser cycle
+ *
+ * @var int
+ */
+ protected $_token;
- /**
- * Flag indicating how objects should be decoded
- *
- * @var int
- * @access protected
- */
- protected $_decodeType;
+ /**
+ * Flag indicating how objects should be decoded
+ *
+ * @var int
+ * @access protected
+ */
+ protected $_decodeType;
- /**
- * Constructor
- *
- * @param string $source String source to decode
- * @param int $decodeType How objects should be decoded -- see
- * {@link Zend_Json::TYPE_ARRAY} and {@link Zend_Json::TYPE_OBJECT} for
- * valid values
- * @return void
- */
- protected function __construct($source, $decodeType)
- {
-
- // eliminate comments
- $source = preg_replace(array(
+ /**
+ * Constructor
+ *
+ * @param string $source String source to decode
+ * @param int $decodeType How objects should be decoded -- see
+ * {@link Zend_Json::TYPE_ARRAY} and {@link Zend_Json::TYPE_OBJECT} for
+ * valid values
+ * @return void
+ */
+ protected function __construct($source, $decodeType)
+ {
+
+ // eliminate comments
+ $source = preg_replace(array(
- // eliminate single line comments in '// ...' form
- '#^\s*//(.+)$#m',
-
- // eliminate multi-line comments in '/* ... */' form, at start of string
- '#^\s*/\*(.+)\*/#Us',
-
- // eliminate multi-line comments in '/* ... */' form, at end of string
- '#/\*(.+)\*/\s*$#Us'
-
- ), '', $source);
-
- // Set defaults
- $this->_source = $source;
- $this->_sourceLength = strlen($source);
- $this->_token = self::EOF;
- $this->_offset = 0;
+ // eliminate single line comments in '// ...' form
+ '#^\s*//(.+)$#m',
+
+ // eliminate multi-line comments in '/* ... */' form, at start of string
+ '#^\s*/\*(.+)\*/#Us',
+
+ // eliminate multi-line comments in '/* ... */' form, at end of string
+ '#/\*(.+)\*/\s*$#Us'
+
+ ), '', $source);
+
+ // Set defaults
+ $this->_source = $source;
+ $this->_sourceLength = strlen($source);
+ $this->_token = self::EOF;
+ $this->_offset = 0;
- // Normalize and set $decodeType
- if (!in_array($decodeType, array(Zend_Json::TYPE_ARRAY, Zend_Json::TYPE_OBJECT)))
- {
- $decodeType = Zend_Json::TYPE_ARRAY;
- }
- $this->_decodeType = $decodeType;
+ // Normalize and set $decodeType
+ if (!in_array($decodeType, array(Zend_Json::TYPE_ARRAY, Zend_Json::TYPE_OBJECT)))
+ {
+ $decodeType = Zend_Json::TYPE_ARRAY;
+ }
+ $this->_decodeType = $decodeType;
- // Set pointer at first token
- $this->_getNextToken();
- }
+ // Set pointer at first token
+ $this->_getNextToken();
+ }
- /**
- * Decode a JSON source string
- *
- * Decodes a JSON encoded string. The value returned will be one of the
- * following:
- * - integer
- * - float
- * - boolean
- * - null
- * - StdClass
- * - array
- * - array of one or more of the above types
- *
- * By default, decoded objects will be returned as associative arrays; to
- * return a StdClass object instead, pass {@link Zend_Json::TYPE_OBJECT} to
- * the $objectDecodeType parameter.
- *
- * Throws a Zend_Json_Exception if the source string is null.
- *
- * @static
- * @access public
- * @param string $source String to be decoded
- * @param int $objectDecodeType How objects should be decoded; should be
- * either or {@link Zend_Json::TYPE_ARRAY} or
- * {@link Zend_Json::TYPE_OBJECT}; defaults to TYPE_ARRAY
- * @return mixed
- * @throws Zend_Json_Exception
- */
- public static function decode($source = null, $objectDecodeType = Zend_Json::TYPE_ARRAY)
- {
- if (null === $source) {
- throw new Zend_Json_Exception('Must specify JSON encoded source for decoding');
- } elseif (!is_string($source)) {
- throw new Zend_Json_Exception('Can only decode JSON encoded strings');
- }
+ /**
+ * Decode a JSON source string
+ *
+ * Decodes a JSON encoded string. The value returned will be one of the
+ * following:
+ * - integer
+ * - float
+ * - boolean
+ * - null
+ * - StdClass
+ * - array
+ * - array of one or more of the above types
+ *
+ * By default, decoded objects will be returned as associative arrays; to
+ * return a StdClass object instead, pass {@link Zend_Json::TYPE_OBJECT} to
+ * the $objectDecodeType parameter.
+ *
+ * Throws a Zend_Json_Exception if the source string is null.
+ *
+ * @static
+ * @access public
+ * @param string $source String to be decoded
+ * @param int $objectDecodeType How objects should be decoded; should be
+ * either or {@link Zend_Json::TYPE_ARRAY} or
+ * {@link Zend_Json::TYPE_OBJECT}; defaults to TYPE_ARRAY
+ * @return mixed
+ * @throws Zend_Json_Exception
+ */
+ public static function decode($source = null, $objectDecodeType = Zend_Json::TYPE_ARRAY)
+ {
+ if (null === $source) {
+ throw new Zend_Json_Exception('Must specify JSON encoded source for decoding');
+ } elseif (!is_string($source)) {
+ throw new Zend_Json_Exception('Can only decode JSON encoded strings');
+ }
- $decoder = new self($source, $objectDecodeType);
+ $decoder = new self($source, $objectDecodeType);
- return $decoder->_decodeValue();
- }
+ return $decoder->_decodeValue();
+ }
- /**
- * Recursive driving rountine for supported toplevel tops
- *
- * @return mixed
- */
- protected function _decodeValue()
- {
- switch ($this->_token) {
- case self::DATUM:
- $result = $this->_tokenValue;
- $this->_getNextToken();
- return($result);
- break;
- case self::LBRACE:
- return($this->_decodeObject());
- break;
- case self::LBRACKET:
- return($this->_decodeArray());
- break;
- default:
- return null;
- break;
- }
- }
+ /**
+ * Recursive driving rountine for supported toplevel tops
+ *
+ * @return mixed
+ */
+ protected function _decodeValue()
+ {
+ switch ($this->_token) {
+ case self::DATUM:
+ $result = $this->_tokenValue;
+ $this->_getNextToken();
+ return($result);
+ break;
+ case self::LBRACE:
+ return($this->_decodeObject());
+ break;
+ case self::LBRACKET:
+ return($this->_decodeArray());
+ break;
+ default:
+ return null;
+ break;
+ }
+ }
- /**
- * Decodes an object of the form:
- * { "attribute: value, "attribute2" : value,...}
- *
- * If ZJsonEnoder or ZJAjax was used to encode the original object
- * then a special attribute called __className which specifies a class
- * name that should wrap the data contained within the encoded source.
- *
- * Decodes to either an array or StdClass object, based on the value of
- * {@link $_decodeType}. If invalid $_decodeType present, returns as an
- * array.
- *
- * @return array|StdClass
- */
- protected function _decodeObject()
- {
- $members = array();
- $tok = $this->_getNextToken();
+ /**
+ * Decodes an object of the form:
+ * { "attribute: value, "attribute2" : value,...}
+ *
+ * If ZJsonEnoder or ZJAjax was used to encode the original object
+ * then a special attribute called __className which specifies a class
+ * name that should wrap the data contained within the encoded source.
+ *
+ * Decodes to either an array or StdClass object, based on the value of
+ * {@link $_decodeType}. If invalid $_decodeType present, returns as an
+ * array.
+ *
+ * @return array|StdClass
+ */
+ protected function _decodeObject()
+ {
+ $members = array();
+ $tok = $this->_getNextToken();
- while ($tok && $tok != self::RBRACE) {
- if ($tok != self::DATUM || ! is_string($this->_tokenValue)) {
- throw new Zend_Json_Exception('Missing key in object encoding: ' . $this->_source);
- }
+ while ($tok && $tok != self::RBRACE) {
+ if ($tok != self::DATUM || ! is_string($this->_tokenValue)) {
+ throw new Zend_Json_Exception('Missing key in object encoding: ' . $this->_source);
+ }
- $key = $this->_tokenValue;
- $tok = $this->_getNextToken();
+ $key = $this->_tokenValue;
+ $tok = $this->_getNextToken();
- if ($tok != self::COLON) {
- throw new Zend_Json_Exception('Missing ":" in object encoding: ' . $this->_source);
- }
+ if ($tok != self::COLON) {
+ throw new Zend_Json_Exception('Missing ":" in object encoding: ' . $this->_source);
+ }
- $tok = $this->_getNextToken();
- $members[$key] = $this->_decodeValue();
- $tok = $this->_token;
+ $tok = $this->_getNextToken();
+ $members[$key] = $this->_decodeValue();
+ $tok = $this->_token;
- if ($tok == self::RBRACE) {
- break;
- }
+ if ($tok == self::RBRACE) {
+ break;
+ }
- if ($tok != self::COMMA) {
- throw new Zend_Json_Exception('Missing "," in object encoding: ' . $this->_source);
- }
+ if ($tok != self::COMMA) {
+ throw new Zend_Json_Exception('Missing "," in object encoding: ' . $this->_source);
+ }
- $tok = $this->_getNextToken();
- }
+ $tok = $this->_getNextToken();
+ }
- switch ($this->_decodeType) {
- case Zend_Json::TYPE_OBJECT:
- // Create new StdClass and populate with $members
- $result = new StdClass();
- foreach ($members as $key => $value) {
- $result->$key = $value;
- }
- break;
- case Zend_Json::TYPE_ARRAY:
- default:
- $result = $members;
- break;
- }
+ switch ($this->_decodeType) {
+ case Zend_Json::TYPE_OBJECT:
+ // Create new StdClass and populate with $members
+ $result = new StdClass();
+ foreach ($members as $key => $value) {
+ $result->$key = $value;
+ }
+ break;
+ case Zend_Json::TYPE_ARRAY:
+ default:
+ $result = $members;
+ break;
+ }
- $this->_getNextToken();
- return $result;
- }
+ $this->_getNextToken();
+ return $result;
+ }
- /**
- * Decodes a JSON array format:
- * [element, element2,...,elementN]
- *
- * @return array
- */
- protected function _decodeArray()
- {
- $result = array();
- $starttok = $tok = $this->_getNextToken(); // Move past the '['
- $index = 0;
+ /**
+ * Decodes a JSON array format:
+ * [element, element2,...,elementN]
+ *
+ * @return array
+ */
+ protected function _decodeArray()
+ {
+ $result = array();
+ $starttok = $tok = $this->_getNextToken(); // Move past the '['
+ $index = 0;
- while ($tok && $tok != self::RBRACKET) {
- $result[$index++] = $this->_decodeValue();
+ while ($tok && $tok != self::RBRACKET) {
+ $result[$index++] = $this->_decodeValue();
- $tok = $this->_token;
+ $tok = $this->_token;
- if ($tok == self::RBRACKET || !$tok) {
- break;
- }
+ if ($tok == self::RBRACKET || !$tok) {
+ break;
+ }
- if ($tok != self::COMMA) {
- throw new Zend_Json_Exception('Missing "," in array encoding: ' . $this->_source);
- }
+ if ($tok != self::COMMA) {
+ throw new Zend_Json_Exception('Missing "," in array encoding: ' . $this->_source);
+ }
- $tok = $this->_getNextToken();
- }
+ $tok = $this->_getNextToken();
+ }
- $this->_getNextToken();
- return($result);
- }
+ $this->_getNextToken();
+ return($result);
+ }
- /**
- * Removes whitepsace characters from the source input
- */
- protected function _eatWhitespace()
- {
- if (preg_match(
- '/([\t\b\f\n\r ])*/s',
- $this->_source,
- $matches,
- PREG_OFFSET_CAPTURE,
- $this->_offset)
- && $matches[0][1] == $this->_offset)
- {
- $this->_offset += strlen($matches[0][0]);
- }
- }
+ /**
+ * Removes whitepsace characters from the source input
+ */
+ protected function _eatWhitespace()
+ {
+ if (preg_match(
+ '/([\t\b\f\n\r ])*/s',
+ $this->_source,
+ $matches,
+ PREG_OFFSET_CAPTURE,
+ $this->_offset)
+ && $matches[0][1] == $this->_offset)
+ {
+ $this->_offset += strlen($matches[0][0]);
+ }
+ }
- /**
- * Retrieves the next token from the source stream
- *
- * @return int Token constant value specified in class definition
- */
- protected function _getNextToken()
- {
- $this->_token = self::EOF;
- $this->_tokenValue = null;
- $this->_eatWhitespace();
-
- if ($this->_offset >= $this->_sourceLength) {
- return(self::EOF);
- }
+ /**
+ * Retrieves the next token from the source stream
+ *
+ * @return int Token constant value specified in class definition
+ */
+ protected function _getNextToken()
+ {
+ $this->_token = self::EOF;
+ $this->_tokenValue = null;
+ $this->_eatWhitespace();
+
+ if ($this->_offset >= $this->_sourceLength) {
+ return(self::EOF);
+ }
- $str = $this->_source;
- $str_length = $this->_sourceLength;
- $i = $this->_offset;
- $start = $i;
-
- switch ($str{$i}) {
- case '{':
- $this->_token = self::LBRACE;
- break;
- case '}':
- $this->_token = self::RBRACE;
- break;
- case '[':
- $this->_token = self::LBRACKET;
- break;
- case ']':
- $this->_token = self::RBRACKET;
- break;
- case ',':
- $this->_token = self::COMMA;
- break;
- case ':':
- $this->_token = self::COLON;
- break;
- case '"':
- $result = '';
- do {
- $i++;
- if ($i >= $str_length) {
- break;
- }
+ $str = $this->_source;
+ $str_length = $this->_sourceLength;
+ $i = $this->_offset;
+ $start = $i;
+
+ switch ($str{$i}) {
+ case '{':
+ $this->_token = self::LBRACE;
+ break;
+ case '}':
+ $this->_token = self::RBRACE;
+ break;
+ case '[':
+ $this->_token = self::LBRACKET;
+ break;
+ case ']':
+ $this->_token = self::RBRACKET;
+ break;
+ case ',':
+ $this->_token = self::COMMA;
+ break;
+ case ':':
+ $this->_token = self::COLON;
+ break;
+ case '"':
+ $result = '';
+ do {
+ $i++;
+ if ($i >= $str_length) {
+ break;
+ }
- $chr = $str{$i};
- if ($chr == '\\') {
- $i++;
- if ($i >= $str_length) {
- break;
- }
- $chr = $str{$i};
- switch ($chr) {
- case '"' :
- $result .= '"';
- break;
- case '\\':
- $result .= '\\';
- break;
- case '/' :
- $result .= '/';
- break;
- case 'b' :
- $result .= chr(8);
- break;
- case 'f' :
- $result .= chr(12);
- break;
- case 'n' :
- $result .= chr(10);
- break;
- case 'r' :
- $result .= chr(13);
- break;
- case 't' :
- $result .= chr(9);
- break;
- case '\'' :
- $result .= '\'';
- break;
- case 'u':
- $result .= self::decode_unicode_byte(substr($str, $i + 1, 4));
- $i += 4;
- break;
- default:
- throw new Zend_Json_Exception("Illegal escape "
- . "sequence '" . $chr . "'");
- }
- } elseif ($chr == '"') {
- break;
- } else {
- $result .= $chr;
- }
- } while ($i < $str_length);
+ $chr = $str{$i};
+ if ($chr == '\\') {
+ $i++;
+ if ($i >= $str_length) {
+ break;
+ }
+ $chr = $str{$i};
+ switch ($chr) {
+ case '"' :
+ $result .= '"';
+ break;
+ case '\\':
+ $result .= '\\';
+ break;
+ case '/' :
+ $result .= '/';
+ break;
+ case 'b' :
+ $result .= chr(8);
+ break;
+ case 'f' :
+ $result .= chr(12);
+ break;
+ case 'n' :
+ $result .= chr(10);
+ break;
+ case 'r' :
+ $result .= chr(13);
+ break;
+ case 't' :
+ $result .= chr(9);
+ break;
+ case '\'' :
+ $result .= '\'';
+ break;
+ case 'u':
+ $result .= self::decode_unicode_byte(substr($str, $i + 1, 4));
+ $i += 4;
+ break;
+ default:
+ throw new Zend_Json_Exception("Illegal escape "
+ . "sequence '" . $chr . "'");
+ }
+ } elseif ($chr == '"') {
+ break;
+ } else {
+ $result .= $chr;
+ }
+ } while ($i < $str_length);
- $this->_token = self::DATUM;
- //$this->_tokenValue = substr($str, $start + 1, $i - $start - 1);
- $this->_tokenValue = $result;
- break;
- case "'":
- $result = '';
- do {
- $i++;
- if ($i >= $str_length) {
- break;
- }
+ $this->_token = self::DATUM;
+ //$this->_tokenValue = substr($str, $start + 1, $i - $start - 1);
+ $this->_tokenValue = $result;
+ break;
+ case "'":
+ $result = '';
+ do {
+ $i++;
+ if ($i >= $str_length) {
+ break;
+ }
- $chr = $str{$i};
- if ($chr == '\\') {
- $i++;
- if ($i >= $str_length) {
- break;
- }
- $chr = $str{$i};
- switch ($chr) {
- case "'" :
- $result .= "'";
- break;
- case '\\':
- $result .= '\\';
- break;
- case '/' :
- $result .= '/';
- break;
- case 'b' :
- $result .= chr(8);
- break;
- case 'f' :
- $result .= chr(12);
- break;
- case 'n' :
- $result .= chr(10);
- break;
- case 'r' :
- $result .= chr(13);
- break;
- case 't' :
- $result .= chr(9);
- break;
- case '"' :
- $result .= '"';
- break;
- default:
- throw new Zend_Json_Exception("Illegal escape "
- . "sequence '" . $chr . "'");
- }
- } elseif ($chr == "'") {
- break;
- } else {
- $result .= $chr;
- }
- } while ($i < $str_length);
+ $chr = $str{$i};
+ if ($chr == '\\') {
+ $i++;
+ if ($i >= $str_length) {
+ break;
+ }
+ $chr = $str{$i};
+ switch ($chr) {
+ case "'" :
+ $result .= "'";
+ break;
+ case '\\':
+ $result .= '\\';
+ break;
+ case '/' :
+ $result .= '/';
+ break;
+ case 'b' :
+ $result .= chr(8);
+ break;
+ case 'f' :
+ $result .= chr(12);
+ break;
+ case 'n' :
+ $result .= chr(10);
+ break;
+ case 'r' :
+ $result .= chr(13);
+ break;
+ case 't' :
+ $result .= chr(9);
+ break;
+ case '"' :
+ $result .= '"';
+ break;
+ default:
+ throw new Zend_Json_Exception("Illegal escape "
+ . "sequence '" . $chr . "'");
+ }
+ } elseif ($chr == "'") {
+ break;
+ } else {
+ $result .= $chr;
+ }
+ } while ($i < $str_length);
- $this->_token = self::DATUM;
- //$this->_tokenValue = substr($str, $start + 1, $i - $start - 1);
- $this->_tokenValue = $result;
- break;
- case 't':
- if (($i+ 3) < $str_length && substr($str, $start, 4) == "true") {
- $this->_token = self::DATUM;
- }
- $this->_tokenValue = true;
- $i += 3;
- break;
- case 'f':
- if (($i+ 4) < $str_length && substr($str, $start, 5) == "false") {
- $this->_token = self::DATUM;
- }
- $this->_tokenValue = false;
- $i += 4;
- break;
- case 'n':
- if (($i+ 3) < $str_length && substr($str, $start, 4) == "null") {
- $this->_token = self::DATUM;
- }
- $this->_tokenValue = NULL;
- $i += 3;
- break;
- case ' ':
- break;
- }
+ $this->_token = self::DATUM;
+ //$this->_tokenValue = substr($str, $start + 1, $i - $start - 1);
+ $this->_tokenValue = $result;
+ break;
+ case 't':
+ if (($i+ 3) < $str_length && substr($str, $start, 4) == "true") {
+ $this->_token = self::DATUM;
+ }
+ $this->_tokenValue = true;
+ $i += 3;
+ break;
+ case 'f':
+ if (($i+ 4) < $str_length && substr($str, $start, 5) == "false") {
+ $this->_token = self::DATUM;
+ }
+ $this->_tokenValue = false;
+ $i += 4;
+ break;
+ case 'n':
+ if (($i+ 3) < $str_length && substr($str, $start, 4) == "null") {
+ $this->_token = self::DATUM;
+ }
+ $this->_tokenValue = NULL;
+ $i += 3;
+ break;
+ case ' ':
+ break;
+ }
- if ($this->_token != self::EOF) {
- $this->_offset = $i + 1; // Consume the last token character
- return($this->_token);
- }
+ if ($this->_token != self::EOF) {
+ $this->_offset = $i + 1; // Consume the last token character
+ return($this->_token);
+ }
- $chr = $str{$i};
- if ($chr == '-' || $chr == '.' || ($chr >= '0' && $chr <= '9')) {
- if (preg_match('/-?([0-9])*(\.[0-9]*)?((e|E)((-|\+)?)[0-9]+)?/s',
- $str, $matches, PREG_OFFSET_CAPTURE, $start) && $matches[0][1] == $start) {
+ $chr = $str{$i};
+ if ($chr == '-' || $chr == '.' || ($chr >= '0' && $chr <= '9')) {
+ if (preg_match('/-?([0-9])*(\.[0-9]*)?((e|E)((-|\+)?)[0-9]+)?/s',
+ $str, $matches, PREG_OFFSET_CAPTURE, $start) && $matches[0][1] == $start) {
- $datum = $matches[0][0];
+ $datum = $matches[0][0];
- if (is_numeric($datum)) {
- if (preg_match('/^0\d+$/', $datum)) {
- throw new Zend_Json_Exception("Octal notation not supported by JSON (value: $datum)");
- } else {
- $val = intval($datum);
- $fVal = floatval($datum);
- $this->_tokenValue = ($val == $fVal ? $val : $fVal);
- }
- } else {
- throw new Zend_Json_Exception("Illegal number format: $datum");
- }
+ if (is_numeric($datum)) {
+ if (preg_match('/^0\d+$/', $datum)) {
+ throw new Zend_Json_Exception("Octal notation not supported by JSON (value: $datum)");
+ } else {
+ $val = intval($datum);
+ $fVal = floatval($datum);
+ $this->_tokenValue = ($val == $fVal ? $val : $fVal);
+ }
+ } else {
+ throw new Zend_Json_Exception("Illegal number format: $datum");
+ }
- $this->_token = self::DATUM;
- $this->_offset = $start + strlen($datum);
- }
- } else {
- throw new Zend_Json_Exception("Illegal Token at pos $i: $chr\nContext:\n--------------------------------------------------" . substr($str, $i) . "\n--------------------------------------------------");
- }
+ $this->_token = self::DATUM;
+ $this->_offset = $start + strlen($datum);
+ }
+ } else {
+ throw new Zend_Json_Exception("Illegal Token at pos $i: $chr\nContext:\n--------------------------------------------------" . substr($str, $i) . "\n--------------------------------------------------");
+ }
- return($this->_token);
- }
-
- /**
- * Handle a Unicode byte; local to Enano.
- * @param string 4 character byte sequence
- * @return string
- */
-
- protected function decode_unicode_byte($byte)
- {
- if ( strlen($byte) != 4 )
- throw new Zend_Json_Exception("Invalid Unicode sequence \\u$byte");
-
- $value = hexdec($byte);
+ return($this->_token);
+ }
+
+ /**
+ * Handle a Unicode byte; local to Enano.
+ * @param string 4 character byte sequence
+ * @return string
+ */
+
+ protected function decode_unicode_byte($byte)
+ {
+ if ( strlen($byte) != 4 )
+ throw new Zend_Json_Exception("Invalid Unicode sequence \\u$byte");
+
+ $value = hexdec($byte);
- if ($value < 0x0080)
- {
- // 1 byte: 0xxxxxxx
- $character = chr($value);
- }
- else if ($value < 0x0800)
- {
- // 2 bytes: 110xxxxx 10xxxxxx
- $character =
- chr((($value & 0x07c0) >> 6) | 0xc0)
- . chr(($value & 0x3f) | 0x80);
- }
- else
- {
- // 3 bytes: 1110xxxx 10xxxxxx 10xxxxxx
- $character =
- chr((($value & 0xf000) >> 12) | 0xe0)
- . chr((($value & 0x0fc0) >> 6) | 0x80)
- . chr(($value & 0x3f) | 0x80);
- }
-
- return $character;
- }
+ if ($value < 0x0080)
+ {
+ // 1 byte: 0xxxxxxx
+ $character = chr($value);
+ }
+ else if ($value < 0x0800)
+ {
+ // 2 bytes: 110xxxxx 10xxxxxx
+ $character =
+ chr((($value & 0x07c0) >> 6) | 0xc0)
+ . chr(($value & 0x3f) | 0x80);
+ }
+ else
+ {
+ // 3 bytes: 1110xxxx 10xxxxxx 10xxxxxx
+ $character =
+ chr((($value & 0xf000) >> 12) | 0xe0)
+ . chr((($value & 0x0fc0) >> 6) | 0x80)
+ . chr(($value & 0x3f) | 0x80);
+ }
+
+ return $character;
+ }
}
/**
@@ -995,62 +995,62 @@
*/
class Zend_Json
{
- /**
- * How objects should be encoded -- arrays or as StdClass. TYPE_ARRAY is 1
- * so that it is a boolean true value, allowing it to be used with
- * ext/json's functions.
- */
- const TYPE_ARRAY = 1;
- const TYPE_OBJECT = 0;
+ /**
+ * How objects should be encoded -- arrays or as StdClass. TYPE_ARRAY is 1
+ * so that it is a boolean true value, allowing it to be used with
+ * ext/json's functions.
+ */
+ const TYPE_ARRAY = 1;
+ const TYPE_OBJECT = 0;
- /**
- * @var bool
- */
- public static $useBuiltinEncoderDecoder = true;
+ /**
+ * @var bool
+ */
+ public static $useBuiltinEncoderDecoder = true;
- /**
- * Decodes the given $encodedValue string which is
- * encoded in the JSON format
- *
- * Uses ext/json's json_decode if available.
- *
- * @param string $encodedValue Encoded in JSON format
- * @param int $objectDecodeType Optional; flag indicating how to decode
- * objects. See {@link ZJsonDecoder::decode()} for details.
- * @return mixed
- */
- public static function decode($encodedValue, $objectDecodeType = Zend_Json::TYPE_ARRAY)
- {
- if (function_exists('json_decode') && self::$useBuiltinEncoderDecoder !== true) {
- return json_decode($encodedValue, $objectDecodeType);
- }
+ /**
+ * Decodes the given $encodedValue string which is
+ * encoded in the JSON format
+ *
+ * Uses ext/json's json_decode if available.
+ *
+ * @param string $encodedValue Encoded in JSON format
+ * @param int $objectDecodeType Optional; flag indicating how to decode
+ * objects. See {@link ZJsonDecoder::decode()} for details.
+ * @return mixed
+ */
+ public static function decode($encodedValue, $objectDecodeType = Zend_Json::TYPE_ARRAY)
+ {
+ if (function_exists('json_decode') && self::$useBuiltinEncoderDecoder !== true) {
+ return json_decode($encodedValue, $objectDecodeType);
+ }
- return Zend_Json_Decoder::decode($encodedValue, $objectDecodeType);
- }
+ return Zend_Json_Decoder::decode($encodedValue, $objectDecodeType);
+ }
- /**
- * Encode the mixed $valueToEncode into the JSON format
- *
- * Encodes using ext/json's json_encode() if available.
- *
- * NOTE: Object should not contain cycles; the JSON format
- * does not allow object reference.
- *
- * NOTE: Only public variables will be encoded
- *
- * @param mixed $valueToEncode
- * @param boolean $cycleCheck Optional; whether or not to check for object recursion; off by default
- * @return string JSON encoded object
- */
- public static function encode($valueToEncode, $cycleCheck = false)
- {
- if (function_exists('json_encode') && self::$useBuiltinEncoderDecoder !== true) {
- return json_encode($valueToEncode);
- }
+ /**
+ * Encode the mixed $valueToEncode into the JSON format
+ *
+ * Encodes using ext/json's json_encode() if available.
+ *
+ * NOTE: Object should not contain cycles; the JSON format
+ * does not allow object reference.
+ *
+ * NOTE: Only public variables will be encoded
+ *
+ * @param mixed $valueToEncode
+ * @param boolean $cycleCheck Optional; whether or not to check for object recursion; off by default
+ * @return string JSON encoded object
+ */
+ public static function encode($valueToEncode, $cycleCheck = false)
+ {
+ if (function_exists('json_encode') && self::$useBuiltinEncoderDecoder !== true) {
+ return json_encode($valueToEncode);
+ }
- return Zend_Json_Encoder::encode($valueToEncode, $cycleCheck);
- }
+ return Zend_Json_Encoder::encode($valueToEncode, $cycleCheck);
+ }
}
?>
diff -r de56132c008d -r bdac73ed481e includes/lang.php
--- a/includes/lang.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/lang.php Sun Mar 28 23:10:46 2010 -0400
@@ -21,766 +21,766 @@
class Language
{
-
- /**
- * The numerical ID of the loaded language.
- * @var int
- */
-
- var $lang_id;
-
- /**
- * The ISO-639-3 code for the loaded language. This should be grabbed directly from the database.
- * @var string
- */
-
- var $lang_code;
+
+ /**
+ * The numerical ID of the loaded language.
+ * @var int
+ */
+
+ var $lang_id;
+
+ /**
+ * The ISO-639-3 code for the loaded language. This should be grabbed directly from the database.
+ * @var string
+ */
+
+ var $lang_code;
- /**
- * Used to track when a language was last changed, to allow browsers to cache language data
- * @var int
- */
-
- var $lang_timestamp;
-
- /**
- * Will be an object that holds an instance of the class configured with the site's default language. Only instanciated when needed.
- * @var object
- */
-
- var $default;
-
- /**
- * The list of loaded strings.
- * @var array
- * @access private
- */
-
- var $strings = array();
-
- /**
- * Switch for debug mode. If true, will show an asterisk after localized strings. This
- * can be useful if you're localizing a component and need to see what's already done.
- * @var bool
- */
-
- var $debug = false;
-
- /**
- * List of available filters to pass variables through.
- * @var array
- * @access private
- */
-
- protected $filters = array();
-
- /**
- * Constructor.
- * @param int|string Language ID or code to load.
- */
-
- function __construct($lang)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( defined('IN_ENANO_INSTALL') && ( !defined('ENANO_CONFIG_FETCHED') || ( defined('IN_ENANO_UPGRADE') && !defined('IN_ENANO_UPGRADE_POST') ) ) )
- {
- // special case for the Enano installer: it will load its own strings from a JSON file and just use this API for fetching
- // and templatizing them.
- // 1.1.4 fix: this was still being called after main API startup from installer payload
- $this->lang_id = 1;
- $this->lang_code = $lang;
- return true;
- }
- if ( is_string($lang) )
- {
- $sql_col = 'lang_code=\'' . $db->escape($lang) . '\'';
- }
- else if ( is_int($lang) )
- {
- $sql_col = 'lang_id=' . $lang . '';
- }
- else
- {
- $db->_die('lang.php - attempting to pass invalid value to constructor');
- }
-
- $lang_default = ( $x = getConfig('default_language') ) ? intval($x) : '0';
-
- $q = $db->sql_query("SELECT lang_id, lang_code, last_changed, ( lang_id = $lang_default ) AS is_default FROM " . table_prefix . "language WHERE $sql_col OR lang_id = $lang_default ORDER BY is_default ASC LIMIT 1;");
-
- if ( !$q )
- $db->_die('lang.php - main select query');
-
- if ( $db->numrows() < 1 )
- $db->_die('lang.php - There are no languages installed');
-
- $row = $db->fetchrow();
-
- $this->lang_id = intval( $row['lang_id'] );
- $this->lang_code = $row['lang_code'];
- $this->lang_timestamp = $row['last_changed'];
-
- $this->register_filter('htmlsafe', 'htmlspecialchars');
- $this->register_filter('urlencode', 'urlencode');
- $this->register_filter('rawurlencode', 'rawurlencode');
-
- $code = $plugins->setHook('lang_init');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
- }
-
- /**
- * Fetches language strings from the database, or a cache file if it's available.
- * @param bool If true (default), allows the cache to be used.
- */
-
- function fetch($allow_cache = true)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- // Attempt to load the strings from a cache file
- $loaded = false;
-
- if ( $allow_cache )
- {
- // Load the cache manager
- global $cache;
-
- if ( $cached = $cache->fetch("lang_{$this->lang_id}") )
- {
- $this->merge($cached);
- $loaded = true;
- }
- }
- if ( !$loaded )
- {
- // No cache file - select and retrieve from the database
- $q = $db->sql_unbuffered_query("SELECT string_category, string_name, string_content FROM " . table_prefix . "language_strings WHERE lang_id = {$this->lang_id};");
- if ( !$q )
- $db->_die('lang.php - selecting language string data');
- if ( $row = $db->fetchrow() )
- {
- $strings = array();
- do
- {
- $cat =& $row['string_category'];
- if ( !is_array(@$strings[$cat]) )
- {
- $strings[$cat] = array();
- }
- $strings[$cat][ $row['string_name'] ] = $row['string_content'];
- }
- while ( $row = $db->fetchrow() );
- // all done fetching
- $this->merge($strings);
- $this->regen_caches(false);
- }
- /*
- else
- {
- if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
- $db->_die('lang.php - No strings for language ' . $this->lang_code);
- }
- */
- }
- }
-
- /**
- * Loads a file from the disk cache (treated as PHP) and merges it into RAM.
- * @param string File to load
- */
-
- function load_cache_file($file)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( !file_exists($file) )
- $db->_die('lang.php - requested cache file doesn\'t exist');
-
- @include($file);
-
- if ( !isset($lang_cache) || ( isset($lang_cache) && !is_array($lang_cache) ) )
- $db->_die('lang.php - the cache file is invalid (didn\'t set $lang_cache as an array)');
-
- $this->merge($lang_cache);
- }
-
- /**
- * Loads a JSON language file and parses the strings into RAM. Will use the cache if possible, but stays far away from the database,
- * which we assume doesn't exist yet.
- */
-
- function load_file($file)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( !file_exists($file) )
- {
- if ( defined('IN_ENANO_INSTALL') )
- {
- die('lang.php - requested JSON file (' . htmlspecialchars($file) . ') doesn\'t exist');
- }
- else
- {
- $db->_die('lang.php - requested JSON file doesn\'t exist');
- }
- }
-
- $contents = trim(@file_get_contents($file));
- if ( empty($contents) )
- $db->_die('lang.php - empty language file...');
-
- // Trim off all text before and after the starting and ending braces
- $contents = preg_replace('/^([^{]+)\{/', '{', $contents);
- $contents = preg_replace('/\}([^}]+)$/', '}', $contents);
- $contents = trim($contents);
-
- if ( empty($contents) )
- $db->_die('lang.php - no meat to the language file...');
-
- $checksum = md5($contents);
- if ( file_exists("./cache/lang_json_{$checksum}.php") )
- {
- $this->load_cache_file("./cache/lang_json_{$checksum}.php");
- }
- else
- {
- // Correct syntax to be nice to the json parser
-
- // eliminate comments
- $contents = preg_replace(array(
- // eliminate single line comments in '// ...' form
- '#^\s*//(.+)$#m',
- // eliminate multi-line comments in '/* ... */' form, at start of string
- '#^\s*/\*(.+)\*/#Us',
- // eliminate multi-line comments in '/* ... */' form, at end of string
- '#/\*(.+)\*/\s*$#Us'
- ), '', $contents);
-
- $contents = preg_replace('/([,\{\[])([\s]*?)([a-z0-9_]+)([\s]*?):/', '\\1\\2"\\3" :', $contents);
-
- try
- {
- $langdata = enano_json_decode($contents);
- }
- catch(Zend_Json_Exception $e)
- {
- $db->_die('lang.php - Exception caught by JSON parser' . htmlspecialchars(print_r($e, true)) . '
');
- exit;
- }
-
- if ( !is_array($langdata) )
- $db->_die('lang.php - invalid language file');
-
- if ( !isset($langdata['categories']) || !isset($langdata['strings']) )
- $db->_die('lang.php - language file does not contain the proper items');
-
- $this->merge($langdata['strings']);
-
- $lang_file = "./cache/lang_json_{$checksum}.php";
-
- $handle = @fopen($lang_file, 'w');
- if ( !$handle )
- // Couldn't open the file. Silently fail and let the strings come from RAM.
- return false;
-
- // The file's open, that means we should be good.
- fwrite($handle, 'lang_id = 1;
+ $this->lang_code = $lang;
+ return true;
+ }
+ if ( is_string($lang) )
+ {
+ $sql_col = 'lang_code=\'' . $db->escape($lang) . '\'';
+ }
+ else if ( is_int($lang) )
+ {
+ $sql_col = 'lang_id=' . $lang . '';
+ }
+ else
+ {
+ $db->_die('lang.php - attempting to pass invalid value to constructor');
+ }
+
+ $lang_default = ( $x = getConfig('default_language') ) ? intval($x) : '0';
+
+ $q = $db->sql_query("SELECT lang_id, lang_code, last_changed, ( lang_id = $lang_default ) AS is_default FROM " . table_prefix . "language WHERE $sql_col OR lang_id = $lang_default ORDER BY is_default ASC LIMIT 1;");
+
+ if ( !$q )
+ $db->_die('lang.php - main select query');
+
+ if ( $db->numrows() < 1 )
+ $db->_die('lang.php - There are no languages installed');
+
+ $row = $db->fetchrow();
+
+ $this->lang_id = intval( $row['lang_id'] );
+ $this->lang_code = $row['lang_code'];
+ $this->lang_timestamp = $row['last_changed'];
+
+ $this->register_filter('htmlsafe', 'htmlspecialchars');
+ $this->register_filter('urlencode', 'urlencode');
+ $this->register_filter('rawurlencode', 'rawurlencode');
+
+ $code = $plugins->setHook('lang_init');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+ }
+
+ /**
+ * Fetches language strings from the database, or a cache file if it's available.
+ * @param bool If true (default), allows the cache to be used.
+ */
+
+ function fetch($allow_cache = true)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ // Attempt to load the strings from a cache file
+ $loaded = false;
+
+ if ( $allow_cache )
+ {
+ // Load the cache manager
+ global $cache;
+
+ if ( $cached = $cache->fetch("lang_{$this->lang_id}") )
+ {
+ $this->merge($cached);
+ $loaded = true;
+ }
+ }
+ if ( !$loaded )
+ {
+ // No cache file - select and retrieve from the database
+ $q = $db->sql_unbuffered_query("SELECT string_category, string_name, string_content FROM " . table_prefix . "language_strings WHERE lang_id = {$this->lang_id};");
+ if ( !$q )
+ $db->_die('lang.php - selecting language string data');
+ if ( $row = $db->fetchrow() )
+ {
+ $strings = array();
+ do
+ {
+ $cat =& $row['string_category'];
+ if ( !is_array(@$strings[$cat]) )
+ {
+ $strings[$cat] = array();
+ }
+ $strings[$cat][ $row['string_name'] ] = $row['string_content'];
+ }
+ while ( $row = $db->fetchrow() );
+ // all done fetching
+ $this->merge($strings);
+ $this->regen_caches(false);
+ }
+ /*
+ else
+ {
+ if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
+ $db->_die('lang.php - No strings for language ' . $this->lang_code);
+ }
+ */
+ }
+ }
+
+ /**
+ * Loads a file from the disk cache (treated as PHP) and merges it into RAM.
+ * @param string File to load
+ */
+
+ function load_cache_file($file)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( !file_exists($file) )
+ $db->_die('lang.php - requested cache file doesn\'t exist');
+
+ @include($file);
+
+ if ( !isset($lang_cache) || ( isset($lang_cache) && !is_array($lang_cache) ) )
+ $db->_die('lang.php - the cache file is invalid (didn\'t set $lang_cache as an array)');
+
+ $this->merge($lang_cache);
+ }
+
+ /**
+ * Loads a JSON language file and parses the strings into RAM. Will use the cache if possible, but stays far away from the database,
+ * which we assume doesn't exist yet.
+ */
+
+ function load_file($file)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( !file_exists($file) )
+ {
+ if ( defined('IN_ENANO_INSTALL') )
+ {
+ die('lang.php - requested JSON file (' . htmlspecialchars($file) . ') doesn\'t exist');
+ }
+ else
+ {
+ $db->_die('lang.php - requested JSON file doesn\'t exist');
+ }
+ }
+
+ $contents = trim(@file_get_contents($file));
+ if ( empty($contents) )
+ $db->_die('lang.php - empty language file...');
+
+ // Trim off all text before and after the starting and ending braces
+ $contents = preg_replace('/^([^{]+)\{/', '{', $contents);
+ $contents = preg_replace('/\}([^}]+)$/', '}', $contents);
+ $contents = trim($contents);
+
+ if ( empty($contents) )
+ $db->_die('lang.php - no meat to the language file...');
+
+ $checksum = md5($contents);
+ if ( file_exists("./cache/lang_json_{$checksum}.php") )
+ {
+ $this->load_cache_file("./cache/lang_json_{$checksum}.php");
+ }
+ else
+ {
+ // Correct syntax to be nice to the json parser
+
+ // eliminate comments
+ $contents = preg_replace(array(
+ // eliminate single line comments in '// ...' form
+ '#^\s*//(.+)$#m',
+ // eliminate multi-line comments in '/* ... */' form, at start of string
+ '#^\s*/\*(.+)\*/#Us',
+ // eliminate multi-line comments in '/* ... */' form, at end of string
+ '#/\*(.+)\*/\s*$#Us'
+ ), '', $contents);
+
+ $contents = preg_replace('/([,\{\[])([\s]*?)([a-z0-9_]+)([\s]*?):/', '\\1\\2"\\3" :', $contents);
+
+ try
+ {
+ $langdata = enano_json_decode($contents);
+ }
+ catch(Zend_Json_Exception $e)
+ {
+ $db->_die('lang.php - Exception caught by JSON parser
' . htmlspecialchars(print_r($e, true)) . '
');
+ exit;
+ }
+
+ if ( !is_array($langdata) )
+ $db->_die('lang.php - invalid language file');
+
+ if ( !isset($langdata['categories']) || !isset($langdata['strings']) )
+ $db->_die('lang.php - language file does not contain the proper items');
+
+ $this->merge($langdata['strings']);
+
+ $lang_file = "./cache/lang_json_{$checksum}.php";
+
+ $handle = @fopen($lang_file, 'w');
+ if ( !$handle )
+ // Couldn't open the file. Silently fail and let the strings come from RAM.
+ return false;
+
+ // The file's open, that means we should be good.
+ fwrite($handle, 'var_export_string($this->strings);
- if ( empty($exported) )
- // Ehh, that's not good
- $db->_die('lang.php - load_file(): var_export_string() failed');
-
- fwrite($handle, $exported . '; ?>');
-
- // Clean up
- unset($exported, $langdata);
-
- // Done =)
- fclose($handle);
- }
- }
-
- /**
- * Merges a standard language assoc array ($arr[cat][stringid]) with the master in RAM.
- * @param array
- */
-
- function merge($strings)
- {
- // This is stupidly simple.
- foreach ( $strings as $cat_id => $contents )
- {
- if ( !isset($this->strings[$cat_id]) || ( isset($this->strings[$cat_id]) && !is_array($this->strings[$cat_id]) ) )
- $this->strings[$cat_id] = array();
- foreach ( $contents as $string_id => $string )
- {
- $this->strings[$cat_id][$string_id] = $string;
- }
- }
- }
-
- /**
- * Imports a JSON-format language file into the database and merges with current strings.
- * @param string Path to the JSON file to load
- * @param bool If true, only imports new strings and skips those that already exist. Defaults to false (import all strings)
- * @param bool Enable debugging output, makes the process over CLI more interesting
- */
-
- function import($file, $skip_existing = false, $debug = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( !file_exists($file) )
- $db->_die('lang.php - can\'t import language file: string file doesn\'t exist');
-
- if ( $this->lang_id == 0 )
- $db->_die('lang.php - BUG: trying to perform import when $lang->lang_id == 0');
-
- if ( $debug )
- $br = ( isset($_SERVER['REQUEST_URI']) ) ? '
' : '';
-
- if ( $debug )
- echo "Importing file: $file$br\n Checking file...$br\n";
-
- $contents = trim(@file_get_contents($file));
-
- if ( empty($contents) )
- $db->_die('lang.php - can\'t load the contents of the language file');
-
- if ( $debug )
- echo " Cleaning up JSON$br\n";
-
- // Trim off all text before and after the starting and ending braces
- $contents = preg_replace('/^([^{]+)\{/', '{', $contents);
- $contents = preg_replace('/\}([^}]+)$/', '}', $contents);
-
- // Correct syntax to be nice to the json parser
- $contents = enano_clean_json($contents);
-
- if ( $debug )
- echo " Decoding JSON stream$br\n";
-
- try
- {
- $langdata = enano_json_decode($contents);
- }
- catch(Zend_Json_Exception $e)
- {
- $db->_die('lang.php - Exception caught by JSON parser
' . htmlspecialchars(print_r($e, true)) . '
');
- exit;
- }
-
- if ( !is_array($langdata) )
- {
- $db->_die('lang.php - invalid or non-well-formed language file');
- }
-
- if ( $debug )
- echo " Starting string import$br\n";
-
- return $this->import_array($langdata, $skip_existing, $debug);
- }
-
- /**
- * Imports a JSON-format language file into the database and merges with current strings.
- * @param string Path to plugin file
- */
-
- function import_plugin($file)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( !file_exists($file) )
- $db->_die('lang.php - can\'t import language file: string file doesn\'t exist');
-
- if ( $this->lang_id == 0 )
- $db->_die('lang.php - BUG: trying to perform import when $lang->lang_id == 0');
-
- $block = pluginLoader::parse_plugin_blocks($file, 'language');
- if ( !is_array($block) )
- return false;
- if ( !isset($block[0]) )
- return false;
-
- $contents =& $block[0]['value'];
-
- // Trim off all text before and after the starting and ending braces
- $contents = enano_trim_json($contents);
-
- // Correct syntax to be nice to the json parser
- $contents = enano_clean_json($contents);
-
- try
- {
- $langdata = enano_json_decode($contents);
- }
- catch(Zend_Json_Exception $e)
- {
- $db->_die('lang.php - Exception caught by JSON parser
' . htmlspecialchars(print_r($e, true)) . '
');
- exit;
- }
-
- if ( !is_array($langdata) )
- {
- $db->_die('lang.php - invalid or non-well-formed language file');
- }
-
- // Does the plugin support the current language?
- if ( isset($langdata[$this->lang_code]) )
- {
- // Yes, import that
- return $this->import_array($langdata[$this->lang_code]);
- }
-
- // Just import the first language we run across.
- $supported_langs = array_keys($langdata);
-
- if ( !isset($supported_langs[0]) )
- {
- $db->_die('lang.php - plugin has an invalid or corrupt language block');
- }
-
- $first_lang = $supported_langs[0];
-
- return $this->import_array($langdata[$first_lang], false, true);
- }
-
- /**
- * Performs the actual import of string data.
- * @param array Parsed JSON object, should be in the form of an array
- * @param bool If true, only imports new strings and skips those that already exist. Defaults to false.
- * @param bool Enable debugging output
- * @access private
- */
-
- protected function import_array($langdata, $skip_existing = false, $debug = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( !isset($langdata['categories']) || !isset($langdata['strings']) )
- $db->_die('lang.php - language file does not contain the proper items');
-
- if ( $debug )
- $br = ( isset($_SERVER['REQUEST_URI']) ) ? '
' : '';
-
- $insert_list = array();
- $delete_list = array();
-
- foreach ( $langdata['categories'] as $category )
- {
- if ( isset($langdata['strings'][$category]) )
- {
- if ( $debug )
- {
- $desc = ( isset($langdata['strings']['meta'][$category]) ) ? $langdata['strings']['meta'][$category] : $this->get("meta_$category");
- echo " Indexing category: $category ({$desc})$br\n";
- }
- foreach ( $langdata['strings'][$category] as $string_name => $string_value )
- {
- // should we skip this string?
- if ( isset($this->strings[$category]) && $skip_existing )
- {
- if ( isset($this->strings[$category][$string_name]) )
- {
- // already exists, skip
- if ( $debug )
- echo " Skipping string (already exists): {$category}_{$string_name}$br\n";
- continue;
- }
- }
- $string_name = $db->escape($string_name);
- $string_value = $db->escape($string_value);
- $category_name = $db->escape($category);
- $insert_list[] = "({$this->lang_id}, '$category_name', '$string_name', '$string_value')";
- $delete_list[] = "( lang_id = {$this->lang_id} AND string_category = '$category_name' AND string_name = '$string_name' )";
- }
- }
- }
-
- if ( $debug )
- {
- echo " Running deletion of old strings...";
- $start = microtime_float();
- }
- $delete_list = implode(" OR\n ", $delete_list);
-
- if ( !empty($delete_list) )
- {
- $sql = "DELETE FROM " . table_prefix . "language_strings WHERE $delete_list;";
-
- // Free some memory
- unset($delete_list);
-
- // Run the query
- $q = $db->sql_query($sql);
- if ( !$q )
- $db->_die('lang.php - couldn\'t kill off them old strings');
- }
-
- if ( $debug )
- {
- $time = round(microtime_float() - $start, 5);
- echo "({$time}s)$br\n";
- }
-
- if ( !empty($insert_list) )
- {
- if ( $debug )
- {
- echo " Inserting strings...";
- $start = microtime_float();
- }
- $insert_list = implode(",\n ", $insert_list);
- $sql = "INSERT INTO " . table_prefix . "language_strings(lang_id, string_category, string_name, string_content) VALUES\n $insert_list;";
-
- // Free some memory
- unset($insert_list);
-
- // Run the query
- $q = $db->sql_query($sql);
- if ( !$q )
- $db->_die('lang.php - couldn\'t insert strings in import()');
-
- if ( $debug )
- {
- $time = round(microtime_float() - $start, 5);
- echo "({$time}s)$br\n";
- }
- }
-
- // YAY! done!
- // This will regenerate the cache file if possible.
- if ( $debug )
- echo " Regenerating cache file$br\n";
- $this->regen_caches();
-
- return true;
- }
-
- /**
- * Refetches the strings and writes out the cache file.
- */
-
- function regen_caches($refetch = true)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- // Refresh the strings in RAM to the latest copies in the DB
- if ( $refetch )
- $this->fetch(false);
-
- // Load the cache manager
- global $cache;
-
- // Store it
- $cache->store("lang_{$this->lang_id}", $this->strings, -1);
-
- // Update timestamp in database
- $q = $db->sql_query('UPDATE ' . table_prefix . 'language SET last_changed = ' . time() . ' WHERE lang_id = ' . $this->lang_id . ';');
- if ( !$q )
- $db->_die('lang.php - updating timestamp on language');
-
- return true;
- }
-
- /**
- * Calls var_export() on whatever, and returns the function's output.
- * @param mixed Whatever you want var_exported. Usually an array.
- * @return string
- */
-
- static function var_export_string($val)
- {
- ob_start();
- var_export($val);
- $contents = ob_get_contents();
- ob_end_clean();
- return $contents;
- }
-
- /**
- * Registers a filter, a function that strings can be passed through to change the string somehow (e.g. htmlspecialchars)
- * @param string Filter name. Lowercase alphanumeric (htmlsafe)
- * @param callback Function to call.
- * @return bool True on success, false if some error occurred
- */
-
- public function register_filter($filter_name, $filter_function)
- {
- if ( !is_string($filter_function) && !is_array($filter_function) )
- {
- return false;
- }
- if ( ( is_string($filter_function) && !function_exists($filter_function) ) || ( is_array($filter_function) && !method_exists(@$filter_function[0], @$filter_function[1]) ) )
- {
- return false;
- }
- if ( !preg_match('/^[a-z0-9_]+$/', $filter_name) )
- {
- return false;
- }
- $this->filters[$filter_name] = $filter_function;
- return true;
- }
-
- /**
- * Fetches a language string from the cache in RAM. If it isn't there, it will call fetch() again and then try. If it still can't find it, it will ask for the string
- * in the default language. If even then the string can't be found, this function will return what was passed to it.
- *
- * This will also templatize strings. If a string contains variables in the format %foo%, you may specify the second parameter as an associative array in the format
- * of 'foo' => 'foo substitute'.
- *
- * @param string ID of the string to fetch. This will always be in the format of category_stringid.
- * @param array Optional. Associative array of substitutions.
- * @return string
- */
-
- function get($string_id, $substitutions = false)
- {
- if ( !is_array($substitutions) )
- $substitutions = array();
- // if this isn't a valid language string ID, just return the string unprocessed.
- if ( !preg_match('/^([a-z0-9]+)((_[a-z0-9]+)+)$/', $string_id) )
- return $string_id;
- return $this->substitute($this->get_uncensored($string_id), $substitutions);
- }
-
- /**
- * The same as get(), but does not perform any substitution or filtering. Used in get() (of course) and in the admin panel, where
- * strings are updated only if they were changed.
- *
- * @param string ID of the string to fetch. This will always be in the format of category_stringid.
- * @param array Optional. Associative array of substitutions.
- * @return string
- */
-
- function get_uncensored($string_id, $substitutions = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- // Extract the category and string ID
- $category = substr($string_id, 0, ( strpos($string_id, '_') ));
- $string_name = substr($string_id, ( strpos($string_id, '_') + 1 ));
- $found = false;
- if ( isset($this->strings[$category]) && isset($this->strings[$category][$string_name]) )
- {
- $found = true;
- $string = $this->strings[$category][$string_name];
- }
- if ( !$found )
- {
- // Ehh, the string wasn't found. Rerun fetch() and try again.
- // Or if it's the installer, no use in refetching, so just fail.
- if ( defined('IN_ENANO_INSTALL') || ( defined('ENANO_INSTALLED') && !@$db->_conn ) )
- {
- return $string_id;
- }
- $this->fetch();
- profiler_log('Language(' . $this->lang_code . '): refetched due to missing string: ' . $string_id);
- if ( isset($this->strings[$category]) && isset($this->strings[$category][$string_name]) )
- {
- $found = true;
- $string = $this->strings[$category][$string_name];
- }
- if ( !$found )
- {
- // STILL not found. Check the default language.
- $lang_default = ( $x = getConfig('default_language') ) ? intval($x) : $this->lang_id;
- if ( $lang_default != $this->lang_id )
- {
- if ( !is_object($this->default) )
- $this->default = new Language($lang_default);
- return $this->default->get_uncensored($string_id);
- }
- }
- }
- if ( !$found )
- {
- // Alright, it's nowhere. Return the input, grumble grumble...
- return $string_id;
- }
- // Found it!
- return $string;
- }
-
- /**
- * Processes substitutions.
- * @param string
- * @param array
- * @return string
- */
-
- function substitute($string, $subs)
- {
- preg_match_all('/%this\.([a-z0-9_]+)((?:\|(?:[a-z0-9_]+))*)%/', $string, $matches);
- if ( count($matches[0]) > 0 )
- {
- foreach ( $matches[1] as $i => $string_id )
- {
- $result = $this->get($string_id);
- $string = str_replace($matches[0][$i], $this->process_filters($result, $matches[2][$i]), $string);
- }
- }
- preg_match_all('/%config\.([a-z0-9_]+)((?:\|(?:[a-z0-9_]+))*)%/', $string, $matches);
- if ( count($matches[0]) > 0 )
- {
- foreach ( $matches[1] as $i => $string_id )
- {
- $result = getConfig($string_id, '');
- $string = str_replace($matches[0][$i], $this->process_filters($result, $matches[2][$i]), $string);
- }
- }
- preg_match_all('/%([a-z0-9_]+)((?:\|(?:[a-z0-9_]+))*)%/', $string, $matches);
- if ( count($matches[0]) > 0 )
- {
- foreach ( $matches[1] as $i => $string_id )
- {
- if ( isset($subs[$string_id]) )
- {
- $string = str_replace($matches[0][$i], $this->process_filters($subs[$string_id], $matches[2][$i]), $string);
- }
- }
- }
- return ( $this->debug ) ? "$string*" : $string;
- }
-
- /**
- * Processes filters to a language string.
- * @param string Unprocessed string
- * @param string Filter list (format: |filter1|filter2|filter3, initial pipe is important); can also be an array if you so desire
- * @return string
- */
-
- function process_filters($string, $filters)
- {
- if ( !empty($filters) )
- {
- $filters = trim($filters, '|');
- $filters = explode('|', $filters);
- foreach ( $filters as $filter )
- {
- if ( isset($this->filters[$filter]) )
- {
- $result = call_user_func($this->filters[$filter], $string);
- if ( is_string($result) )
- {
- $string = $result;
- }
- }
- }
- }
- return $string;
- }
-
+
+ $exported = $this->var_export_string($this->strings);
+ if ( empty($exported) )
+ // Ehh, that's not good
+ $db->_die('lang.php - load_file(): var_export_string() failed');
+
+ fwrite($handle, $exported . '; ?>');
+
+ // Clean up
+ unset($exported, $langdata);
+
+ // Done =)
+ fclose($handle);
+ }
+ }
+
+ /**
+ * Merges a standard language assoc array ($arr[cat][stringid]) with the master in RAM.
+ * @param array
+ */
+
+ function merge($strings)
+ {
+ // This is stupidly simple.
+ foreach ( $strings as $cat_id => $contents )
+ {
+ if ( !isset($this->strings[$cat_id]) || ( isset($this->strings[$cat_id]) && !is_array($this->strings[$cat_id]) ) )
+ $this->strings[$cat_id] = array();
+ foreach ( $contents as $string_id => $string )
+ {
+ $this->strings[$cat_id][$string_id] = $string;
+ }
+ }
+ }
+
+ /**
+ * Imports a JSON-format language file into the database and merges with current strings.
+ * @param string Path to the JSON file to load
+ * @param bool If true, only imports new strings and skips those that already exist. Defaults to false (import all strings)
+ * @param bool Enable debugging output, makes the process over CLI more interesting
+ */
+
+ function import($file, $skip_existing = false, $debug = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( !file_exists($file) )
+ $db->_die('lang.php - can\'t import language file: string file doesn\'t exist');
+
+ if ( $this->lang_id == 0 )
+ $db->_die('lang.php - BUG: trying to perform import when $lang->lang_id == 0');
+
+ if ( $debug )
+ $br = ( isset($_SERVER['REQUEST_URI']) ) ? '
' : '';
+
+ if ( $debug )
+ echo "Importing file: $file$br\n Checking file...$br\n";
+
+ $contents = trim(@file_get_contents($file));
+
+ if ( empty($contents) )
+ $db->_die('lang.php - can\'t load the contents of the language file');
+
+ if ( $debug )
+ echo " Cleaning up JSON$br\n";
+
+ // Trim off all text before and after the starting and ending braces
+ $contents = preg_replace('/^([^{]+)\{/', '{', $contents);
+ $contents = preg_replace('/\}([^}]+)$/', '}', $contents);
+
+ // Correct syntax to be nice to the json parser
+ $contents = enano_clean_json($contents);
+
+ if ( $debug )
+ echo " Decoding JSON stream$br\n";
+
+ try
+ {
+ $langdata = enano_json_decode($contents);
+ }
+ catch(Zend_Json_Exception $e)
+ {
+ $db->_die('lang.php - Exception caught by JSON parser
' . htmlspecialchars(print_r($e, true)) . '
');
+ exit;
+ }
+
+ if ( !is_array($langdata) )
+ {
+ $db->_die('lang.php - invalid or non-well-formed language file');
+ }
+
+ if ( $debug )
+ echo " Starting string import$br\n";
+
+ return $this->import_array($langdata, $skip_existing, $debug);
+ }
+
+ /**
+ * Imports a JSON-format language file into the database and merges with current strings.
+ * @param string Path to plugin file
+ */
+
+ function import_plugin($file)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( !file_exists($file) )
+ $db->_die('lang.php - can\'t import language file: string file doesn\'t exist');
+
+ if ( $this->lang_id == 0 )
+ $db->_die('lang.php - BUG: trying to perform import when $lang->lang_id == 0');
+
+ $block = pluginLoader::parse_plugin_blocks($file, 'language');
+ if ( !is_array($block) )
+ return false;
+ if ( !isset($block[0]) )
+ return false;
+
+ $contents =& $block[0]['value'];
+
+ // Trim off all text before and after the starting and ending braces
+ $contents = enano_trim_json($contents);
+
+ // Correct syntax to be nice to the json parser
+ $contents = enano_clean_json($contents);
+
+ try
+ {
+ $langdata = enano_json_decode($contents);
+ }
+ catch(Zend_Json_Exception $e)
+ {
+ $db->_die('lang.php - Exception caught by JSON parser
' . htmlspecialchars(print_r($e, true)) . '
');
+ exit;
+ }
+
+ if ( !is_array($langdata) )
+ {
+ $db->_die('lang.php - invalid or non-well-formed language file');
+ }
+
+ // Does the plugin support the current language?
+ if ( isset($langdata[$this->lang_code]) )
+ {
+ // Yes, import that
+ return $this->import_array($langdata[$this->lang_code]);
+ }
+
+ // Just import the first language we run across.
+ $supported_langs = array_keys($langdata);
+
+ if ( !isset($supported_langs[0]) )
+ {
+ $db->_die('lang.php - plugin has an invalid or corrupt language block');
+ }
+
+ $first_lang = $supported_langs[0];
+
+ return $this->import_array($langdata[$first_lang], false, true);
+ }
+
+ /**
+ * Performs the actual import of string data.
+ * @param array Parsed JSON object, should be in the form of an array
+ * @param bool If true, only imports new strings and skips those that already exist. Defaults to false.
+ * @param bool Enable debugging output
+ * @access private
+ */
+
+ protected function import_array($langdata, $skip_existing = false, $debug = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( !isset($langdata['categories']) || !isset($langdata['strings']) )
+ $db->_die('lang.php - language file does not contain the proper items');
+
+ if ( $debug )
+ $br = ( isset($_SERVER['REQUEST_URI']) ) ? '
' : '';
+
+ $insert_list = array();
+ $delete_list = array();
+
+ foreach ( $langdata['categories'] as $category )
+ {
+ if ( isset($langdata['strings'][$category]) )
+ {
+ if ( $debug )
+ {
+ $desc = ( isset($langdata['strings']['meta'][$category]) ) ? $langdata['strings']['meta'][$category] : $this->get("meta_$category");
+ echo " Indexing category: $category ({$desc})$br\n";
+ }
+ foreach ( $langdata['strings'][$category] as $string_name => $string_value )
+ {
+ // should we skip this string?
+ if ( isset($this->strings[$category]) && $skip_existing )
+ {
+ if ( isset($this->strings[$category][$string_name]) )
+ {
+ // already exists, skip
+ if ( $debug )
+ echo " Skipping string (already exists): {$category}_{$string_name}$br\n";
+ continue;
+ }
+ }
+ $string_name = $db->escape($string_name);
+ $string_value = $db->escape($string_value);
+ $category_name = $db->escape($category);
+ $insert_list[] = "({$this->lang_id}, '$category_name', '$string_name', '$string_value')";
+ $delete_list[] = "( lang_id = {$this->lang_id} AND string_category = '$category_name' AND string_name = '$string_name' )";
+ }
+ }
+ }
+
+ if ( $debug )
+ {
+ echo " Running deletion of old strings...";
+ $start = microtime_float();
+ }
+ $delete_list = implode(" OR\n ", $delete_list);
+
+ if ( !empty($delete_list) )
+ {
+ $sql = "DELETE FROM " . table_prefix . "language_strings WHERE $delete_list;";
+
+ // Free some memory
+ unset($delete_list);
+
+ // Run the query
+ $q = $db->sql_query($sql);
+ if ( !$q )
+ $db->_die('lang.php - couldn\'t kill off them old strings');
+ }
+
+ if ( $debug )
+ {
+ $time = round(microtime_float() - $start, 5);
+ echo "({$time}s)$br\n";
+ }
+
+ if ( !empty($insert_list) )
+ {
+ if ( $debug )
+ {
+ echo " Inserting strings...";
+ $start = microtime_float();
+ }
+ $insert_list = implode(",\n ", $insert_list);
+ $sql = "INSERT INTO " . table_prefix . "language_strings(lang_id, string_category, string_name, string_content) VALUES\n $insert_list;";
+
+ // Free some memory
+ unset($insert_list);
+
+ // Run the query
+ $q = $db->sql_query($sql);
+ if ( !$q )
+ $db->_die('lang.php - couldn\'t insert strings in import()');
+
+ if ( $debug )
+ {
+ $time = round(microtime_float() - $start, 5);
+ echo "({$time}s)$br\n";
+ }
+ }
+
+ // YAY! done!
+ // This will regenerate the cache file if possible.
+ if ( $debug )
+ echo " Regenerating cache file$br\n";
+ $this->regen_caches();
+
+ return true;
+ }
+
+ /**
+ * Refetches the strings and writes out the cache file.
+ */
+
+ function regen_caches($refetch = true)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ // Refresh the strings in RAM to the latest copies in the DB
+ if ( $refetch )
+ $this->fetch(false);
+
+ // Load the cache manager
+ global $cache;
+
+ // Store it
+ $cache->store("lang_{$this->lang_id}", $this->strings, -1);
+
+ // Update timestamp in database
+ $q = $db->sql_query('UPDATE ' . table_prefix . 'language SET last_changed = ' . time() . ' WHERE lang_id = ' . $this->lang_id . ';');
+ if ( !$q )
+ $db->_die('lang.php - updating timestamp on language');
+
+ return true;
+ }
+
+ /**
+ * Calls var_export() on whatever, and returns the function's output.
+ * @param mixed Whatever you want var_exported. Usually an array.
+ * @return string
+ */
+
+ static function var_export_string($val)
+ {
+ ob_start();
+ var_export($val);
+ $contents = ob_get_contents();
+ ob_end_clean();
+ return $contents;
+ }
+
+ /**
+ * Registers a filter, a function that strings can be passed through to change the string somehow (e.g. htmlspecialchars)
+ * @param string Filter name. Lowercase alphanumeric (htmlsafe)
+ * @param callback Function to call.
+ * @return bool True on success, false if some error occurred
+ */
+
+ public function register_filter($filter_name, $filter_function)
+ {
+ if ( !is_string($filter_function) && !is_array($filter_function) )
+ {
+ return false;
+ }
+ if ( ( is_string($filter_function) && !function_exists($filter_function) ) || ( is_array($filter_function) && !method_exists(@$filter_function[0], @$filter_function[1]) ) )
+ {
+ return false;
+ }
+ if ( !preg_match('/^[a-z0-9_]+$/', $filter_name) )
+ {
+ return false;
+ }
+ $this->filters[$filter_name] = $filter_function;
+ return true;
+ }
+
+ /**
+ * Fetches a language string from the cache in RAM. If it isn't there, it will call fetch() again and then try. If it still can't find it, it will ask for the string
+ * in the default language. If even then the string can't be found, this function will return what was passed to it.
+ *
+ * This will also templatize strings. If a string contains variables in the format %foo%, you may specify the second parameter as an associative array in the format
+ * of 'foo' => 'foo substitute'.
+ *
+ * @param string ID of the string to fetch. This will always be in the format of category_stringid.
+ * @param array Optional. Associative array of substitutions.
+ * @return string
+ */
+
+ function get($string_id, $substitutions = false)
+ {
+ if ( !is_array($substitutions) )
+ $substitutions = array();
+ // if this isn't a valid language string ID, just return the string unprocessed.
+ if ( !preg_match('/^([a-z0-9]+)((_[a-z0-9]+)+)$/', $string_id) )
+ return $string_id;
+ return $this->substitute($this->get_uncensored($string_id), $substitutions);
+ }
+
+ /**
+ * The same as get(), but does not perform any substitution or filtering. Used in get() (of course) and in the admin panel, where
+ * strings are updated only if they were changed.
+ *
+ * @param string ID of the string to fetch. This will always be in the format of category_stringid.
+ * @param array Optional. Associative array of substitutions.
+ * @return string
+ */
+
+ function get_uncensored($string_id, $substitutions = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ // Extract the category and string ID
+ $category = substr($string_id, 0, ( strpos($string_id, '_') ));
+ $string_name = substr($string_id, ( strpos($string_id, '_') + 1 ));
+ $found = false;
+ if ( isset($this->strings[$category]) && isset($this->strings[$category][$string_name]) )
+ {
+ $found = true;
+ $string = $this->strings[$category][$string_name];
+ }
+ if ( !$found )
+ {
+ // Ehh, the string wasn't found. Rerun fetch() and try again.
+ // Or if it's the installer, no use in refetching, so just fail.
+ if ( defined('IN_ENANO_INSTALL') || ( defined('ENANO_INSTALLED') && !@$db->_conn ) )
+ {
+ return $string_id;
+ }
+ $this->fetch();
+ profiler_log('Language(' . $this->lang_code . '): refetched due to missing string: ' . $string_id);
+ if ( isset($this->strings[$category]) && isset($this->strings[$category][$string_name]) )
+ {
+ $found = true;
+ $string = $this->strings[$category][$string_name];
+ }
+ if ( !$found )
+ {
+ // STILL not found. Check the default language.
+ $lang_default = ( $x = getConfig('default_language') ) ? intval($x) : $this->lang_id;
+ if ( $lang_default != $this->lang_id )
+ {
+ if ( !is_object($this->default) )
+ $this->default = new Language($lang_default);
+ return $this->default->get_uncensored($string_id);
+ }
+ }
+ }
+ if ( !$found )
+ {
+ // Alright, it's nowhere. Return the input, grumble grumble...
+ return $string_id;
+ }
+ // Found it!
+ return $string;
+ }
+
+ /**
+ * Processes substitutions.
+ * @param string
+ * @param array
+ * @return string
+ */
+
+ function substitute($string, $subs)
+ {
+ preg_match_all('/%this\.([a-z0-9_]+)((?:\|(?:[a-z0-9_]+))*)%/', $string, $matches);
+ if ( count($matches[0]) > 0 )
+ {
+ foreach ( $matches[1] as $i => $string_id )
+ {
+ $result = $this->get($string_id);
+ $string = str_replace($matches[0][$i], $this->process_filters($result, $matches[2][$i]), $string);
+ }
+ }
+ preg_match_all('/%config\.([a-z0-9_]+)((?:\|(?:[a-z0-9_]+))*)%/', $string, $matches);
+ if ( count($matches[0]) > 0 )
+ {
+ foreach ( $matches[1] as $i => $string_id )
+ {
+ $result = getConfig($string_id, '');
+ $string = str_replace($matches[0][$i], $this->process_filters($result, $matches[2][$i]), $string);
+ }
+ }
+ preg_match_all('/%([a-z0-9_]+)((?:\|(?:[a-z0-9_]+))*)%/', $string, $matches);
+ if ( count($matches[0]) > 0 )
+ {
+ foreach ( $matches[1] as $i => $string_id )
+ {
+ if ( isset($subs[$string_id]) )
+ {
+ $string = str_replace($matches[0][$i], $this->process_filters($subs[$string_id], $matches[2][$i]), $string);
+ }
+ }
+ }
+ return ( $this->debug ) ? "$string*" : $string;
+ }
+
+ /**
+ * Processes filters to a language string.
+ * @param string Unprocessed string
+ * @param string Filter list (format: |filter1|filter2|filter3, initial pipe is important); can also be an array if you so desire
+ * @return string
+ */
+
+ function process_filters($string, $filters)
+ {
+ if ( !empty($filters) )
+ {
+ $filters = trim($filters, '|');
+ $filters = explode('|', $filters);
+ foreach ( $filters as $filter )
+ {
+ if ( isset($this->filters[$filter]) )
+ {
+ $result = call_user_func($this->filters[$filter], $string);
+ if ( is_string($result) )
+ {
+ $string = $result;
+ }
+ }
+ }
+ }
+ return $string;
+ }
+
} // class Language
?>
diff -r de56132c008d -r bdac73ed481e includes/log.php
--- a/includes/log.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/log.php Sun Mar 28 23:10:46 2010 -0400
@@ -22,469 +22,469 @@
class LogDisplay
{
- /**
- * Criteria for the search.
- * Structure:
-
- array(
- array( 'user', 'Dan' ),
- array( 'within', 86400 ),
- array( 'page', 'Main_Page' )
- )
-
- * @var array
- */
-
- var $criteria = array();
-
- /**
- * Adds a criterion for the log display.
- * @param string Criterion type - user, page, or within
- * @param string Value - username, page ID, or (int) within # seconds or (string) number + suffix (suffix: d = day, w = week, m = month, y = year) ex: "1w"
- */
-
- public function add_criterion($criterion, $value)
- {
- switch ( $criterion )
- {
- case 'user':
- case 'page':
- case 'action':
- $this->criteria[] = array($criterion, $value);
- break;
- case 'minor':
- $this->criteria[] = array($criterion, intval($value));
- break;
- case 'within':
- if ( is_int($value) )
- {
- $this->criteria[] = array($criterion, $value);
- }
- else if ( is_string($value) )
- {
- $lastchar = substr($value, -1);
- $amt = intval($value);
- switch($lastchar)
- {
- case 'd':
- $amt = $amt * 86400;
- break;
- case 'w':
- $amt = $amt * 604800;
- break;
- case 'm':
- $amt = $amt * 2592000;
- break;
- case 'y':
- $amt = $amt * 31536000;
- break;
- }
- $this->criteria[] = array($criterion, $amt);
- }
- else
- {
- throw new Exception('Invalid value type for within');
- }
- break;
- default:
- throw new Exception('Unknown criterion type');
- break;
- }
- }
-
- /**
- * Build the necessary SQL query.
- * @param int Optional: offset, defaults to 0
- * @param int Optional: page size, defaults to 0; 0 = don't limit
- */
-
- public function build_sql($offset = 0, $page_size = 0, $just_page_count = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $where_extra = '';
- $where_bits = array(
- 'user' => array(),
- 'page' => array(),
- 'action' => array()
- );
- foreach ( $this->criteria as $criterion )
- {
- list($type, $value) = $criterion;
- switch($type)
- {
- case 'user':
- $where_bits['user'][] = "author = '" . $db->escape(str_replace('_', ' ', $value)) . "'";
- break;
- case 'action':
- if ( $value === 'protect' )
- {
- $where_bits['action'][] = "action = 'prot'";
- $where_bits['action'][] = "action = 'unprot'";
- $where_bits['action'][] = "action = 'semiprot'";
- }
- else
- {
- $where_bits['action'][] = "action = '" . $db->escape($value) . "'";
- }
- break;
- case 'page':
- list($page_id, $namespace) = RenderMan::strToPageId($value);
- $where_bits['page'][] = "page_id = '" . $db->escape($page_id) . "' AND namespace = '" . $db->escape($namespace) . "'";
- break;
- case 'within':
- $threshold = time() - $value;
- $where_extra .= "\n AND time_id > $threshold";
- break;
- case 'minor':
- if ( $value == 1 )
- $where_extra .= "\n AND ( minor_edit = 1 OR action != 'edit' )";
- else
- $where_extra .= "\n AND minor_edit != 1";
- break;
- }
- }
- if ( !empty($where_bits['user']) )
- {
- $where_extra .= "\n AND ( " . implode(" OR ", $where_bits['user']) . " )";
- }
- if ( !empty($where_bits['page']) )
- {
- $where_extra .= "\n AND ( (" . implode(") OR (", $where_bits['page']) . ") )";
- }
- if ( !empty($where_bits['action']) )
- {
- $where_extra .= "\n AND ( (" . implode(") OR (", $where_bits['action']) . ") )";
- }
- if ( ENANO_DBLAYER == 'PGSQL' )
- $limit = ( $page_size > 0 ) ? "\n LIMIT $page_size OFFSET $offset" : '';
- else
- $limit = ( $page_size > 0 ) ? "\n LIMIT $offset, $page_size" : '';
- $columns = ( $just_page_count ) ? 'COUNT(*)' : 'log_id, action, page_id, namespace, CHAR_LENGTH(page_text) AS revision_size, author, author_uid, u.username, time_id, edit_summary, minor_edit';
- $sql = 'SELECT ' . $columns . ' FROM ' . table_prefix . "logs AS l\n"
- . " LEFT JOIN " . table_prefix . "users AS u\n"
- . " ON ( u.user_id = l.author_uid OR u.user_id IS NULL )\n"
- . " WHERE log_type = 'page' AND is_draft != 1$where_extra\n"
- . " GROUP BY log_id, action, page_id, namespace, page_text, author, author_uid, username, time_id, edit_summary, minor_edit\n"
- . " ORDER BY time_id DESC $limit;";
-
- return $sql;
- }
-
- /**
- * Get data!
- * @param int Offset, defaults to 0
- * @param int Page size, if 0 (default) returns entire table (danger Will Robinson!)
- * @return array
- */
-
- public function get_data($offset = 0, $page_size = 0)
- {
- global $db, $session, $paths, $session, $plugins; // Common objects
- $sql = $this->build_sql($offset, $page_size);
- if ( !$db->sql_query($sql) )
- $db->_die();
-
- $return = array();
- $deplist = array();
- $idlist = array();
- while ( $row = $db->fetchrow() )
- {
- $return[ $row['log_id'] ] = $row;
- if ( $row['action'] === 'edit' )
- {
- // This is a page revision; its parent needs to be found
- $pagekey = serialize(array($row['page_id'], $row['namespace']));
- $deplist[$pagekey] = "( page_id = '" . $db->escape($row['page_id']) . "' AND namespace = '" . $db->escape($row['namespace']) . "' AND log_id < {$row['log_id']} )";
- // if we already have a revision from this page in the dataset, we've found its parent
- if ( isset($idlist[$pagekey]) )
- {
- $child =& $return[ $idlist[$pagekey] ];
- $child['parent_size'] = $row['revision_size'];
- $child['parent_revid'] = $row['log_id'];
- $child['parent_time'] = $row['time_id'];
- unset($child);
- }
- $idlist[$pagekey] = $row['log_id'];
- }
- }
-
- // Second query fetches all parent revision data
- // (maybe we have no edits?? check deplist)
-
- if ( !empty($deplist) )
- {
- // FIXME: inefficient. damn GROUP BY for not obeying ORDER BY, it means we can't group and instead have to select
- // all previous revisions of page X and discard all but the first one we find.
- $where_extra = implode("\n OR ", $deplist);
- $sql = 'SELECT log_id, page_id, namespace, CHAR_LENGTH(page_text) AS revision_size, time_id FROM ' . table_prefix . "logs\n"
- . " WHERE log_type = 'page' AND action = 'edit'\n AND ( $where_extra )\n"
- // . " GROUP BY page_id, namespace\n"
- . " ORDER BY log_id DESC;";
- if ( !$db->sql_query($sql) )
- $db->_die();
-
- while ( $row = $db->fetchrow() )
- {
- $pagekey = serialize(array($row['page_id'], $row['namespace']));
- if ( isset($idlist[$pagekey]) )
- {
- $child =& $return[ $idlist[$pagekey] ];
- $child['parent_size'] = $row['revision_size'];
- $child['parent_revid'] = $row['log_id'];
- $child['parent_time'] = $row['time_id'];
- unset($child, $idlist[$pagekey]);
- }
- }
- }
-
- // final iteration goes through all edits and if there's not info on the parent, sets to 0. It also calculates size change.
- foreach ( $return as &$row )
- {
- if ( $row['action'] === 'edit' && !isset($row['parent_revid']) )
- {
- $row['parent_revid'] = 0;
- $row['parent_size'] = 0;
- }
- if ( $row['action'] === 'edit' )
- {
- $row['size_delta'] = $row['revision_size'] - $row['parent_size'];
- }
- }
-
- return array_values($return);
- }
-
- /**
- * Get the number of rows that will be in the result set.
- * @return int
- */
-
- public function get_row_count()
- {
- global $db, $session, $paths, $session, $plugins; // Common objects
-
- if ( !$db->sql_query( $this->build_sql(0, 0, true) ) )
- $db->_die();
-
- list($count) = $db->fetchrow_num();
- return $count;
- }
-
- /**
- * Returns the list of criteria
- * @return array
- */
-
- public function get_criteria()
- {
- return $this->criteria;
- }
-
- /**
- * Formats a result row into pretty HTML.
- * @param array dataset from LogDisplay::get_data()
- * @param bool If true (default), shows action buttons.
- * @param bool If true (default), shows page title; good for integrated displays
- * @static
- * @return string
- */
-
- public static function render_row($row, $show_buttons = true, $show_pagetitle = true)
- {
- global $db, $session, $paths, $session, $plugins; // Common objects
- global $lang;
-
- $html = '';
-
- $pagekey = ( isset($paths->nslist[$row['namespace']]) ) ? $paths->nslist[$row['namespace']] . $row['page_id'] : $row['namespace'] . ':' . $row['page_id'];
- $pagekey = sanitize_page_id($pagekey);
-
- // diff button
- if ( $show_buttons )
- {
- if ( $row['action'] == 'edit' && !empty($row['parent_revid']) )
- {
- $html .= '(';
- $ispage = isPage($pagekey);
-
- if ( $ispage )
- $html .= '';
-
- $html .= $lang->get('pagetools_rc_btn_diff');
-
- if ( $ispage )
- $html .= '';
-
- if ( $ispage )
- $html .= ', ';
-
- $html .= $lang->get('pagetools_rc_btn_view');
-
- if ( $ispage )
- $html .= '';
-
- if ( $row['parent_revid'] > 0 && isPage($pagekey) )
- {
- $html .= ', ' . $lang->get('pagetools_rc_btn_undo') . '';
- }
- $html .= ') ';
- }
- else if ( $row['action'] != 'edit' && ( isPage($pagekey) || $row['action'] == 'delete' ) )
- {
- $html .= '(';
- $html .= '' . $lang->get('pagetools_rc_btn_undo') . '';
- $html .= ') ';
- }
-
- // hist button
- $html .= '(';
- if ( isPage($pagekey) )
- {
- $html .= '';
- }
- $html .= $lang->get('pagetools_rc_btn_hist');
- if ( isPage($pagekey) )
- {
- $html .= '';
- }
- $html .= ') . . ';
- }
-
- if ( $show_pagetitle )
- {
- // new page?
- if ( $row['action'] == 'edit' && empty($row['parent_revid']) )
- {
- $html .= 'N ';
- }
- // minor edit?
- if ( $row['action'] == 'edit' && $row['minor_edit'] )
- {
- $html .= 'm ';
- }
-
- // link to the page
- $cls = ( isPage($pagekey) ) ? '' : ' class="wikilink-nonexistent"';
- $html .= '' . htmlspecialchars(get_page_title_ns($row['page_id'], $row['namespace'])) . '; ';
- }
-
- // date
- $today = time() - ( time() % 86400 );
- $date = MemberlistFormatter::format_date($row['time_id']) . ' ';
- $date .= date('h:i:s', $row['time_id']);
- $html .= "$date . . ";
-
- // size counter
- if ( $row['action'] == 'edit' )
- {
- $css = self::get_css($row['size_delta']);
- $size_change = number_format($row['size_delta']);
- if ( substr($size_change, 0, 1) != '-' )
- $size_change = "+$size_change";
-
- $html .= "({$size_change})";
- $html .= ' . . ';
- }
-
- // link to userpage
- $real_username = $row['author_uid'] > 1 && !empty($row['username']) ? $row['username'] : $row['author'];
- $cls = ( isPage($paths->nslist['User'] . $real_username) ) ? '' : ' class="wikilink-nonexistent"';
- $rank_info = $session->get_user_rank($row['author_uid']);
- $html .= '' . htmlspecialchars($real_username) . ' ';
- $html .= '(';
- $html .= '';
- $html .= $lang->get('pagetools_rc_btn_pm');
- $html .= ', ';
- $html .= '';
- $html .= $lang->get('pagetools_rc_btn_usertalk');
- $html .= '';
- $html .= ') . . ';
-
- // Edit summary
-
- if ( $row['action'] == 'edit' )
- {
- $html .= '(';
- if ( empty($row['edit_summary']) )
- {
- $html .= '' . $lang->get('history_summary_none_given') . '';
- }
- else
- {
- $html .= RenderMan::parse_internal_links(htmlspecialchars($row['edit_summary']));
- }
- $html .= ')';
- }
- else
- {
- switch($row['action'])
- {
- default:
- $html .= $row['action'];
- break;
- case 'rename':
- $html .= $lang->get('log_action_rename', array('old_name' => htmlspecialchars($row['edit_summary'])));
- break;
- case 'create':
- $html .= $lang->get('log_action_create');
- break;
- case 'votereset':
- $html .= $lang->get('log_action_votereset', array('num_votes' => $row['edit_summary'], 'plural' => ( intval($row['edit_summary']) == 1 ? '' : $lang->get('meta_plural'))));
- break;
- case 'prot':
- case 'unprot':
- case 'semiprot':
- case 'delete':
- case 'reupload':
- $stringmap = array(
- 'prot' => 'log_action_protect_full',
- 'unprot' => 'log_action_protect_none',
- 'semiprot' => 'log_action_protect_semi',
- 'delete' => 'log_action_delete',
- 'reupload' => 'log_action_reupload'
- );
-
- if ( $row['edit_summary'] === '__REVERSION__' )
- $reason = '' . $lang->get('log_msg_reversion') . '';
- else if ( $row['action'] == 'reupload' && $row['edit_summary'] === '__ROLLBACK__' )
- $reason = '' . $lang->get('log_msg_file_restored') . '';
- else
- $reason = ( !empty($row['edit_summary']) ) ? htmlspecialchars($row['edit_summary']) : '' . $lang->get('log_msg_no_reason_provided') . '';
-
- $html .= $lang->get($stringmap[$row['action']], array('reason' => $reason));
- }
- }
-
- return $html;
- }
-
- /**
- * Return CSS blurb for size delta
- * @return string
- * @static
- * @access private
- */
-
- private static function get_css($change_size)
- {
- // Hardly changed at all? Return a gray
- if ( $change_size <= 5 && $change_size >= -5 )
- return 'color: #808080;';
- // determine saturation based on size of change (1-500 bytes)
- $change_abs = abs($change_size);
- $index = 0x70 * ( $change_abs / 500 );
- if ( $index > 0x70 )
- $index = 0x70;
- $index = $index + 0x40;
- $index = dechex($index);
- if ( strlen($index) < 2 )
- $index = "0$index";
- $css = ( $change_size > 0 ) ? "color: #00{$index}00;" : "color: #{$index}0000;";
- if ( $change_abs > 500 )
- $css .= ' font-weight: bold;';
- return $css;
- }
+ /**
+ * Criteria for the search.
+ * Structure:
+
+ array(
+ array( 'user', 'Dan' ),
+ array( 'within', 86400 ),
+ array( 'page', 'Main_Page' )
+ )
+
+ * @var array
+ */
+
+ var $criteria = array();
+
+ /**
+ * Adds a criterion for the log display.
+ * @param string Criterion type - user, page, or within
+ * @param string Value - username, page ID, or (int) within # seconds or (string) number + suffix (suffix: d = day, w = week, m = month, y = year) ex: "1w"
+ */
+
+ public function add_criterion($criterion, $value)
+ {
+ switch ( $criterion )
+ {
+ case 'user':
+ case 'page':
+ case 'action':
+ $this->criteria[] = array($criterion, $value);
+ break;
+ case 'minor':
+ $this->criteria[] = array($criterion, intval($value));
+ break;
+ case 'within':
+ if ( is_int($value) )
+ {
+ $this->criteria[] = array($criterion, $value);
+ }
+ else if ( is_string($value) )
+ {
+ $lastchar = substr($value, -1);
+ $amt = intval($value);
+ switch($lastchar)
+ {
+ case 'd':
+ $amt = $amt * 86400;
+ break;
+ case 'w':
+ $amt = $amt * 604800;
+ break;
+ case 'm':
+ $amt = $amt * 2592000;
+ break;
+ case 'y':
+ $amt = $amt * 31536000;
+ break;
+ }
+ $this->criteria[] = array($criterion, $amt);
+ }
+ else
+ {
+ throw new Exception('Invalid value type for within');
+ }
+ break;
+ default:
+ throw new Exception('Unknown criterion type');
+ break;
+ }
+ }
+
+ /**
+ * Build the necessary SQL query.
+ * @param int Optional: offset, defaults to 0
+ * @param int Optional: page size, defaults to 0; 0 = don't limit
+ */
+
+ public function build_sql($offset = 0, $page_size = 0, $just_page_count = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $where_extra = '';
+ $where_bits = array(
+ 'user' => array(),
+ 'page' => array(),
+ 'action' => array()
+ );
+ foreach ( $this->criteria as $criterion )
+ {
+ list($type, $value) = $criterion;
+ switch($type)
+ {
+ case 'user':
+ $where_bits['user'][] = "author = '" . $db->escape(str_replace('_', ' ', $value)) . "'";
+ break;
+ case 'action':
+ if ( $value === 'protect' )
+ {
+ $where_bits['action'][] = "action = 'prot'";
+ $where_bits['action'][] = "action = 'unprot'";
+ $where_bits['action'][] = "action = 'semiprot'";
+ }
+ else
+ {
+ $where_bits['action'][] = "action = '" . $db->escape($value) . "'";
+ }
+ break;
+ case 'page':
+ list($page_id, $namespace) = RenderMan::strToPageId($value);
+ $where_bits['page'][] = "page_id = '" . $db->escape($page_id) . "' AND namespace = '" . $db->escape($namespace) . "'";
+ break;
+ case 'within':
+ $threshold = time() - $value;
+ $where_extra .= "\n AND time_id > $threshold";
+ break;
+ case 'minor':
+ if ( $value == 1 )
+ $where_extra .= "\n AND ( minor_edit = 1 OR action != 'edit' )";
+ else
+ $where_extra .= "\n AND minor_edit != 1";
+ break;
+ }
+ }
+ if ( !empty($where_bits['user']) )
+ {
+ $where_extra .= "\n AND ( " . implode(" OR ", $where_bits['user']) . " )";
+ }
+ if ( !empty($where_bits['page']) )
+ {
+ $where_extra .= "\n AND ( (" . implode(") OR (", $where_bits['page']) . ") )";
+ }
+ if ( !empty($where_bits['action']) )
+ {
+ $where_extra .= "\n AND ( (" . implode(") OR (", $where_bits['action']) . ") )";
+ }
+ if ( ENANO_DBLAYER == 'PGSQL' )
+ $limit = ( $page_size > 0 ) ? "\n LIMIT $page_size OFFSET $offset" : '';
+ else
+ $limit = ( $page_size > 0 ) ? "\n LIMIT $offset, $page_size" : '';
+ $columns = ( $just_page_count ) ? 'COUNT(*)' : 'log_id, action, page_id, namespace, CHAR_LENGTH(page_text) AS revision_size, author, author_uid, u.username, time_id, edit_summary, minor_edit';
+ $sql = 'SELECT ' . $columns . ' FROM ' . table_prefix . "logs AS l\n"
+ . " LEFT JOIN " . table_prefix . "users AS u\n"
+ . " ON ( u.user_id = l.author_uid OR u.user_id IS NULL )\n"
+ . " WHERE log_type = 'page' AND is_draft != 1$where_extra\n"
+ . " GROUP BY log_id, action, page_id, namespace, page_text, author, author_uid, username, time_id, edit_summary, minor_edit\n"
+ . " ORDER BY time_id DESC $limit;";
+
+ return $sql;
+ }
+
+ /**
+ * Get data!
+ * @param int Offset, defaults to 0
+ * @param int Page size, if 0 (default) returns entire table (danger Will Robinson!)
+ * @return array
+ */
+
+ public function get_data($offset = 0, $page_size = 0)
+ {
+ global $db, $session, $paths, $session, $plugins; // Common objects
+ $sql = $this->build_sql($offset, $page_size);
+ if ( !$db->sql_query($sql) )
+ $db->_die();
+
+ $return = array();
+ $deplist = array();
+ $idlist = array();
+ while ( $row = $db->fetchrow() )
+ {
+ $return[ $row['log_id'] ] = $row;
+ if ( $row['action'] === 'edit' )
+ {
+ // This is a page revision; its parent needs to be found
+ $pagekey = serialize(array($row['page_id'], $row['namespace']));
+ $deplist[$pagekey] = "( page_id = '" . $db->escape($row['page_id']) . "' AND namespace = '" . $db->escape($row['namespace']) . "' AND log_id < {$row['log_id']} )";
+ // if we already have a revision from this page in the dataset, we've found its parent
+ if ( isset($idlist[$pagekey]) )
+ {
+ $child =& $return[ $idlist[$pagekey] ];
+ $child['parent_size'] = $row['revision_size'];
+ $child['parent_revid'] = $row['log_id'];
+ $child['parent_time'] = $row['time_id'];
+ unset($child);
+ }
+ $idlist[$pagekey] = $row['log_id'];
+ }
+ }
+
+ // Second query fetches all parent revision data
+ // (maybe we have no edits?? check deplist)
+
+ if ( !empty($deplist) )
+ {
+ // FIXME: inefficient. damn GROUP BY for not obeying ORDER BY, it means we can't group and instead have to select
+ // all previous revisions of page X and discard all but the first one we find.
+ $where_extra = implode("\n OR ", $deplist);
+ $sql = 'SELECT log_id, page_id, namespace, CHAR_LENGTH(page_text) AS revision_size, time_id FROM ' . table_prefix . "logs\n"
+ . " WHERE log_type = 'page' AND action = 'edit'\n AND ( $where_extra )\n"
+ // . " GROUP BY page_id, namespace\n"
+ . " ORDER BY log_id DESC;";
+ if ( !$db->sql_query($sql) )
+ $db->_die();
+
+ while ( $row = $db->fetchrow() )
+ {
+ $pagekey = serialize(array($row['page_id'], $row['namespace']));
+ if ( isset($idlist[$pagekey]) )
+ {
+ $child =& $return[ $idlist[$pagekey] ];
+ $child['parent_size'] = $row['revision_size'];
+ $child['parent_revid'] = $row['log_id'];
+ $child['parent_time'] = $row['time_id'];
+ unset($child, $idlist[$pagekey]);
+ }
+ }
+ }
+
+ // final iteration goes through all edits and if there's not info on the parent, sets to 0. It also calculates size change.
+ foreach ( $return as &$row )
+ {
+ if ( $row['action'] === 'edit' && !isset($row['parent_revid']) )
+ {
+ $row['parent_revid'] = 0;
+ $row['parent_size'] = 0;
+ }
+ if ( $row['action'] === 'edit' )
+ {
+ $row['size_delta'] = $row['revision_size'] - $row['parent_size'];
+ }
+ }
+
+ return array_values($return);
+ }
+
+ /**
+ * Get the number of rows that will be in the result set.
+ * @return int
+ */
+
+ public function get_row_count()
+ {
+ global $db, $session, $paths, $session, $plugins; // Common objects
+
+ if ( !$db->sql_query( $this->build_sql(0, 0, true) ) )
+ $db->_die();
+
+ list($count) = $db->fetchrow_num();
+ return $count;
+ }
+
+ /**
+ * Returns the list of criteria
+ * @return array
+ */
+
+ public function get_criteria()
+ {
+ return $this->criteria;
+ }
+
+ /**
+ * Formats a result row into pretty HTML.
+ * @param array dataset from LogDisplay::get_data()
+ * @param bool If true (default), shows action buttons.
+ * @param bool If true (default), shows page title; good for integrated displays
+ * @static
+ * @return string
+ */
+
+ public static function render_row($row, $show_buttons = true, $show_pagetitle = true)
+ {
+ global $db, $session, $paths, $session, $plugins; // Common objects
+ global $lang;
+
+ $html = '';
+
+ $pagekey = ( isset($paths->nslist[$row['namespace']]) ) ? $paths->nslist[$row['namespace']] . $row['page_id'] : $row['namespace'] . ':' . $row['page_id'];
+ $pagekey = sanitize_page_id($pagekey);
+
+ // diff button
+ if ( $show_buttons )
+ {
+ if ( $row['action'] == 'edit' && !empty($row['parent_revid']) )
+ {
+ $html .= '(';
+ $ispage = isPage($pagekey);
+
+ if ( $ispage )
+ $html .= '';
+
+ $html .= $lang->get('pagetools_rc_btn_diff');
+
+ if ( $ispage )
+ $html .= '';
+
+ if ( $ispage )
+ $html .= ', ';
+
+ $html .= $lang->get('pagetools_rc_btn_view');
+
+ if ( $ispage )
+ $html .= '';
+
+ if ( $row['parent_revid'] > 0 && isPage($pagekey) )
+ {
+ $html .= ', ' . $lang->get('pagetools_rc_btn_undo') . '';
+ }
+ $html .= ') ';
+ }
+ else if ( $row['action'] != 'edit' && ( isPage($pagekey) || $row['action'] == 'delete' ) )
+ {
+ $html .= '(';
+ $html .= '' . $lang->get('pagetools_rc_btn_undo') . '';
+ $html .= ') ';
+ }
+
+ // hist button
+ $html .= '(';
+ if ( isPage($pagekey) )
+ {
+ $html .= '';
+ }
+ $html .= $lang->get('pagetools_rc_btn_hist');
+ if ( isPage($pagekey) )
+ {
+ $html .= '';
+ }
+ $html .= ') . . ';
+ }
+
+ if ( $show_pagetitle )
+ {
+ // new page?
+ if ( $row['action'] == 'edit' && empty($row['parent_revid']) )
+ {
+ $html .= 'N ';
+ }
+ // minor edit?
+ if ( $row['action'] == 'edit' && $row['minor_edit'] )
+ {
+ $html .= 'm ';
+ }
+
+ // link to the page
+ $cls = ( isPage($pagekey) ) ? '' : ' class="wikilink-nonexistent"';
+ $html .= '' . htmlspecialchars(get_page_title_ns($row['page_id'], $row['namespace'])) . '; ';
+ }
+
+ // date
+ $today = time() - ( time() % 86400 );
+ $date = MemberlistFormatter::format_date($row['time_id']) . ' ';
+ $date .= date('h:i:s', $row['time_id']);
+ $html .= "$date . . ";
+
+ // size counter
+ if ( $row['action'] == 'edit' )
+ {
+ $css = self::get_css($row['size_delta']);
+ $size_change = number_format($row['size_delta']);
+ if ( substr($size_change, 0, 1) != '-' )
+ $size_change = "+$size_change";
+
+ $html .= "({$size_change})";
+ $html .= ' . . ';
+ }
+
+ // link to userpage
+ $real_username = $row['author_uid'] > 1 && !empty($row['username']) ? $row['username'] : $row['author'];
+ $cls = ( isPage($paths->nslist['User'] . $real_username) ) ? '' : ' class="wikilink-nonexistent"';
+ $rank_info = $session->get_user_rank($row['author_uid']);
+ $html .= '' . htmlspecialchars($real_username) . ' ';
+ $html .= '(';
+ $html .= '';
+ $html .= $lang->get('pagetools_rc_btn_pm');
+ $html .= ', ';
+ $html .= '';
+ $html .= $lang->get('pagetools_rc_btn_usertalk');
+ $html .= '';
+ $html .= ') . . ';
+
+ // Edit summary
+
+ if ( $row['action'] == 'edit' )
+ {
+ $html .= '(';
+ if ( empty($row['edit_summary']) )
+ {
+ $html .= '' . $lang->get('history_summary_none_given') . '';
+ }
+ else
+ {
+ $html .= RenderMan::parse_internal_links(htmlspecialchars($row['edit_summary']));
+ }
+ $html .= ')';
+ }
+ else
+ {
+ switch($row['action'])
+ {
+ default:
+ $html .= $row['action'];
+ break;
+ case 'rename':
+ $html .= $lang->get('log_action_rename', array('old_name' => htmlspecialchars($row['edit_summary'])));
+ break;
+ case 'create':
+ $html .= $lang->get('log_action_create');
+ break;
+ case 'votereset':
+ $html .= $lang->get('log_action_votereset', array('num_votes' => $row['edit_summary'], 'plural' => ( intval($row['edit_summary']) == 1 ? '' : $lang->get('meta_plural'))));
+ break;
+ case 'prot':
+ case 'unprot':
+ case 'semiprot':
+ case 'delete':
+ case 'reupload':
+ $stringmap = array(
+ 'prot' => 'log_action_protect_full',
+ 'unprot' => 'log_action_protect_none',
+ 'semiprot' => 'log_action_protect_semi',
+ 'delete' => 'log_action_delete',
+ 'reupload' => 'log_action_reupload'
+ );
+
+ if ( $row['edit_summary'] === '__REVERSION__' )
+ $reason = '' . $lang->get('log_msg_reversion') . '';
+ else if ( $row['action'] == 'reupload' && $row['edit_summary'] === '__ROLLBACK__' )
+ $reason = '' . $lang->get('log_msg_file_restored') . '';
+ else
+ $reason = ( !empty($row['edit_summary']) ) ? htmlspecialchars($row['edit_summary']) : '' . $lang->get('log_msg_no_reason_provided') . '';
+
+ $html .= $lang->get($stringmap[$row['action']], array('reason' => $reason));
+ }
+ }
+
+ return $html;
+ }
+
+ /**
+ * Return CSS blurb for size delta
+ * @return string
+ * @static
+ * @access private
+ */
+
+ private static function get_css($change_size)
+ {
+ // Hardly changed at all? Return a gray
+ if ( $change_size <= 5 && $change_size >= -5 )
+ return 'color: #808080;';
+ // determine saturation based on size of change (1-500 bytes)
+ $change_abs = abs($change_size);
+ $index = 0x70 * ( $change_abs / 500 );
+ if ( $index > 0x70 )
+ $index = 0x70;
+ $index = $index + 0x40;
+ $index = dechex($index);
+ if ( strlen($index) < 2 )
+ $index = "0$index";
+ $css = ( $change_size > 0 ) ? "color: #00{$index}00;" : "color: #{$index}0000;";
+ if ( $change_abs > 500 )
+ $css .= ' font-weight: bold;';
+ return $css;
+ }
}
?>
diff -r de56132c008d -r bdac73ed481e includes/math.php
--- a/includes/math.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/math.php Sun Mar 28 23:10:46 2010 -0400
@@ -18,70 +18,70 @@
class EnanoMath_GMP
{
- var $api = 'GMP';
-
- /**
- * Initializes a number to a GMP integer.
- * @param string String representation of the number
- * @param int Base the number is currently in, defaults to 10
- * @return resource
- */
-
- function init($int, $base = 10)
- {
- return ( is_resource($int) ) ? $int : gmp_init($int, $base);
- }
-
- /**
- * Converts a number from a GMP integer to a string
- * @param resource
- * @param int Base, default is 10
- * @return string
- */
-
- function str($int, $base = 10)
- {
- return ( is_string($int) ) ? $int : gmp_strval($int, $base);
- }
-
- /**
- * Converts a number between bases.
- * @param resource BigInt to convert
- * @param int Base to convert from
- * @param int Base to convert to
- */
-
- function basecon($int, $from, $to)
- {
- return $this->init(gmp_strval(gmp_init($this->str($int), $from), $to));
- }
-
- /**
- * Generates a random integer.
- * @param int Length
- * @return resource
- */
-
- function random($len)
- {
- return gmp_random($len / 8);
- }
-
- /**
- * Powmod operation (calculates (a ^ b) mod m)
- * @param resource a
- * @param resource b
- * @param resource m
- * @return resource
- */
-
- function powmod($a, $b, $m)
- {
- $a = $this->init($a);
- $b = $this->init($b);
- $m = $this->init($m);
- return ( function_exists('gmp_powm') ) ? gmp_powm($a, $b, $m) : gmp_mod(gmp_pow($a, $b), $m);
- }
+ var $api = 'GMP';
+
+ /**
+ * Initializes a number to a GMP integer.
+ * @param string String representation of the number
+ * @param int Base the number is currently in, defaults to 10
+ * @return resource
+ */
+
+ function init($int, $base = 10)
+ {
+ return ( is_resource($int) ) ? $int : gmp_init($int, $base);
+ }
+
+ /**
+ * Converts a number from a GMP integer to a string
+ * @param resource
+ * @param int Base, default is 10
+ * @return string
+ */
+
+ function str($int, $base = 10)
+ {
+ return ( is_string($int) ) ? $int : gmp_strval($int, $base);
+ }
+
+ /**
+ * Converts a number between bases.
+ * @param resource BigInt to convert
+ * @param int Base to convert from
+ * @param int Base to convert to
+ */
+
+ function basecon($int, $from, $to)
+ {
+ return $this->init(gmp_strval(gmp_init($this->str($int), $from), $to));
+ }
+
+ /**
+ * Generates a random integer.
+ * @param int Length
+ * @return resource
+ */
+
+ function random($len)
+ {
+ return gmp_random($len / 8);
+ }
+
+ /**
+ * Powmod operation (calculates (a ^ b) mod m)
+ * @param resource a
+ * @param resource b
+ * @param resource m
+ * @return resource
+ */
+
+ function powmod($a, $b, $m)
+ {
+ $a = $this->init($a);
+ $b = $this->init($b);
+ $m = $this->init($m);
+ return ( function_exists('gmp_powm') ) ? gmp_powm($a, $b, $m) : gmp_mod(gmp_pow($a, $b), $m);
+ }
}
/**
@@ -90,70 +90,70 @@
class EnanoMath_BigInt
{
- var $api = 'big_int';
-
- /**
- * Initializes a number to a BigInt integer.
- * @param string String representation of the number
- * @param int Base the number is in, defaults to 10
- * @return resource
- */
-
- function init($int, $base = 10)
- {
- return (is_resource($int)) ? $int : bi_from_str($int, $base);
- }
-
- /**
- * Converts a number from a BigInt integer to a string
- * @param resource
- * @param int Base, default is 10
- * @return string
- */
-
- function str($int, $base = 10)
- {
- return ( is_string($int) ) ? $int : bi_to_str($int, $base);
- }
-
- /**
- * Generates a random integer
- * @param int Length (bits)
- * @return resource
- */
-
- function random($len)
- {
- return bi_rand($len);
- }
-
- /**
- * Converts a number between bases.
- * @param resource BigInt to convert
- * @param int Base to convert from
- * @param int Base to convert to
- */
-
- function basecon($int, $from, $to)
- {
- return bi_base_convert($this->str($int, $from), $from, $to);
- }
-
- /**
- * Powmod operation (calculates (a ^ b) mod m)
- * @param resource a
- * @param resource b
- * @param resource m
- * @return resource
- */
-
- function powmod($a, $b, $m)
- {
- $a = $this->init($a);
- $b = $this->init($b);
- $m = $this->init($m);
- return bi_powmod($a, $b, $m);
- }
+ var $api = 'big_int';
+
+ /**
+ * Initializes a number to a BigInt integer.
+ * @param string String representation of the number
+ * @param int Base the number is in, defaults to 10
+ * @return resource
+ */
+
+ function init($int, $base = 10)
+ {
+ return (is_resource($int)) ? $int : bi_from_str($int, $base);
+ }
+
+ /**
+ * Converts a number from a BigInt integer to a string
+ * @param resource
+ * @param int Base, default is 10
+ * @return string
+ */
+
+ function str($int, $base = 10)
+ {
+ return ( is_string($int) ) ? $int : bi_to_str($int, $base);
+ }
+
+ /**
+ * Generates a random integer
+ * @param int Length (bits)
+ * @return resource
+ */
+
+ function random($len)
+ {
+ return bi_rand($len);
+ }
+
+ /**
+ * Converts a number between bases.
+ * @param resource BigInt to convert
+ * @param int Base to convert from
+ * @param int Base to convert to
+ */
+
+ function basecon($int, $from, $to)
+ {
+ return bi_base_convert($this->str($int, $from), $from, $to);
+ }
+
+ /**
+ * Powmod operation (calculates (a ^ b) mod m)
+ * @param resource a
+ * @param resource b
+ * @param resource m
+ * @return resource
+ */
+
+ function powmod($a, $b, $m)
+ {
+ $a = $this->init($a);
+ $b = $this->init($b);
+ $m = $this->init($m);
+ return bi_powmod($a, $b, $m);
+ }
}
/**
@@ -162,129 +162,129 @@
class EnanoMath_BCMath
{
- var $api = 'BCMath';
-
- /**
- * Initializes a number to a BCMath integer.
- * @param string String representation of the number
- * @param int Base the number is in, defaults to 10
- * @return resource
- */
-
- function init($int, $base = 10)
- {
- return $this->basecon($int, $base, 10);
- }
-
- /**
- * Converts a number from a BCMath integer to a string
- * @param resource
- * @param int Base, default is 10
- * @return string
- */
-
- function str($res)
- {
- return ( is_string($res) ) ? $res : strval($this->basecon($res, 10, $base));
- }
-
- /**
- * Generates a random integer
- * @param int Length in bits
- * @return resource
- */
-
- function random($len)
- {
- $len = 4 * $len;
- $chars = '0123456789abcdef';
- $ret = '';
- for ( $i = 0; $i < $len; $i++ )
- {
- $chid = mt_rand ( 0, strlen($chars) - 1 );
- $chr = $chars{$chid};
- $ret .= $chr;
- }
- return $this->basecon($this->init($ret), 16, 10);
- }
-
- /**
- * Converts a number between bases.
- * @param resource BigInt to convert
- * @param int Base to convert from
- * @param int Base to convert to
- */
-
- function basecon($int, $from, $to)
- {
- if ( $from != 10 )
- $int = $this->_bcmath_base2dec($int, $from);
- if ( $to != 10 )
- $int = $this->_bcmath_dec2base($int, $to);
- return $int;
- }
-
- /**
- * Powmod operation (calculates (a ^ b) mod m)
- * @param resource a
- * @param resource b
- * @param resource m
- * @return resource
- */
-
- function powmod($a, $b, $m)
- {
- $a = $this->init($a);
- $b = $this->init($b);
- $m = $this->init($m);
- return ( function_exists('bcpowmod') ) ? bcpowmod($a, $b, $m) : bcmod( bcpow($a, $b), $m );
- }
-
- // from us.php.net/bc:
- // convert a decimal value to any other base value
- function _bcmath_dec2base($dec,$base,$digits=FALSE) {
- if($base<2 or $base>256) die("Invalid Base: ".$base);
- bcscale(0);
- $value="";
- if(!$digits) $digits=$this->_bcmath_digits($base);
- while($dec>$base-1) {
- $rest=bcmod($dec,$base);
- $dec=bcdiv($dec,$base);
- $value=$digits[$rest].$value;
- }
- $value=$digits[intval($dec)].$value;
- return (string) $value;
- }
-
- // convert another base value to its decimal value
- function _bcmath_base2dec($value,$base,$digits=FALSE) {
- if($base<2 or $base>256) die("Invalid Base: ".$base);
- bcscale(0);
- if($base<37) $value=strtolower($value);
- if(!$digits) $digits=$this->_bcmath_digits($base);
- $size=strlen($value);
- $dec="0";
- for($loop=0;$loop<$size;$loop++) {
- $element=strpos($digits,$value[$loop]);
- $power=bcpow($base,$size-$loop-1);
- $dec=bcadd($dec,bcmul($element,$power));
- }
- return (string) $dec;
- }
-
- function _bcmath_digits($base) {
- if($base>64) {
- $digits="";
- for($loop=0;$loop<256;$loop++) {
- $digits.=chr($loop);
- }
- } else {
- $digits ="0123456789abcdefghijklmnopqrstuvwxyz";
- $digits.="ABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
- }
- $digits=substr($digits,0,$base);
- return (string) $digits;
- }
+ var $api = 'BCMath';
+
+ /**
+ * Initializes a number to a BCMath integer.
+ * @param string String representation of the number
+ * @param int Base the number is in, defaults to 10
+ * @return resource
+ */
+
+ function init($int, $base = 10)
+ {
+ return $this->basecon($int, $base, 10);
+ }
+
+ /**
+ * Converts a number from a BCMath integer to a string
+ * @param resource
+ * @param int Base, default is 10
+ * @return string
+ */
+
+ function str($res)
+ {
+ return ( is_string($res) ) ? $res : strval($this->basecon($res, 10, $base));
+ }
+
+ /**
+ * Generates a random integer
+ * @param int Length in bits
+ * @return resource
+ */
+
+ function random($len)
+ {
+ $len = 4 * $len;
+ $chars = '0123456789abcdef';
+ $ret = '';
+ for ( $i = 0; $i < $len; $i++ )
+ {
+ $chid = mt_rand ( 0, strlen($chars) - 1 );
+ $chr = $chars{$chid};
+ $ret .= $chr;
+ }
+ return $this->basecon($this->init($ret), 16, 10);
+ }
+
+ /**
+ * Converts a number between bases.
+ * @param resource BigInt to convert
+ * @param int Base to convert from
+ * @param int Base to convert to
+ */
+
+ function basecon($int, $from, $to)
+ {
+ if ( $from != 10 )
+ $int = $this->_bcmath_base2dec($int, $from);
+ if ( $to != 10 )
+ $int = $this->_bcmath_dec2base($int, $to);
+ return $int;
+ }
+
+ /**
+ * Powmod operation (calculates (a ^ b) mod m)
+ * @param resource a
+ * @param resource b
+ * @param resource m
+ * @return resource
+ */
+
+ function powmod($a, $b, $m)
+ {
+ $a = $this->init($a);
+ $b = $this->init($b);
+ $m = $this->init($m);
+ return ( function_exists('bcpowmod') ) ? bcpowmod($a, $b, $m) : bcmod( bcpow($a, $b), $m );
+ }
+
+ // from us.php.net/bc:
+ // convert a decimal value to any other base value
+ function _bcmath_dec2base($dec,$base,$digits=FALSE) {
+ if($base<2 or $base>256) die("Invalid Base: ".$base);
+ bcscale(0);
+ $value="";
+ if(!$digits) $digits=$this->_bcmath_digits($base);
+ while($dec>$base-1) {
+ $rest=bcmod($dec,$base);
+ $dec=bcdiv($dec,$base);
+ $value=$digits[$rest].$value;
+ }
+ $value=$digits[intval($dec)].$value;
+ return (string) $value;
+ }
+
+ // convert another base value to its decimal value
+ function _bcmath_base2dec($value,$base,$digits=FALSE) {
+ if($base<2 or $base>256) die("Invalid Base: ".$base);
+ bcscale(0);
+ if($base<37) $value=strtolower($value);
+ if(!$digits) $digits=$this->_bcmath_digits($base);
+ $size=strlen($value);
+ $dec="0";
+ for($loop=0;$loop<$size;$loop++) {
+ $element=strpos($digits,$value[$loop]);
+ $power=bcpow($base,$size-$loop-1);
+ $dec=bcadd($dec,bcmul($element,$power));
+ }
+ return (string) $dec;
+ }
+
+ function _bcmath_digits($base) {
+ if($base>64) {
+ $digits="";
+ for($loop=0;$loop<256;$loop++) {
+ $digits.=chr($loop);
+ }
+ } else {
+ $digits ="0123456789abcdefghijklmnopqrstuvwxyz";
+ $digits.="ABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
+ }
+ $digits=substr($digits,0,$base);
+ return (string) $digits;
+ }
}
/**
@@ -294,14 +294,14 @@
function enanomath_create()
{
- if ( function_exists('gmp_init') )
- return new EnanoMath_GMP();
- else if ( function_exists('bi_from_str') )
- return new EnanoMath_BigInt();
- else if ( function_exists('bcadd') )
- return new EnanoMath_BCMath();
- else
- throw new Exception('dh_err_not_supported');
+ if ( function_exists('gmp_init') )
+ return new EnanoMath_GMP();
+ else if ( function_exists('bi_from_str') )
+ return new EnanoMath_BigInt();
+ else if ( function_exists('bcadd') )
+ return new EnanoMath_BCMath();
+ else
+ throw new Exception('dh_err_not_supported');
}
?>
diff -r de56132c008d -r bdac73ed481e includes/namespaces/api.php
--- a/includes/namespaces/api.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/namespaces/api.php Sun Mar 28 23:10:46 2010 -0400
@@ -13,21 +13,21 @@
class Namespace_API extends Namespace_Default
{
- function send()
- {
- global $output, $session;
- $uri = scriptPath . '/' . $this->page_id;
- if ( $output->naked )
- {
- $sep = ( strstr($uri, '?') ) ? '&' : '?';
- $uri .= "{$sep}noheaders";
- }
- if ( $session->sid_super )
- {
- $sep = ( strstr($uri, '?') ) ? '&' : '?';
- $uri .= "{$sep}auth={$session->sid_super}";
- }
- redirect( $uri, '', '', 0 );
- }
+ function send()
+ {
+ global $output, $session;
+ $uri = scriptPath . '/' . $this->page_id;
+ if ( $output->naked )
+ {
+ $sep = ( strstr($uri, '?') ) ? '&' : '?';
+ $uri .= "{$sep}noheaders";
+ }
+ if ( $session->sid_super )
+ {
+ $sep = ( strstr($uri, '?') ) ? '&' : '?';
+ $uri .= "{$sep}auth={$session->sid_super}";
+ }
+ redirect( $uri, '', '', 0 );
+ }
}
diff -r de56132c008d -r bdac73ed481e includes/namespaces/default.php
--- a/includes/namespaces/default.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/namespaces/default.php Sun Mar 28 23:10:46 2010 -0400
@@ -21,1013 +21,1013 @@
class Namespace_Default
{
- /**
- * Page ID
- * @var string
- */
-
- public $page_id;
-
- /**
- * Namespace
- * @var string
- */
-
- public $namespace;
-
- /**
- * Local copy of the page text
- */
-
- public $text_cache;
-
- /**
- * Revision ID to send. If 0, the latest revision.
- * @var int
- */
-
- public $revision_id = 0;
-
- /**
- * Tracks whether the page exists
- * @var bool
- */
-
- public $exists = false;
-
- /**
- * Page title
- * @var string
- */
-
- public $title = '';
-
- /**
- * PathManager info array ("cdata") for this page. (The one with urlname, name, namespace, delvotes, delvote_ips, protected, visible, etc.)
- * @var array
- */
-
- public $cdata = array();
-
- /**
- * ACL calculation instance for this page.
- * @var object(Session_ACLPageInfo)
- */
-
- public $perms = false;
-
- /**
- * Protection calculation
- * @var bool
- */
-
- public $page_protected = false;
-
- /**
- * Wiki mode calculation
- * @var bool
- */
-
- public $wiki_mode = false;
-
- /**
- * Page conditions. These represent the final decision as to whether an action is allowed or not. They are set to true if ACLs permit AND if
- * the action "makes sense." (e.g., you can't vote to delete a non-wikimode page.)
- * @var array
- */
-
- public $conds = array();
-
- /**
- * Constructor.
- */
-
- public function __construct($page_id, $namespace, $revision_id = 0)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $this->page_id = sanitize_page_id($page_id);
- $this->namespace = $namespace;
- $this->revision_id = intval($revision_id);
-
- // grab the cdata
- $this->build_cdata();
-
- $this->page_protected = $this->cdata['really_protected'] ? true : false;
- switch($this->cdata['wiki_mode'])
- {
- case 0: $this->wiki_mode = false; break;
- case 1: $this->wiki_mode = true; break;
- default: case 2: $this->wiki_mode = getConfig('wiki_mode') == 1; break;
- }
- }
-
- /**
- * Build the page's cdata.
- */
-
- public function build_cdata()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- static $cdata_cache = array();
- $pathskey = $paths->get_pathskey($this->page_id, $this->namespace);
- if ( isset($cdata_cache[$pathskey]) )
- {
- $this->cdata = $cdata_cache[$pathskey];
- $this->exists = $cdata_cache[$pathskey]['page_exists'];
- $this->title = $cdata_cache[$pathskey]['name'];
- return null;
- }
-
- $this->exists = false;
- $ns_char = substr($paths->nslist['Special'], -1);
- $page_name = $this->namespace == 'Article' ? dirtify_page_id($this->page_id) : "{$this->namespace}{$ns_char}" . dirtify_page_id($this->page_id);
- $page_name = str_replace('_', ' ', $page_name);
- $this->title = $page_name;
-
- $this->cdata = array(
- 'name' => $page_name,
- 'urlname' => $this->page_id,
- 'namespace' => $this->namespace,
- 'special' => 0,
- 'visible' => 0,
- 'comments_on' => 1,
- 'protected' => 0,
- 'delvotes' => 0,
- 'delvote_ips' => '',
- 'wiki_mode' => 2,
- 'page_exists' => false,
- 'page_format' => getConfig('default_page_format', 'wikitext')
- );
-
- if ( $data_from_db = Namespace_Default::get_cdata_from_db($this->page_id, $this->namespace) )
- {
- $this->exists = true;
- $this->cdata = $data_from_db;
- $this->cdata['page_exists'] = true;
- $this->title = $this->cdata['name'];
- }
-
- $this->cdata = Namespace_Default::bake_cdata($this->cdata);
-
- $cdata_cache[$pathskey] = $this->cdata;
- }
-
- /**
- * Pulls the page's actual text from the database.
- */
-
- function fetch_text()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( !empty($this->text_cache) )
- {
- return $this->text_cache;
- }
-
- if ( $this->revision_id > 0 && is_int($this->revision_id) )
- {
-
- $q = $db->sql_query('SELECT page_text, char_tag, time_id FROM '.table_prefix.'logs WHERE log_type=\'page\' AND action=\'edit\' AND page_id=\'' . $this->page_id . '\' AND namespace=\'' . $this->namespace . '\' AND log_id=' . $this->revision_id . ';');
- if ( !$q )
- {
- $this->send_error('Error during SQL query.', true);
- }
- if ( $db->numrows() < 1 )
- {
- // Compatibility fix for old pages with dots in the page ID
- if ( strstr($this->page_id, '.2e') )
- {
- $db->free_result();
- $page_id = str_replace('.2e', '.', $this->page_id);
- $q = $db->sql_query('SELECT page_text, char_tag, time_id FROM '.table_prefix.'logs WHERE log_type=\'page\' AND action=\'edit\' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $this->namespace . '\' AND log_id=' . $this->revision_id . ';');
- if ( !$q )
- {
- $this->send_error('Error during SQL query.', true);
- }
- if ( $db->numrows() < 1 )
- {
- $this->page_exists = false;
- return 'err_no_text_rows';
- }
- }
- else
- {
- $this->page_exists = false;
- return 'err_no_text_rows';
- }
- }
- else
- {
- $row = $db->fetchrow();
- }
-
- $db->free_result();
-
- }
- else
- {
- $q = $db->sql_query('SELECT t.page_text, t.char_tag, l.time_id FROM '.table_prefix."page_text AS t\n"
- . " LEFT JOIN " . table_prefix . "logs AS l\n"
- . " ON ( l.page_id = t.page_id AND l.namespace = t.namespace )\n"
- . " WHERE t.page_id='$this->page_id' AND t.namespace='$this->namespace'\n"
- . " ORDER BY l.time_id DESC LIMIT 1;");
- if ( !$q )
- {
- $this->send_error('Error during SQL query.', true);
- }
- if ( $db->numrows() < 1 )
- {
- // Compatibility fix for old pages with dots in the page ID
- if ( strstr($this->page_id, '.2e') )
- {
- $db->free_result();
- $page_id = str_replace('.2e', '.', $this->page_id);
- $q = $db->sql_query('SELECT page_text, char_tag FROM '.table_prefix.'page_text WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $this->namespace . '\';');
- if ( !$q )
- {
- $this->send_error('Error during SQL query.', true);
- }
- if ( $db->numrows() < 1 )
- {
- $this->page_exists = false;
- return 'err_no_text_rows';
- }
- }
- else
- {
- $this->page_exists = false;
- return 'err_no_text_rows';
- }
- }
-
- $row = $db->fetchrow();
- $db->free_result();
-
- }
-
- if ( !empty($row['char_tag']) )
- {
- // This page text entry uses the old text-escaping format
- $from = array(
- "{APOS:{$row['char_tag']}}",
- "{QUOT:{$row['char_tag']}}",
- "{SLASH:{$row['char_tag']}}"
- );
- $to = array("'", '"', '\\');
- $row['page_text'] = str_replace($from, $to, $row['page_text']);
- }
-
- $this->text_cache = $row['page_text'];
-
- if ( isset($row['time_id']) )
- {
- $this->revision_time = intval($row['time_id']);
- }
-
- return $row['page_text'];
- }
-
- /**
- * Send the page.
- */
-
- public function send()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $output;
-
- $output->add_before_footer($this->display_categories());
-
- if ( $this->exists )
- $this->send_from_db();
- else
- {
- // This is the DEPRECATED way to extend namespaces. It's left in only for compatibility with older plugins.
- ob_start();
- $code = $plugins->setHook('page_not_found');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
- $c = ob_get_contents();
- if ( !empty($c) )
- {
- ob_end_clean();
- echo $c;
- }
- else
- {
- $output->header();
- $this->error_404();
- $output->footer();
- }
- }
- }
-
- /**
- * Get a redirect, if there is one.
- * @return mixed Array: Page ID and namespace, associative; bool: false (no redirect)
- */
-
- public function get_redirect()
- {
- $text = $this->fetch_text();
- if ( preg_match('/^#redirect \[\[([^\]]+?)\]\]/i', $text, $match ) )
- {
- list($page_id, $namespace) = RenderMan::strToPageID($match[1]);
- return array(
- 'page_id' => $page_id,
- 'namespace' => $namespace
- );
- }
- return false;
- }
-
- /**
- * The "real" send-the-page function. The reason for this is so other namespaces can re-use the code
- * to fetch the page from the DB while being able to install their own wrappers.
- */
-
- public function send_from_db($incl_inner_headers = true, $send_headers = true)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- global $output;
-
- $text = $this->fetch_text();
-
- profiler_log("Namespace [$this->namespace, $this->page_id]: pulled text from DB");
-
- $text = preg_replace('/([\s]*)__NOBREADCRUMBS__([\s]*)/', '', $text);
- $text = preg_replace('/([\s]*)__NOTOC__([\s]*)/', '', $text);
- $text = preg_replace('/^#redirect \[\[.+?\]\]\s*/i', '', $text);
-
- if ( $send_headers )
- {
- $output->set_title($this->title);
- $output->header();
- }
- $this->do_breadcrumbs();
-
- if ( $incl_inner_headers )
- {
- if ( !$this->perms )
- $this->perms = $session->fetch_page_acl($this->page_id, $this->namespace);
-
- if ( $this->perms->get_permissions('vote_reset') && $this->cdata['delvotes'] > 0)
- {
- $delvote_ips = unserialize($this->cdata['delvote_ips']);
- $hr = htmlspecialchars(implode(', ', $delvote_ips['u']));
-
- $string_id = ( $this->cdata['delvotes'] == 1 ) ? 'delvote_lbl_votes_one' : 'delvote_lbl_votes_plural';
- $string = $lang->get($string_id, array('num_users' => $this->cdata['delvotes']));
-
- echo '
- ' . $lang->get('etc_lbl_notice') . ' ' . $string . '
- ' . $lang->get('delvote_lbl_users_that_voted') . ' ' . $hr . '
- ' . $lang->get('delvote_btn_deletepage') . ' | ' . $lang->get('delvote_btn_resetvotes') . '
- ';
- }
- }
-
- if ( $this->revision_id )
- {
- echo '
- ' . $lang->get('page_msg_archived_title') . '
- ' . $lang->get('page_msg_archived_body', array(
- 'archive_date' => enano_date(ED_DATE, $this->revision_time),
- 'archive_time' => enano_date(ED_TIME, $this->revision_time),
- 'current_link' => makeUrlNS($this->namespace, $this->page_id),
- 'restore_link' => makeUrlNS($this->namespace, $this->page_id, 'do=edit&revid='.$this->revision_id),
- 'restore_onclick' => 'ajaxEditor(\''.$this->revision_id.'\'); return false;',
- )) . '
- ';
- $q = $db->sql_query('SELECT page_format FROM ' . table_prefix . "logs WHERE log_id = {$this->revision_id};");
- if ( !$q )
- $db->_die();
-
- list($page_format) = $db->fetchrow_num();
- $db->free_result();
- }
- else
- {
- $page_format = $this->cdata['page_format'];
- }
-
- $code = $plugins->setHook('pageprocess_render_head');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- $prof_contentevent = profiler_log("Namespace [$this->namespace, $this->page_id]: headers and preprocessing done - about to send content");
-
- if ( $incl_inner_headers )
- {
- if ( $page_format === 'wikitext' )
- {
- $text = '?>' . RenderMan::render($text);
- }
- else
- {
- // Page format is XHTML. This means we want to disable functionality that MCE takes care of, while still retaining
- // the ability to wikilink, the ability to use images, etc. Basically, RENDER_INLINEONLY disables all behavior in
- // the rendering engine/Text_Wiki that conflicts with MCE.
- $text = '?>' . RenderMan::render($text, RENDER_INLINE);
- }
- }
- else
- {
- $text = '?>' . $text;
- $text = preg_replace('/(.*?)<\/nowiki>/s', '\\1', $text);
- }
-
- eval ( $text );
-
- profiler_log("Namespace [$this->namespace, $this->page_id]: content sent", true, $prof_contentevent);
-
- $code = $plugins->setHook('pageprocess_render_tail');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- if ( $incl_inner_headers )
- {
- display_page_footers();
- }
-
- profiler_log("Namespace [$this->namespace, $this->page_id]: sent footers");
-
- if ( $send_headers )
- $output->footer();
- }
-
- /**
- * Echoes out breadcrumb data, if appropriate.
- * @access private
- */
-
- function do_breadcrumbs()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- if ( strpos($this->text_cache, '__NOBREADCRUMBS__') !== false )
- return false;
-
- $mode = getConfig('breadcrumb_mode');
-
- if ( $mode == 'never' )
- // Breadcrumbs are disabled
- return true;
-
- // Minimum depth for breadcrumb display
- $threshold = ( $mode == 'always' ) ? 0 : 1;
-
- $breadcrumb_data = explode('/', $this->page_id);
- if ( count($breadcrumb_data) > $threshold )
- {
- // If we're not on a subpage of the main page, add "Home" to the list
- $show_home = false;
- if ( $mode == 'always' )
- {
- $show_home = true;
- }
- echo '
-
-
- ';
- }
- }
-
- public function error_404()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang, $output;
-
- $userpage = $this->namespace == 'User';
-
- @header('HTTP/1.1 404 Not Found');
-
- $msg = ( $pp = $paths->sysmsg('Page_not_found') ) ? $pp : '{STANDARD404}';
-
- $standard_404 = '';
-
- if ( $userpage )
- {
- $standard_404 .= '' . $lang->get('page_msg_404_title_userpage') . '
- ' . $lang->get('page_msg_404_body_userpage');
- }
- else
- {
- $standard_404 .= '
' . $lang->get('page_msg_404_title') . '
- ' . $lang->get('page_msg_404_body');
- }
- if ( $session->get_permissions('create_page') )
- {
- $standard_404 .= ' ' . $lang->get('page_msg_404_create', array(
- 'create_flags' => 'href="'.makeUrlNS($this->namespace, $this->page_id, 'do=edit', true).'" onclick="ajaxEditor(); return false;"',
- 'mainpage_link' => makeUrl(get_main_page(), false, true)
- ));
- }
- else
- {
- $standard_404 .= ' ' . $lang->get('page_msg_404_gohome', array(
- 'mainpage_link' => makeUrl(get_main_page(), false, true)
- ));
- }
- $standard_404 .= '
';
- if ( $session->get_permissions('history_rollback') )
- {
- $e = $db->sql_query('SELECT * FROM ' . table_prefix . 'logs WHERE action=\'delete\' AND page_id=\'' . $this->page_id . '\' AND namespace=\'' . $this->namespace . '\' ORDER BY time_id DESC;');
- if ( !$e )
- {
- $db->_die('The deletion log could not be selected.');
- }
- if ( $db->numrows() > 0 )
- {
- $r = $db->fetchrow();
- $standard_404 .= '' . $lang->get('page_msg_404_was_deleted', array(
- 'delete_time' => enano_date(ED_DATE | ED_TIME, $r['time_id']),
- 'delete_reason' => htmlspecialchars($r['edit_summary']),
- 'rollback_flags' => 'href="'.makeUrl($paths->page, 'do=rollback&id='.$r['log_id']).'" onclick="ajaxRollback(\''.$r['log_id'].'\'); return false;"'
- ))
- . '
';
- if ( $session->user_level >= USER_LEVEL_ADMIN )
- {
- $standard_404 .= '' . $lang->get('page_msg_404_admin_opts', array(
- 'detag_link' => makeUrl($paths->page, 'do=detag', true)
- ))
- . '
';
- }
- }
- $db->free_result();
- }
- $standard_404 .= '
- ' . $lang->get('page_msg_404_http_response') . '
-
';
-
- $parser = $template->makeParserText($msg);
- $parser->assign_vars(array(
- 'STANDARD404' => $standard_404
- ));
-
- $msg = RenderMan::render($parser->run());
- eval( '?>' . $msg );
- }
-
- /**
- * Display the categories a page is in. If the current page is a category, its contents will also be printed.
- */
-
- function display_categories()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- $html = '';
-
- if ( $this->namespace == 'Category' )
- {
- // Show member pages and subcategories
- $q = $db->sql_query('SELECT p.urlname, p.namespace, p.name, p.namespace=\'Category\' AS is_category FROM '.table_prefix.'categories AS c
- LEFT JOIN '.table_prefix.'pages AS p
- ON ( p.urlname = c.page_id AND p.namespace = c.namespace )
- WHERE c.category_id=\'' . $db->escape($this->page_id) . '\'
- ORDER BY is_category DESC, p.name ASC;');
- if ( !$q )
- {
- $db->_die();
- }
- $html .= '' . $lang->get('onpage_cat_heading_subcategories') . '
';
- $html .= '';
- $html .= '';
- $html .= '';
- $ticker = 0;
- $counter = 0;
- $switched = false;
- $class = 'row1';
- while ( $row = $db->fetchrow($q) )
- {
- if ( $row['is_category'] == 0 && !$switched )
- {
- if ( $counter > 0 )
- {
- // Fill-in
- while ( $ticker < 3 )
- {
- $ticker++;
- $html .= '' . $lang->get('onpage_cat_msg_no_subcategories') . ' ';
- }
- $html .= '
' . "\n\n";
- $html .= '' . $lang->get('onpage_cat_heading_pages') . '
';
- $html .= '';
- $html .= '';
- $html .= '';
- $counter = 0;
- $ticker = -1;
- $switched = true;
- }
- $counter++;
- $ticker++;
- if ( $ticker == 3 )
- {
- $html .= ' ';
- $ticker = 0;
- $class = ( $class == 'row3' ) ? 'row1' : 'row3';
- }
- $html .= ""; // " to workaround stupid jEdit bug
-
- $link = makeUrlNS($row['namespace'], sanitize_page_id($row['urlname']));
- $html .= 'nslist[$row['namespace']] . sanitize_page_id($row['urlname']);
- if ( !isPage( $key ) )
- {
- $html .= ' class="wikilink-nonexistent"';
- }
- $html .= '>';
- $title = get_page_title_ns($row['urlname'], $row['namespace']);
- $html .= htmlspecialchars($title);
- $html .= '';
-
- $html .= " ";
- }
- if ( !$switched )
- {
- if ( $counter > 0 )
- {
- // Fill-in
- while ( $ticker < 2 )
- {
- $ticker++;
- $html .= '' . $lang->get('onpage_cat_msg_no_subcategories') . ' ';
- }
- $html .= '
' . "\n\n";
- $html .= '' . $lang->get('onpage_cat_heading_pages') . '
';
- $html .= '';
- $html .= '';
- $html .= '';
- $counter = 0;
- $ticker = 0;
- $switched = true;
- }
- if ( $counter > 0 )
- {
- // Fill-in
- while ( $ticker < 2 )
- {
- $ticker++;
- $html .= '' . $lang->get('onpage_cat_msg_no_pages') . ' ';
- }
- $html .= '
' . "\n\n";
- }
-
- if ( $this->namespace != 'Special' && $this->namespace != 'Admin' )
- {
- $html .= '';
- $html .= '';
- $html .= '(' . $lang->get('tags_catbox_link') . ')';
- $html .= '';
- $html .= '' . $lang->get('catedit_catbox_lbl_categories') . ' ';
-
- $q = $db->sql_query('SELECT category_id FROM ' . table_prefix . "categories WHERE page_id = '$this->page_id' AND namespace = '$this->namespace';");
- if ( !$q )
- $db->_die();
-
- if ( $row = $db->fetchrow() )
- {
- $list = array();
- do
- {
- $cid = sanitize_page_id($row['category_id']);
- $title = get_page_title_ns($cid, 'Category');
- $link = makeUrlNS('Category', $cid);
- $list[] = '' . htmlspecialchars($title) . '';
- }
- while ( $row = $db->fetchrow($q) );
- $html .= implode(', ', $list);
- }
- else
- {
- $html .= $lang->get('catedit_catbox_lbl_uncategorized');
- }
-
- $can_edit = ( $session->get_permissions('edit_cat') && ( !$paths->page_protected || $session->get_permissions('even_when_protected') ) );
- if ( $can_edit )
- {
- $edit_link = '' . $lang->get('catedit_catbox_link_edit') . '';
- $html .= ' [ ' . $edit_link . ' ]';
- }
-
- $html .= '';
- }
- return $html;
- }
-
- /**
- * Pull in switches as to whether a specific toolbar button should be used or not. This sets things up according to the current page being displayed.
- * @return array Associative
- */
-
- function set_conds()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( !$this->perms )
- $this->perms = $session->fetch_page_acl($this->page_id, $this->namespace);
-
- if ( !$this->perms )
- {
- // We're trying to send a page WAY too early (session hasn't been started yet), such as for a redirect. Send a default set of conds because
- // there's NO way to get permissions to determine anything otherwise. Yes, starting $session here might be dangerous.
- $this->conds = array(
- 'article' => true,
- 'comments' => false,
- 'edit' => false,
- 'viewsource' => false,
- 'history' => false,
- 'rename' => false,
- 'delvote' => false,
- 'resetvotes' => false,
- 'delete' => false,
- 'printable' => false,
- 'protect' => false,
- 'setwikimode' => false,
- 'clearlogs' => false,
- 'password' => false,
- 'acledit' => false,
- 'adminpage' => false
- );
- return $this->conds;
- }
-
- // die('have perms: ' . print_r($this->perms, true) . "\n---------------------------------\nBacktrace:\n" . enano_debug_print_backtrace(true));
-
- $enforce_protection = ( $this->page_protected && ( ( $session->check_acl_scope('even_when_protected', $this->namespace) && !$this->perms->get_permissions('even_when_protected') ) || !$session->check_acl_scope('even_when_protected', $this->namespace) ) );
-
- $conds = array();
-
- // Article: always show
- $conds['article'] = true;
-
- // Discussion: Show if comments are enabled on the site, and if comments are on for this page.
- $conds['comments'] = $this->perms->get_permissions('read') && getConfig('enable_comments', '1')=='1' && $this->cdata['comments_on'] == 1;
-
- // Edit: Show if we have permission to edit the page, and if we don't have protection in effect
- $conds['edit'] = $this->perms->get_permissions('read') && $session->check_acl_scope('edit_page', $this->namespace) && $this->perms->get_permissions('edit_page') && !$enforce_protection;
-
- // View source: Show if we have permission to view source and either ACLs prohibit editing or protection is in effect
- $conds['viewsource'] = $session->check_acl_scope('view_source', $this->namespace) && $this->perms->get_permissions('view_source') && ( !$this->perms->get_permissions('edit_page') || $enforce_protection ) && $this->namespace != 'API';
-
- // History: Show if we have permission to see history and if the page exists
- $conds['history'] = $session->check_acl_scope('history_view', $this->namespace) && $this->exists && $this->perms->get_permissions('history_view');
-
- // Rename: Show if the page exists, if we have permission to rename, and if protection isn't in effect
- $conds['rename'] = $session->check_acl_scope('rename', $this->namespace) && $this->exists && $this->perms->get_permissions('rename') && !$enforce_protection;
-
- // Vote-to-delete: Show if we have Wiki Mode on, if we have permission to vote for deletion, and if the page exists (can't vote to delete a nonexistent page)
- $conds['delvote'] = $this->wiki_mode && $session->check_acl_scope('vote_delete', $this->namespace) && $this->perms->get_permissions('vote_delete') && $this->exists;
-
- // Reset votes: Show if we have Wiki Mode on, if we have permission to reset votes, if the page exists, and if there's at least one vote
- $conds['resetvotes'] = $session->check_acl_scope('vote_reset', $this->namespace) && $this->wiki_mode && $this->exists && $this->perms->get_permissions('vote_reset') && $this->cdata['delvotes'] > 0;
-
- // Delete page: Show if the page exists and if we have permission to delete it
- $conds['delete'] = $session->check_acl_scope('delete_page', $this->namespace) && $this->exists && $this->perms->get_permissions('delete_page');
-
- // Printable view: Show if the page exists
- $conds['printable'] = $this->exists;
-
- // Protect: Show if we have Wiki Mode on, if the page exists, and if we have permission to protect the page.
- $conds['protect'] = $session->check_acl_scope('protect', $this->namespace) && $this->wiki_mode && $this->exists && $this->perms->get_permissions('protect');
-
- // Set Wiki Mode: Show if the page exists and if we have permission to set wiki mode
- $conds['setwikimode'] = $session->check_acl_scope('set_wiki_mode', $this->namespace) && $this->exists && $this->perms->get_permissions('set_wiki_mode');
-
- // Clear logs: Show if we have permission to clear logs
- $conds['clearlogs'] = $session->check_acl_scope('clear_logs', $this->namespace) && $this->perms->get_permissions('clear_logs');
-
- // Set password: a little bit complicated. If there's a password, check for password_reset; else, check for password_set.
- $conds['password'] = empty($this->cdata['password']) ?
- $session->check_acl_scope('password_set', $this->namespace) && $this->perms->get_permissions('password_set') :
- $session->check_acl_scope('password_reset', $this->namespace) && $this->perms->get_permissions('password_reset');
-
- // Edit ACLs: Show if this is a non-Enano page that's calling the Enano API and (a) if we have permissions to edit ACLs or (b) we're an admin AND ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL is on
- $conds['acledit'] = $this->namespace != 'API' && $session->check_acl_scope('edit_acl', $this->namespace) && ( $this->perms->get_permissions('edit_acl') || ( defined('ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL') && $session->user_level >= USER_LEVEL_ADMIN ) );
-
- // Admin page: Show if the page exists and if we're an admin
- $conds['adminpage'] = $session->user_level >= USER_LEVEL_ADMIN && $this->exists;
-
- // Allow plugins to change stuff
- $code = $plugins->setHook('page_conds_set');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- $this->conds = $conds;
- }
-
- /**
- * Return page conditions
- * @return array
- */
-
- public function get_conds()
- {
- if ( empty($this->conds) )
- $this->set_conds();
-
- return $this->conds;
- }
-
- /**
- * Just tell us if the current page exists or not.
- * @return bool
- */
-
- public function exists()
- {
- return $this->exists;
- }
-
- /**
- * Return cdata
- * @return array
- */
-
- public function get_cdata()
- {
- return $this->cdata;
- }
-
- /**
- * Bake, or finalize the processing of, a cdata array.
- * @static
- * @access public
- */
-
- public static function bake_cdata($cdata)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- // urlname_nons is the actual page_id.
- $cdata['urlname_nons'] = $cdata['urlname'];
- if ( isset($paths->nslist[ $cdata['namespace'] ]) )
- {
- $cdata['urlname'] = $paths->nslist[ $cdata['namespace'] ] . $cdata['urlname'];
- }
- else
- {
- $ns_char = substr($paths->nslist['Special'], -1);
- $cdata['urlname'] = $cdata['namespace'] . $ns_char . $cdata['urlname'];
- }
-
- // add missing keys
- $defaults = array(
- 'special' => 0,
- 'visible' => 0,
- 'comments_on' => 1,
- 'protected' => 0,
- 'delvotes' => 0,
- 'delvote_ips' => serialize(array()),
- 'wiki_mode' => 2,
- 'page_format' => getConfig('default_page_format', 'wikitext')
- );
- foreach ( $defaults as $key => $value )
- {
- if ( !isset($cdata[$key]) )
- $cdata[$key] = $value;
- }
-
- // fix up deletion votes
- if ( empty($cdata['delvotes']) )
- $cdata['delvotes'] = 0;
-
- // fix up deletion vote IP list
- if ( empty($cdata['delvote_ips']) )
- $cdata['delvote_ips'] = serialize(array());
-
- // calculate wiki mode
- $cdata['really_wiki_mode'] = ( $cdata['wiki_mode'] == 1 || ( $cdata['wiki_mode'] == 2 && getConfig('wiki_mode', 0) == 1 ) );
-
- // calculate protection
- $cdata['really_protected'] = ( $cdata['protected'] > 0 );
- if ( $cdata['protected'] == 2 )
- {
- $cdata['really_protected'] = !$session->user_logged_in || ( $session->user_logged_in && $session->reg_time + 86400*4 > time() );
- }
-
- return $cdata;
- }
-
- /**
- * Grabs raw (unbaked) cdata from the database, caching if possible.
- * @param string Page ID
- * @param string Namespace.
- * @static
- */
-
- public static function get_cdata_from_db($page_id, $namespace)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- static $cache = array();
-
- $pathskey = $paths->get_pathskey($page_id, $namespace);
- if ( isset($cache[$pathskey]) )
- return $cache[$pathskey];
-
- $page_id_db = $db->escape($page_id);
- $namespace_db = $db->escape($namespace);
-
- $q = $db->sql_query('SELECT p.*'
- . ' FROM ' . table_prefix . "pages AS p\n"
- . " WHERE p.urlname = '$page_id_db' AND p.namespace = '$namespace_db'\n"
- . " GROUP BY p.urlname, p.name, p.namespace, p.page_order, p.special, p.visible, p.protected, p.wiki_mode, p.comments_on, p.delvotes, p.delvote_ips, p.page_format, p.password;");
-
- if ( !$q )
- $db->_die();
-
- if ( $db->numrows() < 1 )
- {
- $db->free_result();
- $cache[$pathskey] = false;
- return false;
- }
-
- $row = $db->fetchrow();
-
- // Get comment counts
- // FIXME: Apparently there's a bit of recursion in here. Fetching permissions depends on this cdata function.
- // Perhaps we should eliminate session's dependency on cdata? (What is it used for?)
- $q = $db->sql_query('SELECT approved FROM ' . table_prefix . "comments WHERE page_id = '$page_id_db' AND namespace = '$namespace_db';");
- // yay parallel assignment
- $row['comments_approved'] = $row['comments_unapproved'] = $row['comments_spam'] = 0;
- while ( $commentrow = $db->fetchrow() )
- switch($commentrow['approved'])
- {
- case COMMENT_APPROVED:
- default:
- $row['comments_approved']++;
- break;
- case COMMENT_UNAPPROVED:
- $row['comments_unapproved']++;
- break;
- case COMMENT_SPAM:
- $row['comments_spam']++;
- break;
- }
-
- $cache[$pathskey] = $row;
- return $row;
- }
+ /**
+ * Page ID
+ * @var string
+ */
+
+ public $page_id;
+
+ /**
+ * Namespace
+ * @var string
+ */
+
+ public $namespace;
+
+ /**
+ * Local copy of the page text
+ */
+
+ public $text_cache;
+
+ /**
+ * Revision ID to send. If 0, the latest revision.
+ * @var int
+ */
+
+ public $revision_id = 0;
+
+ /**
+ * Tracks whether the page exists
+ * @var bool
+ */
+
+ public $exists = false;
+
+ /**
+ * Page title
+ * @var string
+ */
+
+ public $title = '';
+
+ /**
+ * PathManager info array ("cdata") for this page. (The one with urlname, name, namespace, delvotes, delvote_ips, protected, visible, etc.)
+ * @var array
+ */
+
+ public $cdata = array();
+
+ /**
+ * ACL calculation instance for this page.
+ * @var object(Session_ACLPageInfo)
+ */
+
+ public $perms = false;
+
+ /**
+ * Protection calculation
+ * @var bool
+ */
+
+ public $page_protected = false;
+
+ /**
+ * Wiki mode calculation
+ * @var bool
+ */
+
+ public $wiki_mode = false;
+
+ /**
+ * Page conditions. These represent the final decision as to whether an action is allowed or not. They are set to true if ACLs permit AND if
+ * the action "makes sense." (e.g., you can't vote to delete a non-wikimode page.)
+ * @var array
+ */
+
+ public $conds = array();
+
+ /**
+ * Constructor.
+ */
+
+ public function __construct($page_id, $namespace, $revision_id = 0)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $this->page_id = sanitize_page_id($page_id);
+ $this->namespace = $namespace;
+ $this->revision_id = intval($revision_id);
+
+ // grab the cdata
+ $this->build_cdata();
+
+ $this->page_protected = $this->cdata['really_protected'] ? true : false;
+ switch($this->cdata['wiki_mode'])
+ {
+ case 0: $this->wiki_mode = false; break;
+ case 1: $this->wiki_mode = true; break;
+ default: case 2: $this->wiki_mode = getConfig('wiki_mode') == 1; break;
+ }
+ }
+
+ /**
+ * Build the page's cdata.
+ */
+
+ public function build_cdata()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ static $cdata_cache = array();
+ $pathskey = $paths->get_pathskey($this->page_id, $this->namespace);
+ if ( isset($cdata_cache[$pathskey]) )
+ {
+ $this->cdata = $cdata_cache[$pathskey];
+ $this->exists = $cdata_cache[$pathskey]['page_exists'];
+ $this->title = $cdata_cache[$pathskey]['name'];
+ return null;
+ }
+
+ $this->exists = false;
+ $ns_char = substr($paths->nslist['Special'], -1);
+ $page_name = $this->namespace == 'Article' ? dirtify_page_id($this->page_id) : "{$this->namespace}{$ns_char}" . dirtify_page_id($this->page_id);
+ $page_name = str_replace('_', ' ', $page_name);
+ $this->title = $page_name;
+
+ $this->cdata = array(
+ 'name' => $page_name,
+ 'urlname' => $this->page_id,
+ 'namespace' => $this->namespace,
+ 'special' => 0,
+ 'visible' => 0,
+ 'comments_on' => 1,
+ 'protected' => 0,
+ 'delvotes' => 0,
+ 'delvote_ips' => '',
+ 'wiki_mode' => 2,
+ 'page_exists' => false,
+ 'page_format' => getConfig('default_page_format', 'wikitext')
+ );
+
+ if ( $data_from_db = Namespace_Default::get_cdata_from_db($this->page_id, $this->namespace) )
+ {
+ $this->exists = true;
+ $this->cdata = $data_from_db;
+ $this->cdata['page_exists'] = true;
+ $this->title = $this->cdata['name'];
+ }
+
+ $this->cdata = Namespace_Default::bake_cdata($this->cdata);
+
+ $cdata_cache[$pathskey] = $this->cdata;
+ }
+
+ /**
+ * Pulls the page's actual text from the database.
+ */
+
+ function fetch_text()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( !empty($this->text_cache) )
+ {
+ return $this->text_cache;
+ }
+
+ if ( $this->revision_id > 0 && is_int($this->revision_id) )
+ {
+
+ $q = $db->sql_query('SELECT page_text, char_tag, time_id FROM '.table_prefix.'logs WHERE log_type=\'page\' AND action=\'edit\' AND page_id=\'' . $this->page_id . '\' AND namespace=\'' . $this->namespace . '\' AND log_id=' . $this->revision_id . ';');
+ if ( !$q )
+ {
+ $this->send_error('Error during SQL query.', true);
+ }
+ if ( $db->numrows() < 1 )
+ {
+ // Compatibility fix for old pages with dots in the page ID
+ if ( strstr($this->page_id, '.2e') )
+ {
+ $db->free_result();
+ $page_id = str_replace('.2e', '.', $this->page_id);
+ $q = $db->sql_query('SELECT page_text, char_tag, time_id FROM '.table_prefix.'logs WHERE log_type=\'page\' AND action=\'edit\' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $this->namespace . '\' AND log_id=' . $this->revision_id . ';');
+ if ( !$q )
+ {
+ $this->send_error('Error during SQL query.', true);
+ }
+ if ( $db->numrows() < 1 )
+ {
+ $this->page_exists = false;
+ return 'err_no_text_rows';
+ }
+ }
+ else
+ {
+ $this->page_exists = false;
+ return 'err_no_text_rows';
+ }
+ }
+ else
+ {
+ $row = $db->fetchrow();
+ }
+
+ $db->free_result();
+
+ }
+ else
+ {
+ $q = $db->sql_query('SELECT t.page_text, t.char_tag, l.time_id FROM '.table_prefix."page_text AS t\n"
+ . " LEFT JOIN " . table_prefix . "logs AS l\n"
+ . " ON ( l.page_id = t.page_id AND l.namespace = t.namespace )\n"
+ . " WHERE t.page_id='$this->page_id' AND t.namespace='$this->namespace'\n"
+ . " ORDER BY l.time_id DESC LIMIT 1;");
+ if ( !$q )
+ {
+ $this->send_error('Error during SQL query.', true);
+ }
+ if ( $db->numrows() < 1 )
+ {
+ // Compatibility fix for old pages with dots in the page ID
+ if ( strstr($this->page_id, '.2e') )
+ {
+ $db->free_result();
+ $page_id = str_replace('.2e', '.', $this->page_id);
+ $q = $db->sql_query('SELECT page_text, char_tag FROM '.table_prefix.'page_text WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $this->namespace . '\';');
+ if ( !$q )
+ {
+ $this->send_error('Error during SQL query.', true);
+ }
+ if ( $db->numrows() < 1 )
+ {
+ $this->page_exists = false;
+ return 'err_no_text_rows';
+ }
+ }
+ else
+ {
+ $this->page_exists = false;
+ return 'err_no_text_rows';
+ }
+ }
+
+ $row = $db->fetchrow();
+ $db->free_result();
+
+ }
+
+ if ( !empty($row['char_tag']) )
+ {
+ // This page text entry uses the old text-escaping format
+ $from = array(
+ "{APOS:{$row['char_tag']}}",
+ "{QUOT:{$row['char_tag']}}",
+ "{SLASH:{$row['char_tag']}}"
+ );
+ $to = array("'", '"', '\\');
+ $row['page_text'] = str_replace($from, $to, $row['page_text']);
+ }
+
+ $this->text_cache = $row['page_text'];
+
+ if ( isset($row['time_id']) )
+ {
+ $this->revision_time = intval($row['time_id']);
+ }
+
+ return $row['page_text'];
+ }
+
+ /**
+ * Send the page.
+ */
+
+ public function send()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $output;
+
+ $output->add_before_footer($this->display_categories());
+
+ if ( $this->exists )
+ $this->send_from_db();
+ else
+ {
+ // This is the DEPRECATED way to extend namespaces. It's left in only for compatibility with older plugins.
+ ob_start();
+ $code = $plugins->setHook('page_not_found');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+ $c = ob_get_contents();
+ if ( !empty($c) )
+ {
+ ob_end_clean();
+ echo $c;
+ }
+ else
+ {
+ $output->header();
+ $this->error_404();
+ $output->footer();
+ }
+ }
+ }
+
+ /**
+ * Get a redirect, if there is one.
+ * @return mixed Array: Page ID and namespace, associative; bool: false (no redirect)
+ */
+
+ public function get_redirect()
+ {
+ $text = $this->fetch_text();
+ if ( preg_match('/^#redirect \[\[([^\]]+?)\]\]/i', $text, $match ) )
+ {
+ list($page_id, $namespace) = RenderMan::strToPageID($match[1]);
+ return array(
+ 'page_id' => $page_id,
+ 'namespace' => $namespace
+ );
+ }
+ return false;
+ }
+
+ /**
+ * The "real" send-the-page function. The reason for this is so other namespaces can re-use the code
+ * to fetch the page from the DB while being able to install their own wrappers.
+ */
+
+ public function send_from_db($incl_inner_headers = true, $send_headers = true)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+ global $output;
+
+ $text = $this->fetch_text();
+
+ profiler_log("Namespace [$this->namespace, $this->page_id]: pulled text from DB");
+
+ $text = preg_replace('/([\s]*)__NOBREADCRUMBS__([\s]*)/', '', $text);
+ $text = preg_replace('/([\s]*)__NOTOC__([\s]*)/', '', $text);
+ $text = preg_replace('/^#redirect \[\[.+?\]\]\s*/i', '', $text);
+
+ if ( $send_headers )
+ {
+ $output->set_title($this->title);
+ $output->header();
+ }
+ $this->do_breadcrumbs();
+
+ if ( $incl_inner_headers )
+ {
+ if ( !$this->perms )
+ $this->perms = $session->fetch_page_acl($this->page_id, $this->namespace);
+
+ if ( $this->perms->get_permissions('vote_reset') && $this->cdata['delvotes'] > 0)
+ {
+ $delvote_ips = unserialize($this->cdata['delvote_ips']);
+ $hr = htmlspecialchars(implode(', ', $delvote_ips['u']));
+
+ $string_id = ( $this->cdata['delvotes'] == 1 ) ? 'delvote_lbl_votes_one' : 'delvote_lbl_votes_plural';
+ $string = $lang->get($string_id, array('num_users' => $this->cdata['delvotes']));
+
+ echo '
+ ' . $lang->get('etc_lbl_notice') . ' ' . $string . '
+ ' . $lang->get('delvote_lbl_users_that_voted') . ' ' . $hr . '
+ ' . $lang->get('delvote_btn_deletepage') . ' | ' . $lang->get('delvote_btn_resetvotes') . '
+ ';
+ }
+ }
+
+ if ( $this->revision_id )
+ {
+ echo '
+ ' . $lang->get('page_msg_archived_title') . '
+ ' . $lang->get('page_msg_archived_body', array(
+ 'archive_date' => enano_date(ED_DATE, $this->revision_time),
+ 'archive_time' => enano_date(ED_TIME, $this->revision_time),
+ 'current_link' => makeUrlNS($this->namespace, $this->page_id),
+ 'restore_link' => makeUrlNS($this->namespace, $this->page_id, 'do=edit&revid='.$this->revision_id),
+ 'restore_onclick' => 'ajaxEditor(\''.$this->revision_id.'\'); return false;',
+ )) . '
+ ';
+ $q = $db->sql_query('SELECT page_format FROM ' . table_prefix . "logs WHERE log_id = {$this->revision_id};");
+ if ( !$q )
+ $db->_die();
+
+ list($page_format) = $db->fetchrow_num();
+ $db->free_result();
+ }
+ else
+ {
+ $page_format = $this->cdata['page_format'];
+ }
+
+ $code = $plugins->setHook('pageprocess_render_head');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ $prof_contentevent = profiler_log("Namespace [$this->namespace, $this->page_id]: headers and preprocessing done - about to send content");
+
+ if ( $incl_inner_headers )
+ {
+ if ( $page_format === 'wikitext' )
+ {
+ $text = '?>' . RenderMan::render($text);
+ }
+ else
+ {
+ // Page format is XHTML. This means we want to disable functionality that MCE takes care of, while still retaining
+ // the ability to wikilink, the ability to use images, etc. Basically, RENDER_INLINEONLY disables all behavior in
+ // the rendering engine/Text_Wiki that conflicts with MCE.
+ $text = '?>' . RenderMan::render($text, RENDER_INLINE);
+ }
+ }
+ else
+ {
+ $text = '?>' . $text;
+ $text = preg_replace('/(.*?)<\/nowiki>/s', '\\1', $text);
+ }
+
+ eval ( $text );
+
+ profiler_log("Namespace [$this->namespace, $this->page_id]: content sent", true, $prof_contentevent);
+
+ $code = $plugins->setHook('pageprocess_render_tail');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ if ( $incl_inner_headers )
+ {
+ display_page_footers();
+ }
+
+ profiler_log("Namespace [$this->namespace, $this->page_id]: sent footers");
+
+ if ( $send_headers )
+ $output->footer();
+ }
+
+ /**
+ * Echoes out breadcrumb data, if appropriate.
+ * @access private
+ */
+
+ function do_breadcrumbs()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ if ( strpos($this->text_cache, '__NOBREADCRUMBS__') !== false )
+ return false;
+
+ $mode = getConfig('breadcrumb_mode');
+
+ if ( $mode == 'never' )
+ // Breadcrumbs are disabled
+ return true;
+
+ // Minimum depth for breadcrumb display
+ $threshold = ( $mode == 'always' ) ? 0 : 1;
+
+ $breadcrumb_data = explode('/', $this->page_id);
+ if ( count($breadcrumb_data) > $threshold )
+ {
+ // If we're not on a subpage of the main page, add "Home" to the list
+ $show_home = false;
+ if ( $mode == 'always' )
+ {
+ $show_home = true;
+ }
+ echo '
+
+
+ ';
+ }
+ }
+
+ public function error_404()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang, $output;
+
+ $userpage = $this->namespace == 'User';
+
+ @header('HTTP/1.1 404 Not Found');
+
+ $msg = ( $pp = $paths->sysmsg('Page_not_found') ) ? $pp : '{STANDARD404}';
+
+ $standard_404 = '';
+
+ if ( $userpage )
+ {
+ $standard_404 .= '' . $lang->get('page_msg_404_title_userpage') . '
+ ' . $lang->get('page_msg_404_body_userpage');
+ }
+ else
+ {
+ $standard_404 .= '
' . $lang->get('page_msg_404_title') . '
+ ' . $lang->get('page_msg_404_body');
+ }
+ if ( $session->get_permissions('create_page') )
+ {
+ $standard_404 .= ' ' . $lang->get('page_msg_404_create', array(
+ 'create_flags' => 'href="'.makeUrlNS($this->namespace, $this->page_id, 'do=edit', true).'" onclick="ajaxEditor(); return false;"',
+ 'mainpage_link' => makeUrl(get_main_page(), false, true)
+ ));
+ }
+ else
+ {
+ $standard_404 .= ' ' . $lang->get('page_msg_404_gohome', array(
+ 'mainpage_link' => makeUrl(get_main_page(), false, true)
+ ));
+ }
+ $standard_404 .= '
';
+ if ( $session->get_permissions('history_rollback') )
+ {
+ $e = $db->sql_query('SELECT * FROM ' . table_prefix . 'logs WHERE action=\'delete\' AND page_id=\'' . $this->page_id . '\' AND namespace=\'' . $this->namespace . '\' ORDER BY time_id DESC;');
+ if ( !$e )
+ {
+ $db->_die('The deletion log could not be selected.');
+ }
+ if ( $db->numrows() > 0 )
+ {
+ $r = $db->fetchrow();
+ $standard_404 .= '' . $lang->get('page_msg_404_was_deleted', array(
+ 'delete_time' => enano_date(ED_DATE | ED_TIME, $r['time_id']),
+ 'delete_reason' => htmlspecialchars($r['edit_summary']),
+ 'rollback_flags' => 'href="'.makeUrl($paths->page, 'do=rollback&id='.$r['log_id']).'" onclick="ajaxRollback(\''.$r['log_id'].'\'); return false;"'
+ ))
+ . '
';
+ if ( $session->user_level >= USER_LEVEL_ADMIN )
+ {
+ $standard_404 .= '' . $lang->get('page_msg_404_admin_opts', array(
+ 'detag_link' => makeUrl($paths->page, 'do=detag', true)
+ ))
+ . '
';
+ }
+ }
+ $db->free_result();
+ }
+ $standard_404 .= '
+ ' . $lang->get('page_msg_404_http_response') . '
+
';
+
+ $parser = $template->makeParserText($msg);
+ $parser->assign_vars(array(
+ 'STANDARD404' => $standard_404
+ ));
+
+ $msg = RenderMan::render($parser->run());
+ eval( '?>' . $msg );
+ }
+
+ /**
+ * Display the categories a page is in. If the current page is a category, its contents will also be printed.
+ */
+
+ function display_categories()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ $html = '';
+
+ if ( $this->namespace == 'Category' )
+ {
+ // Show member pages and subcategories
+ $q = $db->sql_query('SELECT p.urlname, p.namespace, p.name, p.namespace=\'Category\' AS is_category FROM '.table_prefix.'categories AS c
+ LEFT JOIN '.table_prefix.'pages AS p
+ ON ( p.urlname = c.page_id AND p.namespace = c.namespace )
+ WHERE c.category_id=\'' . $db->escape($this->page_id) . '\'
+ ORDER BY is_category DESC, p.name ASC;');
+ if ( !$q )
+ {
+ $db->_die();
+ }
+ $html .= '' . $lang->get('onpage_cat_heading_subcategories') . '
';
+ $html .= '';
+ $html .= '';
+ $html .= '';
+ $ticker = 0;
+ $counter = 0;
+ $switched = false;
+ $class = 'row1';
+ while ( $row = $db->fetchrow($q) )
+ {
+ if ( $row['is_category'] == 0 && !$switched )
+ {
+ if ( $counter > 0 )
+ {
+ // Fill-in
+ while ( $ticker < 3 )
+ {
+ $ticker++;
+ $html .= '' . $lang->get('onpage_cat_msg_no_subcategories') . ' ';
+ }
+ $html .= '
' . "\n\n";
+ $html .= '' . $lang->get('onpage_cat_heading_pages') . '
';
+ $html .= '';
+ $html .= '';
+ $html .= '';
+ $counter = 0;
+ $ticker = -1;
+ $switched = true;
+ }
+ $counter++;
+ $ticker++;
+ if ( $ticker == 3 )
+ {
+ $html .= ' ';
+ $ticker = 0;
+ $class = ( $class == 'row3' ) ? 'row1' : 'row3';
+ }
+ $html .= ""; // " to workaround stupid jEdit bug
+
+ $link = makeUrlNS($row['namespace'], sanitize_page_id($row['urlname']));
+ $html .= 'nslist[$row['namespace']] . sanitize_page_id($row['urlname']);
+ if ( !isPage( $key ) )
+ {
+ $html .= ' class="wikilink-nonexistent"';
+ }
+ $html .= '>';
+ $title = get_page_title_ns($row['urlname'], $row['namespace']);
+ $html .= htmlspecialchars($title);
+ $html .= '';
+
+ $html .= " ";
+ }
+ if ( !$switched )
+ {
+ if ( $counter > 0 )
+ {
+ // Fill-in
+ while ( $ticker < 2 )
+ {
+ $ticker++;
+ $html .= '' . $lang->get('onpage_cat_msg_no_subcategories') . ' ';
+ }
+ $html .= '
' . "\n\n";
+ $html .= '' . $lang->get('onpage_cat_heading_pages') . '
';
+ $html .= '';
+ $html .= '';
+ $html .= '';
+ $counter = 0;
+ $ticker = 0;
+ $switched = true;
+ }
+ if ( $counter > 0 )
+ {
+ // Fill-in
+ while ( $ticker < 2 )
+ {
+ $ticker++;
+ $html .= '' . $lang->get('onpage_cat_msg_no_pages') . ' ';
+ }
+ $html .= '
' . "\n\n";
+ }
+
+ if ( $this->namespace != 'Special' && $this->namespace != 'Admin' )
+ {
+ $html .= '';
+ $html .= '';
+ $html .= '(' . $lang->get('tags_catbox_link') . ')';
+ $html .= '';
+ $html .= '' . $lang->get('catedit_catbox_lbl_categories') . ' ';
+
+ $q = $db->sql_query('SELECT category_id FROM ' . table_prefix . "categories WHERE page_id = '$this->page_id' AND namespace = '$this->namespace';");
+ if ( !$q )
+ $db->_die();
+
+ if ( $row = $db->fetchrow() )
+ {
+ $list = array();
+ do
+ {
+ $cid = sanitize_page_id($row['category_id']);
+ $title = get_page_title_ns($cid, 'Category');
+ $link = makeUrlNS('Category', $cid);
+ $list[] = '' . htmlspecialchars($title) . '';
+ }
+ while ( $row = $db->fetchrow($q) );
+ $html .= implode(', ', $list);
+ }
+ else
+ {
+ $html .= $lang->get('catedit_catbox_lbl_uncategorized');
+ }
+
+ $can_edit = ( $session->get_permissions('edit_cat') && ( !$paths->page_protected || $session->get_permissions('even_when_protected') ) );
+ if ( $can_edit )
+ {
+ $edit_link = '' . $lang->get('catedit_catbox_link_edit') . '';
+ $html .= ' [ ' . $edit_link . ' ]';
+ }
+
+ $html .= '';
+ }
+ return $html;
+ }
+
+ /**
+ * Pull in switches as to whether a specific toolbar button should be used or not. This sets things up according to the current page being displayed.
+ * @return array Associative
+ */
+
+ function set_conds()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( !$this->perms )
+ $this->perms = $session->fetch_page_acl($this->page_id, $this->namespace);
+
+ if ( !$this->perms )
+ {
+ // We're trying to send a page WAY too early (session hasn't been started yet), such as for a redirect. Send a default set of conds because
+ // there's NO way to get permissions to determine anything otherwise. Yes, starting $session here might be dangerous.
+ $this->conds = array(
+ 'article' => true,
+ 'comments' => false,
+ 'edit' => false,
+ 'viewsource' => false,
+ 'history' => false,
+ 'rename' => false,
+ 'delvote' => false,
+ 'resetvotes' => false,
+ 'delete' => false,
+ 'printable' => false,
+ 'protect' => false,
+ 'setwikimode' => false,
+ 'clearlogs' => false,
+ 'password' => false,
+ 'acledit' => false,
+ 'adminpage' => false
+ );
+ return $this->conds;
+ }
+
+ // die('have perms: ' . print_r($this->perms, true) . "\n---------------------------------\nBacktrace:\n" . enano_debug_print_backtrace(true));
+
+ $enforce_protection = ( $this->page_protected && ( ( $session->check_acl_scope('even_when_protected', $this->namespace) && !$this->perms->get_permissions('even_when_protected') ) || !$session->check_acl_scope('even_when_protected', $this->namespace) ) );
+
+ $conds = array();
+
+ // Article: always show
+ $conds['article'] = true;
+
+ // Discussion: Show if comments are enabled on the site, and if comments are on for this page.
+ $conds['comments'] = $this->perms->get_permissions('read') && getConfig('enable_comments', '1')=='1' && $this->cdata['comments_on'] == 1;
+
+ // Edit: Show if we have permission to edit the page, and if we don't have protection in effect
+ $conds['edit'] = $this->perms->get_permissions('read') && $session->check_acl_scope('edit_page', $this->namespace) && $this->perms->get_permissions('edit_page') && !$enforce_protection;
+
+ // View source: Show if we have permission to view source and either ACLs prohibit editing or protection is in effect
+ $conds['viewsource'] = $session->check_acl_scope('view_source', $this->namespace) && $this->perms->get_permissions('view_source') && ( !$this->perms->get_permissions('edit_page') || $enforce_protection ) && $this->namespace != 'API';
+
+ // History: Show if we have permission to see history and if the page exists
+ $conds['history'] = $session->check_acl_scope('history_view', $this->namespace) && $this->exists && $this->perms->get_permissions('history_view');
+
+ // Rename: Show if the page exists, if we have permission to rename, and if protection isn't in effect
+ $conds['rename'] = $session->check_acl_scope('rename', $this->namespace) && $this->exists && $this->perms->get_permissions('rename') && !$enforce_protection;
+
+ // Vote-to-delete: Show if we have Wiki Mode on, if we have permission to vote for deletion, and if the page exists (can't vote to delete a nonexistent page)
+ $conds['delvote'] = $this->wiki_mode && $session->check_acl_scope('vote_delete', $this->namespace) && $this->perms->get_permissions('vote_delete') && $this->exists;
+
+ // Reset votes: Show if we have Wiki Mode on, if we have permission to reset votes, if the page exists, and if there's at least one vote
+ $conds['resetvotes'] = $session->check_acl_scope('vote_reset', $this->namespace) && $this->wiki_mode && $this->exists && $this->perms->get_permissions('vote_reset') && $this->cdata['delvotes'] > 0;
+
+ // Delete page: Show if the page exists and if we have permission to delete it
+ $conds['delete'] = $session->check_acl_scope('delete_page', $this->namespace) && $this->exists && $this->perms->get_permissions('delete_page');
+
+ // Printable view: Show if the page exists
+ $conds['printable'] = $this->exists;
+
+ // Protect: Show if we have Wiki Mode on, if the page exists, and if we have permission to protect the page.
+ $conds['protect'] = $session->check_acl_scope('protect', $this->namespace) && $this->wiki_mode && $this->exists && $this->perms->get_permissions('protect');
+
+ // Set Wiki Mode: Show if the page exists and if we have permission to set wiki mode
+ $conds['setwikimode'] = $session->check_acl_scope('set_wiki_mode', $this->namespace) && $this->exists && $this->perms->get_permissions('set_wiki_mode');
+
+ // Clear logs: Show if we have permission to clear logs
+ $conds['clearlogs'] = $session->check_acl_scope('clear_logs', $this->namespace) && $this->perms->get_permissions('clear_logs');
+
+ // Set password: a little bit complicated. If there's a password, check for password_reset; else, check for password_set.
+ $conds['password'] = empty($this->cdata['password']) ?
+ $session->check_acl_scope('password_set', $this->namespace) && $this->perms->get_permissions('password_set') :
+ $session->check_acl_scope('password_reset', $this->namespace) && $this->perms->get_permissions('password_reset');
+
+ // Edit ACLs: Show if this is a non-Enano page that's calling the Enano API and (a) if we have permissions to edit ACLs or (b) we're an admin AND ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL is on
+ $conds['acledit'] = $this->namespace != 'API' && $session->check_acl_scope('edit_acl', $this->namespace) && ( $this->perms->get_permissions('edit_acl') || ( defined('ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL') && $session->user_level >= USER_LEVEL_ADMIN ) );
+
+ // Admin page: Show if the page exists and if we're an admin
+ $conds['adminpage'] = $session->user_level >= USER_LEVEL_ADMIN && $this->exists;
+
+ // Allow plugins to change stuff
+ $code = $plugins->setHook('page_conds_set');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ $this->conds = $conds;
+ }
+
+ /**
+ * Return page conditions
+ * @return array
+ */
+
+ public function get_conds()
+ {
+ if ( empty($this->conds) )
+ $this->set_conds();
+
+ return $this->conds;
+ }
+
+ /**
+ * Just tell us if the current page exists or not.
+ * @return bool
+ */
+
+ public function exists()
+ {
+ return $this->exists;
+ }
+
+ /**
+ * Return cdata
+ * @return array
+ */
+
+ public function get_cdata()
+ {
+ return $this->cdata;
+ }
+
+ /**
+ * Bake, or finalize the processing of, a cdata array.
+ * @static
+ * @access public
+ */
+
+ public static function bake_cdata($cdata)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ // urlname_nons is the actual page_id.
+ $cdata['urlname_nons'] = $cdata['urlname'];
+ if ( isset($paths->nslist[ $cdata['namespace'] ]) )
+ {
+ $cdata['urlname'] = $paths->nslist[ $cdata['namespace'] ] . $cdata['urlname'];
+ }
+ else
+ {
+ $ns_char = substr($paths->nslist['Special'], -1);
+ $cdata['urlname'] = $cdata['namespace'] . $ns_char . $cdata['urlname'];
+ }
+
+ // add missing keys
+ $defaults = array(
+ 'special' => 0,
+ 'visible' => 0,
+ 'comments_on' => 1,
+ 'protected' => 0,
+ 'delvotes' => 0,
+ 'delvote_ips' => serialize(array()),
+ 'wiki_mode' => 2,
+ 'page_format' => getConfig('default_page_format', 'wikitext')
+ );
+ foreach ( $defaults as $key => $value )
+ {
+ if ( !isset($cdata[$key]) )
+ $cdata[$key] = $value;
+ }
+
+ // fix up deletion votes
+ if ( empty($cdata['delvotes']) )
+ $cdata['delvotes'] = 0;
+
+ // fix up deletion vote IP list
+ if ( empty($cdata['delvote_ips']) )
+ $cdata['delvote_ips'] = serialize(array());
+
+ // calculate wiki mode
+ $cdata['really_wiki_mode'] = ( $cdata['wiki_mode'] == 1 || ( $cdata['wiki_mode'] == 2 && getConfig('wiki_mode', 0) == 1 ) );
+
+ // calculate protection
+ $cdata['really_protected'] = ( $cdata['protected'] > 0 );
+ if ( $cdata['protected'] == 2 )
+ {
+ $cdata['really_protected'] = !$session->user_logged_in || ( $session->user_logged_in && $session->reg_time + 86400*4 > time() );
+ }
+
+ return $cdata;
+ }
+
+ /**
+ * Grabs raw (unbaked) cdata from the database, caching if possible.
+ * @param string Page ID
+ * @param string Namespace.
+ * @static
+ */
+
+ public static function get_cdata_from_db($page_id, $namespace)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ static $cache = array();
+
+ $pathskey = $paths->get_pathskey($page_id, $namespace);
+ if ( isset($cache[$pathskey]) )
+ return $cache[$pathskey];
+
+ $page_id_db = $db->escape($page_id);
+ $namespace_db = $db->escape($namespace);
+
+ $q = $db->sql_query('SELECT p.*'
+ . ' FROM ' . table_prefix . "pages AS p\n"
+ . " WHERE p.urlname = '$page_id_db' AND p.namespace = '$namespace_db'\n"
+ . " GROUP BY p.urlname, p.name, p.namespace, p.page_order, p.special, p.visible, p.protected, p.wiki_mode, p.comments_on, p.delvotes, p.delvote_ips, p.page_format, p.password;");
+
+ if ( !$q )
+ $db->_die();
+
+ if ( $db->numrows() < 1 )
+ {
+ $db->free_result();
+ $cache[$pathskey] = false;
+ return false;
+ }
+
+ $row = $db->fetchrow();
+
+ // Get comment counts
+ // FIXME: Apparently there's a bit of recursion in here. Fetching permissions depends on this cdata function.
+ // Perhaps we should eliminate session's dependency on cdata? (What is it used for?)
+ $q = $db->sql_query('SELECT approved FROM ' . table_prefix . "comments WHERE page_id = '$page_id_db' AND namespace = '$namespace_db';");
+ // yay parallel assignment
+ $row['comments_approved'] = $row['comments_unapproved'] = $row['comments_spam'] = 0;
+ while ( $commentrow = $db->fetchrow() )
+ switch($commentrow['approved'])
+ {
+ case COMMENT_APPROVED:
+ default:
+ $row['comments_approved']++;
+ break;
+ case COMMENT_UNAPPROVED:
+ $row['comments_unapproved']++;
+ break;
+ case COMMENT_SPAM:
+ $row['comments_spam']++;
+ break;
+ }
+
+ $cache[$pathskey] = $row;
+ return $row;
+ }
}
/**
diff -r de56132c008d -r bdac73ed481e includes/namespaces/file.php
--- a/includes/namespaces/file.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/namespaces/file.php Sun Mar 28 23:10:46 2010 -0400
@@ -13,255 +13,255 @@
class Namespace_File extends Namespace_Default
{
- function send()
- {
- global $output;
-
- $output->add_before_footer($this->show_info());
- $output->add_before_footer($this->display_categories());
-
- if ( $this->exists )
- {
- $this->send_from_db();
- }
- else
- {
- $output->header();
- $this->error_404();
- $output->footer();
- }
- }
-
- function show_info()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- require_once(ENANO_ROOT . '/includes/log.php');
-
- $local_page_id = $this->page_id;
- $local_namespace = $this->namespace;
- $html = '';
-
- // Prevent unnecessary work
- if ( $local_namespace != 'File' )
- return null;
-
- $selfn = $db->escape($this->page_id);
- $q = $db->sql_query('SELECT f.mimetype,f.time_id,f.size,l.log_id FROM ' . table_prefix . "files AS f\n"
- . " LEFT JOIN " . table_prefix . "logs AS l\n"
- . " ON ( l.time_id = f.time_id AND ( l.action = 'reupload' OR l.action IS NULL ) )\n"
- . " WHERE f.page_id = '$selfn'\n"
- . " ORDER BY f.time_id DESC;");
- if ( !$q )
- {
- $db->_die('The file type could not be fetched.');
- }
-
- if ( $db->numrows() < 1 )
- {
- $html .= '
- ' . $lang->get('onpage_filebox_heading') . '
- ' . $lang->get('onpage_filebox_msg_not_found', array('upload_link' => makeUrlNS('Special', 'UploadFile/'.$local_page_id))) . '
-
-
';
- return $html;
- }
- $r = $db->fetchrow();
- $mimetype = $r['mimetype'];
- $datestring = enano_date(ED_DATE | ED_TIME, (int)$r['time_id']);
- $html .= '
- ' . $lang->get('onpage_filebox_heading') . '
- ' . $lang->get('onpage_filebox_lbl_type') . ' '.$r['mimetype'].'
';
-
- $size = $r['size'] . ' ' . $lang->get('etc_unit_bytes');
- if ( $r['size'] >= 1048576 )
- {
- $size .= ' (' . ( round($r['size'] / 1048576, 1) ) . ' ' . $lang->get('etc_unit_megabytes_short') . ')';
- }
- else if ( $r['size'] >= 1024 )
- {
- $size .= ' (' . ( round($r['size'] / 1024, 1) ) . ' ' . $lang->get('etc_unit_kilobytes_short') . ')';
- }
-
- $html .= $lang->get('onpage_filebox_lbl_size', array('size' => $size));
-
- $html .= '
' . $lang->get('onpage_filebox_lbl_uploaded') . ' ' . $datestring . '
';
- // are we dealing with an image?
- $is_image = substr($mimetype, 0, 6) == 'image/';
-
- // for anything other than plain text and
- if ( !$is_image && ( substr($mimetype, 0, 5) != 'text/' || $mimetype == 'text/html' || $mimetype == 'text/javascript' ) )
- {
- $html .= '
- ' . $lang->get('onpage_filebox_msg_virus_warning') . '
- ';
- }
- if ( $is_image )
- {
- // show a thumbnail of the image
- $html .= '
-
- 
-
-
';
- }
- $html .= '
-
- ' . $lang->get('onpage_filebox_btn_download') . '
- ';
- // allow reupload if:
- // * we are allowed to upload new versions, and
- // - the file is unprotected, or
- // - we have permission to override protection
-
- if ( !$this->perms )
- $this->perms = $session->fetch_page_acl($this->page_id, $this->namespace);
-
- if ( $this->perms->get_permissions('upload_new_version') && ( !$this->page_protected || $this->perms->get_permissions('even_when_protected') ) )
- {
- // upload new version link
- $html .= ' |
- ' . $lang->get('onpage_filebox_btn_upload_new') . '
- ';
- }
- // close off paragraph
- $html .= '
';
- // only show this if there's more than one revision
- if ( $db->numrows() > 1 )
- {
- // requery, sql_result_seek() doesn't work on postgres
- $db->free_result();
- $q = $db->sql_query('SELECT f.mimetype,f.time_id,f.size,l.log_id FROM ' . table_prefix . "files AS f\n"
- . " LEFT JOIN " . table_prefix . "logs AS l\n"
- . " ON ( l.time_id = f.time_id AND ( l.action = 'reupload' OR l.action IS NULL ) )\n"
- . " WHERE f.page_id = '$selfn'\n"
- . " ORDER BY f.time_id DESC;");
- if ( !$q )
- $db->_die();
-
- $log = new LogDisplay();
- $log->add_criterion('page', $paths->nslist['File'] . $this->page_id);
- $log->add_criterion('action', 'reupload');
- $data = $log->get_data();
- $i = -1;
-
- $html .= '' . $lang->get('onpage_filebox_heading_history') . '
';
- $last_rollback_id = false;
- $download_flag = $is_image ? false : 'download';
- while ( $r = $db->fetchrow($q) )
- {
- $html .= '(' . $lang->get('onpage_filebox_btn_this_version') . ') ';
- if ( $session->get_permissions('history_rollback') && $last_rollback_id )
- $html .= ' (' . $lang->get('onpage_filebox_btn_revert') . ') ';
- else if ( $session->get_permissions('history_rollback') && !$last_rollback_id )
- $html .= ' (' . $lang->get('onpage_filebox_btn_current') . ') ';
- $last_rollback_id = $r['log_id'];
-
- $html .= $r['mimetype'].', ';
-
- $fs = $r['size'];
- $fs = (int)$fs;
-
- if($fs >= 1048576)
- {
- $fs = round($fs / 1048576, 1);
- $size = $fs . ' ' . $lang->get('etc_unit_megabytes_short');
- }
- else
- if ( $fs >= 1024 )
- {
- $fs = round($fs / 1024, 1);
- $size = $fs . ' ' . $lang->get('etc_unit_kilobytes_short');
- }
- else
- {
- $size = $fs . ' ' . $lang->get('etc_unit_bytes');
- }
-
- $html .= $size;
- if ( isset($data[++$i]) )
- $html .= ': ' . LogDisplay::render_row($data[$i], false, false);
-
- $html .= '
';
- }
- $html .= '
';
- }
- $db->free_result();
- $html .= '
';
- return $html;
- }
-
- /**
- * Delete a file from the database and filesystem based on file ID.
- * @param int File ID
- * @return null
- */
-
- public static function delete_file($file_id)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( !is_int($file_id) )
- // seriously?
- return null;
-
- // pull file info
- $q = $db->sql_query('SELECT filename, page_id, time_id, file_extension, file_key FROM ' . table_prefix . "files WHERE file_id = $file_id;");
- if ( !$q )
- $db->_die();
-
- if ( $db->numrows() < 1 )
- {
- $db->free_result();
- return null;
- }
-
- $row = $db->fetchrow();
- $db->free_result();
-
- // make sure the image isn't used by multiple revisions
- $q = $db->sql_query('SELECT 1 FROM ' . table_prefix . "files WHERE file_key = '{$row['file_key']}';");
- if ( !$q )
- $db->_die();
- if ( $db->numrows() < 1 )
- {
- // remove from filesystem
- $file_path = ENANO_ROOT . "/files/{$row['file_key']}{$row['file_extension']}";
- @unlink($file_path);
- // old filename standard
- $file_path = ENANO_ROOT . "/files/{$row['file_key']}-{$row['time_id']}{$row['file_extension']}";
- @unlink($file_path);
- }
- $db->free_result();
-
- // remove from cache
- if ( $dp = @opendir(ENANO_ROOT . '/cache/') )
- {
- $regexp = '#' . preg_quote($row['filename']) . '-' . $row['time_id'] . '-[0-9]+x[0-9]+' . preg_quote($row['file_extension']) . '#';
- while ( $dh = @readdir($dp) )
- {
- if ( preg_match($regexp, $dh) )
- {
- // it's a match, delete the cached thumbnail
- @unlink(ENANO_ROOT . "/cache/$dh");
- }
- }
- closedir($dp);
- }
-
- // remove from database
- $q = $db->sql_query('DELETE FROM ' . table_prefix . "files WHERE file_id = $file_id;");
- if ( !$q )
- $db->_die();
-
- // remove from logs
- $page_id_db = $db->escape($row['page_id']);
- $q = $db->sql_query('DELETE FROM ' . table_prefix . "logs WHERE page_id = '{$page_id_db}' AND namespace = 'File' AND action = 'reupload' AND time_id = {$row['time_id']};");
- if ( !$q )
- $db->_die();
-
- return true;
- }
+ function send()
+ {
+ global $output;
+
+ $output->add_before_footer($this->show_info());
+ $output->add_before_footer($this->display_categories());
+
+ if ( $this->exists )
+ {
+ $this->send_from_db();
+ }
+ else
+ {
+ $output->header();
+ $this->error_404();
+ $output->footer();
+ }
+ }
+
+ function show_info()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ require_once(ENANO_ROOT . '/includes/log.php');
+
+ $local_page_id = $this->page_id;
+ $local_namespace = $this->namespace;
+ $html = '';
+
+ // Prevent unnecessary work
+ if ( $local_namespace != 'File' )
+ return null;
+
+ $selfn = $db->escape($this->page_id);
+ $q = $db->sql_query('SELECT f.mimetype,f.time_id,f.size,l.log_id FROM ' . table_prefix . "files AS f\n"
+ . " LEFT JOIN " . table_prefix . "logs AS l\n"
+ . " ON ( l.time_id = f.time_id AND ( l.action = 'reupload' OR l.action IS NULL ) )\n"
+ . " WHERE f.page_id = '$selfn'\n"
+ . " ORDER BY f.time_id DESC;");
+ if ( !$q )
+ {
+ $db->_die('The file type could not be fetched.');
+ }
+
+ if ( $db->numrows() < 1 )
+ {
+ $html .= '
+ ' . $lang->get('onpage_filebox_heading') . '
+ ' . $lang->get('onpage_filebox_msg_not_found', array('upload_link' => makeUrlNS('Special', 'UploadFile/'.$local_page_id))) . '
+
+
';
+ return $html;
+ }
+ $r = $db->fetchrow();
+ $mimetype = $r['mimetype'];
+ $datestring = enano_date(ED_DATE | ED_TIME, (int)$r['time_id']);
+ $html .= '
+ ' . $lang->get('onpage_filebox_heading') . '
+ ' . $lang->get('onpage_filebox_lbl_type') . ' '.$r['mimetype'].'
';
+
+ $size = $r['size'] . ' ' . $lang->get('etc_unit_bytes');
+ if ( $r['size'] >= 1048576 )
+ {
+ $size .= ' (' . ( round($r['size'] / 1048576, 1) ) . ' ' . $lang->get('etc_unit_megabytes_short') . ')';
+ }
+ else if ( $r['size'] >= 1024 )
+ {
+ $size .= ' (' . ( round($r['size'] / 1024, 1) ) . ' ' . $lang->get('etc_unit_kilobytes_short') . ')';
+ }
+
+ $html .= $lang->get('onpage_filebox_lbl_size', array('size' => $size));
+
+ $html .= '
' . $lang->get('onpage_filebox_lbl_uploaded') . ' ' . $datestring . '
';
+ // are we dealing with an image?
+ $is_image = substr($mimetype, 0, 6) == 'image/';
+
+ // for anything other than plain text and
+ if ( !$is_image && ( substr($mimetype, 0, 5) != 'text/' || $mimetype == 'text/html' || $mimetype == 'text/javascript' ) )
+ {
+ $html .= '
+ ' . $lang->get('onpage_filebox_msg_virus_warning') . '
+ ';
+ }
+ if ( $is_image )
+ {
+ // show a thumbnail of the image
+ $html .= '
+
+
+
+
';
+ }
+ $html .= '
+
+ ' . $lang->get('onpage_filebox_btn_download') . '
+ ';
+ // allow reupload if:
+ // * we are allowed to upload new versions, and
+ // - the file is unprotected, or
+ // - we have permission to override protection
+
+ if ( !$this->perms )
+ $this->perms = $session->fetch_page_acl($this->page_id, $this->namespace);
+
+ if ( $this->perms->get_permissions('upload_new_version') && ( !$this->page_protected || $this->perms->get_permissions('even_when_protected') ) )
+ {
+ // upload new version link
+ $html .= ' |
+ ' . $lang->get('onpage_filebox_btn_upload_new') . '
+ ';
+ }
+ // close off paragraph
+ $html .= '
';
+ // only show this if there's more than one revision
+ if ( $db->numrows() > 1 )
+ {
+ // requery, sql_result_seek() doesn't work on postgres
+ $db->free_result();
+ $q = $db->sql_query('SELECT f.mimetype,f.time_id,f.size,l.log_id FROM ' . table_prefix . "files AS f\n"
+ . " LEFT JOIN " . table_prefix . "logs AS l\n"
+ . " ON ( l.time_id = f.time_id AND ( l.action = 'reupload' OR l.action IS NULL ) )\n"
+ . " WHERE f.page_id = '$selfn'\n"
+ . " ORDER BY f.time_id DESC;");
+ if ( !$q )
+ $db->_die();
+
+ $log = new LogDisplay();
+ $log->add_criterion('page', $paths->nslist['File'] . $this->page_id);
+ $log->add_criterion('action', 'reupload');
+ $data = $log->get_data();
+ $i = -1;
+
+ $html .= '' . $lang->get('onpage_filebox_heading_history') . '
';
+ $last_rollback_id = false;
+ $download_flag = $is_image ? false : 'download';
+ while ( $r = $db->fetchrow($q) )
+ {
+ $html .= '(' . $lang->get('onpage_filebox_btn_this_version') . ') ';
+ if ( $session->get_permissions('history_rollback') && $last_rollback_id )
+ $html .= ' (' . $lang->get('onpage_filebox_btn_revert') . ') ';
+ else if ( $session->get_permissions('history_rollback') && !$last_rollback_id )
+ $html .= ' (' . $lang->get('onpage_filebox_btn_current') . ') ';
+ $last_rollback_id = $r['log_id'];
+
+ $html .= $r['mimetype'].', ';
+
+ $fs = $r['size'];
+ $fs = (int)$fs;
+
+ if($fs >= 1048576)
+ {
+ $fs = round($fs / 1048576, 1);
+ $size = $fs . ' ' . $lang->get('etc_unit_megabytes_short');
+ }
+ else
+ if ( $fs >= 1024 )
+ {
+ $fs = round($fs / 1024, 1);
+ $size = $fs . ' ' . $lang->get('etc_unit_kilobytes_short');
+ }
+ else
+ {
+ $size = $fs . ' ' . $lang->get('etc_unit_bytes');
+ }
+
+ $html .= $size;
+ if ( isset($data[++$i]) )
+ $html .= ': ' . LogDisplay::render_row($data[$i], false, false);
+
+ $html .= '
';
+ }
+ $html .= '
';
+ }
+ $db->free_result();
+ $html .= '
';
+ return $html;
+ }
+
+ /**
+ * Delete a file from the database and filesystem based on file ID.
+ * @param int File ID
+ * @return null
+ */
+
+ public static function delete_file($file_id)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( !is_int($file_id) )
+ // seriously?
+ return null;
+
+ // pull file info
+ $q = $db->sql_query('SELECT filename, page_id, time_id, file_extension, file_key FROM ' . table_prefix . "files WHERE file_id = $file_id;");
+ if ( !$q )
+ $db->_die();
+
+ if ( $db->numrows() < 1 )
+ {
+ $db->free_result();
+ return null;
+ }
+
+ $row = $db->fetchrow();
+ $db->free_result();
+
+ // make sure the image isn't used by multiple revisions
+ $q = $db->sql_query('SELECT 1 FROM ' . table_prefix . "files WHERE file_key = '{$row['file_key']}';");
+ if ( !$q )
+ $db->_die();
+ if ( $db->numrows() < 1 )
+ {
+ // remove from filesystem
+ $file_path = ENANO_ROOT . "/files/{$row['file_key']}{$row['file_extension']}";
+ @unlink($file_path);
+ // old filename standard
+ $file_path = ENANO_ROOT . "/files/{$row['file_key']}-{$row['time_id']}{$row['file_extension']}";
+ @unlink($file_path);
+ }
+ $db->free_result();
+
+ // remove from cache
+ if ( $dp = @opendir(ENANO_ROOT . '/cache/') )
+ {
+ $regexp = '#' . preg_quote($row['filename']) . '-' . $row['time_id'] . '-[0-9]+x[0-9]+' . preg_quote($row['file_extension']) . '#';
+ while ( $dh = @readdir($dp) )
+ {
+ if ( preg_match($regexp, $dh) )
+ {
+ // it's a match, delete the cached thumbnail
+ @unlink(ENANO_ROOT . "/cache/$dh");
+ }
+ }
+ closedir($dp);
+ }
+
+ // remove from database
+ $q = $db->sql_query('DELETE FROM ' . table_prefix . "files WHERE file_id = $file_id;");
+ if ( !$q )
+ $db->_die();
+
+ // remove from logs
+ $page_id_db = $db->escape($row['page_id']);
+ $q = $db->sql_query('DELETE FROM ' . table_prefix . "logs WHERE page_id = '{$page_id_db}' AND namespace = 'File' AND action = 'reupload' AND time_id = {$row['time_id']};");
+ if ( !$q )
+ $db->_die();
+
+ return true;
+ }
}
diff -r de56132c008d -r bdac73ed481e includes/namespaces/special.php
--- a/includes/namespaces/special.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/namespaces/special.php Sun Mar 28 23:10:46 2010 -0400
@@ -13,97 +13,97 @@
class Namespace_Special extends Namespace_Default
{
- public function __construct($page_id, $namespace, $revision_id = 0)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $this->page_id = sanitize_page_id($page_id);
- $this->namespace = $namespace;
- $this->build_cdata();
- $this->revision_id = intval($revision_id);
-
- $this->page_protected = true;
- $this->wiki_mode = 0;
- }
-
- public function build_cdata()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- $this->exists = function_exists("page_{$this->namespace}_{$this->page_id}");
-
- if ( isset($paths->pages[ $paths->get_pathskey($this->page_id, $this->namespace) ]) )
- {
- $page_name = $paths->pages[ $paths->get_pathskey($this->page_id, $this->namespace) ]['name'];
- }
- else
- {
- $page_name = "{$paths->nslist[ $this->namespace ]}{$this->page_id}";
- if ( ($_ = $lang->get('specialpage_' . strtolower($this->page_id))) !== 'specialpage_' . strtolower($this->page_id) )
- {
- $page_name = $_;
- }
- }
-
- $this->cdata = array(
- 'name' => $lang->get($page_name),
- 'urlname' => $this->page_id,
- 'namespace' => $this->namespace,
- 'special' => 0,
- 'visible' => 0,
- 'comments_on' => 0,
- 'protected' => 0,
- 'delvotes' => 0,
- 'delvote_ips' => '',
- 'wiki_mode' => 2,
- 'page_exists' => false,
- 'page_format' => getConfig('default_page_format', 'wikitext')
- );
- $this->cdata = Namespace_Default::bake_cdata($this->cdata);
-
- $this->title =& $this->cdata['name'];
- }
-
- function send()
- {
- global $output;
-
- if ( $this->exists )
- {
- call_user_func("page_{$this->namespace}_{$this->page_id}");
- }
- else
- {
- $output->header();
- $this->error_404();
- $output->footer();
- }
- }
-
- // We add the unused variable $userpage here to silence "declaration should be compatible" errors
- function error_404()
- {
- global $lang, $output;
- $func_name = "page_{$this->namespace}_{$this->page_id}";
-
- if ( $this->namespace == 'Admin' )
- die_semicritical($lang->get('page_msg_admin_404_title'), $lang->get('page_msg_admin_404_body', array('func_name' => $func_name)), true);
-
- $title = $lang->get('page_err_custompage_function_missing_title');
- $message = $lang->get('page_err_custompage_function_missing_body', array( 'function_name' => $func_name ));
-
- $output->set_title($title);
- $output->header();
- echo "$message
";
- $output->footer();
- }
-
- function set_conds()
- {
- parent::set_conds();
-
- $this->conds['printable'] = false;
- $this->conds['adminpage'] = false;
- }
+ public function __construct($page_id, $namespace, $revision_id = 0)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $this->page_id = sanitize_page_id($page_id);
+ $this->namespace = $namespace;
+ $this->build_cdata();
+ $this->revision_id = intval($revision_id);
+
+ $this->page_protected = true;
+ $this->wiki_mode = 0;
+ }
+
+ public function build_cdata()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ $this->exists = function_exists("page_{$this->namespace}_{$this->page_id}");
+
+ if ( isset($paths->pages[ $paths->get_pathskey($this->page_id, $this->namespace) ]) )
+ {
+ $page_name = $paths->pages[ $paths->get_pathskey($this->page_id, $this->namespace) ]['name'];
+ }
+ else
+ {
+ $page_name = "{$paths->nslist[ $this->namespace ]}{$this->page_id}";
+ if ( ($_ = $lang->get('specialpage_' . strtolower($this->page_id))) !== 'specialpage_' . strtolower($this->page_id) )
+ {
+ $page_name = $_;
+ }
+ }
+
+ $this->cdata = array(
+ 'name' => $lang->get($page_name),
+ 'urlname' => $this->page_id,
+ 'namespace' => $this->namespace,
+ 'special' => 0,
+ 'visible' => 0,
+ 'comments_on' => 0,
+ 'protected' => 0,
+ 'delvotes' => 0,
+ 'delvote_ips' => '',
+ 'wiki_mode' => 2,
+ 'page_exists' => false,
+ 'page_format' => getConfig('default_page_format', 'wikitext')
+ );
+ $this->cdata = Namespace_Default::bake_cdata($this->cdata);
+
+ $this->title =& $this->cdata['name'];
+ }
+
+ function send()
+ {
+ global $output;
+
+ if ( $this->exists )
+ {
+ call_user_func("page_{$this->namespace}_{$this->page_id}");
+ }
+ else
+ {
+ $output->header();
+ $this->error_404();
+ $output->footer();
+ }
+ }
+
+ // We add the unused variable $userpage here to silence "declaration should be compatible" errors
+ function error_404()
+ {
+ global $lang, $output;
+ $func_name = "page_{$this->namespace}_{$this->page_id}";
+
+ if ( $this->namespace == 'Admin' )
+ die_semicritical($lang->get('page_msg_admin_404_title'), $lang->get('page_msg_admin_404_body', array('func_name' => $func_name)), true);
+
+ $title = $lang->get('page_err_custompage_function_missing_title');
+ $message = $lang->get('page_err_custompage_function_missing_body', array( 'function_name' => $func_name ));
+
+ $output->set_title($title);
+ $output->header();
+ echo "$message
";
+ $output->footer();
+ }
+
+ function set_conds()
+ {
+ parent::set_conds();
+
+ $this->conds['printable'] = false;
+ $this->conds['adminpage'] = false;
+ }
}
diff -r de56132c008d -r bdac73ed481e includes/namespaces/template.php
--- a/includes/namespaces/template.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/namespaces/template.php Sun Mar 28 23:10:46 2010 -0400
@@ -13,28 +13,28 @@
class Namespace_Template extends Namespace_Default
{
- function send()
- {
- global $output;
-
- $output->add_before_footer($this->display_categories());
- $output->header();
-
- if ( $this->exists )
- {
- $text = $this->fetch_text();
- $text = preg_replace('/(.*?)<\/noinclude>/is', '\\1', $text);
- $text = preg_replace('/(.*?)<\/nodisplay>/is', '', $text);
-
- $text = RenderMan::render( $text );
-
- eval( '?>' . $text );
- }
- else
- {
- $this->error_404();
- }
-
- $output->footer();
- }
+ function send()
+ {
+ global $output;
+
+ $output->add_before_footer($this->display_categories());
+ $output->header();
+
+ if ( $this->exists )
+ {
+ $text = $this->fetch_text();
+ $text = preg_replace('/(.*?)<\/noinclude>/is', '\\1', $text);
+ $text = preg_replace('/(.*?)<\/nodisplay>/is', '', $text);
+
+ $text = RenderMan::render( $text );
+
+ eval( '?>' . $text );
+ }
+ else
+ {
+ $this->error_404();
+ }
+
+ $output->footer();
+ }
}
diff -r de56132c008d -r bdac73ed481e includes/namespaces/user.php
--- a/includes/namespaces/user.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/namespaces/user.php Sun Mar 28 23:10:46 2010 -0400
@@ -13,463 +13,463 @@
class Namespace_User extends Namespace_Default
{
- public function __construct($page_id, $namespace, $revision_id = 0)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- parent::__construct($page_id, $namespace, $revision_id);
-
- if ( ( $this->title == str_replace('_', ' ', $this->page_id) || $this->title == $paths->nslist['User'] . str_replace('_', ' ', $this->page_id) ) || !$this->exists )
- {
- $this->title = $lang->get('userpage_page_title', array('username' => str_replace('_', ' ', dirtify_page_id($this->page_id))));
- $this->cdata['name'] = $this->title;
- }
-
- }
-
- public function send()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $email;
- global $lang, $output;
-
- /**
- * PLUGGING INTO USER PAGES
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * Userpages are highly programmable and extendable using a number of
- * hooks. These hooks are:
- *
- * - userpage_sidebar_left
- * - userpage_sidebar_right
- * - userpage_tabs_links
- * - userpage_tabs_body
- *
- * You can add a variety of sections to user pages, including new tabs
- * and new sections on the tables. To add a tab, attach to
- * userpage_tabs_links and echo out:
- *
- * YOUR TAB TEXT
- *
- * Then hook into userpage_tabs_body and echo out:
- *
- * YOUR TAB CONTENT
- *
- * The userpage javascript runtime will take care of everything else,
- * meaning transitions, click events, etc. Currently it's not possible
- * to add custom click events to tabs, but any DOM-related JS that needs
- * to run in your tab can be run onload and the effects will be seen when
- * your tab is clicked. YOURTABID should be lowercase alphanumeric and
- * have a short prefix so as to assure that it remains specific to your
- * plugin.
- *
- * To hook into the "profile" tab, use userpage_sidebar_{left,right}. Just
- * echo out table cells as normal. The table on the left (the wide one) has
- * four columns, and the one on the right has one column.
- *
- * See plugins.php for a guide on creating and attaching to hooks.
- */
-
- $page_urlname = dirtify_page_id($this->page_id);
-
- $target_username = strtr($page_urlname,
- Array(
- '_' => ' ',
- '<' => '<',
- '>' => '>'
- ));
-
- $target_username = preg_replace('/^' . str_replace('/', '\\/', preg_quote($paths->nslist['User'])) . '/', '', $target_username);
- list($target_username) = explode('/', $target_username);
-
- $ux_columns = $db->columns_in(table_prefix . 'users_extra');
-
- $output->set_title($this->title);
- $q = $db->sql_query('SELECT u.username, u.user_id AS authoritative_uid, u.real_name, u.email, u.reg_time, u.user_has_avatar, u.avatar_type, x.*, COUNT(c.comment_id) AS n_comments
- FROM '.table_prefix.'users u
- LEFT JOIN '.table_prefix.'users_extra AS x
- ON ( u.user_id = x.user_id OR x.user_id IS NULL )
- LEFT JOIN '.table_prefix.'comments AS c
- ON ( ( c.user_id=u.user_id AND c.name=u.username AND c.approved=1 ) OR ( c.comment_id IS NULL AND c.approved IS NULL ) )
- WHERE u.username=\'' . $db->escape($target_username) . '\'
- GROUP BY u.username, u.user_id, u.real_name, u.email, u.reg_time, u.user_has_avatar, u.avatar_type, x.' . implode(', x.', $ux_columns) . ';');
- if ( !$q )
- $db->_die();
-
- $user_exists = true;
-
- if ( $db->numrows() < 1 )
- {
- $user_exists = false;
- }
- else
- {
- $userdata = $db->fetchrow();
- if ( $userdata['authoritative_uid'] == 1 )
- {
- // Hide data for anonymous user
- $user_exists = false;
- unset($userdata);
- }
- }
-
- // get the user's rank
- if ( $user_exists )
- {
- $rank_data = $session->get_user_rank(intval($userdata['authoritative_uid']));
- }
- else
- {
- // get the rank data for the anonymous user (placeholder basically)
- $rank_data = $session->get_user_rank(1);
- }
-
- // add the userpage script to the header
- $template->add_header('');
-
- $output->header();
-
- // if ( $send_headers )
- // {
- // display_page_headers();
- // }
-
- //
- // BASIC INFORMATION
- // Presentation of username/rank/avatar/basic info
- //
-
- if ( $user_exists )
- {
-
- ?>
-
-
- - get('userpage_tab_profile'); ?>
- - get('userpage_tab_content'); ?>
- setHook('userpage_tabs_links');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
- ?>
-
-
-
-
-
- ';
-
- echo ' ';
-
- echo '
- ';
-
- // heading
- echo '
-
- ' . $lang->get('userpage_heading_basics', array('username' => htmlspecialchars($target_username))) . '
-
- ' . (
- $session->user_level >= USER_LEVEL_ADMIN ?
- '» ' . $lang->get('userpage_btn_administer_user') . ' '
- : ''
- ) . '
- ';
-
- // avi/rank/username
- echo '
-
- ' . (
- $userdata['user_has_avatar'] == 1 ?
- '
- ![' . $lang->get('usercp_avatar_image_alt', array('username' => $userdata['username'])) . '](' . make_avatar_url(intval($userdata['authoritative_uid']), $userdata['avatar_type'], $userdata['email']) . ')
- '
- : ''
- ) . '
- ' . htmlspecialchars($userdata['username']) . '
- ' . ( !empty($rank_data['user_title']) ? '
' . htmlspecialchars($rank_data['user_title']) : '' ) . '
- ' . ( !empty($rank_data['rank_title']) ? '
' . htmlspecialchars($lang->get($rank_data['rank_title'])) : '' ) . '
-
- ';
-
- // join date & total comments
- echo '';
- echo '
- ' . $lang->get('userpage_lbl_joined') . '
-
-
- ' . enano_date(ED_DATE | ED_TIME, $userdata['reg_time']) . '
- ';
- echo '
- ' . $lang->get('userpage_lbl_num_comments') . '
-
-
- ' . $userdata['n_comments'] . '
- ';
- echo ' ';
-
- // real name
- if ( !empty($userdata['real_name']) )
- {
- echo '
-
- ' . $lang->get('userpage_lbl_real_name') . '
-
-
- ' . htmlspecialchars($userdata['real_name']) . '
-
- ';
- }
-
- // latest comments
-
- echo '' . $lang->get('userpage_heading_comments', array('username' => htmlspecialchars($target_username))) . ' ';
- echo '';
-
- echo '';
- $class = 'row1';
-
- $tpl = '
- class="wikilink-nonexistent">{PAGE}
- {lang:userpage_comments_lbl_posted} {DATE}
- {SUBJECT}
- ';
- $parser = $template->makeParserText($tpl);
-
- if ( count($comments) > 0 )
- {
- foreach ( $comments as $comment )
- {
- $c_page_id = $paths->nslist[ $comment['namespace'] ] . sanitize_page_id($comment['page_id']);
- if ( isPage($c_page_id) )
- {
- $parser->assign_bool(array(
- 'page_exists' => true
- ));
- $page_title = get_page_title($c_page_id);
- }
- else
- {
- $parser->assign_bool(array(
- 'page_exists' => false
- ));
- $page_title = htmlspecialchars(dirtify_page_id($c_page_id));
- }
- $parser->assign_vars(array(
- 'CLASS' => $class,
- 'PAGE_LINK' => makeUrlNS($comment['namespace'], sanitize_page_id($comment['page_id'])),
- 'PAGE' => $page_title,
- 'SUBJECT' => $comment['subject'],
- 'DATE' => $comment['time'],
- 'COMMENT_LINK' => makeUrlNS($comment['namespace'], sanitize_page_id($comment['page_id']), 'do=comments', true)
- ));
- $class = ( $class == 'row3' ) ? 'row1' : 'row3';
- echo $parser->run();
- }
- }
- else
- {
- echo '' . $lang->get('userpage_msg_no_comments') . ' ';
- }
- echo '
';
-
- echo '';
- echo '
- ';
-
- echo ' ';
-
- //
- // CONTACT INFORMATION
- //
-
- echo ' ';
-
- echo '
- ';
-
- //
- // Main part of sidebar
- //
-
- // Contact information
-
- echo '' . $lang->get('userpage_heading_contact') . ' ' . $lang->get('userpage_lbl_email') . ' ' . $email_link . ' ' . $lang->get('userpage_lbl_homepage') . '
' . $userdata['user_homepage'] . ' ' . $lang->get('userpage_btn_send_pm', array('username' => htmlspecialchars($target_username), 'pm_link' => makeUrlNS('Special', 'PrivateMessages/Compose/to/' . $this->page_id, false, true))) . ' ' . $lang->get('userpage_btn_send_pm_guest', array('username' => htmlspecialchars($target_username), 'login_flags' => 'href="' . makeUrlNS('Special', 'Login/' . $paths->nslist[$this->namespace] . $this->page_id) . '" onclick="ajaxStartLogin(); return false;"')) . ' ' . $lang->get('userpage_lbl_aim') . ' ' . $userdata['user_aim'] . ' ' . $lang->get('userpage_lbl_yim') . ' ' . $userdata['user_yahoo'] . ' ' . $lang->get('userpage_lbl_wlm') . ' ' . $email_link . ' ' . $lang->get('userpage_lbl_xmpp') . ' ' . $email_link . ' ' . $lang->get('userpage_heading_real_life', array('username' => htmlspecialchars($target_username))) . ' ' . $lang->get('userpage_lbl_location') . ' ' . $userdata['user_location'] . ' ' . $lang->get('userpage_lbl_job') . ' ' . $userdata['user_job'] . ' ' . $lang->get('userpage_lbl_hobbies') . ' ' . $userdata['user_hobbies'] . ' ' . $lang->get('userpage_msg_no_contact_info', array('username' => htmlspecialchars($target_username))) . '
- ';
- echo ' ';
-
- //
- // End of profile
- //
-
- echo ' ';
-
- echo ''; // tab:profile
-
- }
-
- // User's own content
-
- echo '';
-
- echo '';
-
- if ( $this->exists )
- {
- $this->send_from_db(true, false);
- }
- else
- {
- $this->error_404();
- }
-
- echo ''; // tab:content
-
- $code = $plugins->setHook('userpage_tabs_body');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- if ( $user_exists )
- {
- echo ''; // userpage_wrap
- }
- else
- {
- if ( !is_valid_ip($target_username) )
- {
- echo '' . $lang->get('userpage_msg_user_not_exist', array('username' => htmlspecialchars($target_username))) . '
';
- }
- }
-
- // if ( $send_headers )
- // {
- // display_page_footers();
- // }
-
- $output->footer();
- }
+ public function __construct($page_id, $namespace, $revision_id = 0)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ parent::__construct($page_id, $namespace, $revision_id);
+
+ if ( ( $this->title == str_replace('_', ' ', $this->page_id) || $this->title == $paths->nslist['User'] . str_replace('_', ' ', $this->page_id) ) || !$this->exists )
+ {
+ $this->title = $lang->get('userpage_page_title', array('username' => str_replace('_', ' ', dirtify_page_id($this->page_id))));
+ $this->cdata['name'] = $this->title;
+ }
+
+ }
+
+ public function send()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $email;
+ global $lang, $output;
+
+ /**
+ * PLUGGING INTO USER PAGES
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * Userpages are highly programmable and extendable using a number of
+ * hooks. These hooks are:
+ *
+ * - userpage_sidebar_left
+ * - userpage_sidebar_right
+ * - userpage_tabs_links
+ * - userpage_tabs_body
+ *
+ * You can add a variety of sections to user pages, including new tabs
+ * and new sections on the tables. To add a tab, attach to
+ * userpage_tabs_links and echo out:
+ *
+ * YOUR TAB TEXT
+ *
+ * Then hook into userpage_tabs_body and echo out:
+ *
+ * YOUR TAB CONTENT
+ *
+ * The userpage javascript runtime will take care of everything else,
+ * meaning transitions, click events, etc. Currently it's not possible
+ * to add custom click events to tabs, but any DOM-related JS that needs
+ * to run in your tab can be run onload and the effects will be seen when
+ * your tab is clicked. YOURTABID should be lowercase alphanumeric and
+ * have a short prefix so as to assure that it remains specific to your
+ * plugin.
+ *
+ * To hook into the "profile" tab, use userpage_sidebar_{left,right}. Just
+ * echo out table cells as normal. The table on the left (the wide one) has
+ * four columns, and the one on the right has one column.
+ *
+ * See plugins.php for a guide on creating and attaching to hooks.
+ */
+
+ $page_urlname = dirtify_page_id($this->page_id);
+
+ $target_username = strtr($page_urlname,
+ Array(
+ '_' => ' ',
+ '<' => '<',
+ '>' => '>'
+ ));
+
+ $target_username = preg_replace('/^' . str_replace('/', '\\/', preg_quote($paths->nslist['User'])) . '/', '', $target_username);
+ list($target_username) = explode('/', $target_username);
+
+ $ux_columns = $db->columns_in(table_prefix . 'users_extra');
+
+ $output->set_title($this->title);
+ $q = $db->sql_query('SELECT u.username, u.user_id AS authoritative_uid, u.real_name, u.email, u.reg_time, u.user_has_avatar, u.avatar_type, x.*, COUNT(c.comment_id) AS n_comments
+ FROM '.table_prefix.'users u
+ LEFT JOIN '.table_prefix.'users_extra AS x
+ ON ( u.user_id = x.user_id OR x.user_id IS NULL )
+ LEFT JOIN '.table_prefix.'comments AS c
+ ON ( ( c.user_id=u.user_id AND c.name=u.username AND c.approved=1 ) OR ( c.comment_id IS NULL AND c.approved IS NULL ) )
+ WHERE u.username=\'' . $db->escape($target_username) . '\'
+ GROUP BY u.username, u.user_id, u.real_name, u.email, u.reg_time, u.user_has_avatar, u.avatar_type, x.' . implode(', x.', $ux_columns) . ';');
+ if ( !$q )
+ $db->_die();
+
+ $user_exists = true;
+
+ if ( $db->numrows() < 1 )
+ {
+ $user_exists = false;
+ }
+ else
+ {
+ $userdata = $db->fetchrow();
+ if ( $userdata['authoritative_uid'] == 1 )
+ {
+ // Hide data for anonymous user
+ $user_exists = false;
+ unset($userdata);
+ }
+ }
+
+ // get the user's rank
+ if ( $user_exists )
+ {
+ $rank_data = $session->get_user_rank(intval($userdata['authoritative_uid']));
+ }
+ else
+ {
+ // get the rank data for the anonymous user (placeholder basically)
+ $rank_data = $session->get_user_rank(1);
+ }
+
+ // add the userpage script to the header
+ $template->add_header('');
+
+ $output->header();
+
+ // if ( $send_headers )
+ // {
+ // display_page_headers();
+ // }
+
+ //
+ // BASIC INFORMATION
+ // Presentation of username/rank/avatar/basic info
+ //
+
+ if ( $user_exists )
+ {
+
+ ?>
+
+
+ - get('userpage_tab_profile'); ?>
+ - get('userpage_tab_content'); ?>
+ setHook('userpage_tabs_links');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+ ?>
+
+
+
+
+
+ ';
+
+ echo ' ';
+
+ echo '
+ ';
+
+ // heading
+ echo '
+
+ ' . $lang->get('userpage_heading_basics', array('username' => htmlspecialchars($target_username))) . '
+
+ ' . (
+ $session->user_level >= USER_LEVEL_ADMIN ?
+ '» ' . $lang->get('userpage_btn_administer_user') . ' '
+ : ''
+ ) . '
+ ';
+
+ // avi/rank/username
+ echo '
+
+ ' . (
+ $userdata['user_has_avatar'] == 1 ?
+ '
+
+ '
+ : ''
+ ) . '
+ ' . htmlspecialchars($userdata['username']) . '
+ ' . ( !empty($rank_data['user_title']) ? '
' . htmlspecialchars($rank_data['user_title']) : '' ) . '
+ ' . ( !empty($rank_data['rank_title']) ? '
' . htmlspecialchars($lang->get($rank_data['rank_title'])) : '' ) . '
+
+ ';
+
+ // join date & total comments
+ echo '';
+ echo '
+ ' . $lang->get('userpage_lbl_joined') . '
+
+
+ ' . enano_date(ED_DATE | ED_TIME, $userdata['reg_time']) . '
+ ';
+ echo '
+ ' . $lang->get('userpage_lbl_num_comments') . '
+
+
+ ' . $userdata['n_comments'] . '
+ ';
+ echo ' ';
+
+ // real name
+ if ( !empty($userdata['real_name']) )
+ {
+ echo '
+
+ ' . $lang->get('userpage_lbl_real_name') . '
+
+
+ ' . htmlspecialchars($userdata['real_name']) . '
+
+ ';
+ }
+
+ // latest comments
+
+ echo '' . $lang->get('userpage_heading_comments', array('username' => htmlspecialchars($target_username))) . ' ';
+ echo '';
+
+ echo '';
+ $class = 'row1';
+
+ $tpl = '
+ class="wikilink-nonexistent">{PAGE}
+ {lang:userpage_comments_lbl_posted} {DATE}
+ {SUBJECT}
+ ';
+ $parser = $template->makeParserText($tpl);
+
+ if ( count($comments) > 0 )
+ {
+ foreach ( $comments as $comment )
+ {
+ $c_page_id = $paths->nslist[ $comment['namespace'] ] . sanitize_page_id($comment['page_id']);
+ if ( isPage($c_page_id) )
+ {
+ $parser->assign_bool(array(
+ 'page_exists' => true
+ ));
+ $page_title = get_page_title($c_page_id);
+ }
+ else
+ {
+ $parser->assign_bool(array(
+ 'page_exists' => false
+ ));
+ $page_title = htmlspecialchars(dirtify_page_id($c_page_id));
+ }
+ $parser->assign_vars(array(
+ 'CLASS' => $class,
+ 'PAGE_LINK' => makeUrlNS($comment['namespace'], sanitize_page_id($comment['page_id'])),
+ 'PAGE' => $page_title,
+ 'SUBJECT' => $comment['subject'],
+ 'DATE' => $comment['time'],
+ 'COMMENT_LINK' => makeUrlNS($comment['namespace'], sanitize_page_id($comment['page_id']), 'do=comments', true)
+ ));
+ $class = ( $class == 'row3' ) ? 'row1' : 'row3';
+ echo $parser->run();
+ }
+ }
+ else
+ {
+ echo '' . $lang->get('userpage_msg_no_comments') . ' ';
+ }
+ echo '
';
+
+ echo '';
+ echo '
+ ';
+
+ echo ' ';
+
+ //
+ // CONTACT INFORMATION
+ //
+
+ echo ' ';
+
+ echo '
+ ';
+
+ //
+ // Main part of sidebar
+ //
+
+ // Contact information
+
+ echo '' . $lang->get('userpage_heading_contact') . ' ' . $lang->get('userpage_lbl_email') . ' ' . $email_link . ' ' . $lang->get('userpage_lbl_homepage') . '
' . $userdata['user_homepage'] . ' ' . $lang->get('userpage_btn_send_pm', array('username' => htmlspecialchars($target_username), 'pm_link' => makeUrlNS('Special', 'PrivateMessages/Compose/to/' . $this->page_id, false, true))) . ' ' . $lang->get('userpage_btn_send_pm_guest', array('username' => htmlspecialchars($target_username), 'login_flags' => 'href="' . makeUrlNS('Special', 'Login/' . $paths->nslist[$this->namespace] . $this->page_id) . '" onclick="ajaxStartLogin(); return false;"')) . ' ' . $lang->get('userpage_lbl_aim') . ' ' . $userdata['user_aim'] . ' ' . $lang->get('userpage_lbl_yim') . ' ' . $userdata['user_yahoo'] . ' ' . $lang->get('userpage_lbl_wlm') . ' ' . $email_link . ' ' . $lang->get('userpage_lbl_xmpp') . ' ' . $email_link . ' ' . $lang->get('userpage_heading_real_life', array('username' => htmlspecialchars($target_username))) . ' ' . $lang->get('userpage_lbl_location') . ' ' . $userdata['user_location'] . ' ' . $lang->get('userpage_lbl_job') . ' ' . $userdata['user_job'] . ' ' . $lang->get('userpage_lbl_hobbies') . ' ' . $userdata['user_hobbies'] . ' ' . $lang->get('userpage_msg_no_contact_info', array('username' => htmlspecialchars($target_username))) . '
+ ';
+ echo ' ';
+
+ //
+ // End of profile
+ //
+
+ echo ' ';
+
+ echo ''; // tab:profile
+
+ }
+
+ // User's own content
+
+ echo '';
+
+ echo '';
+
+ if ( $this->exists )
+ {
+ $this->send_from_db(true, false);
+ }
+ else
+ {
+ $this->error_404();
+ }
+
+ echo ''; // tab:content
+
+ $code = $plugins->setHook('userpage_tabs_body');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ if ( $user_exists )
+ {
+ echo ''; // userpage_wrap
+ }
+ else
+ {
+ if ( !is_valid_ip($target_username) )
+ {
+ echo '' . $lang->get('userpage_msg_user_not_exist', array('username' => htmlspecialchars($target_username))) . '
';
+ }
+ }
+
+ // if ( $send_headers )
+ // {
+ // display_page_footers();
+ // }
+
+ $output->footer();
+ }
}
diff -r de56132c008d -r bdac73ed481e includes/output.php
--- a/includes/output.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/output.php Sun Mar 28 23:10:46 2010 -0400
@@ -20,111 +20,111 @@
abstract class Output_Base
{
- /**
- * Page title
- * @var string
- */
-
- public $title = 'Untitled';
-
- /**
- * To allow scripts to determine whether we are outputting headers or not.
- * @var bool
- */
-
- public $naked = false;
-
- /**
- * Added content
- * @var string
- * @var string
- * @var string
- * @var string
- */
-
- public $before_header = '', $after_header = '', $before_footer = '', $after_footer = '';
-
- /**
- * Call this to send content headers (e.g. the first third of the document if HTML) in place of $template->header().
- * @access public
- */
-
- abstract public function header();
-
- /**
- * Call this to send extra stuff after the content (equivalent of $template->footer()).
- * @access public
- */
-
- abstract public function footer();
-
- /**
- * Add some code just before the header.
- * @access public
- */
-
- public function add_before_header($code)
- {
- $this->before_header .= $code;
- }
-
- /**
- * Add some code just after the header.
- * @access public
- */
-
- public function add_after_header($code)
- {
- $this->after_header .= $code;
- }
-
- /**
- * Add some code just before the footer.
- * @access public
- */
-
- public function add_before_footer($code)
- {
- $this->before_footer .= $code;
- }
-
- /**
- * Add some code just after the footer.
- * @access public
- */
-
- public function add_after_footer($code)
- {
- $this->after_footer .= $code;
- }
-
- /**
- * Send any required HTML headers through, e.g. Content-type.
- * @access public
- */
-
- public function http_headers()
- {
- header('Content-type: text/html');
- }
-
- /**
- * Set the title of the page being output.
- * @param string Page name
- */
-
- public function set_title($title)
- {
- $this->title = $title;
- }
-
- /**
- * Avoid sending things out of order.
- * @var bool
- * @var bool
- */
-
- public $headers_sent = false, $footers_sent = false;
+ /**
+ * Page title
+ * @var string
+ */
+
+ public $title = 'Untitled';
+
+ /**
+ * To allow scripts to determine whether we are outputting headers or not.
+ * @var bool
+ */
+
+ public $naked = false;
+
+ /**
+ * Added content
+ * @var string
+ * @var string
+ * @var string
+ * @var string
+ */
+
+ public $before_header = '', $after_header = '', $before_footer = '', $after_footer = '';
+
+ /**
+ * Call this to send content headers (e.g. the first third of the document if HTML) in place of $template->header().
+ * @access public
+ */
+
+ abstract public function header();
+
+ /**
+ * Call this to send extra stuff after the content (equivalent of $template->footer()).
+ * @access public
+ */
+
+ abstract public function footer();
+
+ /**
+ * Add some code just before the header.
+ * @access public
+ */
+
+ public function add_before_header($code)
+ {
+ $this->before_header .= $code;
+ }
+
+ /**
+ * Add some code just after the header.
+ * @access public
+ */
+
+ public function add_after_header($code)
+ {
+ $this->after_header .= $code;
+ }
+
+ /**
+ * Add some code just before the footer.
+ * @access public
+ */
+
+ public function add_before_footer($code)
+ {
+ $this->before_footer .= $code;
+ }
+
+ /**
+ * Add some code just after the footer.
+ * @access public
+ */
+
+ public function add_after_footer($code)
+ {
+ $this->after_footer .= $code;
+ }
+
+ /**
+ * Send any required HTML headers through, e.g. Content-type.
+ * @access public
+ */
+
+ public function http_headers()
+ {
+ header('Content-type: text/html');
+ }
+
+ /**
+ * Set the title of the page being output.
+ * @param string Page name
+ */
+
+ public function set_title($title)
+ {
+ $this->title = $title;
+ }
+
+ /**
+ * Avoid sending things out of order.
+ * @var bool
+ * @var bool
+ */
+
+ public $headers_sent = false, $footers_sent = false;
}
/**
@@ -133,62 +133,62 @@
class Output_HTML extends Output_Base
{
- public function header()
- {
- if ( $this->headers_sent )
- return;
-
- $this->headers_sent = true;
-
- ob_start();
- }
-
- public function footer()
- {
- global $template;
- if ( !$this->headers_sent )
- return;
-
- $this->headers_sent = false;
- $content = ob_get_contents();
- ob_end_clean();
-
- ob_start();
- echo $this->before_header;
- echo $template->getHeader();
- echo $this->after_header;
- echo $content;
- echo $this->before_footer;
- echo $template->getFooter();
- echo $this->after_footer;
-
- global $aggressive_optimize_html;
- if ( $aggressive_optimize_html )
- {
- $content = ob_get_contents();
- ob_end_clean();
-
- ob_start();
- echo aggressive_optimize_html($content);
- }
- else
- {
- $content = ob_get_contents();
- ob_end_clean();
-
- ob_start();
- echo preg_replace('~~', '', $content);
- }
-
- }
-
- public function set_title($title)
- {
- global $template;
- $template->assign_vars(array(
- 'PAGE_NAME' => htmlspecialchars($title)
- ));
- }
+ public function header()
+ {
+ if ( $this->headers_sent )
+ return;
+
+ $this->headers_sent = true;
+
+ ob_start();
+ }
+
+ public function footer()
+ {
+ global $template;
+ if ( !$this->headers_sent )
+ return;
+
+ $this->headers_sent = false;
+ $content = ob_get_contents();
+ ob_end_clean();
+
+ ob_start();
+ echo $this->before_header;
+ echo $template->getHeader();
+ echo $this->after_header;
+ echo $content;
+ echo $this->before_footer;
+ echo $template->getFooter();
+ echo $this->after_footer;
+
+ global $aggressive_optimize_html;
+ if ( $aggressive_optimize_html )
+ {
+ $content = ob_get_contents();
+ ob_end_clean();
+
+ ob_start();
+ echo aggressive_optimize_html($content);
+ }
+ else
+ {
+ $content = ob_get_contents();
+ ob_end_clean();
+
+ ob_start();
+ echo preg_replace('~~', '', $content);
+ }
+
+ }
+
+ public function set_title($title)
+ {
+ global $template;
+ $template->assign_vars(array(
+ 'PAGE_NAME' => htmlspecialchars($title)
+ ));
+ }
}
/**
@@ -197,43 +197,43 @@
class Output_HTML_Simple extends Output_HTML
{
- public function footer()
- {
- global $template;
- if ( !$this->headers_sent )
- return;
-
- $this->headers_sent = false;
- $content = ob_get_contents();
- ob_end_clean();
-
- ob_start();
- echo $this->before_header;
- echo $template->getHeader(true);
- echo $this->after_header;
- echo $content;
- echo $this->before_footer;
- echo $template->getFooter(true);
- echo $this->after_footer;
-
- global $aggressive_optimize_html;
- if ( $aggressive_optimize_html )
- {
- $content = ob_get_contents();
- ob_end_clean();
-
- ob_start();
- echo aggressive_optimize_html($content);
- }
- else
- {
- $content = ob_get_contents();
- ob_end_clean();
-
- ob_start();
- echo preg_replace('~~', '', $content);
- }
- }
+ public function footer()
+ {
+ global $template;
+ if ( !$this->headers_sent )
+ return;
+
+ $this->headers_sent = false;
+ $content = ob_get_contents();
+ ob_end_clean();
+
+ ob_start();
+ echo $this->before_header;
+ echo $template->getHeader(true);
+ echo $this->after_header;
+ echo $content;
+ echo $this->before_footer;
+ echo $template->getFooter(true);
+ echo $this->after_footer;
+
+ global $aggressive_optimize_html;
+ if ( $aggressive_optimize_html )
+ {
+ $content = ob_get_contents();
+ ob_end_clean();
+
+ ob_start();
+ echo aggressive_optimize_html($content);
+ }
+ else
+ {
+ $content = ob_get_contents();
+ ob_end_clean();
+
+ ob_start();
+ echo preg_replace('~~', '', $content);
+ }
+ }
}
/**
@@ -242,17 +242,17 @@
class Output_Striptease extends Output_HTML
{
- public function header()
- {
- echo $this->before_header;
- echo $this->after_header;
- }
-
- public function footer()
- {
- echo $this->before_footer;
- echo $this->after_footer;
- }
+ public function header()
+ {
+ echo $this->before_header;
+ echo $this->after_header;
+ }
+
+ public function footer()
+ {
+ echo $this->before_footer;
+ echo $this->after_footer;
+ }
}
/**
@@ -261,15 +261,15 @@
class Output_Naked extends Output_HTML
{
- public $naked = true;
-
- public function header()
- {
- }
-
- public function footer()
- {
- }
+ public $naked = true;
+
+ public function header()
+ {
+ }
+
+ public function footer()
+ {
+ }
}
/**
@@ -278,47 +278,47 @@
class Output_Safe
{
- protected $template;
- protected $headers_sent = false;
- public function __construct()
- {
- $this->template = new template_nodb();
- $theme = ( defined('ENANO_CONFIG_FETCHED') ) ? getConfig('theme_default') : 'oxygen';
- $style = ( defined('ENANO_CONFIG_FETCHED') ) ? '__foo__' : 'bleu';
-
- $this->template->load_theme($theme, $style);
- $this->template->tpl_strings['SITE_NAME'] = getConfig('site_name');
- $this->template->tpl_strings['SITE_DESC'] = getConfig('site_desc');
- $this->template->tpl_strings['COPYRIGHT'] = getConfig('copyright_notice');
- $this->template->tpl_strings['PAGE_NAME'] = 'Untitled';
- }
- public function header()
- {
- if ( $this->headers_sent )
- return;
-
- $this->headers_sent = true;
-
- $this->template->header();
- }
-
- public function footer()
- {
- global $template;
- if ( !$this->headers_sent )
- {
- $this->template->header();
- }
-
- $this->headers_sent = false;
- $this->template->footer();
-
- }
-
- public function set_title($title)
- {
- $this->template->tpl_strings['PAGE_NAME'] = $title;
- }
+ protected $template;
+ protected $headers_sent = false;
+ public function __construct()
+ {
+ $this->template = new template_nodb();
+ $theme = ( defined('ENANO_CONFIG_FETCHED') ) ? getConfig('theme_default') : 'oxygen';
+ $style = ( defined('ENANO_CONFIG_FETCHED') ) ? '__foo__' : 'bleu';
+
+ $this->template->load_theme($theme, $style);
+ $this->template->tpl_strings['SITE_NAME'] = getConfig('site_name');
+ $this->template->tpl_strings['SITE_DESC'] = getConfig('site_desc');
+ $this->template->tpl_strings['COPYRIGHT'] = getConfig('copyright_notice');
+ $this->template->tpl_strings['PAGE_NAME'] = 'Untitled';
+ }
+ public function header()
+ {
+ if ( $this->headers_sent )
+ return;
+
+ $this->headers_sent = true;
+
+ $this->template->header();
+ }
+
+ public function footer()
+ {
+ global $template;
+ if ( !$this->headers_sent )
+ {
+ $this->template->header();
+ }
+
+ $this->headers_sent = false;
+ $this->template->footer();
+
+ }
+
+ public function set_title($title)
+ {
+ $this->template->tpl_strings['PAGE_NAME'] = $title;
+ }
}
?>
diff -r de56132c008d -r bdac73ed481e includes/pageprocess.php
--- a/includes/pageprocess.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/pageprocess.php Sun Mar 28 23:10:46 2010 -0400
@@ -23,1271 +23,1271 @@
class PageProcessor
{
-
- /**
- * Page ID and namespace of the page handled by this instance
- * @var string
- */
-
- var $page_id;
- var $namespace;
-
- /**
- * The instance of the namespace processor for the namespace we're doing.
- * @var object
- */
-
- var $ns;
-
- /**
- * The title of the page sent to the template parser
- * @var string
- */
-
- var $title = '';
-
- /**
- * The information about the page(s) we were redirected from
- * @var array
- */
-
- var $redirect_stack = array();
-
- /**
- * The revision ID (history entry) to send. If set to 0 (the default) then the most recent revision will be sent.
- * @var int
- */
-
- var $revision_id = 0;
-
- /**
- * The time this revision was saved, as a UNIX timestamp
- * @var int
- */
-
- var $revision_time = 0;
-
- /**
- * Unsanitized page ID.
- * @var string
- */
-
- var $page_id_unclean;
-
- /**
- * Tracks if the page we're loading exists in the database or not.
- * @var bool
- */
-
- var $page_exists = false;
-
- /**
- * Permissions!
- * @var object
- */
-
- var $perms = null;
-
- /**
- * The SHA1 hash of the user-inputted password for the page
- * @var string
- */
-
- var $password = '';
-
- /**
- * Switch to track if redirects are allowed. Defaults to true.
- * @var bool
- */
-
- var $allow_redir = true;
-
- /**
- * Holds any error message from redirection code. Defaults to false (no error).
- * @var mixed
- */
-
- var $redir_error = false;
-
- /**
- * If this is set to true, this will call the header and footer funcs on $template when render() is called.
- * @var bool
- */
-
- var $send_headers = false;
-
- /**
- * Cache the fetched text so we don't fetch it from the DB twice.
- * @var string
- */
-
- var $text_cache = '';
-
- /**
- * Debugging information to track errors. You can set enable to false to disable sending debug information.
- * @var array
- */
-
- var $debug = array(
- 'enable' => false,
- 'works' => false
- );
-
- /**
- * The list of errors raised in the class.
- * @var array
- */
-
- var $_errors = array();
-
- /**
- * Constructor.
- * @param string The page ID (urlname) of the page
- * @param string The namespace of the page
- * @param int Optional. The revision ID to send.
- */
-
- function __construct( $page_id, $namespace, $revision_id = 0 )
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- profiler_log("PageProcessor [{$namespace}:{$page_id}]: Started constructor");
-
- // See if we can get some debug info
- if ( function_exists('debug_backtrace') && $this->debug['enable'] )
- {
- $this->debug['works'] = true;
- $this->debug['backtrace'] = enano_debug_print_backtrace(true);
- }
-
- // First things first - check page existence and permissions
-
- if ( !isset($paths->nslist[$namespace]) )
- {
- $this->send_error('The namespace "' . htmlspecialchars($namespace) . '" does not exist.');
- }
-
- if ( !is_int($revision_id) )
- $revision_id = 0;
-
- $this->_setup( $page_id, $namespace, $revision_id );
- }
-
- /**
- * The main method to send the page content. Also responsible for checking permissions and calling the statistics counter.
- * @param bool If true, the stat counter is called. Defaults to false.
- */
-
- function send( $do_stats = false )
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang, $output;
-
- profiler_log('PageProcessor: send() called');
-
- if ( !$this->perms->get_permissions('read') )
- {
- // Permission denied to read page. Is this one of our core pages that must always be allowed?
- // NOTE: Not even the administration panel will work if ACLs deny access to it.
- if ( $this->namespace == 'Special' && in_array($this->page_id, array('Login', 'Logout', 'LangExportJSON', 'CSS')) )
- {
- // Do nothing; allow execution to continue
- }
- else
- {
- // Page isn't whitelisted, behave as normal
- $this->err_access_denied();
- return false;
- }
- }
- if ( $this->revision_id > 0 && !$this->perms->get_permissions('history_view') )
- {
- $this->err_access_denied();
- return false;
- }
-
- // Is there a custom function registered for handling this namespace?
- // DEPRECATED (even though it only saw its way into one alpha release.)
- if ( $proc = $paths->get_namespace_processor($this->namespace) )
- {
- // yes, just call that
- // this is protected aggressively by the PathManager against overriding critical namespaces
- return call_user_func($proc, $this);
- }
-
- $pathskey = $paths->nslist[ $this->namespace ] . $this->page_id;
- $strict_no_headers = false;
- $admin_fail = false;
- if ( $this->namespace == 'Admin' && strstr($this->page_id, '/') )
- {
- $this->page_id = substr($this->page_id, 0, strpos($this->page_id, '/'));
- $funcname = "page_{$this->namespace}_{$this->page_id}";
- if ( function_exists($funcname) )
- {
- $this->page_exists = true;
- }
- }
- if ( isPage($pathskey) )
- {
- $cdata = $this->ns->get_cdata();
-
- if ( $cdata['special'] == 1 )
- {
- $this->send_headers = false;
- $strict_no_headers = true;
- $GLOBALS['output'] = new Output_Naked();
- }
- if ( isset($cdata['password']) )
- {
- if ( $cdata['password'] != '' && $cdata['password'] != sha1('') )
- {
- $password =& $cdata['password'];
- if ( $this->password != $password )
- {
- $this->err_wrong_password();
- return false;
- }
- }
- }
- if ( isset($cdata['require_admin']) && $cdata['require_admin'] )
- {
- if ( $session->auth_level < USER_LEVEL_ADMIN )
- {
- $admin_fail = true;
- }
- }
- }
- else if ( $this->namespace === $paths->namespace && $this->page_id == $paths->page_id )
- {
- if ( isset($paths->cpage['require_admin']) && $paths->cpage['require_admin'] )
- {
- if ( $session->auth_level < USER_LEVEL_ADMIN )
- {
- $admin_fail = true;
- }
- }
- }
- if ( $admin_fail )
- {
- header('Content-type: text/javascript');
- echo enano_json_encode(array(
- 'mode' => 'error',
- 'error' => 'need_auth_to_admin'
- ));
- return true;
- }
- if ( $this->page_exists && $this->namespace != 'Special' && $this->namespace != 'Admin' && $do_stats )
- {
- require_once(ENANO_ROOT.'/includes/stats.php');
- doStats($this->page_id, $this->namespace);
- }
-
- // We are all done. Ship off the page.
-
- if ( !$this->allow_redir )
- {
- if ( method_exists($this->ns, 'get_redirect') )
- {
- if ( $result = $this->ns->get_redirect() )
- display_redirect_notice($result['page_id'], $result['namespace']);
- }
- }
- else
- {
- $this->process_redirects();
-
- if ( count($this->redirect_stack) > 0 )
- {
- $stack = array_reverse($this->redirect_stack);
- foreach ( $stack as $stackel )
- {
- $url = makeUrlNS($stackel['old_namespace'], $stackel['old_page_id'], 'redirect=no', true);
- $page_data = $this->ns->get_cdata();
- $title = $stackel['old_title'];
- $a = '' . htmlspecialchars($title) . '';
- $output->add_after_header('' . $lang->get('page_msg_redirected_from', array('from' => $a)) . '
');
- }
- $template->set_page($this);
- }
-
- if ( $this->redir_error )
- {
- $output->add_after_header('');
- $result = $this->ns->get_redirect();
- display_redirect_notice($result['page_id'], $result['namespace']);
- }
- }
-
- $this->ns->send();
- }
-
- /**
- * Sends the page through by fetching it from the database.
- */
-
- function send_from_db($strict_no_headers = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- $this->ns->send_from_db();
- }
-
- /**
- * Fetches the wikitext or HTML source for the page.
- * @return string
- */
-
- function fetch_source()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( !$this->perms->get_permissions('view_source') )
- {
- return false;
- }
- if ( !$this->page_exists )
- {
- return '';
- }
- $cdata = $this->ns->get_cdata();
- if ( isset($cdata['password']) )
- {
- if ( $cdata['password'] != sha1('') && $cdata['password'] !== $this->password && !empty($cdata['password']) )
- {
- return false;
- }
- }
- return $this->fetch_text();
- }
-
- /**
- * Updates (saves/changes/edits) the content of the page.
- * @param string The new text for the page
- * @param string A summary of edits made to the page.
- * @param bool If true, the edit is marked as a minor revision
- * @param string Page format - wikitext or xhtml. REQUIRED, and new in 1.1.6.
- * @return bool True on success, false on failure. When returning false, it will push errors to the PageProcessor error stack; read with $page->pop_error()
- */
-
- function update_page($text, $edit_summary = false, $minor_edit = false, $page_format)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- // Create the page if it doesn't exist
- if ( !$this->page_exists )
- {
- if ( !$this->create_page() )
- {
- return false;
- }
- }
-
- //
- // Validation
- //
-
- $page_id = $db->escape($this->page_id);
- $namespace = $db->escape($this->namespace);
-
- $q = $db->sql_query('SELECT protected FROM ' . table_prefix . "pages WHERE urlname='$page_id' AND namespace='$namespace';");
- if ( !$q )
- $db->_die('PageProcess updating page content');
- if ( $db->numrows() < 1 )
- {
- $this->raise_error($lang->get('editor_err_no_rows'));
- return false;
- }
-
- // Do we have permission to edit the page?
- if ( !$this->perms->get_permissions('edit_page') )
- {
- $this->raise_error($lang->get('editor_err_no_permission'));
- return false;
- }
-
- list($protection) = $db->fetchrow_num();
- $db->free_result();
-
- if ( $protection == 1 )
- {
- // The page is protected - do we have permission to edit protected pages?
- if ( !$this->perms->get_permissions('even_when_protected') )
- {
- $this->raise_error($lang->get('editor_err_page_protected'));
- return false;
- }
- }
- else if ( $protection == 2 )
- {
- // The page is semi-protected.
- if (
- ( !$session->user_logged_in || // Is the user logged in?
- ( $session->user_logged_in && $session->reg_time + ( 4 * 86400 ) >= time() ) ) // If so, have they been registered for 4 days?
- && !$this->perms->get_permissions('even_when_protected') ) // And of course, is there an ACL that overrides semi-protection?
- {
- $this->raise_error($lang->get('editor_err_page_protected'));
- return false;
- }
- }
-
- // Spam check
- if ( !spamalyze($text) )
- {
- $this->raise_error($lang->get('editor_err_spamcheck_failed'));
- return false;
- }
-
- // Page format check
- if ( !in_array($page_format, array('xhtml', 'wikitext')) )
- {
- $this->raise_error("format \"$page_format\" not one of [xhtml, wikitext]");
- return false;
- }
-
- //
- // Protection validated; update page content
- //
-
- $text_undb = RenderMan::preprocess_text($text, false, false);
- $text = $db->escape($text_undb);
- $author = $db->escape($session->username);
- $time = time();
- $edit_summary = ( strval($edit_summary) === $edit_summary ) ? $db->escape($edit_summary) : '';
- $minor_edit = ( $minor_edit ) ? '1' : '0';
- $date_string = enano_date(ED_DATE | ED_TIME);
-
- // Insert log entry
- $sql = 'INSERT INTO ' . table_prefix . "logs ( time_id, date_string, log_type, action, page_id, namespace, author, author_uid, page_text, edit_summary, minor_edit, page_format )\n"
- . " VALUES ( $time, '$date_string', 'page', 'edit', '{$this->page_id}', '{$this->namespace}', '$author', $session->user_id, '$text', '$edit_summary', $minor_edit, '$page_format' );";
- if ( !$db->sql_query($sql) )
- {
- $this->raise_error($db->get_error());
- return false;
- }
-
- // Update the master text entry
- $sql = 'UPDATE ' . table_prefix . "page_text SET page_text = '$text' WHERE page_id = '{$this->page_id}' AND namespace = '{$this->namespace}';";
- if ( !$db->sql_query($sql) )
- {
- $this->raise_error($db->get_error());
- return false;
- }
-
- // If there's an identical draft copy, delete it
- $sql = 'DELETE FROM ' . table_prefix . "logs WHERE is_draft = 1 AND page_id = '{$this->page_id}' AND namespace = '{$this->namespace}' AND page_text = '{$text}';";
- if ( !$db->sql_query($sql) )
- {
- $this->raise_error($db->get_error());
- return false;
- }
-
- // Set page_format
- // Using @ due to warning thrown when saving new page
- $cdata = $this->ns->get_cdata();
- if ( @$cdata['page_format'] !== $page_format )
- {
- // Note: no SQL injection to worry about here. Everything that goes into this is sanitized already, barring some rogue plugin.
- // (and if there's a rogue plugin running, we have bigger things to worry about anyway.)
- if ( !$db->sql_query('UPDATE ' . table_prefix . "pages SET page_format = '$page_format' WHERE urlname = '$this->page_id' AND namespace = '$this->namespace';") )
- {
- $this->raise_error($db->get_error());
- return false;
- }
- $paths->update_metadata_cache();
- }
-
- // Rebuild the search index
- $paths->rebuild_page_index($this->page_id, $this->namespace);
-
- $this->text_cache = $text_undb;
-
- return true;
-
- }
-
- /**
- * Creates the page if it doesn't already exist.
- * @param string Optional page title.
- * @param bool Visibility (allow indexing) flag
- * @return bool True on success, false on failure.
- */
-
- function create_page($title = false, $visible = true)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- // Do we have permission to create the page?
- if ( !$this->perms->get_permissions('create_page') )
- {
- $this->raise_error($lang->get('pagetools_create_err_no_permission'));
- return false;
- }
-
- // Does it already exist?
- if ( $this->page_exists )
- {
- $this->raise_error($lang->get('pagetools_create_err_already_exists'));
- return false;
- }
-
- // It's not in there. Perform validation.
-
- // We can't create special, admin, or external pages.
- if ( $this->namespace == 'Special' || $this->namespace == 'Admin' || $this->namespace == 'API' )
- {
- $this->raise_error($lang->get('pagetools_create_err_nodb_namespace'));
- return false;
- }
-
- // Guess the proper title
- $name = ( !empty($title) ) ? $title : str_replace('_', ' ', dirtify_page_id($this->page_id));
-
- // Check for the restricted Project: prefix
- if ( substr($this->page_id, 0, 8) == 'Project:' )
- {
- $this->raise_error($lang->get('pagetools_create_err_reserved_prefix'));
- return false;
- }
-
- // Validation successful - insert the page
-
- $metadata = array(
- 'urlname' => $this->page_id,
- 'namespace' => $this->namespace,
- 'name' => $name,
- 'special' => 0,
- 'visible' => $visible ? 1 : 0,
- 'comments_on' => 1,
- 'protected' => ( $this->namespace == 'System' ? 1 : 0 ),
- 'delvotes' => 0,
- 'delvote_ips' => serialize(array()),
- 'wiki_mode' => 2
- );
-
- $paths->add_page($metadata);
-
- $page_id = $db->escape($this->page_id);
- $namespace = $db->escape($this->namespace);
- $name = $db->escape($name);
- $protect = ( $this->namespace == 'System' ) ? '1' : '0';
- $blank_array = $db->escape(serialize(array()));
-
- // Query 1: Metadata entry
- $q = $db->sql_query('INSERT INTO ' . table_prefix . "pages(name, urlname, namespace, visible, protected, delvotes, delvote_ips, wiki_mode)\n"
- . " VALUES ( '$name', '$page_id', '$namespace', {$metadata['visible']}, $protect, 0, '$blank_array', 2 );");
- if ( !$q )
- $db->_die('PageProcessor page creation - metadata stage');
-
- // Query 2: Text insertion
- $q = $db->sql_query('INSERT INTO ' . table_prefix . "page_text(page_id, namespace, page_text)\n"
- . "VALUES ( '$page_id', '$namespace', '' );");
- if ( !$q )
- $db->_die('PageProcessor page creation - text stage');
-
- // Query 3: Log entry
- $db->sql_query('INSERT INTO ' . table_prefix."logs(time_id, date_string, log_type, action, author, author_uid, page_id, namespace)\n"
- . " VALUES ( " . time() . ", 'DEPRECATED', 'page', 'create', \n"
- . " '" . $db->escape($session->username) . "', $session->user_id, '" . $db->escape($this->page_id) . "', '" . $this->namespace . "');");
- if ( !$q )
- $db->_die('PageProcessor page creation - logging stage');
-
- // Update the cache
- $paths->update_metadata_cache();
-
- // Make sure that when/if we save the page later in this instance it doesn't get re-created
- $this->page_exists = true;
-
- // Page created. We're good!
- return true;
- }
-
- /**
- * Rolls back a non-edit action in the logs
- * @param int Log entry (log_id) to roll back
- * @return array Standard Enano error/success protocol
- */
-
- function rollback_log_entry($log_id)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $cache;
-
- // Verify permissions
- if ( !$this->perms->get_permissions('history_rollback') )
- {
- return array(
- 'success' => false,
- 'error' => 'access_denied'
- );
- }
-
- // Check input
- $log_id = intval($log_id);
- if ( empty($log_id) )
- {
- return array(
- 'success' => false,
- 'error' => 'invalid_parameter'
- );
- }
-
- // Fetch the log entry
- $q = $db->sql_query('SELECT * FROM ' . table_prefix . "logs WHERE log_type = 'page' AND page_id='{$this->page_id}' AND namespace='{$this->namespace}' AND log_id = $log_id;");
- if ( !$q )
- $db->_die();
-
- // Is this even a valid log entry for this context?
- if ( $db->numrows() < 1 )
- {
- return array(
- 'success' => false,
- 'error' => 'entry_not_found'
- );
- }
-
- // All good, fetch and free the result
- $log_entry = $db->fetchrow();
- $db->free_result();
-
- $dateline = enano_date(ED_DATE | ED_TIME, $log_entry['time_id']);
-
- // Let's see, what do we have here...
- switch ( $log_entry['action'] )
- {
- case 'rename':
- // Page was renamed, let the rename method handle this
- return array_merge($this->rename_page($log_entry['edit_summary']), array('dateline' => $dateline, 'action' => $log_entry['action']));
- break;
- case 'prot':
- case 'unprot':
- case 'semiprot':
- return array_merge($this->protect_page(intval($log_entry['page_text']), '__REVERSION__'), array('dateline' => $dateline, 'action' => $log_entry['action']));
- break;
- case 'delete':
-
- // Raising a previously dead page has implications...
-
- // FIXME: l10n
- // rollback_extra is required because usually only moderators can undo page deletion AND restore the content.
- // potential flaw here - once recreated, can past revisions be restored by users without rollback_extra? should
- // probably modify editor routine to deny revert access if the timestamp < timestamp of last deletion if any.
- if ( !$this->perms->get_permissions('history_rollback_extra') )
- return 'Administrative privileges are required for page undeletion.';
-
- // Rolling back the deletion of a page that was since created?
- $pathskey = $paths->nslist[ $this->namespace ] . $this->page_id;
- if ( isPage($pathskey) )
- return array(
- 'success' => false,
- // This is a clean Christian in-joke.
- 'error' => 'seeking_living_among_dead'
- );
-
- // Generate a crappy page name
- $name = $db->escape( str_replace('_', ' ', dirtify_page_id($this->page_id)) );
-
- // Stage 1 - re-insert page
- $e = $db->sql_query('INSERT INTO ' . table_prefix.'pages(name,urlname,namespace) VALUES( \'' . $name . '\', \'' . $this->page_id . '\',\'' . $this->namespace . '\' )');
- if ( !$e )
- $db->die_json();
-
- // Select the latest published revision
- $q = $db->sql_query('SELECT page_text FROM ' . table_prefix . "logs WHERE\n"
- . " log_type = 'page'\n"
- . " AND action = 'edit'\n"
- . " AND page_id = '$this->page_id'\n"
- . " AND namespace = '$this->namespace'\n"
- . " AND is_draft != 1\n"
- . "ORDER BY time_id DESC LIMIT 1;");
- if ( !$q )
- $db->die_json();
- list($page_text) = $db->fetchrow_num();
- $db->free_result($q);
-
- // Apply the latest revision as the current page text
- $page_text = $db->escape($page_text);
- $e = $db->sql_query('INSERT INTO ' . table_prefix."page_text(page_id, namespace, page_text) VALUES\n"
- . " ( '$this->page_id', '$this->namespace', '$page_text' );");
- if ( !$e )
- $db->die_json();
-
- $cache->purge('page_meta');
-
- return array(
- 'success' => true,
- 'dateline' => $dateline,
- 'action' => $log_entry['action']
- );
-
- break;
- case 'reupload':
-
- // given a log id and some revision info, restore the old file.
- // get the timestamp of the file before this one
- $q = $db->sql_query('SELECT time_id, file_key, file_extension, filename, size, mimetype FROM ' . table_prefix . "files WHERE time_id < {$log_entry['time_id']} ORDER BY time_id DESC LIMIT 1;");
- if ( !$q )
- $db->_die();
-
- $row = $db->fetchrow();
- $db->free_result();
-
- // If the file hasn't been renamed to the new format (omitting timestamp), do that now.
- $fname = ENANO_ROOT . "/files/{$row['file_key']}_{$row['time_id']}{$row['file_extension']}";
- if ( @file_exists($fname) )
- {
- // it's stored in the old format - rename
- $fname_new = ENANO_ROOT . "/files/{$row['file_key']}{$row['file_extension']}";
- if ( !@rename($fname, $fname_new) )
- {
- return array(
- 'success' => false,
- 'error' => 'rb_file_rename_failed',
- 'action' => $log_entry['action']
- );
- }
- }
-
- // Insert a new file entry
- $time = time();
- $filename = $db->escape($row['filename']);
- $mimetype = $db->escape($row['mimetype']);
- $ext = $db->escape($row['file_extension']);
- $key = $db->escape($row['file_key']);
-
- $q = $db->sql_query('INSERT INTO ' . table_prefix . "files ( time_id, page_id, filename, size, mimetype, file_extension, file_key ) VALUES\n"
- . " ( $time, '$this->page_id', '$filename', {$row['size']}, '$mimetype', '$ext', '$key' );");
- if ( !$q )
- $db->die_json();
-
- // add reupload log entry
- $username = $db->escape($session->username);
- $q = $db->sql_query('INSERT INTO ' . table_prefix . "logs ( log_type, action, time_id, page_id, namespace, author, author_uid, edit_summary ) VALUES\n"
- . " ( 'page', 'reupload', $time, '$this->page_id', '$this->namespace', '$username', $session->user_id, '__ROLLBACK__' )");
- if ( !$q )
- $db->die_json();
-
- return array(
- 'success' => true,
- 'dateline' => $dateline,
- 'action' => $log_entry['action']
- );
-
- break;
- case 'votereset':
- if ( !$this->perms->get_permissions('history_rollback_extra') )
- return 'Denied!';
-
- // pull existing vote data
- $q = $db->sql_query('SELECT delvotes, delvote_ips FROM ' . table_prefix . "pages WHERE urlname = '$this->page_id' AND namespace = '$this->namespace';");
- if ( !$q )
- $db->_die();
-
- if ( $db->numrows() < 1 )
- return array(
- 'success' => false,
- 'error' => 'page_not_exist',
- 'action' => $log_entry['action']
- );
-
- list($curr_delvotes, $curr_delvote_ips) = $db->fetchrow_num();
- $db->free_result();
-
- // merge with existing votes
- $old_delvote_ips = unserialize($log_entry['page_text']);
- $new_delvote_ips = unserialize($curr_delvote_ips);
- $new_delvote_ips['u'] = array_unique(array_merge($new_delvote_ips['u'], $old_delvote_ips['u']));
- $new_delvote_ips['ip'] = array_unique(array_merge($new_delvote_ips['ip'], $old_delvote_ips['ip']));
- $new_delvotes = count($new_delvote_ips['ip']);
- $new_delvote_ips = $db->escape(serialize($new_delvote_ips));
-
- // update pages table
- $q = $db->sql_query('UPDATE ' . table_prefix . "pages SET delvotes = $new_delvotes, delvote_ips = '$new_delvote_ips' WHERE urlname = '$this->page_id' AND namespace = '$this->namespace';");
-
- $cache->purge('page_meta');
-
- return array(
- 'success' => true,
- 'dateline' => $dateline,
- 'action' => $log_entry['action']
- );
- break;
- default:
-
- return array(
- 'success' => false,
- 'error' => 'rb_action_not_supported',
- 'action' => $log_entry['action']
- );
-
- break;
- }
- }
-
- /**
- * Renames the page
- * @param string New name
- * @return array Standard Enano error/success protocol
- */
-
- function rename_page($new_name)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- // Check permissions
- if ( !$this->perms->get_permissions('rename') )
- {
- return array(
- 'success' => false,
- 'error' => 'access_denied'
- );
- }
-
- // If this is the same as the current name, return success
- $page_name = get_page_title_ns($this->page_id, $this->namespace);
- if ( $page_name === $new_name )
- {
- return array(
- 'success' => true
- );
- }
-
- // Make sure the name is valid
- $new_name = trim($new_name);
- if ( empty($new_name) )
- {
- return array(
- 'success' => false,
- 'error' => 'invalid_parameter'
- );
- }
-
- // Log the action
- $username = $db->escape($session->username);
- $page_name = $db->escape($page_name);
- $time = time();
-
- $q = $db->sql_query('INSERT INTO ' . table_prefix . "logs ( log_type, action, page_id, namespace, author, author_uid, edit_summary, time_id, date_string ) VALUES\n"
- . " ( 'page', 'rename', '{$this->page_id}', '{$this->namespace}', '$username', $session->user_id, '$page_name', '$time', 'DATE_STRING COLUMN OBSOLETE, USE time_id' );");
- if ( !$q )
- $db->_die();
-
- // Not much to do but to rename it now
- $new_name = $db->escape($new_name);
- $q = $db->sql_query('UPDATE ' . table_prefix . "pages SET name = '$new_name' WHERE urlname = '{$this->page_id}' AND namespace = '{$this->namespace}';");
- if ( !$q )
- $db->_die();
-
- // Update the cache
- $paths->update_metadata_cache();
-
- return array(
- 'success' => true
- );
- }
-
- /**
- * Sets the protection level of the page
- * @param int Protection level, one of PROTECT_{FULL,SEMI,NONE}
- * @param string Reason for protection - required
- */
-
- function protect_page($protection_level, $reason)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $cache;
-
- // Validate permissions
- if ( !$this->perms->get_permissions('protect') )
- {
- return array(
- 'success' => false,
- 'error' => 'access_denied'
- );
- }
-
- // Validate re-auth
- if ( !$session->sid_super )
- {
- return array(
- 'success' => false,
- 'error' => 'access_denied_need_reauth'
- );
- }
-
- // Validate input
- $reason = trim($reason);
- if ( !in_array($protection_level, array(PROTECT_NONE, PROTECT_FULL, PROTECT_SEMI)) || empty($reason) )
- {
- return array(
- 'success' => false,
- 'error' => 'invalid_parameter'
- );
- }
-
- // Retrieve page metadata
- $metadata = $this->ns->get_cdata();
-
- // Log the action
- $username = $db->escape($session->username);
- $time = time();
- $existing_protection = intval($metadata['protected']);
- $reason = $db->escape($reason);
-
- if ( $existing_protection == $protection_level )
- {
- return array(
- 'success' => false,
- 'error' => 'protection_already_there'
- );
- }
-
- $action = '[ insanity ]';
- switch($protection_level)
- {
- case PROTECT_FULL: $action = 'prot'; break;
- case PROTECT_NONE: $action = 'unprot'; break;
- case PROTECT_SEMI: $action = 'semiprot'; break;
- }
-
- $sql = 'INSERT INTO ' . table_prefix . "logs ( log_type, action, page_id, namespace, author, author_uid, edit_summary, time_id, page_text, date_string ) VALUES\n"
- . " ( 'page', '$action', '{$this->page_id}', '{$this->namespace}', '$username', $author_uid, '$reason', '$time', '$existing_protection', 'DATE_STRING COLUMN OBSOLETE, USE time_id' );";
- if ( !$db->sql_query($sql) )
- {
- $db->die_json();
- }
-
- // Perform the actual protection
- $q = $db->sql_query('UPDATE ' . table_prefix . "pages SET protected = $protection_level WHERE urlname = '{$this->page_id}' AND namespace = '{$this->namespace}';");
- if ( !$q )
- $db->die_json();
-
- $cache->purge('page_meta');
-
- return array(
- 'success' => true
- );
- }
-
- /**
- * Sets internal variables.
- * @access private
- */
-
- function _setup($page_id, $namespace, $revision_id)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $page_id_cleaned = sanitize_page_id($page_id);
-
- $this->revision_id = $revision_id;
- $this->page_id_unclean = dirtify_page_id($page_id);
-
- // resolve namespace
- $this->ns = namespace_factory($page_id, $namespace, $this->revision_id);
- $this->page_id =& $this->ns->page_id;
- $this->namespace =& $this->ns->namespace;
-
- $this->perms = $session->fetch_page_acl( $page_id, $namespace );
-
- $this->page_exists = $this->ns->exists();
- $this->title = get_page_title_ns($this->page_id, $this->namespace);
-
- profiler_log("PageProcessor [{$this->namespace}:{$this->page_id}]: Ran _setup()");
- }
-
- /**
- * Processes any redirects.
- * @access private
- */
-
- function process_redirects()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $output, $lang;
-
- $this->redirect_stack = array();
-
- if ( !method_exists($this->ns, 'get_redirect') )
- return true;
-
- if ( !$this->allow_redir )
- return true;
-
- $redirect_count = 0;
-
- while ( $result = $this->ns->get_redirect() )
- {
- if ( $result['namespace'] == 'Special' || $result['namespace'] == 'Admin' )
- {
- // Can't redirect to special/admin page
- $this->redir_error = $lang->get('page_err_redirect_to_special');
- break;
- }
- if ( $redirect_count == 3 )
- {
- // max of 3 internal redirects exceeded
- $this->redir_error = $lang->get('page_err_redirects_exceeded');
- break;
- }
-
- $loop = false;
- foreach ( $this->redirect_stack as $stackel )
- {
- if ( $result['page_id'] == $stackel['old_page_id'] && $result['namespace'] == $stackel['old_namespace'] )
- {
- $loop = true;
- break;
- }
- }
-
- if ( $loop )
- {
- // redirect loop
- $this->redir_error = $lang->get('page_err_redirect_infinite_loop');
- break;
- }
- $new_ns = namespace_factory($result['page_id'], $result['namespace']);
- if ( !$new_ns->exists() )
- {
- // new page doesn't exist
- $this->redir_error = $lang->get('page_err_redirect_to_nonexistent');
- break;
- }
-
- // build stack entry
- $stackel = array(
- 'page_id' => $result['page_id'],
- 'namespace' => $result['namespace'],
- 'old_page_id' => $this->page_id,
- 'old_namespace' => $this->namespace,
- 'old_title' => $this->ns->title
- );
-
- // replace everything (perform the actual redirect)
- $this->ns = $new_ns;
-
- $this->page_id =& $this->ns->page_id;
- $this->namespace =& $this->ns->namespace;
-
- $this->redirect_stack[] = $stackel;
-
- $redirect_count++;
- }
- }
-
- /**
- * Sends the page header, dependent on, of course, whether we're supposed to.
- */
-
- function header()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- if ( $this->send_headers )
- $template->header();
- }
-
- /**
- * Sends the page footer, dependent on, of course, whether we're supposed to.
- */
-
- function footer()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- if ( $this->send_headers )
- $template->footer();
- }
-
- /**
- * Fetches the raw, unfiltered page text.
- * @access public
- */
-
- function fetch_text()
- {
- return $this->ns->fetch_text();
- }
-
- /**
- * Tells us if the page exists.
- * @return bool
- */
-
- function exists()
- {
- return $this->ns->exists();
- }
-
- /**
- * Send the error message to the user that the access to this page is denied.
- * @access private
- */
-
- function err_access_denied()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- global $email;
-
- // Log it for crying out loud
- $q = $db->sql_query('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,author_uid,edit_summary,page_text) VALUES(\'security\', \'illegal_page\', '.time().', \'DEPRECATED\', \''.$db->escape($session->username).'\', ' . $session->user_id . ', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', \'' . $db->escape(serialize(array($this->page_id, $this->namespace))) . '\')');
-
- $ob = '';
- //$template->tpl_strings['PAGE_NAME'] = 'Access denied';
- $template->tpl_strings['PAGE_NAME'] = htmlspecialchars( $this->title );
-
- if ( $this->send_headers )
- {
- $ob .= $template->getHeader();
- }
-
- if ( count($this->redirect_stack) > 0 )
- {
- $stack = array_reverse($this->redirect_stack);
- foreach ( $stack as $oldtarget )
- {
- $url = makeUrlNS($oldtarget[1], $oldtarget[0], 'redirect=no', true);
- $old_page = namespace_factory($oldtarget[0], $oldtarget[1]);
- $page_data = $old_page->get_cdata();
- $title = ( isset($page_data['name']) ) ? $page_data['name'] : $paths->nslist[$oldtarget[1]] . htmlspecialchars( str_replace('_', ' ', dirtify_page_id( $oldtarget[0] ) ) );
- $a = '' . $title . '';
-
- $url = makeUrlNS($this->namespace, $this->page_id, 'redirect=no', true);
- $page_data = $this->ns->get_cdata();
- $title = ( isset($page_data['name']) ) ? $page_data['name'] : $paths->nslist[$this->namespace] . htmlspecialchars( str_replace('_', ' ', dirtify_page_id( $this->page_id ) ) );
- $b = '' . $title . '';
-
- $ob .= '' . $lang->get('page_msg_redirected_from_to', array('from' => $a, 'to' => $b)) . '
';
- }
- }
-
- $email_link = $email->encryptEmail(getConfig('contact_email'), '', '', $lang->get('page_err_access_denied_siteadmin'));
-
- $ob .= "" . $lang->get('page_err_access_denied_title') . "
";
- $ob .= "" . $lang->get('page_err_access_denied_body', array('site_administration' => $email_link)) . "
";
-
- if ( $this->send_headers )
- {
- $ob .= $template->getFooter();
- }
- echo $ob;
- }
-
- /**
- * Inform the user of an incorrect or absent password
- * @access private
- */
-
- function err_wrong_password()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- $title = $lang->get('page_msg_passrequired_title');
- $message = ( empty($this->password) ) ?
- '' . $lang->get('page_msg_passrequired') . '
' :
- '' . $lang->get('page_msg_pass_wrong') . '
';
- $message .= '';
- if ( $this->send_headers )
- {
- $template->tpl_strings['PAGE_NAME'] = $title;
- $template->header();
- echo "$message";
- $template->footer();
- }
- else
- {
- echo "$title
- $message";
- }
- }
-
- /**
- * Send the error message to the user complaining that there weren't any rows.
- * @access private
- */
-
- function err_no_rows()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $title = 'No text rows';
- $message = 'While the page\'s existence was verified, there were no rows in the database that matched the query for the text. This may indicate a bug with the software; ask the webmaster for more information. The offending query was:' . $db->latest_query . '
';
- if ( $this->send_headers )
- {
- $template->tpl_strings['PAGE_NAME'] = $title;
- $template->header();
- echo "$message
";
- $template->footer();
- }
- else
- {
- echo "$title
- $message
";
- }
- }
-
- /**
- * Send an error message and die. For debugging or critical technical errors only - nothing that would under normal circumstances be shown to the user.
- * @param string Error message
- * @param bool If true, send DBAL's debugging information as well
- */
-
- function send_error($message, $sql = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- $content = "$message
";
- $template->tpl_strings['PAGE_NAME'] = $lang->get('page_msg_general_error');
-
- if ( $this->debug['works'] )
- {
- $content .= $this->debug['backtrace'];
- }
-
- header('HTTP/1.1 500 Internal Server Error');
-
- $template->header();
- echo $content;
- $template->footer();
-
- $db->close();
-
- exit;
-
- }
-
- /**
- * Raises an error.
- * @param string Error string
- */
-
- function raise_error($string)
- {
- if ( !is_string($string) )
- return false;
- $this->_errors[] = $string;
- }
-
- /**
- * Retrieves the latest error from the error stack and returns it ('pops' the error stack)
- * @return string
- */
-
- function pop_error()
- {
- if ( count($this->_errors) < 1 )
- return false;
- return array_pop($this->_errors);
- }
-
+
+ /**
+ * Page ID and namespace of the page handled by this instance
+ * @var string
+ */
+
+ var $page_id;
+ var $namespace;
+
+ /**
+ * The instance of the namespace processor for the namespace we're doing.
+ * @var object
+ */
+
+ var $ns;
+
+ /**
+ * The title of the page sent to the template parser
+ * @var string
+ */
+
+ var $title = '';
+
+ /**
+ * The information about the page(s) we were redirected from
+ * @var array
+ */
+
+ var $redirect_stack = array();
+
+ /**
+ * The revision ID (history entry) to send. If set to 0 (the default) then the most recent revision will be sent.
+ * @var int
+ */
+
+ var $revision_id = 0;
+
+ /**
+ * The time this revision was saved, as a UNIX timestamp
+ * @var int
+ */
+
+ var $revision_time = 0;
+
+ /**
+ * Unsanitized page ID.
+ * @var string
+ */
+
+ var $page_id_unclean;
+
+ /**
+ * Tracks if the page we're loading exists in the database or not.
+ * @var bool
+ */
+
+ var $page_exists = false;
+
+ /**
+ * Permissions!
+ * @var object
+ */
+
+ var $perms = null;
+
+ /**
+ * The SHA1 hash of the user-inputted password for the page
+ * @var string
+ */
+
+ var $password = '';
+
+ /**
+ * Switch to track if redirects are allowed. Defaults to true.
+ * @var bool
+ */
+
+ var $allow_redir = true;
+
+ /**
+ * Holds any error message from redirection code. Defaults to false (no error).
+ * @var mixed
+ */
+
+ var $redir_error = false;
+
+ /**
+ * If this is set to true, this will call the header and footer funcs on $template when render() is called.
+ * @var bool
+ */
+
+ var $send_headers = false;
+
+ /**
+ * Cache the fetched text so we don't fetch it from the DB twice.
+ * @var string
+ */
+
+ var $text_cache = '';
+
+ /**
+ * Debugging information to track errors. You can set enable to false to disable sending debug information.
+ * @var array
+ */
+
+ var $debug = array(
+ 'enable' => false,
+ 'works' => false
+ );
+
+ /**
+ * The list of errors raised in the class.
+ * @var array
+ */
+
+ var $_errors = array();
+
+ /**
+ * Constructor.
+ * @param string The page ID (urlname) of the page
+ * @param string The namespace of the page
+ * @param int Optional. The revision ID to send.
+ */
+
+ function __construct( $page_id, $namespace, $revision_id = 0 )
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ profiler_log("PageProcessor [{$namespace}:{$page_id}]: Started constructor");
+
+ // See if we can get some debug info
+ if ( function_exists('debug_backtrace') && $this->debug['enable'] )
+ {
+ $this->debug['works'] = true;
+ $this->debug['backtrace'] = enano_debug_print_backtrace(true);
+ }
+
+ // First things first - check page existence and permissions
+
+ if ( !isset($paths->nslist[$namespace]) )
+ {
+ $this->send_error('The namespace "' . htmlspecialchars($namespace) . '" does not exist.');
+ }
+
+ if ( !is_int($revision_id) )
+ $revision_id = 0;
+
+ $this->_setup( $page_id, $namespace, $revision_id );
+ }
+
+ /**
+ * The main method to send the page content. Also responsible for checking permissions and calling the statistics counter.
+ * @param bool If true, the stat counter is called. Defaults to false.
+ */
+
+ function send( $do_stats = false )
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang, $output;
+
+ profiler_log('PageProcessor: send() called');
+
+ if ( !$this->perms->get_permissions('read') )
+ {
+ // Permission denied to read page. Is this one of our core pages that must always be allowed?
+ // NOTE: Not even the administration panel will work if ACLs deny access to it.
+ if ( $this->namespace == 'Special' && in_array($this->page_id, array('Login', 'Logout', 'LangExportJSON', 'CSS')) )
+ {
+ // Do nothing; allow execution to continue
+ }
+ else
+ {
+ // Page isn't whitelisted, behave as normal
+ $this->err_access_denied();
+ return false;
+ }
+ }
+ if ( $this->revision_id > 0 && !$this->perms->get_permissions('history_view') )
+ {
+ $this->err_access_denied();
+ return false;
+ }
+
+ // Is there a custom function registered for handling this namespace?
+ // DEPRECATED (even though it only saw its way into one alpha release.)
+ if ( $proc = $paths->get_namespace_processor($this->namespace) )
+ {
+ // yes, just call that
+ // this is protected aggressively by the PathManager against overriding critical namespaces
+ return call_user_func($proc, $this);
+ }
+
+ $pathskey = $paths->nslist[ $this->namespace ] . $this->page_id;
+ $strict_no_headers = false;
+ $admin_fail = false;
+ if ( $this->namespace == 'Admin' && strstr($this->page_id, '/') )
+ {
+ $this->page_id = substr($this->page_id, 0, strpos($this->page_id, '/'));
+ $funcname = "page_{$this->namespace}_{$this->page_id}";
+ if ( function_exists($funcname) )
+ {
+ $this->page_exists = true;
+ }
+ }
+ if ( isPage($pathskey) )
+ {
+ $cdata = $this->ns->get_cdata();
+
+ if ( $cdata['special'] == 1 )
+ {
+ $this->send_headers = false;
+ $strict_no_headers = true;
+ $GLOBALS['output'] = new Output_Naked();
+ }
+ if ( isset($cdata['password']) )
+ {
+ if ( $cdata['password'] != '' && $cdata['password'] != sha1('') )
+ {
+ $password =& $cdata['password'];
+ if ( $this->password != $password )
+ {
+ $this->err_wrong_password();
+ return false;
+ }
+ }
+ }
+ if ( isset($cdata['require_admin']) && $cdata['require_admin'] )
+ {
+ if ( $session->auth_level < USER_LEVEL_ADMIN )
+ {
+ $admin_fail = true;
+ }
+ }
+ }
+ else if ( $this->namespace === $paths->namespace && $this->page_id == $paths->page_id )
+ {
+ if ( isset($paths->cpage['require_admin']) && $paths->cpage['require_admin'] )
+ {
+ if ( $session->auth_level < USER_LEVEL_ADMIN )
+ {
+ $admin_fail = true;
+ }
+ }
+ }
+ if ( $admin_fail )
+ {
+ header('Content-type: text/javascript');
+ echo enano_json_encode(array(
+ 'mode' => 'error',
+ 'error' => 'need_auth_to_admin'
+ ));
+ return true;
+ }
+ if ( $this->page_exists && $this->namespace != 'Special' && $this->namespace != 'Admin' && $do_stats )
+ {
+ require_once(ENANO_ROOT.'/includes/stats.php');
+ doStats($this->page_id, $this->namespace);
+ }
+
+ // We are all done. Ship off the page.
+
+ if ( !$this->allow_redir )
+ {
+ if ( method_exists($this->ns, 'get_redirect') )
+ {
+ if ( $result = $this->ns->get_redirect() )
+ display_redirect_notice($result['page_id'], $result['namespace']);
+ }
+ }
+ else
+ {
+ $this->process_redirects();
+
+ if ( count($this->redirect_stack) > 0 )
+ {
+ $stack = array_reverse($this->redirect_stack);
+ foreach ( $stack as $stackel )
+ {
+ $url = makeUrlNS($stackel['old_namespace'], $stackel['old_page_id'], 'redirect=no', true);
+ $page_data = $this->ns->get_cdata();
+ $title = $stackel['old_title'];
+ $a = '' . htmlspecialchars($title) . '';
+ $output->add_after_header('' . $lang->get('page_msg_redirected_from', array('from' => $a)) . '
');
+ }
+ $template->set_page($this);
+ }
+
+ if ( $this->redir_error )
+ {
+ $output->add_after_header('');
+ $result = $this->ns->get_redirect();
+ display_redirect_notice($result['page_id'], $result['namespace']);
+ }
+ }
+
+ $this->ns->send();
+ }
+
+ /**
+ * Sends the page through by fetching it from the database.
+ */
+
+ function send_from_db($strict_no_headers = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ $this->ns->send_from_db();
+ }
+
+ /**
+ * Fetches the wikitext or HTML source for the page.
+ * @return string
+ */
+
+ function fetch_source()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( !$this->perms->get_permissions('view_source') )
+ {
+ return false;
+ }
+ if ( !$this->page_exists )
+ {
+ return '';
+ }
+ $cdata = $this->ns->get_cdata();
+ if ( isset($cdata['password']) )
+ {
+ if ( $cdata['password'] != sha1('') && $cdata['password'] !== $this->password && !empty($cdata['password']) )
+ {
+ return false;
+ }
+ }
+ return $this->fetch_text();
+ }
+
+ /**
+ * Updates (saves/changes/edits) the content of the page.
+ * @param string The new text for the page
+ * @param string A summary of edits made to the page.
+ * @param bool If true, the edit is marked as a minor revision
+ * @param string Page format - wikitext or xhtml. REQUIRED, and new in 1.1.6.
+ * @return bool True on success, false on failure. When returning false, it will push errors to the PageProcessor error stack; read with $page->pop_error()
+ */
+
+ function update_page($text, $edit_summary = false, $minor_edit = false, $page_format)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ // Create the page if it doesn't exist
+ if ( !$this->page_exists )
+ {
+ if ( !$this->create_page() )
+ {
+ return false;
+ }
+ }
+
+ //
+ // Validation
+ //
+
+ $page_id = $db->escape($this->page_id);
+ $namespace = $db->escape($this->namespace);
+
+ $q = $db->sql_query('SELECT protected FROM ' . table_prefix . "pages WHERE urlname='$page_id' AND namespace='$namespace';");
+ if ( !$q )
+ $db->_die('PageProcess updating page content');
+ if ( $db->numrows() < 1 )
+ {
+ $this->raise_error($lang->get('editor_err_no_rows'));
+ return false;
+ }
+
+ // Do we have permission to edit the page?
+ if ( !$this->perms->get_permissions('edit_page') )
+ {
+ $this->raise_error($lang->get('editor_err_no_permission'));
+ return false;
+ }
+
+ list($protection) = $db->fetchrow_num();
+ $db->free_result();
+
+ if ( $protection == 1 )
+ {
+ // The page is protected - do we have permission to edit protected pages?
+ if ( !$this->perms->get_permissions('even_when_protected') )
+ {
+ $this->raise_error($lang->get('editor_err_page_protected'));
+ return false;
+ }
+ }
+ else if ( $protection == 2 )
+ {
+ // The page is semi-protected.
+ if (
+ ( !$session->user_logged_in || // Is the user logged in?
+ ( $session->user_logged_in && $session->reg_time + ( 4 * 86400 ) >= time() ) ) // If so, have they been registered for 4 days?
+ && !$this->perms->get_permissions('even_when_protected') ) // And of course, is there an ACL that overrides semi-protection?
+ {
+ $this->raise_error($lang->get('editor_err_page_protected'));
+ return false;
+ }
+ }
+
+ // Spam check
+ if ( !spamalyze($text) )
+ {
+ $this->raise_error($lang->get('editor_err_spamcheck_failed'));
+ return false;
+ }
+
+ // Page format check
+ if ( !in_array($page_format, array('xhtml', 'wikitext')) )
+ {
+ $this->raise_error("format \"$page_format\" not one of [xhtml, wikitext]");
+ return false;
+ }
+
+ //
+ // Protection validated; update page content
+ //
+
+ $text_undb = RenderMan::preprocess_text($text, false, false);
+ $text = $db->escape($text_undb);
+ $author = $db->escape($session->username);
+ $time = time();
+ $edit_summary = ( strval($edit_summary) === $edit_summary ) ? $db->escape($edit_summary) : '';
+ $minor_edit = ( $minor_edit ) ? '1' : '0';
+ $date_string = enano_date(ED_DATE | ED_TIME);
+
+ // Insert log entry
+ $sql = 'INSERT INTO ' . table_prefix . "logs ( time_id, date_string, log_type, action, page_id, namespace, author, author_uid, page_text, edit_summary, minor_edit, page_format )\n"
+ . " VALUES ( $time, '$date_string', 'page', 'edit', '{$this->page_id}', '{$this->namespace}', '$author', $session->user_id, '$text', '$edit_summary', $minor_edit, '$page_format' );";
+ if ( !$db->sql_query($sql) )
+ {
+ $this->raise_error($db->get_error());
+ return false;
+ }
+
+ // Update the master text entry
+ $sql = 'UPDATE ' . table_prefix . "page_text SET page_text = '$text' WHERE page_id = '{$this->page_id}' AND namespace = '{$this->namespace}';";
+ if ( !$db->sql_query($sql) )
+ {
+ $this->raise_error($db->get_error());
+ return false;
+ }
+
+ // If there's an identical draft copy, delete it
+ $sql = 'DELETE FROM ' . table_prefix . "logs WHERE is_draft = 1 AND page_id = '{$this->page_id}' AND namespace = '{$this->namespace}' AND page_text = '{$text}';";
+ if ( !$db->sql_query($sql) )
+ {
+ $this->raise_error($db->get_error());
+ return false;
+ }
+
+ // Set page_format
+ // Using @ due to warning thrown when saving new page
+ $cdata = $this->ns->get_cdata();
+ if ( @$cdata['page_format'] !== $page_format )
+ {
+ // Note: no SQL injection to worry about here. Everything that goes into this is sanitized already, barring some rogue plugin.
+ // (and if there's a rogue plugin running, we have bigger things to worry about anyway.)
+ if ( !$db->sql_query('UPDATE ' . table_prefix . "pages SET page_format = '$page_format' WHERE urlname = '$this->page_id' AND namespace = '$this->namespace';") )
+ {
+ $this->raise_error($db->get_error());
+ return false;
+ }
+ $paths->update_metadata_cache();
+ }
+
+ // Rebuild the search index
+ $paths->rebuild_page_index($this->page_id, $this->namespace);
+
+ $this->text_cache = $text_undb;
+
+ return true;
+
+ }
+
+ /**
+ * Creates the page if it doesn't already exist.
+ * @param string Optional page title.
+ * @param bool Visibility (allow indexing) flag
+ * @return bool True on success, false on failure.
+ */
+
+ function create_page($title = false, $visible = true)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ // Do we have permission to create the page?
+ if ( !$this->perms->get_permissions('create_page') )
+ {
+ $this->raise_error($lang->get('pagetools_create_err_no_permission'));
+ return false;
+ }
+
+ // Does it already exist?
+ if ( $this->page_exists )
+ {
+ $this->raise_error($lang->get('pagetools_create_err_already_exists'));
+ return false;
+ }
+
+ // It's not in there. Perform validation.
+
+ // We can't create special, admin, or external pages.
+ if ( $this->namespace == 'Special' || $this->namespace == 'Admin' || $this->namespace == 'API' )
+ {
+ $this->raise_error($lang->get('pagetools_create_err_nodb_namespace'));
+ return false;
+ }
+
+ // Guess the proper title
+ $name = ( !empty($title) ) ? $title : str_replace('_', ' ', dirtify_page_id($this->page_id));
+
+ // Check for the restricted Project: prefix
+ if ( substr($this->page_id, 0, 8) == 'Project:' )
+ {
+ $this->raise_error($lang->get('pagetools_create_err_reserved_prefix'));
+ return false;
+ }
+
+ // Validation successful - insert the page
+
+ $metadata = array(
+ 'urlname' => $this->page_id,
+ 'namespace' => $this->namespace,
+ 'name' => $name,
+ 'special' => 0,
+ 'visible' => $visible ? 1 : 0,
+ 'comments_on' => 1,
+ 'protected' => ( $this->namespace == 'System' ? 1 : 0 ),
+ 'delvotes' => 0,
+ 'delvote_ips' => serialize(array()),
+ 'wiki_mode' => 2
+ );
+
+ $paths->add_page($metadata);
+
+ $page_id = $db->escape($this->page_id);
+ $namespace = $db->escape($this->namespace);
+ $name = $db->escape($name);
+ $protect = ( $this->namespace == 'System' ) ? '1' : '0';
+ $blank_array = $db->escape(serialize(array()));
+
+ // Query 1: Metadata entry
+ $q = $db->sql_query('INSERT INTO ' . table_prefix . "pages(name, urlname, namespace, visible, protected, delvotes, delvote_ips, wiki_mode)\n"
+ . " VALUES ( '$name', '$page_id', '$namespace', {$metadata['visible']}, $protect, 0, '$blank_array', 2 );");
+ if ( !$q )
+ $db->_die('PageProcessor page creation - metadata stage');
+
+ // Query 2: Text insertion
+ $q = $db->sql_query('INSERT INTO ' . table_prefix . "page_text(page_id, namespace, page_text)\n"
+ . "VALUES ( '$page_id', '$namespace', '' );");
+ if ( !$q )
+ $db->_die('PageProcessor page creation - text stage');
+
+ // Query 3: Log entry
+ $db->sql_query('INSERT INTO ' . table_prefix."logs(time_id, date_string, log_type, action, author, author_uid, page_id, namespace)\n"
+ . " VALUES ( " . time() . ", 'DEPRECATED', 'page', 'create', \n"
+ . " '" . $db->escape($session->username) . "', $session->user_id, '" . $db->escape($this->page_id) . "', '" . $this->namespace . "');");
+ if ( !$q )
+ $db->_die('PageProcessor page creation - logging stage');
+
+ // Update the cache
+ $paths->update_metadata_cache();
+
+ // Make sure that when/if we save the page later in this instance it doesn't get re-created
+ $this->page_exists = true;
+
+ // Page created. We're good!
+ return true;
+ }
+
+ /**
+ * Rolls back a non-edit action in the logs
+ * @param int Log entry (log_id) to roll back
+ * @return array Standard Enano error/success protocol
+ */
+
+ function rollback_log_entry($log_id)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $cache;
+
+ // Verify permissions
+ if ( !$this->perms->get_permissions('history_rollback') )
+ {
+ return array(
+ 'success' => false,
+ 'error' => 'access_denied'
+ );
+ }
+
+ // Check input
+ $log_id = intval($log_id);
+ if ( empty($log_id) )
+ {
+ return array(
+ 'success' => false,
+ 'error' => 'invalid_parameter'
+ );
+ }
+
+ // Fetch the log entry
+ $q = $db->sql_query('SELECT * FROM ' . table_prefix . "logs WHERE log_type = 'page' AND page_id='{$this->page_id}' AND namespace='{$this->namespace}' AND log_id = $log_id;");
+ if ( !$q )
+ $db->_die();
+
+ // Is this even a valid log entry for this context?
+ if ( $db->numrows() < 1 )
+ {
+ return array(
+ 'success' => false,
+ 'error' => 'entry_not_found'
+ );
+ }
+
+ // All good, fetch and free the result
+ $log_entry = $db->fetchrow();
+ $db->free_result();
+
+ $dateline = enano_date(ED_DATE | ED_TIME, $log_entry['time_id']);
+
+ // Let's see, what do we have here...
+ switch ( $log_entry['action'] )
+ {
+ case 'rename':
+ // Page was renamed, let the rename method handle this
+ return array_merge($this->rename_page($log_entry['edit_summary']), array('dateline' => $dateline, 'action' => $log_entry['action']));
+ break;
+ case 'prot':
+ case 'unprot':
+ case 'semiprot':
+ return array_merge($this->protect_page(intval($log_entry['page_text']), '__REVERSION__'), array('dateline' => $dateline, 'action' => $log_entry['action']));
+ break;
+ case 'delete':
+
+ // Raising a previously dead page has implications...
+
+ // FIXME: l10n
+ // rollback_extra is required because usually only moderators can undo page deletion AND restore the content.
+ // potential flaw here - once recreated, can past revisions be restored by users without rollback_extra? should
+ // probably modify editor routine to deny revert access if the timestamp < timestamp of last deletion if any.
+ if ( !$this->perms->get_permissions('history_rollback_extra') )
+ return 'Administrative privileges are required for page undeletion.';
+
+ // Rolling back the deletion of a page that was since created?
+ $pathskey = $paths->nslist[ $this->namespace ] . $this->page_id;
+ if ( isPage($pathskey) )
+ return array(
+ 'success' => false,
+ // This is a clean Christian in-joke.
+ 'error' => 'seeking_living_among_dead'
+ );
+
+ // Generate a crappy page name
+ $name = $db->escape( str_replace('_', ' ', dirtify_page_id($this->page_id)) );
+
+ // Stage 1 - re-insert page
+ $e = $db->sql_query('INSERT INTO ' . table_prefix.'pages(name,urlname,namespace) VALUES( \'' . $name . '\', \'' . $this->page_id . '\',\'' . $this->namespace . '\' )');
+ if ( !$e )
+ $db->die_json();
+
+ // Select the latest published revision
+ $q = $db->sql_query('SELECT page_text FROM ' . table_prefix . "logs WHERE\n"
+ . " log_type = 'page'\n"
+ . " AND action = 'edit'\n"
+ . " AND page_id = '$this->page_id'\n"
+ . " AND namespace = '$this->namespace'\n"
+ . " AND is_draft != 1\n"
+ . "ORDER BY time_id DESC LIMIT 1;");
+ if ( !$q )
+ $db->die_json();
+ list($page_text) = $db->fetchrow_num();
+ $db->free_result($q);
+
+ // Apply the latest revision as the current page text
+ $page_text = $db->escape($page_text);
+ $e = $db->sql_query('INSERT INTO ' . table_prefix."page_text(page_id, namespace, page_text) VALUES\n"
+ . " ( '$this->page_id', '$this->namespace', '$page_text' );");
+ if ( !$e )
+ $db->die_json();
+
+ $cache->purge('page_meta');
+
+ return array(
+ 'success' => true,
+ 'dateline' => $dateline,
+ 'action' => $log_entry['action']
+ );
+
+ break;
+ case 'reupload':
+
+ // given a log id and some revision info, restore the old file.
+ // get the timestamp of the file before this one
+ $q = $db->sql_query('SELECT time_id, file_key, file_extension, filename, size, mimetype FROM ' . table_prefix . "files WHERE time_id < {$log_entry['time_id']} ORDER BY time_id DESC LIMIT 1;");
+ if ( !$q )
+ $db->_die();
+
+ $row = $db->fetchrow();
+ $db->free_result();
+
+ // If the file hasn't been renamed to the new format (omitting timestamp), do that now.
+ $fname = ENANO_ROOT . "/files/{$row['file_key']}_{$row['time_id']}{$row['file_extension']}";
+ if ( @file_exists($fname) )
+ {
+ // it's stored in the old format - rename
+ $fname_new = ENANO_ROOT . "/files/{$row['file_key']}{$row['file_extension']}";
+ if ( !@rename($fname, $fname_new) )
+ {
+ return array(
+ 'success' => false,
+ 'error' => 'rb_file_rename_failed',
+ 'action' => $log_entry['action']
+ );
+ }
+ }
+
+ // Insert a new file entry
+ $time = time();
+ $filename = $db->escape($row['filename']);
+ $mimetype = $db->escape($row['mimetype']);
+ $ext = $db->escape($row['file_extension']);
+ $key = $db->escape($row['file_key']);
+
+ $q = $db->sql_query('INSERT INTO ' . table_prefix . "files ( time_id, page_id, filename, size, mimetype, file_extension, file_key ) VALUES\n"
+ . " ( $time, '$this->page_id', '$filename', {$row['size']}, '$mimetype', '$ext', '$key' );");
+ if ( !$q )
+ $db->die_json();
+
+ // add reupload log entry
+ $username = $db->escape($session->username);
+ $q = $db->sql_query('INSERT INTO ' . table_prefix . "logs ( log_type, action, time_id, page_id, namespace, author, author_uid, edit_summary ) VALUES\n"
+ . " ( 'page', 'reupload', $time, '$this->page_id', '$this->namespace', '$username', $session->user_id, '__ROLLBACK__' )");
+ if ( !$q )
+ $db->die_json();
+
+ return array(
+ 'success' => true,
+ 'dateline' => $dateline,
+ 'action' => $log_entry['action']
+ );
+
+ break;
+ case 'votereset':
+ if ( !$this->perms->get_permissions('history_rollback_extra') )
+ return 'Denied!';
+
+ // pull existing vote data
+ $q = $db->sql_query('SELECT delvotes, delvote_ips FROM ' . table_prefix . "pages WHERE urlname = '$this->page_id' AND namespace = '$this->namespace';");
+ if ( !$q )
+ $db->_die();
+
+ if ( $db->numrows() < 1 )
+ return array(
+ 'success' => false,
+ 'error' => 'page_not_exist',
+ 'action' => $log_entry['action']
+ );
+
+ list($curr_delvotes, $curr_delvote_ips) = $db->fetchrow_num();
+ $db->free_result();
+
+ // merge with existing votes
+ $old_delvote_ips = unserialize($log_entry['page_text']);
+ $new_delvote_ips = unserialize($curr_delvote_ips);
+ $new_delvote_ips['u'] = array_unique(array_merge($new_delvote_ips['u'], $old_delvote_ips['u']));
+ $new_delvote_ips['ip'] = array_unique(array_merge($new_delvote_ips['ip'], $old_delvote_ips['ip']));
+ $new_delvotes = count($new_delvote_ips['ip']);
+ $new_delvote_ips = $db->escape(serialize($new_delvote_ips));
+
+ // update pages table
+ $q = $db->sql_query('UPDATE ' . table_prefix . "pages SET delvotes = $new_delvotes, delvote_ips = '$new_delvote_ips' WHERE urlname = '$this->page_id' AND namespace = '$this->namespace';");
+
+ $cache->purge('page_meta');
+
+ return array(
+ 'success' => true,
+ 'dateline' => $dateline,
+ 'action' => $log_entry['action']
+ );
+ break;
+ default:
+
+ return array(
+ 'success' => false,
+ 'error' => 'rb_action_not_supported',
+ 'action' => $log_entry['action']
+ );
+
+ break;
+ }
+ }
+
+ /**
+ * Renames the page
+ * @param string New name
+ * @return array Standard Enano error/success protocol
+ */
+
+ function rename_page($new_name)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ // Check permissions
+ if ( !$this->perms->get_permissions('rename') )
+ {
+ return array(
+ 'success' => false,
+ 'error' => 'access_denied'
+ );
+ }
+
+ // If this is the same as the current name, return success
+ $page_name = get_page_title_ns($this->page_id, $this->namespace);
+ if ( $page_name === $new_name )
+ {
+ return array(
+ 'success' => true
+ );
+ }
+
+ // Make sure the name is valid
+ $new_name = trim($new_name);
+ if ( empty($new_name) )
+ {
+ return array(
+ 'success' => false,
+ 'error' => 'invalid_parameter'
+ );
+ }
+
+ // Log the action
+ $username = $db->escape($session->username);
+ $page_name = $db->escape($page_name);
+ $time = time();
+
+ $q = $db->sql_query('INSERT INTO ' . table_prefix . "logs ( log_type, action, page_id, namespace, author, author_uid, edit_summary, time_id, date_string ) VALUES\n"
+ . " ( 'page', 'rename', '{$this->page_id}', '{$this->namespace}', '$username', $session->user_id, '$page_name', '$time', 'DATE_STRING COLUMN OBSOLETE, USE time_id' );");
+ if ( !$q )
+ $db->_die();
+
+ // Not much to do but to rename it now
+ $new_name = $db->escape($new_name);
+ $q = $db->sql_query('UPDATE ' . table_prefix . "pages SET name = '$new_name' WHERE urlname = '{$this->page_id}' AND namespace = '{$this->namespace}';");
+ if ( !$q )
+ $db->_die();
+
+ // Update the cache
+ $paths->update_metadata_cache();
+
+ return array(
+ 'success' => true
+ );
+ }
+
+ /**
+ * Sets the protection level of the page
+ * @param int Protection level, one of PROTECT_{FULL,SEMI,NONE}
+ * @param string Reason for protection - required
+ */
+
+ function protect_page($protection_level, $reason)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $cache;
+
+ // Validate permissions
+ if ( !$this->perms->get_permissions('protect') )
+ {
+ return array(
+ 'success' => false,
+ 'error' => 'access_denied'
+ );
+ }
+
+ // Validate re-auth
+ if ( !$session->sid_super )
+ {
+ return array(
+ 'success' => false,
+ 'error' => 'access_denied_need_reauth'
+ );
+ }
+
+ // Validate input
+ $reason = trim($reason);
+ if ( !in_array($protection_level, array(PROTECT_NONE, PROTECT_FULL, PROTECT_SEMI)) || empty($reason) )
+ {
+ return array(
+ 'success' => false,
+ 'error' => 'invalid_parameter'
+ );
+ }
+
+ // Retrieve page metadata
+ $metadata = $this->ns->get_cdata();
+
+ // Log the action
+ $username = $db->escape($session->username);
+ $time = time();
+ $existing_protection = intval($metadata['protected']);
+ $reason = $db->escape($reason);
+
+ if ( $existing_protection == $protection_level )
+ {
+ return array(
+ 'success' => false,
+ 'error' => 'protection_already_there'
+ );
+ }
+
+ $action = '[ insanity ]';
+ switch($protection_level)
+ {
+ case PROTECT_FULL: $action = 'prot'; break;
+ case PROTECT_NONE: $action = 'unprot'; break;
+ case PROTECT_SEMI: $action = 'semiprot'; break;
+ }
+
+ $sql = 'INSERT INTO ' . table_prefix . "logs ( log_type, action, page_id, namespace, author, author_uid, edit_summary, time_id, page_text, date_string ) VALUES\n"
+ . " ( 'page', '$action', '{$this->page_id}', '{$this->namespace}', '$username', $author_uid, '$reason', '$time', '$existing_protection', 'DATE_STRING COLUMN OBSOLETE, USE time_id' );";
+ if ( !$db->sql_query($sql) )
+ {
+ $db->die_json();
+ }
+
+ // Perform the actual protection
+ $q = $db->sql_query('UPDATE ' . table_prefix . "pages SET protected = $protection_level WHERE urlname = '{$this->page_id}' AND namespace = '{$this->namespace}';");
+ if ( !$q )
+ $db->die_json();
+
+ $cache->purge('page_meta');
+
+ return array(
+ 'success' => true
+ );
+ }
+
+ /**
+ * Sets internal variables.
+ * @access private
+ */
+
+ function _setup($page_id, $namespace, $revision_id)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $page_id_cleaned = sanitize_page_id($page_id);
+
+ $this->revision_id = $revision_id;
+ $this->page_id_unclean = dirtify_page_id($page_id);
+
+ // resolve namespace
+ $this->ns = namespace_factory($page_id, $namespace, $this->revision_id);
+ $this->page_id =& $this->ns->page_id;
+ $this->namespace =& $this->ns->namespace;
+
+ $this->perms = $session->fetch_page_acl( $page_id, $namespace );
+
+ $this->page_exists = $this->ns->exists();
+ $this->title = get_page_title_ns($this->page_id, $this->namespace);
+
+ profiler_log("PageProcessor [{$this->namespace}:{$this->page_id}]: Ran _setup()");
+ }
+
+ /**
+ * Processes any redirects.
+ * @access private
+ */
+
+ function process_redirects()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $output, $lang;
+
+ $this->redirect_stack = array();
+
+ if ( !method_exists($this->ns, 'get_redirect') )
+ return true;
+
+ if ( !$this->allow_redir )
+ return true;
+
+ $redirect_count = 0;
+
+ while ( $result = $this->ns->get_redirect() )
+ {
+ if ( $result['namespace'] == 'Special' || $result['namespace'] == 'Admin' )
+ {
+ // Can't redirect to special/admin page
+ $this->redir_error = $lang->get('page_err_redirect_to_special');
+ break;
+ }
+ if ( $redirect_count == 3 )
+ {
+ // max of 3 internal redirects exceeded
+ $this->redir_error = $lang->get('page_err_redirects_exceeded');
+ break;
+ }
+
+ $loop = false;
+ foreach ( $this->redirect_stack as $stackel )
+ {
+ if ( $result['page_id'] == $stackel['old_page_id'] && $result['namespace'] == $stackel['old_namespace'] )
+ {
+ $loop = true;
+ break;
+ }
+ }
+
+ if ( $loop )
+ {
+ // redirect loop
+ $this->redir_error = $lang->get('page_err_redirect_infinite_loop');
+ break;
+ }
+ $new_ns = namespace_factory($result['page_id'], $result['namespace']);
+ if ( !$new_ns->exists() )
+ {
+ // new page doesn't exist
+ $this->redir_error = $lang->get('page_err_redirect_to_nonexistent');
+ break;
+ }
+
+ // build stack entry
+ $stackel = array(
+ 'page_id' => $result['page_id'],
+ 'namespace' => $result['namespace'],
+ 'old_page_id' => $this->page_id,
+ 'old_namespace' => $this->namespace,
+ 'old_title' => $this->ns->title
+ );
+
+ // replace everything (perform the actual redirect)
+ $this->ns = $new_ns;
+
+ $this->page_id =& $this->ns->page_id;
+ $this->namespace =& $this->ns->namespace;
+
+ $this->redirect_stack[] = $stackel;
+
+ $redirect_count++;
+ }
+ }
+
+ /**
+ * Sends the page header, dependent on, of course, whether we're supposed to.
+ */
+
+ function header()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ if ( $this->send_headers )
+ $template->header();
+ }
+
+ /**
+ * Sends the page footer, dependent on, of course, whether we're supposed to.
+ */
+
+ function footer()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ if ( $this->send_headers )
+ $template->footer();
+ }
+
+ /**
+ * Fetches the raw, unfiltered page text.
+ * @access public
+ */
+
+ function fetch_text()
+ {
+ return $this->ns->fetch_text();
+ }
+
+ /**
+ * Tells us if the page exists.
+ * @return bool
+ */
+
+ function exists()
+ {
+ return $this->ns->exists();
+ }
+
+ /**
+ * Send the error message to the user that the access to this page is denied.
+ * @access private
+ */
+
+ function err_access_denied()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+ global $email;
+
+ // Log it for crying out loud
+ $q = $db->sql_query('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,author_uid,edit_summary,page_text) VALUES(\'security\', \'illegal_page\', '.time().', \'DEPRECATED\', \''.$db->escape($session->username).'\', ' . $session->user_id . ', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', \'' . $db->escape(serialize(array($this->page_id, $this->namespace))) . '\')');
+
+ $ob = '';
+ //$template->tpl_strings['PAGE_NAME'] = 'Access denied';
+ $template->tpl_strings['PAGE_NAME'] = htmlspecialchars( $this->title );
+
+ if ( $this->send_headers )
+ {
+ $ob .= $template->getHeader();
+ }
+
+ if ( count($this->redirect_stack) > 0 )
+ {
+ $stack = array_reverse($this->redirect_stack);
+ foreach ( $stack as $oldtarget )
+ {
+ $url = makeUrlNS($oldtarget[1], $oldtarget[0], 'redirect=no', true);
+ $old_page = namespace_factory($oldtarget[0], $oldtarget[1]);
+ $page_data = $old_page->get_cdata();
+ $title = ( isset($page_data['name']) ) ? $page_data['name'] : $paths->nslist[$oldtarget[1]] . htmlspecialchars( str_replace('_', ' ', dirtify_page_id( $oldtarget[0] ) ) );
+ $a = '' . $title . '';
+
+ $url = makeUrlNS($this->namespace, $this->page_id, 'redirect=no', true);
+ $page_data = $this->ns->get_cdata();
+ $title = ( isset($page_data['name']) ) ? $page_data['name'] : $paths->nslist[$this->namespace] . htmlspecialchars( str_replace('_', ' ', dirtify_page_id( $this->page_id ) ) );
+ $b = '' . $title . '';
+
+ $ob .= '' . $lang->get('page_msg_redirected_from_to', array('from' => $a, 'to' => $b)) . '
';
+ }
+ }
+
+ $email_link = $email->encryptEmail(getConfig('contact_email'), '', '', $lang->get('page_err_access_denied_siteadmin'));
+
+ $ob .= "" . $lang->get('page_err_access_denied_title') . "
";
+ $ob .= "" . $lang->get('page_err_access_denied_body', array('site_administration' => $email_link)) . "
";
+
+ if ( $this->send_headers )
+ {
+ $ob .= $template->getFooter();
+ }
+ echo $ob;
+ }
+
+ /**
+ * Inform the user of an incorrect or absent password
+ * @access private
+ */
+
+ function err_wrong_password()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ $title = $lang->get('page_msg_passrequired_title');
+ $message = ( empty($this->password) ) ?
+ '' . $lang->get('page_msg_passrequired') . '
' :
+ '' . $lang->get('page_msg_pass_wrong') . '
';
+ $message .= '';
+ if ( $this->send_headers )
+ {
+ $template->tpl_strings['PAGE_NAME'] = $title;
+ $template->header();
+ echo "$message";
+ $template->footer();
+ }
+ else
+ {
+ echo "$title
+ $message";
+ }
+ }
+
+ /**
+ * Send the error message to the user complaining that there weren't any rows.
+ * @access private
+ */
+
+ function err_no_rows()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $title = 'No text rows';
+ $message = 'While the page\'s existence was verified, there were no rows in the database that matched the query for the text. This may indicate a bug with the software; ask the webmaster for more information. The offending query was:' . $db->latest_query . '
';
+ if ( $this->send_headers )
+ {
+ $template->tpl_strings['PAGE_NAME'] = $title;
+ $template->header();
+ echo "$message
";
+ $template->footer();
+ }
+ else
+ {
+ echo "$title
+ $message
";
+ }
+ }
+
+ /**
+ * Send an error message and die. For debugging or critical technical errors only - nothing that would under normal circumstances be shown to the user.
+ * @param string Error message
+ * @param bool If true, send DBAL's debugging information as well
+ */
+
+ function send_error($message, $sql = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ $content = "$message
";
+ $template->tpl_strings['PAGE_NAME'] = $lang->get('page_msg_general_error');
+
+ if ( $this->debug['works'] )
+ {
+ $content .= $this->debug['backtrace'];
+ }
+
+ header('HTTP/1.1 500 Internal Server Error');
+
+ $template->header();
+ echo $content;
+ $template->footer();
+
+ $db->close();
+
+ exit;
+
+ }
+
+ /**
+ * Raises an error.
+ * @param string Error string
+ */
+
+ function raise_error($string)
+ {
+ if ( !is_string($string) )
+ return false;
+ $this->_errors[] = $string;
+ }
+
+ /**
+ * Retrieves the latest error from the error stack and returns it ('pops' the error stack)
+ * @return string
+ */
+
+ function pop_error()
+ {
+ if ( count($this->_errors) < 1 )
+ return false;
+ return array_pop($this->_errors);
+ }
+
} // class PageProcessor
?>
diff -r de56132c008d -r bdac73ed481e includes/pageutils.php
--- a/includes/pageutils.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/pageutils.php Sun Mar 28 23:10:46 2010 -0400
@@ -13,2446 +13,2446 @@
*/
class PageUtils {
-
- /**
- * Tell if a username is used or not.
- * @param $name the name to check for
- * @return string
- */
-
- public static function checkusername($name)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $name = str_replace('_', ' ', $name);
- $q = $db->sql_query('SELECT username FROM ' . table_prefix.'users WHERE username=\'' . $db->escape(rawurldecode($name)) . '\'');
- if ( !$q )
- {
- die($db->get_error());
- }
- if ( $db->numrows() < 1)
- {
- $db->free_result(); return('good');
- }
- else
- {
- $db->free_result(); return('bad');
- }
- }
-
- /**
- * Get the wiki formatting source for a page
- * @param $page the full page id (Namespace:Pagename)
- * @return string
- * @todo (DONE) Make it require a password (just for security purposes)
- */
-
- public static function getsource($page, $password = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- if ( !isPage($page) )
- {
- return '';
- }
-
- list($page_id, $namespace) = RenderMan::strToPageID($page);
- $ns = namespace_factory($page_id, $namespace);
- $cdata = $ns->get_cdata();
-
- if ( strlen($cdata['password']) == 40 )
- {
- if(!$password || ( $password != $cdata['password']))
- {
- return 'invalid_password';
- }
- }
-
- if(!$session->get_permissions('view_source')) // Dependencies handle this for us - this also checks for read privileges
- return 'access_denied';
- $pid = RenderMan::strToPageID($page);
- if($pid[1] == 'Special' || $pid[1] == 'Admin')
- {
- die('This type of page (' . $paths->nslist[$pid[1]] . ') cannot be edited because the page source code is not stored in the database.');
- }
-
- $e = $db->sql_query('SELECT page_text,char_tag FROM ' . table_prefix.'page_text WHERE page_id=\'' . $pid[0] . '\' AND namespace=\'' . $pid[1] . '\'');
- if ( !$e )
- {
- $db->_die('The page text could not be selected.');
- }
- if( $db->numrows() < 1 )
- {
- return ''; //$db->_die('There were no rows in the text table that matched the page text query.');
- }
-
- $r = $db->fetchrow();
- $db->free_result();
- $message = $r['page_text'];
-
- return htmlspecialchars($message);
- }
-
- /**
- * DEPRECATED. Previously returned the full rendered contents of a page.
- * @param $page the full page id (Namespace:Pagename)
- * @param $send_headers true if the theme headers should be sent (still dependent on current page settings), false otherwise
- * @return string
- */
-
- public static function getpage($page, $send_headers = false, $hist_id = false)
- {
- die('PageUtils->getpage is deprecated.');
- }
-
- /**
- * Writes page data to the database, after verifying permissions and running the XSS filter
- * @param $page_id the page ID
- * @param $namespace the namespace
- * @param $message the text to save
- * @return string
- */
-
- public static function savepage($page_id, $namespace, $message, $summary = 'No edit summary given', $minor = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $page = new PageProcessor($page_id, $namespace);
- $cdata = $page->ns->get_cdata();
- return $page->update_page($message, $summary, $minor, $cdata['page_format']);
- }
-
- /**
- * Creates a page, both in memory and in the database.
- * @param string $page_id
- * @param string $namespace
- * @return bool true on success, false on failure
- */
-
- public static function createPage($page_id, $namespace, $name = false, $visible = 1)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- if(in_array($namespace, Array('Special', 'Admin')))
- {
- // echo 'Notice: PageUtils::createPage: You can\'t create a special page in the database
';
- return 'You can\'t create a special page in the database';
- }
-
- if(!isset($paths->nslist[$namespace]))
- {
- // echo 'Notice: PageUtils::createPage: Couldn\'t look up the namespace
';
- return 'Couldn\'t look up the namespace';
- }
-
- $pname = $paths->nslist[$namespace] . $page_id;
- if(isPage($pname))
- {
- // echo 'Notice: PageUtils::createPage: Page already exists
';
- return 'Page already exists';
- }
-
- if(!$session->get_permissions('create_page'))
- {
- // echo 'Notice: PageUtils::createPage: Not authorized to create pages
';
- return 'Not authorized to create pages';
- }
-
- if($session->user_level < USER_LEVEL_ADMIN && $namespace == 'System')
- {
- // echo 'Notice: PageUtils::createPage: Not authorized to create system messages
';
- return 'Not authorized to create system messages';
- }
-
- if ( substr($page_id, 0, 8) == 'Project:' )
- {
- // echo 'Notice: PageUtils::createPage: Prefix "Project:" is reserved
';
- return 'The prefix "Project:" is reserved for a parser shortcut; if a page was created using this prefix, it would not be possible to link to it.';
- }
-
- /*
- // Dunno why this was here. Enano can handle more flexible names than this...
- $regex = '#^([A-z0-9 _\-\.\/\!\@\(\)]*)$#is';
- if(!preg_match($regex, $name))
- {
- //echo 'Notice: PageUtils::createPage: Name contains invalid characters
';
- return 'Name contains invalid characters';
- }
- */
-
- $page_id = dirtify_page_id($page_id);
-
- if ( !$name )
- $name = str_replace('_', ' ', $page_id);
-
- $page_id = sanitize_page_id( $page_id );
-
- $prot = ( $namespace == 'System' ) ? 1 : 0;
-
- $ips = array(
- 'ip' => array(),
- 'u' => array()
- );
-
- $page_data = Array(
- 'name'=>$name,
- 'urlname'=>$page_id,
- 'namespace'=>$namespace,
- 'special'=>0,'visible'=>1,'comments_on'=>0,'protected'=>$prot,'delvotes'=>0,'delvote_ips'=>serialize($ips),'wiki_mode'=>2,
- );
-
- // die('PageUtils::createpage: Creating page with this data:' . print_r($page_data, true) . '
');
-
- $paths->add_page($page_data);
-
- $qa = $db->sql_query('INSERT INTO ' . table_prefix.'pages(name,urlname,namespace,visible,protected,delvote_ips) VALUES(\'' . $db->escape($name) . '\', \'' . $db->escape($page_id) . '\', \'' . $namespace . '\', '. ( $visible ? '1' : '0' ) .', ' . $prot . ', \'' . $db->escape(serialize($ips)) . '\');');
- $qb = $db->sql_query('INSERT INTO ' . table_prefix.'page_text(page_id,namespace) VALUES(\'' . $db->escape($page_id) . '\', \'' . $namespace . '\');');
- $qc = $db->sql_query('INSERT INTO ' . table_prefix.'logs(time_id,date_string,log_type,action,author,author_uid,page_id,namespace) VALUES('.time().', \'DEPRECATED\', \'page\', \'create\', \'' . $session->username . '\', ' . $session->user_id . ', \'' . $db->escape($page_id) . '\', \'' . $namespace . '\');');
-
- if($qa && $qb && $qc)
- return 'good';
- else
- {
- return $db->get_error();
- }
- }
-
- /**
- * Sets the protection level on a page.
- * @param $page_id string the page ID
- * @param $namespace string the namespace
- * @param $level int level of protection - 0 is off, 1 is full, 2 is semi
- * @param $reason string why the page is being (un)protected
- * @return string - "good" on success, in all other cases, an error string (on query failure, calls $db->_die() )
- */
- public static function protect($page_id, $namespace, $level, $reason)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $page = new PageProcessor($page_id, $namespace);
- return $page->protect_page($level, $reason);
- }
-
- /**
- * Generates an HTML table with history information in it.
- * @param string the page ID
- * @param string the namespace
- * @param string page password
- * @return string
- */
-
- public static function histlist($page_id, $namespace, $password = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- if(!$session->get_permissions('history_view'))
- return 'Access denied';
-
- ob_start();
-
- $pname = $paths->get_pathskey($page_id, $namespace);
- $ns = namespace_factory($page_id, $namespace);
- $cdata = $ns->get_cdata();
-
- if ( !isPage($pname) )
- {
- return 'DNE';
- }
-
- if ( isPage($pname) )
- {
- $password_exists = ( !empty($cdata['password']) && $cdata['password'] !== sha1('') );
- if ( $password_exists && $password !== $cdata['password'] )
- {
- return '' . $lang->get('history_err_wrong_password') . '
';
- }
- }
-
- $wiki = ( ( $cdata['wiki_mode'] == 2 && getConfig('wiki_mode') == '1') || $cdata['wiki_mode'] == 1) ? true : false;
- $prot = ( ( $cdata['protected'] == 2 && $session->user_logged_in && $session->reg_time + 60*60*24*4 < time() ) || $cdata['protected'] == 1) ? true : false;
-
- $q = 'SELECT log_id,time_id,date_string,page_id,namespace,author,author_uid,u.username,edit_summary,minor_edit FROM ' . table_prefix . "logs AS l\n"
- . " LEFT JOIN " . table_prefix . "users AS u\n"
- . " ON ( u.user_id = l.author_uid OR u.user_id IS NULL )\n"
- . " WHERE log_type='page' AND action='edit' AND page_id='$page_id' AND namespace='$namespace' AND is_draft != 1 ORDER BY time_id DESC;";
-
- if ( !($q = $db->sql_query($q)) )
- $db->_die('The history data for the page "' . $paths->cpage['name'] . '" could not be selected.');
-
- echo $lang->get('history_page_subtitle') . '
- ' . $lang->get('history_heading_edits') . '
';
- $numrows = $db->numrows();
- if ( $numrows < 1 )
- {
- echo $lang->get('history_no_entries');
- }
- else
- {
- echo '
- ';
- }
- $db->free_result();
- echo '' . $lang->get('history_heading_other') . '
';
-
- $sql = 'SELECT log_id,action,time_id,date_string,page_id,namespace,author,author_uid,u.username,edit_summary,minor_edit FROM ' . table_prefix . "logs AS l\n"
- . " LEFT JOIN " . table_prefix . "users AS u\n"
- . " ON ( u.user_id = l.author_uid OR u.user_id IS NULL )\n"
- . " WHERE log_type='page' AND action!='edit' AND page_id='$page_id' AND namespace='$namespace' AND is_draft != 1 ORDER BY time_id DESC;";
-
- if ( !( $q = $db->sql_query($sql)) )
- {
- $db->_die('The history data for the page "' . htmlspecialchars($paths->cpage['name']) . '" could not be selected.');
- }
- if ( $db->numrows() < 1 )
- {
- echo $lang->get('history_no_entries');
- }
- else
- {
-
- echo '
-
- ' . $lang->get('history_col_datetime') . '
- ' . $lang->get('history_col_user') . '
- ' . $lang->get('history_col_minor') . '
- ' . $lang->get('history_col_action_taken') . '
- ' . $lang->get('history_col_extra') . '
- ';
- $cls = 'row2';
- while($r = $db->fetchrow($q)) {
-
- if($cls == 'row2') $cls = 'row1';
- else $cls = 'row2';
-
- echo '';
-
- // Date and time
- echo '' . enano_date(ED_DATE | ED_TIME, intval($r['time_id'])) . ' ';
-
- // User
- $real_username = $r['author_uid'] > 1 && !empty($r['username']) ? $r['username'] : $r['author'];
- $rank_info = $session->get_user_rank($r['author_uid']);
- if ( $session->get_permissions('mod_misc') && is_valid_ip($r['author']) && $r['author_uid'] == 1 )
- {
- $rc = ' style="cursor: pointer;" title="' . $lang->get('history_tip_rdns') . '" onclick="ajaxReverseDNS(this, \'' . $r['author'] . '\');"';
- }
- else
- {
- $rc = '';
- }
- echo 'nslist['User'] . sanitize_page_id($real_username)) )
- {
- echo 'class="wikilink-nonexistent"';
- }
- echo 'style="' . $rank_info['rank_style'] . '">' . htmlspecialchars($real_username) . ' '."\n";
-
-
- // Minor edit
- echo ''. (( $r['minor_edit'] ) ? 'M' : '' ) .' ';
-
- // Action taken
- echo '';
- // Some of these are sanitized at insert-time. Others follow the newer Enano policy of stripping HTML at runtime.
- if ($r['action']=='prot') echo $lang->get('history_log_protect') . ' ' . $lang->get('history_extra_reason') . ' ' . ( $r['edit_summary'] === '__REVERSION__' ? $lang->get('history_extra_protection_reversion') : htmlspecialchars($r['edit_summary']) );
- elseif($r['action']=='unprot') echo $lang->get('history_log_unprotect') . ' ' . $lang->get('history_extra_reason') . ' ' . ( $r['edit_summary'] === '__REVERSION__' ? $lang->get('history_extra_protection_reversion') : htmlspecialchars($r['edit_summary']) );
- elseif($r['action']=='semiprot') echo $lang->get('history_log_semiprotect') . ' ' . $lang->get('history_extra_reason') . ' ' . ( $r['edit_summary'] === '__REVERSION__' ? $lang->get('history_extra_protection_reversion') : htmlspecialchars($r['edit_summary']) );
- elseif($r['action']=='rename') echo $lang->get('history_log_rename') . ' ' . $lang->get('history_extra_oldtitle') . ' '.htmlspecialchars($r['edit_summary']);
- elseif($r['action']=='create') echo $lang->get('history_log_create') . ' ';
- elseif($r['action']=='delete') echo $lang->get('history_log_delete') . ' ' . $lang->get('history_extra_reason') . ' ' . $r['edit_summary'];
- elseif($r['action']=='reupload') echo $lang->get('history_log_uploadnew') . ' ' . $lang->get('history_extra_reason') . ' ' . ( $r['edit_summary'] === '__ROLLBACK__' ? $lang->get('history_extra_upload_reversion') : htmlspecialchars($r['edit_summary']) );
- elseif($r['action']=='votereset')echo $lang->get('history_log_votereset') . ' ' . $lang->get('history_extra_numvotes') . ' ' . $r['edit_summary'];
- echo ' ';
-
- // Actions!
- echo '' . $lang->get('history_action_contrib') . ' ';
- echo '' . $lang->get('history_action_revert') . ' ';
-
- echo ' ';
- }
- echo '
';
- }
- $db->free_result();
- $ret = ob_get_contents();
- ob_end_clean();
- return $ret;
- }
-
- /**
- * Rolls back a logged action
- * @param $id the time ID, a.k.a. the primary key in the logs table
- * @return string
- */
-
- public static function rollback($id)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- // placeholder
- return 'PageUtils->rollback() is deprecated - use PageProcessor instead.';
- }
-
- /**
- * Posts a comment.
- * @param $page_id the page ID
- * @param $namespace the namespace
- * @param $name the name of the person posting, defaults to current username/IP
- * @param $subject the subject line of the comment
- * @param $text the comment text
- * @return string javascript code
- */
-
- public static function addcomment($page_id, $namespace, $name, $subject, $text, $captcha_code = false, $captcha_id = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $_ob = '';
- if(!$session->get_permissions('post_comments'))
- return 'Access denied';
- if(getConfig('comments_need_login') == '2' && !$session->user_logged_in) _die('Access denied to post comments: you need to be logged in first.');
- if(getConfig('comments_need_login') == '1' && !$session->user_logged_in)
- {
- if(!$captcha_code || !$captcha_id) _die('BUG: PageUtils::addcomment: no CAPTCHA data passed to method');
- $result = $session->get_captcha($captcha_id);
- if(strtolower($captcha_code) != strtolower($result)) _die('The confirmation code you entered was incorrect.');
- }
- $text = RenderMan::preprocess_text($text);
- $name = $session->user_logged_in ? RenderMan::preprocess_text($session->username) : RenderMan::preprocess_text($name);
- $subj = RenderMan::preprocess_text($subject);
- if(getConfig('approve_comments', '0')=='1') $appr = '0'; else $appr = '1';
- $q = 'INSERT INTO ' . table_prefix.'comments(page_id,namespace,subject,comment_data,name,user_id,approved,time) VALUES(\'' . $page_id . '\',\'' . $namespace . '\',\'' . $subj . '\',\'' . $text . '\',\'' . $name . '\',' . $session->user_id . ',' . $appr . ','.time().')';
- $e = $db->sql_query($q);
- if(!$e) die('alert(unescape(\''.rawurlencode('Error inserting comment data: '.$db->get_error().'\n\nQuery:\n' . $q) . '\'))');
- else $_ob .= 'Your comment has been posted.';
- return PageUtils::comments($page_id, $namespace, false, Array(), $_ob);
- }
-
- /**
- * Generates partly-compiled HTML/Javascript code to be eval'ed by the user's browser to display comments
- * @param $page_id the page ID
- * @param $namespace the namespace
- * @param $action administrative action to perform, default is false
- * @param $flags additional info for $action, shouldn't be used except when deleting/approving comments, etc.
- * @param $_ob text to prepend to output, used by PageUtils::addcomment
- * @return array
- * @access private
- */
-
- public static function comments_raw($page_id, $namespace, $action = false, $flags = Array(), $_ob = '')
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- $pname = $paths->nslist[$namespace] . $page_id;
- $template->init_vars();
-
- ob_start();
-
- if($action && $session->get_permissions('mod_comments')) // Nip hacking attempts in the bud
- {
- switch($action) {
- case "delete":
- if(isset($flags['id']))
- {
- $q = 'DELETE FROM ' . table_prefix.'comments WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND comment_id='.intval($flags['id']).' LIMIT 1;';
- } else {
- $n = $db->escape($flags['name']);
- $s = $db->escape($flags['subj']);
- $t = $db->escape($flags['text']);
- $q = 'DELETE FROM ' . table_prefix.'comments WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND name=\'' . $n . '\' AND subject=\'' . $s . '\' AND comment_data=\'' . $t . '\' LIMIT 1;';
- }
- $e=$db->sql_query($q);
- if(!$e) die('alert(unesape(\''.rawurlencode('Error during query: '.$db->get_error().'\n\nQuery:\n' . $q) . '\'));');
- break;
- case "approve":
- if(isset($flags['id']))
- {
- $where = 'comment_id='.intval($flags['id']);
- } else {
- $n = $db->escape($flags['name']);
- $s = $db->escape($flags['subj']);
- $t = $db->escape($flags['text']);
- $where = 'name=\'' . $n . '\' AND subject=\'' . $s . '\' AND comment_data=\'' . $t . '\'';
- }
- $q = 'SELECT approved FROM ' . table_prefix.'comments WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND ' . $where . ' LIMIT 1;';
- $e = $db->sql_query($q);
- if(!$e) die('alert(unesape(\''.rawurlencode('Error selecting approval status: '.$db->get_error().'\n\nQuery:\n' . $q) . '\'));');
- $r = $db->fetchrow();
- $db->free_result();
- $a = ( $r['approved'] ) ? '0' : '1';
- $q = 'UPDATE ' . table_prefix.'comments SET approved=' . $a . ' WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND ' . $where . ';';
- $e=$db->sql_query($q);
- if(!$e) die('alert(unesape(\''.rawurlencode('Error during query: '.$db->get_error().'\n\nQuery:\n' . $q) . '\'));');
- if($a=='1') $v = $lang->get('comment_btn_mod_unapprove');
- else $v = $lang->get('comment_btn_mod_approve');
- echo 'document.getElementById("mdgApproveLink'.intval($_GET['id']).'").innerHTML="' . $v . '";';
- break;
- }
- }
-
- if(!defined('ENANO_TEMPLATE_LOADED'))
- {
- $template->load_theme($session->theme, $session->style);
- }
-
- $tpl = $template->makeParser('comment.tpl');
-
- $e = $db->sql_query('SELECT * FROM ' . table_prefix.'comments WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND approved=0;');
- if(!$e) $db->_die('The comment text data could not be selected.');
- $num_unapp = $db->numrows();
- $db->free_result();
- $e = $db->sql_query('SELECT * FROM ' . table_prefix.'comments WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND approved=1;');
- if(!$e) $db->_die('The comment text data could not be selected.');
- $num_app = $db->numrows();
- $db->free_result();
- $lq = $db->sql_query('SELECT c.comment_id,c.subject,c.name,c.comment_data,c.approved,c.time,c.user_id,c.ip_address,u.user_level,u.email,u.signature,u.user_has_avatar,u.avatar_type
- FROM ' . table_prefix.'comments AS c
- LEFT JOIN ' . table_prefix.'users AS u
- ON c.user_id=u.user_id
- WHERE page_id=\'' . $page_id . '\'
- AND namespace=\'' . $namespace . '\' ORDER BY c.time ASC;');
- if(!$lq) _die('The comment text data could not be selected. '.$db->get_error());
- $_ob .= '' . $lang->get('comment_heading') . '
';
-
- $n = ( $session->get_permissions('mod_comments')) ? $db->numrows() : $num_app;
-
- $subst = array(
- 'num_comments' => $n,
- 'page_type' => $template->namespace_string
- );
-
- $_ob .= '';
- $_ob .= ( $n == 0 ) ? $lang->get('comment_msg_count_zero', $subst) : ( $n == 1 ? $lang->get('comment_msg_count_one', $subst) : $lang->get('comment_msg_count_plural', $subst) );
-
- if ( $session->get_permissions('mod_comments') && $num_unapp > 0 )
- {
- $_ob .= ' ' . $lang->get('comment_msg_count_unapp_mod', array( 'num_unapp' => $num_unapp )) . '';
- }
- else if ( !$session->get_permissions('mod_comments') && $num_unapp > 0 )
- {
- $ls = ( $num_unapp == 1 ) ? 'comment_msg_count_unapp_one' : 'comment_msg_count_unapp_plural';
- $_ob .= ' ' . $lang->get($ls, array( 'num_unapp' => $num_unapp )) . '';
- }
- $_ob .= '
';
- $list = 'list = { ';
- // _die(htmlspecialchars($ttext));
- $i = -1;
- while ( $row = $db->fetchrow($lq) )
- {
- $i++;
- $strings = Array();
- $bool = Array();
- if ( $session->get_permissions('mod_comments') || $row['approved'] == COMMENT_APPROVED )
- {
- $list .= $i . ' : { \'comment\' : unescape(\''.rawurlencode($row['comment_data']).'\'), \'name\' : unescape(\''.rawurlencode($row['name']).'\'), \'subject\' : unescape(\''.rawurlencode($row['subject']).'\'), }, ';
-
- // Comment ID (used in the Javascript apps)
- $strings['ID'] = (string)$i;
-
- // Determine the name, and whether to link to the user page or not
- $name = '';
- if($row['user_id'] > 1) $name .= '';
- $name .= $row['name'];
- if($row['user_id'] > 1) $name .= '';
- $strings['NAME'] = $name; unset($name);
-
- // Subject
- $s = $row['subject'];
- if(!$row['approved']) $s .= ' ' . $lang->get('comment_msg_note_unapp') . '';
- $strings['SUBJECT'] = $s;
-
- // Date and time
- $strings['DATETIME'] = enano_date(ED_DATE | ED_TIME, $row['time']);
-
- // User level
- switch($row['user_level'])
- {
- default:
- case USER_LEVEL_GUEST:
- $l = $lang->get('user_type_guest');
- break;
- case USER_LEVEL_MEMBER:
- case USER_LEVEL_CHPREF:
- $l = $lang->get('user_type_member');
- break;
- case USER_LEVEL_MOD:
- $l = $lang->get('user_type_mod');
- break;
- case USER_LEVEL_ADMIN:
- $l = $lang->get('user_type_admin');
- break;
- }
- $strings['USER_LEVEL'] = $l; unset($l);
-
- // The actual comment data
- $strings['DATA'] = RenderMan::render($row['comment_data']);
-
- if($session->get_permissions('edit_comments'))
- {
- // Edit link
- $strings['EDIT_LINK'] = '' . $lang->get('comment_btn_edit') . '';
-
- // Delete link
- $strings['DELETE_LINK'] = '' . $lang->get('comment_btn_delete') . '';
- }
- else
- {
- // Edit link
- $strings['EDIT_LINK'] = '';
-
- // Delete link
- $strings['DELETE_LINK'] = '';
- }
-
- // Send PM link
- $strings['SEND_PM_LINK'] = ( $session->user_logged_in && $row['user_id'] > 1 ) ? '' . $lang->get('comment_btn_send_privmsg') . '
' : '';
-
- // Add Buddy link
- $strings['ADD_BUDDY_LINK'] = ( $session->user_logged_in && $row['user_id'] > 1 ) ? '' . $lang->get('comment_btn_add_buddy') . '' : '';
-
- // Mod links
- $applink = '';
- $applink .= '';
- if($row['approved']) $applink .= $lang->get('comment_btn_mod_unapprove');
- else $applink .= $lang->get('comment_btn_mod_approve');
- $applink .= '';
- $strings['MOD_APPROVE_LINK'] = $applink; unset($applink);
- $strings['MOD_DELETE_LINK'] = '' . $lang->get('comment_btn_mod_delete') . '';
- $strings['MOD_IP_LINK'] = '' . ( ( empty($row['ip_address']) ) ? $lang->get('comment_btn_mod_ip_missing') : $lang->get('comment_btn_mod_ip_notimplemented') ) . '';
-
- // Signature
- $strings['SIGNATURE'] = '';
- if($row['signature'] != '') $strings['SIGNATURE'] = RenderMan::render($row['signature']);
-
- // Avatar
- if ( $row['user_has_avatar'] == 1 )
- {
- $bool['user_has_avatar'] = true;
- $strings['AVATAR_ALT'] = $lang->get('usercp_avatar_image_alt', array('username' => $row['name']));
- $strings['AVATAR_URL'] = make_avatar_url(intval($row['user_id']), $row['avatar_type'], $row['email']);
- $strings['USERPAGE_LINK'] = makeUrlNS('User', $row['name']);
- }
-
- $bool['auth_mod'] = ($session->get_permissions('mod_comments')) ? true : false;
- $bool['can_edit'] = ( ( $session->user_logged_in && $row['name'] == $session->username && $session->get_permissions('edit_comments') ) || $session->get_permissions('mod_comments') ) ? true : false;
- $bool['signature'] = ( $strings['SIGNATURE'] == '' ) ? false : true;
-
- // Done processing and compiling, now let's cook it into HTML
- $tpl->assign_vars($strings);
- $tpl->assign_bool($bool);
- $_ob .= $tpl->run();
- }
- }
- if(getConfig('comments_need_login') != '2' || $session->user_logged_in)
- {
- if($session->get_permissions('post_comments'))
- {
- $_ob .= '' . $lang->get('comment_postform_title') . '
';
- $_ob .= $lang->get('comment_postform_blurb');
- if(getConfig('approve_comments', '0')=='1') $_ob .= ' ' . $lang->get('comment_postform_blurb_unapp');
- if(getConfig('comments_need_login') == '1' && !$session->user_logged_in)
- {
- $_ob .= ' ' . $lang->get('comment_postform_blurb_captcha');
- }
- $sn = $session->user_logged_in ? $session->username . '' : '';
- $_ob .= '
-
-
- ';
- }
- } else {
- // FIXME: l10n
- $_ob .= '' . $lang->get('comment_postform_title') . '
You need to be logged in to post comments. Log in
';
- }
- $list .= '};';
- echo 'document.getElementById(\'ajaxEditContainer\').innerHTML = unescape(\''. rawurlencode($_ob) .'\');
- ' . $list;
- echo 'Fat.fade_all(); document.getElementById(\'mdgCommentForm\').style.display = \'none\'; document.getElementById(\'mdgCommentFormLink\').style.display="inline";';
-
- $ret = ob_get_contents();
- ob_end_clean();
- return Array($ret, $_ob);
-
- }
-
- /**
- * Generates ready-to-execute Javascript code to be eval'ed by the user's browser to display comments
- * @param $page_id the page ID
- * @param $namespace the namespace
- * @param $action administrative action to perform, default is false
- * @param $flags additional info for $action, shouldn't be used except when deleting/approving comments, etc.
- * @param $_ob text to prepend to output, used by PageUtils::addcomment
- * @return string
- */
-
- public static function comments($page_id, $namespace, $action = false, $id = -1, $_ob = '')
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $r = PageUtils::comments_raw($page_id, $namespace, $action, $id, $_ob);
- return $r[0];
- }
-
- /**
- * Generates HTML code for comments - used in browser compatibility mode
- * @param $page_id the page ID
- * @param $namespace the namespace
- * @param $action administrative action to perform, default is false
- * @param $flags additional info for $action, shouldn't be used except when deleting/approving comments, etc.
- * @param $_ob text to prepend to output, used by PageUtils::addcomment
- * @return string
- */
-
- public static function comments_html($page_id, $namespace, $action = false, $id = -1, $_ob = '')
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $r = PageUtils::comments_raw($page_id, $namespace, $action, $id, $_ob);
- return $r[1];
- }
-
- /**
- * Updates comment data.
- * @param $page_id the page ID
- * @param $namespace the namespace
- * @param $subject new subject
- * @param $text new text
- * @param $old_subject the old subject, unprocessed and identical to the value in the DB
- * @param $old_text the old text, unprocessed and identical to the value in the DB
- * @param $id the javascript list ID, used internally by the client-side app
- * @return string
- */
-
- public static function savecomment($page_id, $namespace, $subject, $text, $old_subject, $old_text, $id = -1)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- if(!$session->get_permissions('edit_comments'))
- return 'result="BAD";error="Access denied"';
- // Avoid SQL injection
- $old_text = $db->escape($old_text);
- $old_subject = $db->escape($old_subject);
- // Safety check - username/login
- if(!$session->get_permissions('mod_comments')) // allow mods to edit comments
- {
- if(!$session->user_logged_in) _die('AJAX comment save safety check failed because you are not logged in. Sometimes this can happen because you are using a browser that does not send cookies as part of AJAX requests.
Please log in and try again.');
- $q = 'SELECT c.name FROM ' . table_prefix.'comments c, ' . table_prefix.'users u WHERE comment_data=\'' . $old_text . '\' AND subject=\'' . $old_subject . '\' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND u.user_id=c.user_id;';
- $s = $db->sql_query($q);
- if(!$s) _die('SQL error during safety check: '.$db->get_error().'
Attempted SQL:
'.htmlspecialchars($q).'
');
- $r = $db->fetchrow($s);
- $db->free_result();
- if($db->numrows() < 1 || $r['name'] != $session->username) _die('Safety check failed, probably due to a hacking attempt.');
- }
- $s = RenderMan::preprocess_text($subject);
- $t = RenderMan::preprocess_text($text);
- $sql = 'UPDATE ' . table_prefix.'comments SET subject=\'' . $s . '\',comment_data=\'' . $t . '\' WHERE comment_data=\'' . $old_text . '\' AND subject=\'' . $old_subject . '\' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'';
- $result = $db->sql_query($sql);
- if($result)
- {
- return 'result="GOOD";
- list[' . $id . '][\'subject\'] = unescape(\''.str_replace('%5Cn', '%0A', rawurlencode(str_replace('{{EnAnO:Newline}}', '\\n', stripslashes(str_replace('\\n', '{{EnAnO:Newline}}', $s))))).'\');
- list[' . $id . '][\'comment\'] = unescape(\''.str_replace('%5Cn', '%0A', rawurlencode(str_replace('{{EnAnO:Newline}}', '\\n', stripslashes(str_replace('\\n', '{{EnAnO:Newline}}', $t))))).'\'); id = ' . $id . ';
- s = unescape(\''.rawurlencode($s).'\');
- t = unescape(\''.str_replace('%5Cn', '
', rawurlencode(RenderMan::render(str_replace('{{EnAnO:Newline}}', "\n", stripslashes(str_replace('\\n', '{{EnAnO:Newline}}', $t)))))).'\');';
- }
- else
- {
- return 'result="BAD"; error=unescape("'.rawurlencode('Enano encountered a problem whilst saving the comment.
- Performed SQL:
- ' . $sql . '
-
- Error returned by MySQL: '.$db->get_error()).'");';
- }
- }
-
- /**
- * Updates comment data using the comment_id column instead of the old, messy way
- * @param $page_id the page ID
- * @param $namespace the namespace
- * @param $subject new subject
- * @param $text new text
- * @param $id the comment ID (primary key in enano_comments table)
- * @return string
- */
-
- public static function savecomment_neater($page_id, $namespace, $subject, $text, $id)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- if(!is_int($id)) die('PageUtils::savecomment: $id is not an integer, aborting for safety');
- if(!$session->get_permissions('edit_comments'))
- return 'Access denied';
- // Safety check - username/login
- if(!$session->get_permissions('mod_comments')) // allow mods to edit comments
- {
- if(!$session->user_logged_in) _die('AJAX comment save safety check failed because you are not logged in. Sometimes this can happen because you are using a browser that does not send cookies as part of AJAX requests.
Please log in and try again.');
- $q = 'SELECT c.name FROM ' . table_prefix.'comments c, ' . table_prefix.'users u WHERE comment_id=' . $id . ' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND u.user_id=c.user_id;';
- $s = $db->sql_query($q);
- if(!$s) _die('SQL error during safety check: '.$db->get_error().'
Attempted SQL:
'.htmlspecialchars($q).'
');
- $r = $db->fetchrow($s);
- if($db->numrows() < 1 || $r['name'] != $session->username) _die('Safety check failed, probably due to a hacking attempt.');
- $db->free_result();
- }
- $s = RenderMan::preprocess_text($subject);
- $t = RenderMan::preprocess_text($text);
- $sql = 'UPDATE ' . table_prefix.'comments SET subject=\'' . $s . '\',comment_data=\'' . $t . '\' WHERE comment_id=' . $id . ' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'';
- $result = $db->sql_query($sql);
- if($result)
- return 'good';
- else return 'Enano encountered a problem whilst saving the comment.
- Performed SQL:
- ' . $sql . '
-
- Error returned by MySQL: '.$db->get_error();
- }
-
- /**
- * Deletes a comment.
- * @param $page_id the page ID
- * @param $namespace the namespace
- * @param $name the name the user posted under
- * @param $subj the subject of the comment to be deleted
- * @param $text the text of the comment to be deleted
- * @param $id the javascript list ID, used internally by the client-side app
- * @return string
- */
-
- public static function deletecomment($page_id, $namespace, $name, $subj, $text, $id)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if(!$session->get_permissions('edit_comments'))
- return 'alert("Access to delete/edit comments is denied");';
-
- if(!preg_match('#^([0-9]+)$#', (string)$id)) die('$_GET[id] is improperly formed.');
- $n = $db->escape($name);
- $s = $db->escape($subj);
- $t = $db->escape($text);
-
- // Safety check - username/login
- if(!$session->get_permissions('mod_comments')) // allows mods to delete comments
- {
- if(!$session->user_logged_in) _die('AJAX comment save safety check failed because you are not logged in. Sometimes this can happen because you are using a browser that does not send cookies as part of AJAX requests.
Please log in and try again.');
- $q = 'SELECT c.name FROM ' . table_prefix.'comments c, ' . table_prefix.'users u WHERE comment_data=\'' . $t . '\' AND subject=\'' . $s . '\' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND u.user_id=c.user_id;';
- $s = $db->sql_query($q);
- if(!$s) _die('SQL error during safety check: '.$db->get_error().'
Attempted SQL:
'.htmlspecialchars($q).'
');
- $r = $db->fetchrow($s);
- if($db->numrows() < 1 || $r['name'] != $session->username) _die('Safety check failed, probably due to a hacking attempt.');
- $db->free_result();
- }
- $q = 'DELETE FROM ' . table_prefix.'comments WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND name=\'' . $n . '\' AND subject=\'' . $s . '\' AND comment_data=\'' . $t . '\' LIMIT 1;';
- $e=$db->sql_query($q);
- if(!$e) return('alert(unesape(\''.rawurlencode('Error during query: '.$db->get_error().'\n\nQuery:\n' . $q) . '\'));');
- return('good');
- }
-
- /**
- * Deletes a comment in a cleaner fashion.
- * @param $page_id the page ID
- * @param $namespace the namespace
- * @param $id the comment ID (primary key)
- * @return string
- */
-
- public static function deletecomment_neater($page_id, $namespace, $id)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if(!preg_match('#^([0-9]+)$#', (string)$id)) die('$_GET[id] is improperly formed.');
-
- if(!$session->get_permissions('edit_comments'))
- return 'alert("Access to delete/edit comments is denied");';
-
- // Safety check - username/login
- if(!$session->get_permissions('mod_comments')) // allows mods to delete comments
- {
- if(!$session->user_logged_in) _die('AJAX comment save safety check failed because you are not logged in. Sometimes this can happen because you are using a browser that does not send cookies as part of AJAX requests.
Please log in and try again.');
- $q = 'SELECT c.name FROM ' . table_prefix.'comments c, ' . table_prefix.'users u WHERE comment_id=' . $id . ' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND u.user_id=c.user_id;';
- $s = $db->sql_query($q);
- if(!$s) _die('SQL error during safety check: '.$db->get_error().'
Attempted SQL:
'.htmlspecialchars($q).'
');
- $r = $db->fetchrow($s);
- if($db->numrows() < 1 || $r['name'] != $session->username) _die('Safety check failed, probably due to a hacking attempt.');
- $db->free_result();
- }
- $q = 'DELETE FROM ' . table_prefix.'comments WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND comment_id=' . $id . ' LIMIT 1;';
- $e=$db->sql_query($q);
- if(!$e) return('alert(unesape(\''.rawurlencode('Error during query: '.$db->get_error().'\n\nQuery:\n' . $q) . '\'));');
- return('good');
- }
-
- /**
- * Renames a page.
- * @param $page_id the page ID
- * @param $namespace the namespace
- * @param $name the new name for the page
- * @return string error string or success message
- */
-
- public static function rename($page_id, $namespace, $name)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- $page = new PageProcessor($page_id, $namespace);
- return $page->rename_page($name);
- }
-
- /**
- * Flushes (clears) the action logs for a given page
- * @param $page_id the page ID
- * @param $namespace the namespace
- * @return string error/success string
- */
-
- public static function flushlogs($page_id, $namespace)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- if ( !is_object($lang) && defined('IN_ENANO_INSTALL') )
- {
- // This is a special exception for the Enano installer, which doesn't init languages yet.
- $lang = new Language('eng');
- }
- if(!$session->get_permissions('clear_logs') && !defined('IN_ENANO_INSTALL'))
- {
- return $lang->get('etc_access_denied');
- }
- if ( !$session->sid_super )
- {
- return $lang->get('etc_access_denied_need_reauth');
- }
-
- $page_id_db = $db->escape($page_id);
- $namespace_db = $db->escape($namespace);
-
- // If we're flushing a file, also clear all revisions before the current
- if ( $namespace == 'File' )
- {
- $q = $db->sql_query('SELECT file_id FROM ' . table_prefix . "files WHERE page_id='$page_id_db' ORDER BY time_id DESC;");
- if ( !$q )
- $db->_die();
- // discard first row (current revision)
- $db->fetchrow();
- $id_list = array();
- while ( $row = $db->fetchrow() )
- $id_list[] = $row['file_id'];
-
- require_once(ENANO_ROOT . '/includes/namespaces/file.php');
-
- // clear out each file
- foreach ( $id_list as $id )
- Namespace_File::delete_file($id);
- }
-
- $q = $db->sql_query('DELETE FROM ' . table_prefix . "logs WHERE page_id='$page_id_db' AND namespace='$namespace';");
- if ( !$q )
- $db->_die('The log entries could not be deleted.');
-
- // If the page exists, make a backup of it in case it gets spammed/vandalized
- // If not, the admin's probably deleting a trash page
- if ( isPage($paths->get_pathskey($page_id, $namespace)) )
- {
- $q = $db->sql_query('SELECT page_text,char_tag FROM ' . table_prefix . "page_text WHERE page_id='$page_id_db' AND namespace='$namespace_db';");
- if ( !$q )
- $db->_die('The current page text could not be selected; as a result, creating the backup of the page failed. Please make a backup copy of the page by clicking Edit this page and then clicking Save Changes.');
- $row = $db->fetchrow();
- $db->free_result();
- $minor_edit = ( ENANO_DBLAYER == 'MYSQL' ) ? 'false' : '0';
- $username = $db->escape($session->username);
- $q = 'INSERT INTO ' . table_prefix . "logs ( log_type, action, time_id, date_string, page_id, namespace, page_text, char_tag, author, author_uid, edit_summary, minor_edit ) VALUES\n"
- . " ('page', 'edit', " . time() . ", 'DEPRECATED', '$page_id', '$namespace', '" . $db->escape($row['page_text']) . "', '', '{$username}', $session->user_id, '" . $lang->get('page_flushlogs_backup_summary') . "', $minor_edit);";
- if ( !$db->sql_query($q) )
- $db->_die('The history (log) entry could not be inserted into the logs table.');
- }
-
- return $lang->get('ajax_clearlogs_success');
- }
-
- /**
- * Deletes a page.
- * @param string $page_id the condemned page ID
- * @param string $namespace the condemned namespace
- * @param string The reason for deleting the page in question
- * @return string
- */
-
- public static function deletepage($page_id, $namespace, $reason)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- global $cache;
- $perms = $session->fetch_page_acl($page_id, $namespace);
- $x = trim($reason);
- if ( empty($x) )
- {
- return $lang->get('ajax_delete_need_reason');
- }
- if(!$perms->get_permissions('delete_page')) return('Administrative privileges are required to delete pages, you loser.');
-
- if ( !$session->sid_super )
- {
- return $lang->get('etc_access_denied_need_reauth');
- }
-
- $e = $db->sql_query('INSERT INTO ' . table_prefix.'logs(time_id,date_string,log_type,action,page_id,namespace,author,author_uid,edit_summary) VALUES('.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \'page\', \'delete\', \'' . $page_id . '\', \'' . $namespace . '\', \'' . $session->username . '\', ' . $session->user_id . ', \'' . $db->escape(htmlspecialchars($reason)) . '\')');
- if(!$e) $db->_die('The page log entry could not be inserted.');
- $e = $db->sql_query('DELETE FROM ' . table_prefix.'categories WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'');
- if(!$e) $db->_die('The page categorization entries could not be deleted.');
- $e = $db->sql_query('DELETE FROM ' . table_prefix.'comments WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'');
- if(!$e) $db->_die('The page comments could not be deleted.');
- $e = $db->sql_query('DELETE FROM ' . table_prefix.'page_text WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'');
- if(!$e) $db->_die('The page text entry could not be deleted.');
- $e = $db->sql_query('DELETE FROM ' . table_prefix.'pages WHERE urlname=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'');
- if(!$e) $db->_die('The page entry could not be deleted.');
- if ( $namespace == 'File' )
- {
- $e = $db->sql_query('DELETE FROM ' . table_prefix.'files WHERE page_id=\'' . $page_id . '\'');
- if(!$e) $db->_die('The file entry could not be deleted.');
- }
- $cache->purge('page_meta');
- return $lang->get('ajax_delete_success');
- }
-
- /**
- * Deletes files associated with a File page.
- * @param string Page ID
- */
-
- public static function delete_page_files($page_id)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $q = $db->sql_query('SELECT file_id, filename, file_key, time_id, file_extension FROM ' . table_prefix . "files WHERE page_id = '{$db->escape($page_id)}';");
- if ( !$q )
- $db->_die();
-
- while ( $row = $db->fetchrow() )
- {
- // wipe original file
- foreach ( array(
- ENANO_ROOT . "/files/{$row['file_key']}_{$row['time_id']}{$row['file_extension']}",
- ENANO_ROOT . "/files/{$row['file_key']}{$row['file_extension']}"
- ) as $orig_file )
- {
- if ( file_exists($orig_file) )
- @unlink($orig_file);
- }
-
- // wipe cached files
- if ( $dr = @opendir(ENANO_ROOT . '/cache/') )
- {
- // lol404.jpg-1217958283-200x320.jpg
- while ( $dh = @readdir($dr) )
- {
- $regexp = ':^' . preg_quote("{$row['filename']}-{$row['time_id']}-") . '[0-9]+x[0-9]+\.' . ltrim($row['file_extension'], '.') . '$:';
- if ( preg_match($regexp, $dh) )
- {
- @unlink(ENANO_ROOT . "/cache/$dh");
- }
- }
- @closedir($dr);
- }
- }
-
- $q = $db->sql_query('DELETE FROM ' . table_prefix . "files WHERE page_id = '{$db->escape($page_id)}';");
- if ( !$q )
- $db->die();
-
- return true;
- }
-
- /**
- * Increments the deletion votes for a page by 1, and adds the current username/IP to the list of users that have voted for the page to prevent dual-voting
- * @param $page_id the page ID
- * @param $namespace the namespace
- * @return string
- */
-
- public static function delvote($page_id, $namespace)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- global $cache;
-
- if ( !$session->get_permissions('vote_delete') )
- {
- return $lang->get('etc_access_denied');
- }
-
- if ( $namespace == 'Admin' || $namespace == 'Special' || $namespace == 'System' )
- {
- return 'Special pages and system messages can\'t be voted for deletion.';
- }
-
- $pname = $paths->nslist[$namespace] . sanitize_page_id($page_id);
-
- if ( !isPage($pname) )
- {
- return 'The page does not exist.';
- }
-
- $ns = namespace_factory($page_id, $namespace);
- $cdata = $ns->get_cdata();
-
- $cv =& $cdata['delvotes'];
- $ips =& $cdata['delvote_ips'];
-
- if ( empty($ips) )
- {
- $ips = array(
- 'ip' => array(),
- 'u' => array()
- );
- }
- else
- {
- $ips = @unserialize($ips);
- if ( !$ips )
- {
- $ips = array(
- 'ip' => array(),
- 'u' => array()
- );
- }
- }
-
- if ( in_array($session->username, $ips['u']) || in_array($_SERVER['REMOTE_ADDR'], $ips['ip']) )
- {
- return $lang->get('ajax_delvote_already_voted');
- }
-
- $ips['u'][] = $session->username;
- $ips['ip'][] = $_SERVER['REMOTE_ADDR'];
- $ips = $db->escape( serialize($ips) );
-
- $cv++;
-
- $q = 'UPDATE ' . table_prefix.'pages SET delvotes=' . $cv . ',delvote_ips=\'' . $ips . '\' WHERE urlname=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'';
- $w = $db->sql_query($q);
- if ( !$w )
- $db->_die();
-
- // all done, flush page cache to mark it up
- $cache->purge('page_meta');
-
- return $lang->get('ajax_delvote_success');
- }
-
- /**
- * Resets the number of votes against a page to 0.
- * @param $page_id the page ID
- * @param $namespace the namespace
- * @return string
- */
-
- public static function resetdelvotes($page_id, $namespace)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- global $cache;
-
- if ( !$session->get_permissions('vote_reset') )
- {
- return $lang->get('etc_access_denied');
- }
-
- $page_id = $db->escape($page_id);
- $namespace = $db->escape($namespace);
-
- // pull existing info
- $q = $db->sql_query('SELECT delvotes, delvote_ips FROM ' . table_prefix . "pages WHERE urlname = '$page_id' AND namespace = '$namespace'");
- if ( !$q )
- $db->_die();
- if ( $db->numrows() < 1 )
- return $lang->get('page_err_page_not_exist');
-
- list($delvotes, $delvote_ips) = $db->fetchrow_num();
- $db->free_result();
- $delvote_ips = $db->escape($delvote_ips);
- $username = $db->escape($session->username);
-
- // log action
- $time = time();
- $q = $db->sql_query('INSERT INTO ' . table_prefix . "logs (time_id, log_type, action, edit_summary, page_text, author, author_uid, page_id, namespace) VALUES\n"
- . " ( $time, 'page', 'votereset', '$delvotes', '$delvote_ips', '$username', $session->user_id, '$page_id', '$namespace' )");
- if ( !$q )
- $db->_die();
-
- // reset votes
- $empty_vote_record = $db->escape(serialize(array('ip'=>array(),'u'=>array())));
- $q = 'UPDATE ' . table_prefix.'pages SET delvotes=0,delvote_ips=\'' . $empty_vote_record . '\' WHERE urlname=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'';
- $e = $db->sql_query($q);
- if ( !$e )
- {
- $db->_die('The number of delete votes was not reset.');
- }
- else
- {
- $cache->purge('page_meta');
- return $lang->get('ajax_delvote_reset_success');
- }
- }
-
- /**
- * Gets a list of styles for a given theme name. As of Banshee, this returns JSON.
- * @param $id the name of the directory for the theme
- * @return string JSON string with an array containing a list of themes
- */
-
- public static function getstyles()
- {
-
- if ( !preg_match('/^([a-z0-9_-]+)$/', $_GET['id']) )
- return enano_json_encode(false);
-
- $dir = './themes/' . $_GET['id'] . '/css/';
- $list = Array();
- // Open a known directory, and proceed to read its contents
- if (is_dir($dir)) {
- if ($dh = opendir($dir)) {
- while (($file = readdir($dh)) !== false) {
- if ( preg_match('#^(.*?)\.css$#is', $file) && $file != '_printable.css' ) // _printable.css should be included with every theme
- { // it should be a copy of the original style, but
- // mostly black and white
- // Note to self: document this
- $list[] = substr($file, 0, strlen($file)-4);
- }
- }
- closedir($dh);
- }
- }
- else
- {
- return(enano_json_encode(Array('mode' => 'error', 'error' => $dir.' is not a dir')));
- }
-
- return enano_json_encode($list);
- }
-
- /**
- * Assembles a Javascript app with category information
- * @param $page_id the page ID
- * @param $namespace the namespace
- * @return string Javascript code
- */
-
- public static function catedit($page_id, $namespace)
- {
- $d = PageUtils::catedit_raw($page_id, $namespace);
- return $d[0] . ' /* BEGIN CONTENT */ document.getElementById("ajaxEditContainer").innerHTML = unescape(\''.rawurlencode($d[1]).'\');';
- }
-
- /**
- * Does the actual HTML/javascript generation for cat editing, but returns an array
- * @access private
- */
-
- public static function catedit_raw($page_id, $namespace)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- ob_start();
- $_ob = '';
- $e = $db->sql_query('SELECT category_id FROM ' . table_prefix.'categories WHERE page_id=\'' . $paths->page_id . '\' AND namespace=\'' . $paths->namespace . '\'');
- if(!$e) jsdie('Error selecting category information for current page: '.$db->get_error());
- $cat_current = Array();
- while($r = $db->fetchrow())
- {
- $cat_current[] = $r;
- }
- $db->free_result();
-
- $cat_all = array();
- $q = $db->sql_query('SELECT * FROM ' . table_prefix . 'pages WHERE namespace = \'Category\';');
- if ( !$q )
- $db->_die();
-
- while ( $row = $db->fetchrow() )
- {
- $cat_all[] = Namespace_Default::bake_cdata($row);
- }
-
- // Make $cat_all an associative array, like $paths->pages
- $sz = sizeof($cat_all);
- for($i=0;$i<$sz;$i++)
- {
- $cat_all[$cat_all[$i]['urlname_nons']] = $cat_all[$i];
- }
- // Now, the "zipper" function - join the list of categories with the list of cats that this page is a part of
- $cat_info = $cat_all;
- for($i=0;$iget('catedit_title') . '
- ';
-
- $cont = ob_get_contents();
- ob_end_clean();
- return Array($cont, $_ob);
- }
-
- /**
- * Saves category information
- * WARNING: If $which_cats is empty, all the category information for the selected page will be nuked!
- * @param $page_id string the page ID
- * @param $namespace string the namespace
- * @param $which_cats array associative array of categories to put the page in
- * @return string "GOOD" on success, error string on failure
- */
-
- public static function catsave($page_id, $namespace, $which_cats)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- if(!$session->get_permissions('edit_cat')) return('Insufficient privileges to change category information');
-
- $page_perms = $session->fetch_page_acl($page_id, $namespace);
- $ns = namespace_factory($page_id, $namespace);
- $page_data = $ns->get_cdata();
-
- $cat_all = array();
- $q = $db->sql_query('SELECT * FROM ' . table_prefix . 'pages WHERE namespace = \'Category\';');
- if ( !$q )
- $db->_die();
-
- while ( $row = $db->fetchrow() )
- {
- $cat_all[] = Namespace_Default::bake_cdata($row);
- }
-
- // Make $cat_all an associative array, like $paths->pages
- $sz = sizeof($cat_all);
- for($i=0;$i<$sz;$i++)
- {
- $cat_all[$cat_all[$i]['urlname_nons']] = $cat_all[$i];
- }
-
- $rowlist = Array();
-
- for($i=0;$ifetch_page_acl($cat_all[$i]['urlname_nons'], 'Category');
- if ( !$session->get_permissions('edit_cat') || !$perms->get_permissions('edit_cat') ||
- ( $cat_all[$i]['really_protected'] && !$perms->get_permissions('even_when_protected') ) ||
- ( !$page_perms->get_permissions('even_when_protected') && $page_data['protected'] == '1' ) )
- $auth = false;
- if(!$auth)
- {
- // Find out if the page is currently in the category
- $q = $db->sql_query('SELECT * FROM ' . table_prefix.'categories WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';');
- if(!$q)
- return 'MySQL error: ' . $db->get_error();
- if($db->numrows() > 0)
- {
- $auth = true;
- $which_cats[$cat_all[$i]['urlname_nons']] = true; // Force the category to stay in its current state
- }
- $db->free_result();
- }
- if(isset($which_cats[$cat_all[$i]['urlname_nons']]) && $which_cats[$cat_all[$i]['urlname_nons']] == true /* for clarity ;-) */ && $auth ) $rowlist[] = '(\'' . $page_id . '\', \'' . $namespace . '\', \'' . $cat_all[$i]['urlname_nons'] . '\')';
- }
- if(sizeof($rowlist) > 0)
- {
- $val = implode(',', $rowlist);
- $q = 'INSERT INTO ' . table_prefix.'categories(page_id,namespace,category_id) VALUES' . $val . ';';
- $e = $db->sql_query('DELETE FROM ' . table_prefix.'categories WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';');
- if(!$e) $db->_die('The old category data could not be deleted.');
- $e = $db->sql_query($q);
- if(!$e) $db->_die('The new category data could not be inserted.');
- return('GOOD');
- }
- else
- {
- $e = $db->sql_query('DELETE FROM ' . table_prefix.'categories WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';');
- if(!$e) $db->_die('The old category data could not be deleted.');
- return('GOOD');
- }
- }
-
- /**
- * Sets the wiki mode level for a page.
- * @param $page_id string the page ID
- * @param $namespace string the namespace
- * @param $level int 0 for off, 1 for on, 2 for use global setting
- * @return string "GOOD" on success, error string on failure
- */
-
- public static function setwikimode($page_id, $namespace, $level)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $cache;
-
- if(!$session->get_permissions('set_wiki_mode')) return('Insufficient access rights');
- if ( !isset($level) || ( isset($level) && !preg_match('#^([0-2]){1}$#', (string)$level) ) )
- {
- return('Invalid mode string');
- }
- $q = $db->sql_query('UPDATE ' . table_prefix.'pages SET wiki_mode=' . $level . ' WHERE urlname=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';');
- if ( !$q )
- {
- return('Error during update query: '.$db->get_error()."\n\nSQL Backtrace:\n".$db->sql_backtrace());
- }
-
- $cache->purge('page_meta');
- return('GOOD');
- }
-
- /**
- * Sets the access password for a page.
- * @param $page_id string the page ID
- * @param $namespace string the namespace
- * @param $pass string the SHA1 hash of the password - if the password doesn't match the regex ^([0-9a-f]*){40,40}$ it will be sha1'ed
- * @return string
- */
-
- public static function setpass($page_id, $namespace, $pass)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang, $cache;
- // Determine permissions
- $ns = namespace_factory($page_id, $namespace);
- $cdata = $ns->get_cdata();
- if ( $cdata['password'] != '' )
- $a = $session->get_permissions('password_reset');
- else
- $a = $session->get_permissions('password_set');
- if ( !$a )
- return $lang->get('etc_access_denied');
- if ( !isset($pass) )
- return('Password was not set on URL');
- $p = $pass;
- if ( !preg_match('#([0-9a-f]){40,40}#', $p) )
- {
- $p = sha1($p);
- }
- if ( $p == 'da39a3ee5e6b4b0d3255bfef95601890afd80709' )
- // sha1('') = da39a3ee5e6b4b0d3255bfef95601890afd80709
- $p = '';
- $e = $db->sql_query('UPDATE ' . table_prefix.'pages SET password=\'' . $p . '\' WHERE urlname=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';');
- if ( !$e )
- {
- die('PageUtils::setpass(): Error during update query: '.$db->get_error()."\n\nSQL Backtrace:\n".$db->sql_backtrace());
- }
- // Is the new password blank?
- if ( $p == '' )
- {
- return $lang->get('ajax_password_disable_success');
- }
- else
- {
- return $lang->get('ajax_password_success');
- }
- }
-
- /**
- * Generates some preview HTML
- * @param $text string the wikitext to use
- * @return string
- */
-
- public static function genPreview($text)
- {
- global $lang;
- $ret = '' . $lang->get('editor_preview_blurb') . '';
- $text = RenderMan::render(RenderMan::preprocess_text($text, false, false));
- ob_start();
- eval('?>' . $text);
- $text = ob_get_contents();
- ob_end_clean();
- $ret .= $text;
- $ret .= '';
- return $ret;
- }
-
- /**
- * Makes a scrollable box
- * @param string $text the inner HTML
- * @param int $height Optional - the maximum height. Defaults to 250.
- * @return string
- */
-
- public static function scrollBox($text, $height = 250)
- {
- return '' . $text . '';
- }
-
- /**
- * Generates a diff summary between two page revisions.
- * @param $page_id the page ID
- * @param $namespace the namespace
- * @param $id1 the time ID of the first revision
- * @param $id2 the time ID of the second revision
- * @return string XHTML-formatted diff
- */
-
- public static function pagediff($page_id, $namespace, $id1, $id2)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- if ( !$session->get_permissions('history_view') )
- return $lang->get('etc_access_denied');
-
- if(!preg_match('#^([0-9]+)$#', (string)$id1) ||
- !preg_match('#^([0-9]+)$#', (string)$id2 )) return 'SQL injection attempt';
- // OK we made it through security
- // Safest way to make sure we don't end up with the revisions in wrong columns is to make 2 queries
- if ( !$q1 = $db->sql_query('SELECT time_id,page_text,char_tag,author,edit_summary FROM ' . table_prefix.'logs WHERE log_id = ' . $id1 . ' AND log_type=\'page\' AND action=\'edit\' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';')) return 'MySQL error: ' . $db->get_error();
- if ( !$q2 = $db->sql_query('SELECT time_id,page_text,char_tag,author,edit_summary FROM ' . table_prefix.'logs WHERE log_id = ' . $id2 . ' AND log_type=\'page\' AND action=\'edit\' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';')) return 'MySQL error: ' . $db->get_error();
- $row1 = $db->fetchrow($q1);
- $db->free_result($q1);
- $row2 = $db->fetchrow($q2);
- $db->free_result($q2);
- if(sizeof($row1) < 1 || sizeof($row2) < 2)
- {
- if ( !$q1 = $db->sql_query('SELECT time_id,page_text,char_tag,author,edit_summary FROM ' . table_prefix.'logs WHERE time_id = ' . $id1 . ' AND log_type=\'page\' AND action=\'edit\' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';')) return 'MySQL error: ' . $db->get_error();
- if ( !$q2 = $db->sql_query('SELECT time_id,page_text,char_tag,author,edit_summary FROM ' . table_prefix.'logs WHERE time_id = ' . $id2 . ' AND log_type=\'page\' AND action=\'edit\' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';')) return 'MySQL error: ' . $db->get_error();
- $row1 = $db->fetchrow($q1);
- $db->free_result($q1);
- $row2 = $db->fetchrow($q2);
- $db->free_result($q2);
- if(sizeof($row1) < 1 || sizeof($row2) < 2)
- return 'Couldn\'t find any rows that matched the query. The time ID probably doesn\'t exist in the logs table.';
- }
- $text1 = $row1['page_text'];
- $text2 = $row2['page_text'];
- $time1 = enano_date(ED_DATE | ED_TIME, $row1['time_id']);
- $time2 = enano_date(ED_DATE | ED_TIME, $row2['time_id']);
- $_ob = "
- " . $lang->get('history_lbl_comparingrevisions') . " {$time1} → {$time2}
- ";
- // Free some memory
- unset($row1, $row2, $q1, $q2);
-
- $_ob .= RenderMan::diff($text1, $text2);
- return $_ob;
- }
-
- /**
- * Gets ACL information about the selected page for target type X and target ID Y.
- * @param array $parms What to select. This is an array purely for JSON compatibility. It should be an associative array with keys target_type and target_id.
- * @return array
- */
-
- public static function acl_editor($parms = Array())
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- if(!$session->get_permissions('edit_acl') && ( $session->user_level < USER_LEVEL_ADMIN || !defined('ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL')) )
- {
- return Array(
- 'mode' => 'error',
- 'error' => $lang->get('acl_err_access_denied')
- );
- }
- if ( !$session->sid_super )
- {
- return Array(
- 'mode' => 'error',
- 'error' => $lang->get('etc_access_denied_need_reauth')
- );
- }
- $parms['page_id'] = ( isset($parms['page_id']) ) ? $parms['page_id'] : false;
- $parms['namespace'] = ( isset($parms['namespace']) ) ? $parms['namespace'] : false;
- $page_id =& $parms['page_id'];
- $namespace =& $parms['namespace'];
- $page_where_clause = ( empty($page_id) || empty($namespace) ) ? 'AND a.page_id IS NULL AND a.namespace IS NULL' : 'AND a.page_id=\'' . $db->escape($page_id) . '\' AND a.namespace=\'' . $db->escape($namespace) . '\'';
- $page_where_clause_lite = ( empty($page_id) || empty($namespace) ) ? 'AND page_id IS NULL AND namespace IS NULL' : 'AND page_id=\'' . $db->escape($page_id) . '\' AND namespace=\'' . $db->escape($namespace) . '\'';
- //die(print_r($page_id,true));
- $template->load_theme();
- // $perms_obj = $session->fetch_page_acl($page_id, $namespace);
- $perms_obj =& $session;
- $return = Array();
- if ( !file_exists(ENANO_ROOT . '/themes/' . $session->theme . '/acledit.tpl') )
- {
- return Array(
- 'mode' => 'error',
- 'error' => $lang->get('acl_err_missing_template'),
- );
- }
- $return['template'] = $template->extract_vars('acledit.tpl');
- $return['page_id'] = $page_id;
- $return['namespace'] = $namespace;
- if(isset($parms['mode']))
- {
- switch($parms['mode'])
- {
- case 'listgroups':
- $return['groups'] = Array();
- $q = $db->sql_query('SELECT group_id,group_name FROM ' . table_prefix.'groups ORDER BY group_name ASC;');
- while($row = $db->fetchrow())
- {
- $return['groups'][] = Array(
- 'id' => $row['group_id'],
- 'name' => $row['group_name'],
- );
- }
- $db->free_result();
- $return['page_groups'] = Array();
- $q = $db->sql_query('SELECT pg_id,pg_name FROM ' . table_prefix.'page_groups ORDER BY pg_name ASC;');
- if ( !$q )
- return Array(
- 'mode' => 'error',
- 'error' => $db->get_error()
- );
- while ( $row = $db->fetchrow() )
- {
- $return['page_groups'][] = Array(
- 'id' => $row['pg_id'],
- 'name' => $row['pg_name']
- );
- }
- break;
- case 'seltarget_id':
- if ( !is_int($parms['target_id']) )
- {
- return Array(
- 'mode' => 'error',
- 'error' => 'Expected parameter target_id type int'
- );
- }
- $q = $db->sql_query('SELECT target_id, target_type, page_id, namespace, rules FROM ' . table_prefix . "acl WHERE rule_id = {$parms['target_id']};");
- if ( !$q )
- return Array(
- 'mode' => 'error',
- 'error' => $db->get_error()
- );
- if ( $db->numrows() < 1 )
- return Array(
- 'mode' => 'error',
- 'error' => "No rule with ID {$parms['target_id']} found"
- );
- $parms = $db->fetchrow();
- $db->free_result();
-
- // regenerate page selection
- $parms['page_id'] = ( isset($parms['page_id']) ) ? $parms['page_id'] : false;
- $parms['namespace'] = ( isset($parms['namespace']) ) ? $parms['namespace'] : false;
- $parms['mode'] = 'seltarget_id';
- $page_id =& $parms['page_id'];
- $namespace =& $parms['namespace'];
- $page_where_clause = ( empty($page_id) || empty($namespace) ) ? 'AND a.page_id IS NULL AND a.namespace IS NULL' : 'AND a.page_id=\'' . $db->escape($page_id) . '\' AND a.namespace=\'' . $db->escape($namespace) . '\'';
- $page_where_clause_lite = ( empty($page_id) || empty($namespace) ) ? 'AND page_id IS NULL AND namespace IS NULL' : 'AND page_id=\'' . $db->escape($page_id) . '\' AND namespace=\'' . $db->escape($namespace) . '\'';
-
- $return['page_id'] = $parms['page_id'];
- $return['namespace'] = $parms['namespace'];
-
- // From here, let the seltarget handler take over
- case 'seltarget':
- $return['mode'] = 'seltarget';
- $return['acl_types'] = $perms_obj->acl_types;
- $return['acl_deps'] = $perms_obj->acl_deps;
- $return['acl_descs'] = $perms_obj->acl_descs;
- $return['target_type'] = $parms['target_type'];
- $return['target_id'] = $parms['target_id'];
- switch($parms['target_type'])
- {
- case ACL_TYPE_USER:
- $user_col = ( $parms['mode'] == 'seltarget_id' ) ? 'user_id' : 'username';
- $q = $db->sql_query('SELECT a.rules,u.user_id,u.username FROM ' . table_prefix.'users AS u
- LEFT JOIN ' . table_prefix.'acl AS a
- ON a.target_id=u.user_id
- WHERE a.target_type='.ACL_TYPE_USER.'
- AND u.' . $user_col . ' = \'' . $db->escape($parms['target_id']) . '\'
- ' . $page_where_clause . ';');
- if(!$q)
- return(Array('mode'=>'error','error'=>$db->get_error()));
- if($db->numrows() < 1)
- {
- $return['type'] = 'new';
- $q = $db->sql_query('SELECT user_id,username FROM ' . table_prefix.'users WHERE username=\'' . $db->escape($parms['target_id']) . '\';');
- if(!$q)
- return(Array('mode'=>'error','error'=>$db->get_error()));
- if($db->numrows() < 1)
- return Array('mode'=>'error','error'=>$lang->get('acl_err_user_not_found'),'debug' => $db->sql_backtrace());
- $row = $db->fetchrow();
- $return['target_name'] = $row['username'];
- $return['target_id'] = intval($row['user_id']);
- $return['current_perms'] = array();
- }
- else
- {
- $return['type'] = 'edit';
- $row = $db->fetchrow();
- $return['target_name'] = $row['username'];
- $return['target_id'] = intval($row['user_id']);
- $return['current_perms'] = $session->string_to_perm($row['rules']);
- }
- $db->free_result();
- // Eliminate types that don't apply to this namespace
- if ( $namespace && $namespace != '__PageGroup' )
- {
- foreach ( $return['current_perms'] AS $i => $perm )
- {
- if ( ( $page_id != null && $namespace != null ) && ( !in_array ( $namespace, $session->acl_scope[$i] ) && !in_array('All', $session->acl_scope[$i]) ) )
- {
- // echo "// SCOPE CONTROL: eliminating: $i\n";
- unset($return['current_perms'][$i]);
- unset($return['acl_types'][$i]);
- unset($return['acl_descs'][$i]);
- unset($return['acl_deps'][$i]);
- }
- }
- }
- break;
- case ACL_TYPE_GROUP:
- $q = $db->sql_query('SELECT a.rules,g.group_name,g.group_id FROM ' . table_prefix.'groups AS g
- LEFT JOIN ' . table_prefix.'acl AS a
- ON a.target_id=g.group_id
- WHERE a.target_type='.ACL_TYPE_GROUP.'
- AND g.group_id=\''.intval($parms['target_id']).'\'
- ' . $page_where_clause . ';');
- if(!$q)
- return(Array('mode'=>'error','error'=>$db->get_error()));
- if($db->numrows() < 1)
- {
- $return['type'] = 'new';
- $q = $db->sql_query('SELECT group_id,group_name FROM ' . table_prefix.'groups WHERE group_id=\''.intval($parms['target_id']).'\';');
- if(!$q)
- return(Array('mode'=>'error','error'=>$db->get_error()));
- if($db->numrows() < 1)
- return Array('mode'=>'error','error'=>$lang->get('acl_err_bad_group_id'));
- $row = $db->fetchrow();
- $return['target_name'] = $row['group_name'];
- $return['target_id'] = intval($row['group_id']);
- $return['current_perms'] = array();
- }
- else
- {
- $return['type'] = 'edit';
- $row = $db->fetchrow();
- $return['target_name'] = $row['group_name'];
- $return['target_id'] = intval($row['group_id']);
- $return['current_perms'] = $session->string_to_perm($row['rules']);
- }
- $db->free_result();
- // Eliminate types that don't apply to this namespace
- if ( $namespace && $namespace != '__PageGroup' )
- {
- foreach ( $return['current_perms'] AS $i => $perm )
- {
- if ( ( $page_id != false && $namespace != false ) && ( !in_array ( $namespace, $session->acl_scope[$i] ) && !in_array('All', $session->acl_scope[$i]) ) )
- {
- // echo "// SCOPE CONTROL: eliminating: $i\n"; //; ".print_r($namespace,true).":".print_r($page_id,true)."\n";
- unset($return['current_perms'][$i]);
- unset($return['acl_types'][$i]);
- unset($return['acl_descs'][$i]);
- unset($return['acl_deps'][$i]);
- }
- }
- }
- //return Array('mode'=>'debug','text'=>print_r($return, true));
- break;
- default:
- return Array('mode'=>'error','error','Invalid ACL type ID');
- break;
- }
- return $return;
- break;
- case 'save_new':
- case 'save_edit':
- if ( defined('ENANO_DEMO_MODE') )
- {
- return Array('mode'=>'error','error'=>$lang->get('acl_err_demo'));
- }
- $q = $db->sql_query('DELETE FROM ' . table_prefix.'acl WHERE target_type='.intval($parms['target_type']).' AND target_id='.intval($parms['target_id']).'
- ' . $page_where_clause_lite . ';');
- if(!$q)
- return Array('mode'=>'error','error'=>$db->get_error());
- if ( sizeof ( $parms['perms'] ) < 1 )
- {
- // As of 1.1.x, this returns success because the rule length is zero if the user selected "inherit" in all columns
- return Array(
- 'mode' => 'success',
- 'target_type' => $parms['target_type'],
- 'target_id' => $parms['target_id'],
- 'target_name' => $parms['target_name'],
- 'page_id' => $page_id,
- 'namespace' => $namespace,
- );
- }
- $rules = $session->perm_to_string($parms['perms']);
- $q = ($page_id && $namespace) ? 'INSERT INTO ' . table_prefix.'acl ( target_type, target_id, page_id, namespace, rules )
- VALUES( '.intval($parms['target_type']).', '.intval($parms['target_id']).', \'' . $db->escape($page_id) . '\', \'' . $db->escape($namespace) . '\', \'' . $db->escape($rules) . '\' )' :
- 'INSERT INTO ' . table_prefix.'acl ( target_type, target_id, rules )
- VALUES( '.intval($parms['target_type']).', '.intval($parms['target_id']).', \'' . $db->escape($rules) . '\' )';
- if(!$db->sql_query($q)) return Array('mode'=>'error','error'=>$db->get_error());
- return Array(
- 'mode' => 'success',
- 'target_type' => $parms['target_type'],
- 'target_id' => $parms['target_id'],
- 'target_name' => $parms['target_name'],
- 'page_id' => $page_id,
- 'namespace' => $namespace,
- );
- break;
- case 'delete':
- if ( defined('ENANO_DEMO_MODE') )
- {
- return Array('mode'=>'error','error'=>$lang->get('acl_err_demo'));
- }
- $sql = 'DELETE FROM ' . table_prefix.'acl WHERE target_type='.intval($parms['target_type']).' AND target_id='.intval($parms['target_id']).'
- ' . $page_where_clause_lite . ';';
- $q = $db->sql_query($sql);
- if(!$q)
- return Array('mode'=>'error','error'=>$db->get_error());
- return Array(
- 'mode' => 'delete',
- 'target_type' => $parms['target_type'],
- 'target_id' => $parms['target_id'],
- 'target_name' => $parms['target_name'],
- 'page_id' => $page_id,
- 'namespace' => $namespace,
- );
- break;
- case 'list_existing':
-
- $return = array(
- 'mode' => 'list_existing',
- 'key' => acl_list_draw_key(),
- 'rules' => array()
- );
-
- $acl_columns = 'a.' . implode(', a.', $db->columns_in(table_prefix . 'acl'));
- $users_columns = 'u.' . implode(', u.', $db->columns_in(table_prefix . 'users'));
- $groups_columns = 'g.' . implode(', g.', $db->columns_in(table_prefix . 'groups'));
- $pg_columns = 'p.' . implode(', p.', array('pg_id', 'pg_type', 'pg_name', 'pg_target'));
-
- $q = $db->sql_query("SELECT a.rule_id, u.username, g.group_name, a.target_type, a.target_id, a.page_id, a.namespace, a.rules, p.pg_name\n"
- . " FROM " . table_prefix . "acl AS a\n"
- . " LEFT JOIN " . table_prefix . "users AS u\n"
- . " ON ( (a.target_type = " . ACL_TYPE_USER . " AND a.target_id = u.user_id) OR (u.user_id IS NULL) )\n"
- . " LEFT JOIN " . table_prefix . "groups AS g\n"
- . " ON ( (a.target_type = " . ACL_TYPE_GROUP . " AND a.target_id = g.group_id) OR (g.group_id IS NULL) )\n"
- . " LEFT JOIN " . table_prefix . "page_groups as p\n"
- . " ON ( (a.namespace = '__PageGroup' AND a.page_id = CAST(p.pg_id AS CHAR)) OR (p.pg_id IS NULL) )\n"
- . " WHERE ( a.target_type = " . ACL_TYPE_USER . " OR a.target_type = " . ACL_TYPE_GROUP . " )\n"
- . " GROUP BY a.rule_id, $acl_columns, $users_columns, $groups_columns, $pg_columns\n"
- . " ORDER BY a.target_type ASC, a.rule_id ASC;"
- );
-
- if ( !$q )
- $db->_die();
-
- while ( $row = $db->fetchrow($q) )
- {
- if ( $row['target_type'] == ACL_TYPE_USER && empty($row['username']) )
- {
- // This is only done if we have an ACL affecting a user that doesn't exist.
- // Nice little bit of maintenance to have.
- if ( !$db->sql_query("DELETE FROM " . table_prefix . "acl WHERE rule_id = {$row['rule_id']};") )
- $db->_die();
- continue;
- }
- $score = get_acl_rule_score($row['rules']);
- $deep_limit = ACL_SCALE_MINIMAL_SHADE;
- // Determine background color of cell by score
- if ( $score > 5 )
- {
- // high score, show in green
- $color = 2.5 * $score;
- if ( $color > 255 )
- $color = 255;
- $color = round($color);
- // blend with the colordepth limit
- $color = $deep_limit + ( ( 0xFF - $deep_limit ) - ( ( $color / 0xFF ) * ( 0xFF - $deep_limit ) ) );
- $color = dechex($color);
- $color = "{$color}ff{$color}";
- }
- else if ( $score < -5 )
- {
- // low score, show in red
- $color = 0 - $score;
- $color = 2.5 * $color;
- if ( $color > 255 )
- $color = 255;
- $color = round($color);
- // blend with the colordepth limit
- $color = $deep_limit + ( ( 0xFF - $deep_limit ) - ( ( $color / 0xFF ) * ( 0xFF - $deep_limit ) ) );
- $color = dechex($color);
- $color = "ff{$color}{$color}";
- }
- else
- {
- $color = 'efefef';
- }
-
- // Rate rule textually based on its score
- if ( $score >= 70 )
- $desc = $lang->get('acl_msg_scale_allow');
- else if ( $score >= 50 )
- $desc = $lang->get('acl_msg_scale_mostly_allow');
- else if ( $score >= 25 )
- $desc = $lang->get('acl_msg_scale_some_allow');
- else if ( $score >= -25 )
- $desc = $lang->get('acl_msg_scale_mixed');
- else if ( $score <= -70 )
- $desc = $lang->get('acl_msg_scale_deny');
- else if ( $score <= -50 )
- $desc = $lang->get('acl_msg_scale_mostly_deny');
- else if ( $score <= -25 )
- $desc = $lang->get('acl_msg_scale_some_deny');
-
- // group and user target info
- $info = '';
- if ( $row['target_type'] == ACL_TYPE_USER )
- $info = $lang->get('acl_msg_list_user', array( 'username' => $row['username'] )); // "(User: {$row['username']})";
- else if ( $row['target_type'] == ACL_TYPE_GROUP )
- $info = $lang->get('acl_msg_list_group', array( 'group' => $row['group_name'] ));
-
- // affected pages info
- if ( $row['page_id'] && $row['namespace'] && $row['namespace'] != '__PageGroup' )
- $info .= $lang->get('acl_msg_list_on_page', array( 'page_name' => "{$row['namespace']}:{$row['page_id']}" ));
- else if ( $row['page_id'] && $row['namespace'] && $row['namespace'] == '__PageGroup' )
- $info .= $lang->get('acl_msg_list_on_page_group', array( 'page_group' => $row['pg_name'] ));
- else
- $info .= $lang->get('acl_msg_list_entire_site');
-
- $score_string = $lang->get('acl_msg_list_score', array
- (
- 'score' => $score,
- 'desc' => $desc,
- 'info' => $info
- ));
- $return['rules'][] = array(
- 'score_string' => $score_string,
- 'rule_id' => $row['rule_id'],
- 'color' => $color
- );
- }
-
- break;
- case 'list_presets':
- $presets = array();
- $q = $db->sql_query('SELECT page_id AS preset_name, rule_id, rules FROM ' . table_prefix . "acl WHERE target_type = " . ACL_TYPE_PRESET . ";");
- if ( !$q )
- $db->die_json();
-
- while ( $row = $db->fetchrow() )
- {
- $row['rules'] = $session->string_to_perm($row['rules']);
- $presets[] = $row;
- }
-
- return array(
- 'mode' => 'list_existing',
- 'presets' => $presets
- );
- break;
- case 'save_preset':
- if ( empty($parms['preset_name']) )
- {
- return array(
- 'mode' => 'error',
- 'error' => $lang->get('acl_err_preset_name_empty')
- );
- }
- $preset_name = $db->escape($parms['preset_name']);
- $q = $db->sql_query('DELETE FROM ' . table_prefix . "acl WHERE target_type = " . ACL_TYPE_PRESET . " AND page_id = '$preset_name';");
- if ( !$q )
- $db->die_json();
-
- $perms = $session->perm_to_string($parms['perms']);
- if ( !$perms )
- {
- return array(
- 'mode' => 'error',
- 'error' => $lang->get('acl_err_preset_is_blank')
- );
- }
-
- $perms = $db->escape($perms);
- $q = $db->sql_query('INSERT INTO ' . table_prefix . "acl(page_id, target_type, rules) VALUES\n"
- . " ( '$preset_name', " . ACL_TYPE_PRESET . ", '$perms' );");
- if ( !$q )
- $db->die_json();
-
- return array(
- 'mode' => 'success'
- );
- break;
- case 'trace':
- list($targetpid, $targetns) = RenderMan::strToPageID($parms['page']);
- try
- {
- $perms = $session->fetch_page_acl_user($parms['user'], $targetpid, $targetns);
- $perm_table = array(
- AUTH_ALLOW => 'acl_lbl_field_allow',
- AUTH_WIKIMODE => 'acl_lbl_field_wikimode',
- AUTH_DISALLOW => 'acl_lbl_field_disallow',
- AUTH_DENY => 'acl_lbl_field_deny'
- );
-
- $return = array(
- 'mode' => 'trace',
- 'perms' => array()
- );
-
- foreach ( $perms->perm_resolve_table as $perm_type => $lookup_data )
- {
- if ( !$session->check_acl_scope($perm_type, $targetns) )
- continue;
-
- $src_l10n = $lang->get($session->acl_inherit_lang_table[$lookup_data['src']], $lookup_data);
- $divclass = preg_replace('/^acl_inherit_/', '', $session->acl_inherit_lang_table[$lookup_data['src']]);
- $perm_string = $lang->get($perm_table[$perms->perms[$perm_type]]);
- $perm_name = $lang->get($session->acl_descs[$perm_type]);
-
- $return['perms'][$perm_type] = array(
- 'divclass' => "acl_inherit acl_$divclass",
- 'perm_type' => $perm_type,
- 'perm_name' => $perm_name,
- 'perm_value' => $perm_string,
- 'perm_src' => $src_l10n,
- 'rule_id' => intval($lookup_data['rule_id']),
- 'bad_deps' => $perms->acl_check_deps($perm_type, true)
- );
- }
-
- // group rules if possible
- $return['groups'] = array();
- foreach ( $return['perms'] as $rule )
- {
- if ( !isset($return['groups'][$rule['rule_id']]) )
- {
- $return['groups'][$rule['rule_id']] = array();
- }
- $return['groups'][$rule['rule_id']][] = $rule['perm_type'];
- }
- }
- catch ( Exception $e )
- {
- $return = array(
- 'mode' => 'error',
- 'error' => $e->getMessage()
- );
- }
-
- break;
- default:
- return Array('mode'=>'error','error'=>'Hacking attempt');
- break;
- }
- }
- return $return;
- }
-
- /**
- * Same as PageUtils::acl_editor(), but the parms are a JSON string instead of an array. This also returns a JSON string.
- * @param string $parms Same as PageUtils::acl_editor/$parms, but should be a valid JSON string.
- * @return string
- */
-
- public static function acl_json($parms = '{ }')
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- try
- {
- $parms = enano_json_decode($parms);
- }
- catch ( Zend_Json_Exception $e )
- {
- $parms = array();
- }
- $ret = PageUtils::acl_editor($parms);
- $ret = enano_json_encode($ret);
- return $ret;
- }
-
- /**
- * A non-Javascript frontend for the ACL API.
- * @param array The request data, if any, this should be in the format required by PageUtils::acl_editor()
- */
-
- public static function aclmanager($parms)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- ob_start();
- // Convenience
- $formstart = '';
- $parms = PageUtils::acl_preprocess($parms);
- $response = PageUtils::acl_editor($parms);
- $response = PageUtils::acl_postprocess($response);
-
- //die('' . htmlspecialchars(print_r($response, true)) . '
');
-
- switch($response['mode'])
- {
- case 'debug':
- echo '' . htmlspecialchars($response['text']) . '
';
- break;
- case 'stage1':
- echo '' . $lang->get('acl_lbl_welcome_title') . '
- ' . $lang->get('acl_lbl_welcome_body') . '
';
- echo $formstart;
- echo '
-
-
- ' . $template->username_field('data[target_id_user]') . '
- ' . $lang->get('acl_lbl_scope') . '
-
- ' . $groupsel . '
-
-
-
-
-
-
- ';
- echo $formend;
- break;
- case 'success':
- echo '
- ' . $lang->get('acl_lbl_save_success_title') . '
- ' . $lang->get('acl_lbl_save_success_body', array( 'target_name' => $response['target_name'] )) . '
- ' . $formstart . '
-
-
-
-
-
-
-
-
- ' . $formend . '
- ';
- break;
- case 'delete':
- echo '
- ' . $lang->get('acl_lbl_delete_success_title') . '
- ' . $lang->get('acl_lbl_delete_success_body', array('target_name' => $response['target_name'])) . '
- ' . $formstart . '
-
-
-
-
-
-
-
-
- ' . $formend . '
- ';
- break;
- case 'seltarget':
- if ( $response['type'] == 'edit' )
- {
- echo '' . $lang->get('acl_lbl_editwin_title_edit') . '
';
- }
- else
- {
- echo '' . $lang->get('acl_lbl_editwin_title_create') . '
';
- }
- $type = ( $response['target_type'] == ACL_TYPE_GROUP ) ? $lang->get('acl_target_type_group') : $lang->get('acl_target_type_user');
- $scope = ( $response['page_id'] ) ? ( $response['namespace'] == '__PageGroup' ? $lang->get('acl_scope_type_pagegroup') : $lang->get('acl_scope_type_thispage') ) : $lang->get('acl_scope_type_wholesite');
- $subs = array(
- 'target_type' => $type,
- 'target' => $response['target_name'],
- 'scope_type' => $scope
- );
- echo $lang->get('acl_lbl_editwin_body', $subs);
- echo $formstart;
- $parser = $template->makeParserText( $response['template']['acl_field_begin'] );
- echo $parser->run();
- $parser = $template->makeParserText( $response['template']['acl_field_item'] );
- $cls = 'row2';
- foreach ( $response['acl_types'] as $acl_type => $value )
- {
- $vars = Array(
- 'FIELD_INHERIT_CHECKED' => '',
- 'FIELD_DENY_CHECKED' => '',
- 'FIELD_DISALLOW_CHECKED' => '',
- 'FIELD_WIKIMODE_CHECKED' => '',
- 'FIELD_ALLOW_CHECKED' => '',
- );
- $cls = ( $cls == 'row1' ) ? 'row2' : 'row1';
- $vars['ROW_CLASS'] = $cls;
-
- switch ( $response['current_perms'][$acl_type] )
- {
- case 'i':
- default:
- $vars['FIELD_INHERIT_CHECKED'] = 'checked="checked"';
- break;
- case AUTH_ALLOW:
- $vars['FIELD_ALLOW_CHECKED'] = 'checked="checked"';
- break;
- case AUTH_WIKIMODE:
- $vars['FIELD_WIKIMODE_CHECKED'] = 'checked="checked"';
- break;
- case AUTH_DISALLOW:
- $vars['FIELD_DISALLOW_CHECKED'] = 'checked="checked"';
- break;
- case AUTH_DENY:
- $vars['FIELD_DENY_CHECKED'] = 'checked="checked"';
- break;
- }
- $vars['FIELD_NAME'] = 'data[perms][' . $acl_type . ']';
- if ( preg_match('/^([a-z0-9_]+)$/', $response['acl_descs'][$acl_type]) )
- {
- $vars['FIELD_DESC'] = $lang->get($response['acl_descs'][$acl_type]);
- }
- else
- {
- $vars['FIELD_DESC'] = $response['acl_descs'][$acl_type];
- }
- $parser->assign_vars($vars);
- echo $parser->run();
- }
- $parser = $template->makeParserText( $response['template']['acl_field_end'] );
- echo $parser->run();
- echo '
-
-
-
-
-
-
- ' . ( ( $response['type'] == 'edit' ) ? ' ' : '' ) . '
- ';
- echo $formend;
- break;
- case 'error':
- ob_end_clean();
- die_friendly('Error occurred', 'Error returned by permissions API:
' . htmlspecialchars($response['error']) . '
');
- break;
- }
- $ret = ob_get_contents();
- ob_end_clean();
- echo
- $template->getHeader() .
- $ret .
- $template->getFooter();
- }
-
- /**
- * Preprocessor to turn the form-submitted data from the ACL editor into something the backend can handle
- * @param array The posted data
- * @return array
- * @access private
- */
-
- public static function acl_preprocess($parms)
- {
- if ( !isset($parms['mode']) )
- // Nothing to do
- return $parms;
- switch ( $parms['mode'] )
- {
- case 'seltarget':
-
- // Who's affected?
- $parms['target_type'] = intval( $parms['target_type'] );
- $parms['target_id'] = ( $parms['target_type'] == ACL_TYPE_GROUP ) ? $parms['target_id_grp'] : $parms['target_id_user'];
-
- case 'save_edit':
- case 'save_new':
- if ( isset($parms['act_delete_rule']) )
- {
- $parms['mode'] = 'delete';
- }
-
- // Scope (just this page or entire site?)
- if ( $parms['scope'] == 'entire_site' || ( $parms['page_id'] == 'false' && $parms['namespace'] == 'false' ) )
- {
- $parms['page_id'] = false;
- $parms['namespace'] = false;
- }
- else if ( $parms['scope'] == 'page_group' )
- {
- $parms['page_id'] = $parms['pg_id'];
- $parms['namespace'] = '__PageGroup';
- }
-
- break;
- }
-
- if ( isset($parms['act_go_stage1']) )
- {
- $parms = array(
- 'mode' => 'listgroups'
- );
- }
-
- return $parms;
- }
-
- public static function acl_postprocess($response)
- {
- if(!isset($response['mode']))
- {
- if ( isset($response['groups']) )
- $response['mode'] = 'stage1';
- else
- $response = Array(
- 'mode' => 'error',
- 'error' => 'Invalid action passed by API backend.',
- );
- }
- return $response;
- }
-
+
+ /**
+ * Tell if a username is used or not.
+ * @param $name the name to check for
+ * @return string
+ */
+
+ public static function checkusername($name)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $name = str_replace('_', ' ', $name);
+ $q = $db->sql_query('SELECT username FROM ' . table_prefix.'users WHERE username=\'' . $db->escape(rawurldecode($name)) . '\'');
+ if ( !$q )
+ {
+ die($db->get_error());
+ }
+ if ( $db->numrows() < 1)
+ {
+ $db->free_result(); return('good');
+ }
+ else
+ {
+ $db->free_result(); return('bad');
+ }
+ }
+
+ /**
+ * Get the wiki formatting source for a page
+ * @param $page the full page id (Namespace:Pagename)
+ * @return string
+ * @todo (DONE) Make it require a password (just for security purposes)
+ */
+
+ public static function getsource($page, $password = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ if ( !isPage($page) )
+ {
+ return '';
+ }
+
+ list($page_id, $namespace) = RenderMan::strToPageID($page);
+ $ns = namespace_factory($page_id, $namespace);
+ $cdata = $ns->get_cdata();
+
+ if ( strlen($cdata['password']) == 40 )
+ {
+ if(!$password || ( $password != $cdata['password']))
+ {
+ return 'invalid_password';
+ }
+ }
+
+ if(!$session->get_permissions('view_source')) // Dependencies handle this for us - this also checks for read privileges
+ return 'access_denied';
+ $pid = RenderMan::strToPageID($page);
+ if($pid[1] == 'Special' || $pid[1] == 'Admin')
+ {
+ die('This type of page (' . $paths->nslist[$pid[1]] . ') cannot be edited because the page source code is not stored in the database.');
+ }
+
+ $e = $db->sql_query('SELECT page_text,char_tag FROM ' . table_prefix.'page_text WHERE page_id=\'' . $pid[0] . '\' AND namespace=\'' . $pid[1] . '\'');
+ if ( !$e )
+ {
+ $db->_die('The page text could not be selected.');
+ }
+ if( $db->numrows() < 1 )
+ {
+ return ''; //$db->_die('There were no rows in the text table that matched the page text query.');
+ }
+
+ $r = $db->fetchrow();
+ $db->free_result();
+ $message = $r['page_text'];
+
+ return htmlspecialchars($message);
+ }
+
+ /**
+ * DEPRECATED. Previously returned the full rendered contents of a page.
+ * @param $page the full page id (Namespace:Pagename)
+ * @param $send_headers true if the theme headers should be sent (still dependent on current page settings), false otherwise
+ * @return string
+ */
+
+ public static function getpage($page, $send_headers = false, $hist_id = false)
+ {
+ die('PageUtils->getpage is deprecated.');
+ }
+
+ /**
+ * Writes page data to the database, after verifying permissions and running the XSS filter
+ * @param $page_id the page ID
+ * @param $namespace the namespace
+ * @param $message the text to save
+ * @return string
+ */
+
+ public static function savepage($page_id, $namespace, $message, $summary = 'No edit summary given', $minor = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $page = new PageProcessor($page_id, $namespace);
+ $cdata = $page->ns->get_cdata();
+ return $page->update_page($message, $summary, $minor, $cdata['page_format']);
+ }
+
+ /**
+ * Creates a page, both in memory and in the database.
+ * @param string $page_id
+ * @param string $namespace
+ * @return bool true on success, false on failure
+ */
+
+ public static function createPage($page_id, $namespace, $name = false, $visible = 1)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ if(in_array($namespace, Array('Special', 'Admin')))
+ {
+ // echo 'Notice: PageUtils::createPage: You can\'t create a special page in the database
';
+ return 'You can\'t create a special page in the database';
+ }
+
+ if(!isset($paths->nslist[$namespace]))
+ {
+ // echo 'Notice: PageUtils::createPage: Couldn\'t look up the namespace
';
+ return 'Couldn\'t look up the namespace';
+ }
+
+ $pname = $paths->nslist[$namespace] . $page_id;
+ if(isPage($pname))
+ {
+ // echo 'Notice: PageUtils::createPage: Page already exists
';
+ return 'Page already exists';
+ }
+
+ if(!$session->get_permissions('create_page'))
+ {
+ // echo 'Notice: PageUtils::createPage: Not authorized to create pages
';
+ return 'Not authorized to create pages';
+ }
+
+ if($session->user_level < USER_LEVEL_ADMIN && $namespace == 'System')
+ {
+ // echo 'Notice: PageUtils::createPage: Not authorized to create system messages
';
+ return 'Not authorized to create system messages';
+ }
+
+ if ( substr($page_id, 0, 8) == 'Project:' )
+ {
+ // echo 'Notice: PageUtils::createPage: Prefix "Project:" is reserved
';
+ return 'The prefix "Project:" is reserved for a parser shortcut; if a page was created using this prefix, it would not be possible to link to it.';
+ }
+
+ /*
+ // Dunno why this was here. Enano can handle more flexible names than this...
+ $regex = '#^([A-z0-9 _\-\.\/\!\@\(\)]*)$#is';
+ if(!preg_match($regex, $name))
+ {
+ //echo 'Notice: PageUtils::createPage: Name contains invalid characters
';
+ return 'Name contains invalid characters';
+ }
+ */
+
+ $page_id = dirtify_page_id($page_id);
+
+ if ( !$name )
+ $name = str_replace('_', ' ', $page_id);
+
+ $page_id = sanitize_page_id( $page_id );
+
+ $prot = ( $namespace == 'System' ) ? 1 : 0;
+
+ $ips = array(
+ 'ip' => array(),
+ 'u' => array()
+ );
+
+ $page_data = Array(
+ 'name'=>$name,
+ 'urlname'=>$page_id,
+ 'namespace'=>$namespace,
+ 'special'=>0,'visible'=>1,'comments_on'=>0,'protected'=>$prot,'delvotes'=>0,'delvote_ips'=>serialize($ips),'wiki_mode'=>2,
+ );
+
+ // die('PageUtils::createpage: Creating page with this data:' . print_r($page_data, true) . '
');
+
+ $paths->add_page($page_data);
+
+ $qa = $db->sql_query('INSERT INTO ' . table_prefix.'pages(name,urlname,namespace,visible,protected,delvote_ips) VALUES(\'' . $db->escape($name) . '\', \'' . $db->escape($page_id) . '\', \'' . $namespace . '\', '. ( $visible ? '1' : '0' ) .', ' . $prot . ', \'' . $db->escape(serialize($ips)) . '\');');
+ $qb = $db->sql_query('INSERT INTO ' . table_prefix.'page_text(page_id,namespace) VALUES(\'' . $db->escape($page_id) . '\', \'' . $namespace . '\');');
+ $qc = $db->sql_query('INSERT INTO ' . table_prefix.'logs(time_id,date_string,log_type,action,author,author_uid,page_id,namespace) VALUES('.time().', \'DEPRECATED\', \'page\', \'create\', \'' . $session->username . '\', ' . $session->user_id . ', \'' . $db->escape($page_id) . '\', \'' . $namespace . '\');');
+
+ if($qa && $qb && $qc)
+ return 'good';
+ else
+ {
+ return $db->get_error();
+ }
+ }
+
+ /**
+ * Sets the protection level on a page.
+ * @param $page_id string the page ID
+ * @param $namespace string the namespace
+ * @param $level int level of protection - 0 is off, 1 is full, 2 is semi
+ * @param $reason string why the page is being (un)protected
+ * @return string - "good" on success, in all other cases, an error string (on query failure, calls $db->_die() )
+ */
+ public static function protect($page_id, $namespace, $level, $reason)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $page = new PageProcessor($page_id, $namespace);
+ return $page->protect_page($level, $reason);
+ }
+
+ /**
+ * Generates an HTML table with history information in it.
+ * @param string the page ID
+ * @param string the namespace
+ * @param string page password
+ * @return string
+ */
+
+ public static function histlist($page_id, $namespace, $password = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ if(!$session->get_permissions('history_view'))
+ return 'Access denied';
+
+ ob_start();
+
+ $pname = $paths->get_pathskey($page_id, $namespace);
+ $ns = namespace_factory($page_id, $namespace);
+ $cdata = $ns->get_cdata();
+
+ if ( !isPage($pname) )
+ {
+ return 'DNE';
+ }
+
+ if ( isPage($pname) )
+ {
+ $password_exists = ( !empty($cdata['password']) && $cdata['password'] !== sha1('') );
+ if ( $password_exists && $password !== $cdata['password'] )
+ {
+ return '' . $lang->get('history_err_wrong_password') . '
';
+ }
+ }
+
+ $wiki = ( ( $cdata['wiki_mode'] == 2 && getConfig('wiki_mode') == '1') || $cdata['wiki_mode'] == 1) ? true : false;
+ $prot = ( ( $cdata['protected'] == 2 && $session->user_logged_in && $session->reg_time + 60*60*24*4 < time() ) || $cdata['protected'] == 1) ? true : false;
+
+ $q = 'SELECT log_id,time_id,date_string,page_id,namespace,author,author_uid,u.username,edit_summary,minor_edit FROM ' . table_prefix . "logs AS l\n"
+ . " LEFT JOIN " . table_prefix . "users AS u\n"
+ . " ON ( u.user_id = l.author_uid OR u.user_id IS NULL )\n"
+ . " WHERE log_type='page' AND action='edit' AND page_id='$page_id' AND namespace='$namespace' AND is_draft != 1 ORDER BY time_id DESC;";
+
+ if ( !($q = $db->sql_query($q)) )
+ $db->_die('The history data for the page "' . $paths->cpage['name'] . '" could not be selected.');
+
+ echo $lang->get('history_page_subtitle') . '
+ ' . $lang->get('history_heading_edits') . '
';
+ $numrows = $db->numrows();
+ if ( $numrows < 1 )
+ {
+ echo $lang->get('history_no_entries');
+ }
+ else
+ {
+ echo '
+ ';
+ }
+ $db->free_result();
+ echo '' . $lang->get('history_heading_other') . '
';
+
+ $sql = 'SELECT log_id,action,time_id,date_string,page_id,namespace,author,author_uid,u.username,edit_summary,minor_edit FROM ' . table_prefix . "logs AS l\n"
+ . " LEFT JOIN " . table_prefix . "users AS u\n"
+ . " ON ( u.user_id = l.author_uid OR u.user_id IS NULL )\n"
+ . " WHERE log_type='page' AND action!='edit' AND page_id='$page_id' AND namespace='$namespace' AND is_draft != 1 ORDER BY time_id DESC;";
+
+ if ( !( $q = $db->sql_query($sql)) )
+ {
+ $db->_die('The history data for the page "' . htmlspecialchars($paths->cpage['name']) . '" could not be selected.');
+ }
+ if ( $db->numrows() < 1 )
+ {
+ echo $lang->get('history_no_entries');
+ }
+ else
+ {
+
+ echo '
+
+ ' . $lang->get('history_col_datetime') . '
+ ' . $lang->get('history_col_user') . '
+ ' . $lang->get('history_col_minor') . '
+ ' . $lang->get('history_col_action_taken') . '
+ ' . $lang->get('history_col_extra') . '
+ ';
+ $cls = 'row2';
+ while($r = $db->fetchrow($q)) {
+
+ if($cls == 'row2') $cls = 'row1';
+ else $cls = 'row2';
+
+ echo '';
+
+ // Date and time
+ echo '' . enano_date(ED_DATE | ED_TIME, intval($r['time_id'])) . ' ';
+
+ // User
+ $real_username = $r['author_uid'] > 1 && !empty($r['username']) ? $r['username'] : $r['author'];
+ $rank_info = $session->get_user_rank($r['author_uid']);
+ if ( $session->get_permissions('mod_misc') && is_valid_ip($r['author']) && $r['author_uid'] == 1 )
+ {
+ $rc = ' style="cursor: pointer;" title="' . $lang->get('history_tip_rdns') . '" onclick="ajaxReverseDNS(this, \'' . $r['author'] . '\');"';
+ }
+ else
+ {
+ $rc = '';
+ }
+ echo 'nslist['User'] . sanitize_page_id($real_username)) )
+ {
+ echo 'class="wikilink-nonexistent"';
+ }
+ echo 'style="' . $rank_info['rank_style'] . '">' . htmlspecialchars($real_username) . ' '."\n";
+
+
+ // Minor edit
+ echo ''. (( $r['minor_edit'] ) ? 'M' : '' ) .' ';
+
+ // Action taken
+ echo '';
+ // Some of these are sanitized at insert-time. Others follow the newer Enano policy of stripping HTML at runtime.
+ if ($r['action']=='prot') echo $lang->get('history_log_protect') . ' ' . $lang->get('history_extra_reason') . ' ' . ( $r['edit_summary'] === '__REVERSION__' ? $lang->get('history_extra_protection_reversion') : htmlspecialchars($r['edit_summary']) );
+ elseif($r['action']=='unprot') echo $lang->get('history_log_unprotect') . ' ' . $lang->get('history_extra_reason') . ' ' . ( $r['edit_summary'] === '__REVERSION__' ? $lang->get('history_extra_protection_reversion') : htmlspecialchars($r['edit_summary']) );
+ elseif($r['action']=='semiprot') echo $lang->get('history_log_semiprotect') . ' ' . $lang->get('history_extra_reason') . ' ' . ( $r['edit_summary'] === '__REVERSION__' ? $lang->get('history_extra_protection_reversion') : htmlspecialchars($r['edit_summary']) );
+ elseif($r['action']=='rename') echo $lang->get('history_log_rename') . ' ' . $lang->get('history_extra_oldtitle') . ' '.htmlspecialchars($r['edit_summary']);
+ elseif($r['action']=='create') echo $lang->get('history_log_create') . ' ';
+ elseif($r['action']=='delete') echo $lang->get('history_log_delete') . ' ' . $lang->get('history_extra_reason') . ' ' . $r['edit_summary'];
+ elseif($r['action']=='reupload') echo $lang->get('history_log_uploadnew') . ' ' . $lang->get('history_extra_reason') . ' ' . ( $r['edit_summary'] === '__ROLLBACK__' ? $lang->get('history_extra_upload_reversion') : htmlspecialchars($r['edit_summary']) );
+ elseif($r['action']=='votereset')echo $lang->get('history_log_votereset') . ' ' . $lang->get('history_extra_numvotes') . ' ' . $r['edit_summary'];
+ echo ' ';
+
+ // Actions!
+ echo '' . $lang->get('history_action_contrib') . ' ';
+ echo '' . $lang->get('history_action_revert') . ' ';
+
+ echo ' ';
+ }
+ echo '
';
+ }
+ $db->free_result();
+ $ret = ob_get_contents();
+ ob_end_clean();
+ return $ret;
+ }
+
+ /**
+ * Rolls back a logged action
+ * @param $id the time ID, a.k.a. the primary key in the logs table
+ * @return string
+ */
+
+ public static function rollback($id)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ // placeholder
+ return 'PageUtils->rollback() is deprecated - use PageProcessor instead.';
+ }
+
+ /**
+ * Posts a comment.
+ * @param $page_id the page ID
+ * @param $namespace the namespace
+ * @param $name the name of the person posting, defaults to current username/IP
+ * @param $subject the subject line of the comment
+ * @param $text the comment text
+ * @return string javascript code
+ */
+
+ public static function addcomment($page_id, $namespace, $name, $subject, $text, $captcha_code = false, $captcha_id = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $_ob = '';
+ if(!$session->get_permissions('post_comments'))
+ return 'Access denied';
+ if(getConfig('comments_need_login') == '2' && !$session->user_logged_in) _die('Access denied to post comments: you need to be logged in first.');
+ if(getConfig('comments_need_login') == '1' && !$session->user_logged_in)
+ {
+ if(!$captcha_code || !$captcha_id) _die('BUG: PageUtils::addcomment: no CAPTCHA data passed to method');
+ $result = $session->get_captcha($captcha_id);
+ if(strtolower($captcha_code) != strtolower($result)) _die('The confirmation code you entered was incorrect.');
+ }
+ $text = RenderMan::preprocess_text($text);
+ $name = $session->user_logged_in ? RenderMan::preprocess_text($session->username) : RenderMan::preprocess_text($name);
+ $subj = RenderMan::preprocess_text($subject);
+ if(getConfig('approve_comments', '0')=='1') $appr = '0'; else $appr = '1';
+ $q = 'INSERT INTO ' . table_prefix.'comments(page_id,namespace,subject,comment_data,name,user_id,approved,time) VALUES(\'' . $page_id . '\',\'' . $namespace . '\',\'' . $subj . '\',\'' . $text . '\',\'' . $name . '\',' . $session->user_id . ',' . $appr . ','.time().')';
+ $e = $db->sql_query($q);
+ if(!$e) die('alert(unescape(\''.rawurlencode('Error inserting comment data: '.$db->get_error().'\n\nQuery:\n' . $q) . '\'))');
+ else $_ob .= 'Your comment has been posted.';
+ return PageUtils::comments($page_id, $namespace, false, Array(), $_ob);
+ }
+
+ /**
+ * Generates partly-compiled HTML/Javascript code to be eval'ed by the user's browser to display comments
+ * @param $page_id the page ID
+ * @param $namespace the namespace
+ * @param $action administrative action to perform, default is false
+ * @param $flags additional info for $action, shouldn't be used except when deleting/approving comments, etc.
+ * @param $_ob text to prepend to output, used by PageUtils::addcomment
+ * @return array
+ * @access private
+ */
+
+ public static function comments_raw($page_id, $namespace, $action = false, $flags = Array(), $_ob = '')
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ $pname = $paths->nslist[$namespace] . $page_id;
+ $template->init_vars();
+
+ ob_start();
+
+ if($action && $session->get_permissions('mod_comments')) // Nip hacking attempts in the bud
+ {
+ switch($action) {
+ case "delete":
+ if(isset($flags['id']))
+ {
+ $q = 'DELETE FROM ' . table_prefix.'comments WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND comment_id='.intval($flags['id']).' LIMIT 1;';
+ } else {
+ $n = $db->escape($flags['name']);
+ $s = $db->escape($flags['subj']);
+ $t = $db->escape($flags['text']);
+ $q = 'DELETE FROM ' . table_prefix.'comments WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND name=\'' . $n . '\' AND subject=\'' . $s . '\' AND comment_data=\'' . $t . '\' LIMIT 1;';
+ }
+ $e=$db->sql_query($q);
+ if(!$e) die('alert(unesape(\''.rawurlencode('Error during query: '.$db->get_error().'\n\nQuery:\n' . $q) . '\'));');
+ break;
+ case "approve":
+ if(isset($flags['id']))
+ {
+ $where = 'comment_id='.intval($flags['id']);
+ } else {
+ $n = $db->escape($flags['name']);
+ $s = $db->escape($flags['subj']);
+ $t = $db->escape($flags['text']);
+ $where = 'name=\'' . $n . '\' AND subject=\'' . $s . '\' AND comment_data=\'' . $t . '\'';
+ }
+ $q = 'SELECT approved FROM ' . table_prefix.'comments WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND ' . $where . ' LIMIT 1;';
+ $e = $db->sql_query($q);
+ if(!$e) die('alert(unesape(\''.rawurlencode('Error selecting approval status: '.$db->get_error().'\n\nQuery:\n' . $q) . '\'));');
+ $r = $db->fetchrow();
+ $db->free_result();
+ $a = ( $r['approved'] ) ? '0' : '1';
+ $q = 'UPDATE ' . table_prefix.'comments SET approved=' . $a . ' WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND ' . $where . ';';
+ $e=$db->sql_query($q);
+ if(!$e) die('alert(unesape(\''.rawurlencode('Error during query: '.$db->get_error().'\n\nQuery:\n' . $q) . '\'));');
+ if($a=='1') $v = $lang->get('comment_btn_mod_unapprove');
+ else $v = $lang->get('comment_btn_mod_approve');
+ echo 'document.getElementById("mdgApproveLink'.intval($_GET['id']).'").innerHTML="' . $v . '";';
+ break;
+ }
+ }
+
+ if(!defined('ENANO_TEMPLATE_LOADED'))
+ {
+ $template->load_theme($session->theme, $session->style);
+ }
+
+ $tpl = $template->makeParser('comment.tpl');
+
+ $e = $db->sql_query('SELECT * FROM ' . table_prefix.'comments WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND approved=0;');
+ if(!$e) $db->_die('The comment text data could not be selected.');
+ $num_unapp = $db->numrows();
+ $db->free_result();
+ $e = $db->sql_query('SELECT * FROM ' . table_prefix.'comments WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND approved=1;');
+ if(!$e) $db->_die('The comment text data could not be selected.');
+ $num_app = $db->numrows();
+ $db->free_result();
+ $lq = $db->sql_query('SELECT c.comment_id,c.subject,c.name,c.comment_data,c.approved,c.time,c.user_id,c.ip_address,u.user_level,u.email,u.signature,u.user_has_avatar,u.avatar_type
+ FROM ' . table_prefix.'comments AS c
+ LEFT JOIN ' . table_prefix.'users AS u
+ ON c.user_id=u.user_id
+ WHERE page_id=\'' . $page_id . '\'
+ AND namespace=\'' . $namespace . '\' ORDER BY c.time ASC;');
+ if(!$lq) _die('The comment text data could not be selected. '.$db->get_error());
+ $_ob .= '' . $lang->get('comment_heading') . '
';
+
+ $n = ( $session->get_permissions('mod_comments')) ? $db->numrows() : $num_app;
+
+ $subst = array(
+ 'num_comments' => $n,
+ 'page_type' => $template->namespace_string
+ );
+
+ $_ob .= '';
+ $_ob .= ( $n == 0 ) ? $lang->get('comment_msg_count_zero', $subst) : ( $n == 1 ? $lang->get('comment_msg_count_one', $subst) : $lang->get('comment_msg_count_plural', $subst) );
+
+ if ( $session->get_permissions('mod_comments') && $num_unapp > 0 )
+ {
+ $_ob .= ' ' . $lang->get('comment_msg_count_unapp_mod', array( 'num_unapp' => $num_unapp )) . '';
+ }
+ else if ( !$session->get_permissions('mod_comments') && $num_unapp > 0 )
+ {
+ $ls = ( $num_unapp == 1 ) ? 'comment_msg_count_unapp_one' : 'comment_msg_count_unapp_plural';
+ $_ob .= ' ' . $lang->get($ls, array( 'num_unapp' => $num_unapp )) . '';
+ }
+ $_ob .= '
';
+ $list = 'list = { ';
+ // _die(htmlspecialchars($ttext));
+ $i = -1;
+ while ( $row = $db->fetchrow($lq) )
+ {
+ $i++;
+ $strings = Array();
+ $bool = Array();
+ if ( $session->get_permissions('mod_comments') || $row['approved'] == COMMENT_APPROVED )
+ {
+ $list .= $i . ' : { \'comment\' : unescape(\''.rawurlencode($row['comment_data']).'\'), \'name\' : unescape(\''.rawurlencode($row['name']).'\'), \'subject\' : unescape(\''.rawurlencode($row['subject']).'\'), }, ';
+
+ // Comment ID (used in the Javascript apps)
+ $strings['ID'] = (string)$i;
+
+ // Determine the name, and whether to link to the user page or not
+ $name = '';
+ if($row['user_id'] > 1) $name .= '';
+ $name .= $row['name'];
+ if($row['user_id'] > 1) $name .= '';
+ $strings['NAME'] = $name; unset($name);
+
+ // Subject
+ $s = $row['subject'];
+ if(!$row['approved']) $s .= ' ' . $lang->get('comment_msg_note_unapp') . '';
+ $strings['SUBJECT'] = $s;
+
+ // Date and time
+ $strings['DATETIME'] = enano_date(ED_DATE | ED_TIME, $row['time']);
+
+ // User level
+ switch($row['user_level'])
+ {
+ default:
+ case USER_LEVEL_GUEST:
+ $l = $lang->get('user_type_guest');
+ break;
+ case USER_LEVEL_MEMBER:
+ case USER_LEVEL_CHPREF:
+ $l = $lang->get('user_type_member');
+ break;
+ case USER_LEVEL_MOD:
+ $l = $lang->get('user_type_mod');
+ break;
+ case USER_LEVEL_ADMIN:
+ $l = $lang->get('user_type_admin');
+ break;
+ }
+ $strings['USER_LEVEL'] = $l; unset($l);
+
+ // The actual comment data
+ $strings['DATA'] = RenderMan::render($row['comment_data']);
+
+ if($session->get_permissions('edit_comments'))
+ {
+ // Edit link
+ $strings['EDIT_LINK'] = '' . $lang->get('comment_btn_edit') . '';
+
+ // Delete link
+ $strings['DELETE_LINK'] = '' . $lang->get('comment_btn_delete') . '';
+ }
+ else
+ {
+ // Edit link
+ $strings['EDIT_LINK'] = '';
+
+ // Delete link
+ $strings['DELETE_LINK'] = '';
+ }
+
+ // Send PM link
+ $strings['SEND_PM_LINK'] = ( $session->user_logged_in && $row['user_id'] > 1 ) ? '' . $lang->get('comment_btn_send_privmsg') . '
' : '';
+
+ // Add Buddy link
+ $strings['ADD_BUDDY_LINK'] = ( $session->user_logged_in && $row['user_id'] > 1 ) ? '' . $lang->get('comment_btn_add_buddy') . '' : '';
+
+ // Mod links
+ $applink = '';
+ $applink .= '';
+ if($row['approved']) $applink .= $lang->get('comment_btn_mod_unapprove');
+ else $applink .= $lang->get('comment_btn_mod_approve');
+ $applink .= '';
+ $strings['MOD_APPROVE_LINK'] = $applink; unset($applink);
+ $strings['MOD_DELETE_LINK'] = '' . $lang->get('comment_btn_mod_delete') . '';
+ $strings['MOD_IP_LINK'] = '' . ( ( empty($row['ip_address']) ) ? $lang->get('comment_btn_mod_ip_missing') : $lang->get('comment_btn_mod_ip_notimplemented') ) . '';
+
+ // Signature
+ $strings['SIGNATURE'] = '';
+ if($row['signature'] != '') $strings['SIGNATURE'] = RenderMan::render($row['signature']);
+
+ // Avatar
+ if ( $row['user_has_avatar'] == 1 )
+ {
+ $bool['user_has_avatar'] = true;
+ $strings['AVATAR_ALT'] = $lang->get('usercp_avatar_image_alt', array('username' => $row['name']));
+ $strings['AVATAR_URL'] = make_avatar_url(intval($row['user_id']), $row['avatar_type'], $row['email']);
+ $strings['USERPAGE_LINK'] = makeUrlNS('User', $row['name']);
+ }
+
+ $bool['auth_mod'] = ($session->get_permissions('mod_comments')) ? true : false;
+ $bool['can_edit'] = ( ( $session->user_logged_in && $row['name'] == $session->username && $session->get_permissions('edit_comments') ) || $session->get_permissions('mod_comments') ) ? true : false;
+ $bool['signature'] = ( $strings['SIGNATURE'] == '' ) ? false : true;
+
+ // Done processing and compiling, now let's cook it into HTML
+ $tpl->assign_vars($strings);
+ $tpl->assign_bool($bool);
+ $_ob .= $tpl->run();
+ }
+ }
+ if(getConfig('comments_need_login') != '2' || $session->user_logged_in)
+ {
+ if($session->get_permissions('post_comments'))
+ {
+ $_ob .= '' . $lang->get('comment_postform_title') . '
';
+ $_ob .= $lang->get('comment_postform_blurb');
+ if(getConfig('approve_comments', '0')=='1') $_ob .= ' ' . $lang->get('comment_postform_blurb_unapp');
+ if(getConfig('comments_need_login') == '1' && !$session->user_logged_in)
+ {
+ $_ob .= ' ' . $lang->get('comment_postform_blurb_captcha');
+ }
+ $sn = $session->user_logged_in ? $session->username . '' : '';
+ $_ob .= '
+
+
+ ';
+ }
+ } else {
+ // FIXME: l10n
+ $_ob .= '' . $lang->get('comment_postform_title') . '
You need to be logged in to post comments. Log in
';
+ }
+ $list .= '};';
+ echo 'document.getElementById(\'ajaxEditContainer\').innerHTML = unescape(\''. rawurlencode($_ob) .'\');
+ ' . $list;
+ echo 'Fat.fade_all(); document.getElementById(\'mdgCommentForm\').style.display = \'none\'; document.getElementById(\'mdgCommentFormLink\').style.display="inline";';
+
+ $ret = ob_get_contents();
+ ob_end_clean();
+ return Array($ret, $_ob);
+
+ }
+
+ /**
+ * Generates ready-to-execute Javascript code to be eval'ed by the user's browser to display comments
+ * @param $page_id the page ID
+ * @param $namespace the namespace
+ * @param $action administrative action to perform, default is false
+ * @param $flags additional info for $action, shouldn't be used except when deleting/approving comments, etc.
+ * @param $_ob text to prepend to output, used by PageUtils::addcomment
+ * @return string
+ */
+
+ public static function comments($page_id, $namespace, $action = false, $id = -1, $_ob = '')
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $r = PageUtils::comments_raw($page_id, $namespace, $action, $id, $_ob);
+ return $r[0];
+ }
+
+ /**
+ * Generates HTML code for comments - used in browser compatibility mode
+ * @param $page_id the page ID
+ * @param $namespace the namespace
+ * @param $action administrative action to perform, default is false
+ * @param $flags additional info for $action, shouldn't be used except when deleting/approving comments, etc.
+ * @param $_ob text to prepend to output, used by PageUtils::addcomment
+ * @return string
+ */
+
+ public static function comments_html($page_id, $namespace, $action = false, $id = -1, $_ob = '')
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $r = PageUtils::comments_raw($page_id, $namespace, $action, $id, $_ob);
+ return $r[1];
+ }
+
+ /**
+ * Updates comment data.
+ * @param $page_id the page ID
+ * @param $namespace the namespace
+ * @param $subject new subject
+ * @param $text new text
+ * @param $old_subject the old subject, unprocessed and identical to the value in the DB
+ * @param $old_text the old text, unprocessed and identical to the value in the DB
+ * @param $id the javascript list ID, used internally by the client-side app
+ * @return string
+ */
+
+ public static function savecomment($page_id, $namespace, $subject, $text, $old_subject, $old_text, $id = -1)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ if(!$session->get_permissions('edit_comments'))
+ return 'result="BAD";error="Access denied"';
+ // Avoid SQL injection
+ $old_text = $db->escape($old_text);
+ $old_subject = $db->escape($old_subject);
+ // Safety check - username/login
+ if(!$session->get_permissions('mod_comments')) // allow mods to edit comments
+ {
+ if(!$session->user_logged_in) _die('AJAX comment save safety check failed because you are not logged in. Sometimes this can happen because you are using a browser that does not send cookies as part of AJAX requests.
Please log in and try again.');
+ $q = 'SELECT c.name FROM ' . table_prefix.'comments c, ' . table_prefix.'users u WHERE comment_data=\'' . $old_text . '\' AND subject=\'' . $old_subject . '\' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND u.user_id=c.user_id;';
+ $s = $db->sql_query($q);
+ if(!$s) _die('SQL error during safety check: '.$db->get_error().'
Attempted SQL:
'.htmlspecialchars($q).'
');
+ $r = $db->fetchrow($s);
+ $db->free_result();
+ if($db->numrows() < 1 || $r['name'] != $session->username) _die('Safety check failed, probably due to a hacking attempt.');
+ }
+ $s = RenderMan::preprocess_text($subject);
+ $t = RenderMan::preprocess_text($text);
+ $sql = 'UPDATE ' . table_prefix.'comments SET subject=\'' . $s . '\',comment_data=\'' . $t . '\' WHERE comment_data=\'' . $old_text . '\' AND subject=\'' . $old_subject . '\' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'';
+ $result = $db->sql_query($sql);
+ if($result)
+ {
+ return 'result="GOOD";
+ list[' . $id . '][\'subject\'] = unescape(\''.str_replace('%5Cn', '%0A', rawurlencode(str_replace('{{EnAnO:Newline}}', '\\n', stripslashes(str_replace('\\n', '{{EnAnO:Newline}}', $s))))).'\');
+ list[' . $id . '][\'comment\'] = unescape(\''.str_replace('%5Cn', '%0A', rawurlencode(str_replace('{{EnAnO:Newline}}', '\\n', stripslashes(str_replace('\\n', '{{EnAnO:Newline}}', $t))))).'\'); id = ' . $id . ';
+ s = unescape(\''.rawurlencode($s).'\');
+ t = unescape(\''.str_replace('%5Cn', '
', rawurlencode(RenderMan::render(str_replace('{{EnAnO:Newline}}', "\n", stripslashes(str_replace('\\n', '{{EnAnO:Newline}}', $t)))))).'\');';
+ }
+ else
+ {
+ return 'result="BAD"; error=unescape("'.rawurlencode('Enano encountered a problem whilst saving the comment.
+ Performed SQL:
+ ' . $sql . '
+
+ Error returned by MySQL: '.$db->get_error()).'");';
+ }
+ }
+
+ /**
+ * Updates comment data using the comment_id column instead of the old, messy way
+ * @param $page_id the page ID
+ * @param $namespace the namespace
+ * @param $subject new subject
+ * @param $text new text
+ * @param $id the comment ID (primary key in enano_comments table)
+ * @return string
+ */
+
+ public static function savecomment_neater($page_id, $namespace, $subject, $text, $id)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ if(!is_int($id)) die('PageUtils::savecomment: $id is not an integer, aborting for safety');
+ if(!$session->get_permissions('edit_comments'))
+ return 'Access denied';
+ // Safety check - username/login
+ if(!$session->get_permissions('mod_comments')) // allow mods to edit comments
+ {
+ if(!$session->user_logged_in) _die('AJAX comment save safety check failed because you are not logged in. Sometimes this can happen because you are using a browser that does not send cookies as part of AJAX requests.
Please log in and try again.');
+ $q = 'SELECT c.name FROM ' . table_prefix.'comments c, ' . table_prefix.'users u WHERE comment_id=' . $id . ' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND u.user_id=c.user_id;';
+ $s = $db->sql_query($q);
+ if(!$s) _die('SQL error during safety check: '.$db->get_error().'
Attempted SQL:
'.htmlspecialchars($q).'
');
+ $r = $db->fetchrow($s);
+ if($db->numrows() < 1 || $r['name'] != $session->username) _die('Safety check failed, probably due to a hacking attempt.');
+ $db->free_result();
+ }
+ $s = RenderMan::preprocess_text($subject);
+ $t = RenderMan::preprocess_text($text);
+ $sql = 'UPDATE ' . table_prefix.'comments SET subject=\'' . $s . '\',comment_data=\'' . $t . '\' WHERE comment_id=' . $id . ' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'';
+ $result = $db->sql_query($sql);
+ if($result)
+ return 'good';
+ else return 'Enano encountered a problem whilst saving the comment.
+ Performed SQL:
+ ' . $sql . '
+
+ Error returned by MySQL: '.$db->get_error();
+ }
+
+ /**
+ * Deletes a comment.
+ * @param $page_id the page ID
+ * @param $namespace the namespace
+ * @param $name the name the user posted under
+ * @param $subj the subject of the comment to be deleted
+ * @param $text the text of the comment to be deleted
+ * @param $id the javascript list ID, used internally by the client-side app
+ * @return string
+ */
+
+ public static function deletecomment($page_id, $namespace, $name, $subj, $text, $id)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if(!$session->get_permissions('edit_comments'))
+ return 'alert("Access to delete/edit comments is denied");';
+
+ if(!preg_match('#^([0-9]+)$#', (string)$id)) die('$_GET[id] is improperly formed.');
+ $n = $db->escape($name);
+ $s = $db->escape($subj);
+ $t = $db->escape($text);
+
+ // Safety check - username/login
+ if(!$session->get_permissions('mod_comments')) // allows mods to delete comments
+ {
+ if(!$session->user_logged_in) _die('AJAX comment save safety check failed because you are not logged in. Sometimes this can happen because you are using a browser that does not send cookies as part of AJAX requests.
Please log in and try again.');
+ $q = 'SELECT c.name FROM ' . table_prefix.'comments c, ' . table_prefix.'users u WHERE comment_data=\'' . $t . '\' AND subject=\'' . $s . '\' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND u.user_id=c.user_id;';
+ $s = $db->sql_query($q);
+ if(!$s) _die('SQL error during safety check: '.$db->get_error().'
Attempted SQL:
'.htmlspecialchars($q).'
');
+ $r = $db->fetchrow($s);
+ if($db->numrows() < 1 || $r['name'] != $session->username) _die('Safety check failed, probably due to a hacking attempt.');
+ $db->free_result();
+ }
+ $q = 'DELETE FROM ' . table_prefix.'comments WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND name=\'' . $n . '\' AND subject=\'' . $s . '\' AND comment_data=\'' . $t . '\' LIMIT 1;';
+ $e=$db->sql_query($q);
+ if(!$e) return('alert(unesape(\''.rawurlencode('Error during query: '.$db->get_error().'\n\nQuery:\n' . $q) . '\'));');
+ return('good');
+ }
+
+ /**
+ * Deletes a comment in a cleaner fashion.
+ * @param $page_id the page ID
+ * @param $namespace the namespace
+ * @param $id the comment ID (primary key)
+ * @return string
+ */
+
+ public static function deletecomment_neater($page_id, $namespace, $id)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if(!preg_match('#^([0-9]+)$#', (string)$id)) die('$_GET[id] is improperly formed.');
+
+ if(!$session->get_permissions('edit_comments'))
+ return 'alert("Access to delete/edit comments is denied");';
+
+ // Safety check - username/login
+ if(!$session->get_permissions('mod_comments')) // allows mods to delete comments
+ {
+ if(!$session->user_logged_in) _die('AJAX comment save safety check failed because you are not logged in. Sometimes this can happen because you are using a browser that does not send cookies as part of AJAX requests.
Please log in and try again.');
+ $q = 'SELECT c.name FROM ' . table_prefix.'comments c, ' . table_prefix.'users u WHERE comment_id=' . $id . ' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND u.user_id=c.user_id;';
+ $s = $db->sql_query($q);
+ if(!$s) _die('SQL error during safety check: '.$db->get_error().'
Attempted SQL:
'.htmlspecialchars($q).'
');
+ $r = $db->fetchrow($s);
+ if($db->numrows() < 1 || $r['name'] != $session->username) _die('Safety check failed, probably due to a hacking attempt.');
+ $db->free_result();
+ }
+ $q = 'DELETE FROM ' . table_prefix.'comments WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\' AND comment_id=' . $id . ' LIMIT 1;';
+ $e=$db->sql_query($q);
+ if(!$e) return('alert(unesape(\''.rawurlencode('Error during query: '.$db->get_error().'\n\nQuery:\n' . $q) . '\'));');
+ return('good');
+ }
+
+ /**
+ * Renames a page.
+ * @param $page_id the page ID
+ * @param $namespace the namespace
+ * @param $name the new name for the page
+ * @return string error string or success message
+ */
+
+ public static function rename($page_id, $namespace, $name)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ $page = new PageProcessor($page_id, $namespace);
+ return $page->rename_page($name);
+ }
+
+ /**
+ * Flushes (clears) the action logs for a given page
+ * @param $page_id the page ID
+ * @param $namespace the namespace
+ * @return string error/success string
+ */
+
+ public static function flushlogs($page_id, $namespace)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+ if ( !is_object($lang) && defined('IN_ENANO_INSTALL') )
+ {
+ // This is a special exception for the Enano installer, which doesn't init languages yet.
+ $lang = new Language('eng');
+ }
+ if(!$session->get_permissions('clear_logs') && !defined('IN_ENANO_INSTALL'))
+ {
+ return $lang->get('etc_access_denied');
+ }
+ if ( !$session->sid_super )
+ {
+ return $lang->get('etc_access_denied_need_reauth');
+ }
+
+ $page_id_db = $db->escape($page_id);
+ $namespace_db = $db->escape($namespace);
+
+ // If we're flushing a file, also clear all revisions before the current
+ if ( $namespace == 'File' )
+ {
+ $q = $db->sql_query('SELECT file_id FROM ' . table_prefix . "files WHERE page_id='$page_id_db' ORDER BY time_id DESC;");
+ if ( !$q )
+ $db->_die();
+ // discard first row (current revision)
+ $db->fetchrow();
+ $id_list = array();
+ while ( $row = $db->fetchrow() )
+ $id_list[] = $row['file_id'];
+
+ require_once(ENANO_ROOT . '/includes/namespaces/file.php');
+
+ // clear out each file
+ foreach ( $id_list as $id )
+ Namespace_File::delete_file($id);
+ }
+
+ $q = $db->sql_query('DELETE FROM ' . table_prefix . "logs WHERE page_id='$page_id_db' AND namespace='$namespace';");
+ if ( !$q )
+ $db->_die('The log entries could not be deleted.');
+
+ // If the page exists, make a backup of it in case it gets spammed/vandalized
+ // If not, the admin's probably deleting a trash page
+ if ( isPage($paths->get_pathskey($page_id, $namespace)) )
+ {
+ $q = $db->sql_query('SELECT page_text,char_tag FROM ' . table_prefix . "page_text WHERE page_id='$page_id_db' AND namespace='$namespace_db';");
+ if ( !$q )
+ $db->_die('The current page text could not be selected; as a result, creating the backup of the page failed. Please make a backup copy of the page by clicking Edit this page and then clicking Save Changes.');
+ $row = $db->fetchrow();
+ $db->free_result();
+ $minor_edit = ( ENANO_DBLAYER == 'MYSQL' ) ? 'false' : '0';
+ $username = $db->escape($session->username);
+ $q = 'INSERT INTO ' . table_prefix . "logs ( log_type, action, time_id, date_string, page_id, namespace, page_text, char_tag, author, author_uid, edit_summary, minor_edit ) VALUES\n"
+ . " ('page', 'edit', " . time() . ", 'DEPRECATED', '$page_id', '$namespace', '" . $db->escape($row['page_text']) . "', '', '{$username}', $session->user_id, '" . $lang->get('page_flushlogs_backup_summary') . "', $minor_edit);";
+ if ( !$db->sql_query($q) )
+ $db->_die('The history (log) entry could not be inserted into the logs table.');
+ }
+
+ return $lang->get('ajax_clearlogs_success');
+ }
+
+ /**
+ * Deletes a page.
+ * @param string $page_id the condemned page ID
+ * @param string $namespace the condemned namespace
+ * @param string The reason for deleting the page in question
+ * @return string
+ */
+
+ public static function deletepage($page_id, $namespace, $reason)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+ global $cache;
+ $perms = $session->fetch_page_acl($page_id, $namespace);
+ $x = trim($reason);
+ if ( empty($x) )
+ {
+ return $lang->get('ajax_delete_need_reason');
+ }
+ if(!$perms->get_permissions('delete_page')) return('Administrative privileges are required to delete pages, you loser.');
+
+ if ( !$session->sid_super )
+ {
+ return $lang->get('etc_access_denied_need_reauth');
+ }
+
+ $e = $db->sql_query('INSERT INTO ' . table_prefix.'logs(time_id,date_string,log_type,action,page_id,namespace,author,author_uid,edit_summary) VALUES('.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \'page\', \'delete\', \'' . $page_id . '\', \'' . $namespace . '\', \'' . $session->username . '\', ' . $session->user_id . ', \'' . $db->escape(htmlspecialchars($reason)) . '\')');
+ if(!$e) $db->_die('The page log entry could not be inserted.');
+ $e = $db->sql_query('DELETE FROM ' . table_prefix.'categories WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'');
+ if(!$e) $db->_die('The page categorization entries could not be deleted.');
+ $e = $db->sql_query('DELETE FROM ' . table_prefix.'comments WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'');
+ if(!$e) $db->_die('The page comments could not be deleted.');
+ $e = $db->sql_query('DELETE FROM ' . table_prefix.'page_text WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'');
+ if(!$e) $db->_die('The page text entry could not be deleted.');
+ $e = $db->sql_query('DELETE FROM ' . table_prefix.'pages WHERE urlname=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'');
+ if(!$e) $db->_die('The page entry could not be deleted.');
+ if ( $namespace == 'File' )
+ {
+ $e = $db->sql_query('DELETE FROM ' . table_prefix.'files WHERE page_id=\'' . $page_id . '\'');
+ if(!$e) $db->_die('The file entry could not be deleted.');
+ }
+ $cache->purge('page_meta');
+ return $lang->get('ajax_delete_success');
+ }
+
+ /**
+ * Deletes files associated with a File page.
+ * @param string Page ID
+ */
+
+ public static function delete_page_files($page_id)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $q = $db->sql_query('SELECT file_id, filename, file_key, time_id, file_extension FROM ' . table_prefix . "files WHERE page_id = '{$db->escape($page_id)}';");
+ if ( !$q )
+ $db->_die();
+
+ while ( $row = $db->fetchrow() )
+ {
+ // wipe original file
+ foreach ( array(
+ ENANO_ROOT . "/files/{$row['file_key']}_{$row['time_id']}{$row['file_extension']}",
+ ENANO_ROOT . "/files/{$row['file_key']}{$row['file_extension']}"
+ ) as $orig_file )
+ {
+ if ( file_exists($orig_file) )
+ @unlink($orig_file);
+ }
+
+ // wipe cached files
+ if ( $dr = @opendir(ENANO_ROOT . '/cache/') )
+ {
+ // lol404.jpg-1217958283-200x320.jpg
+ while ( $dh = @readdir($dr) )
+ {
+ $regexp = ':^' . preg_quote("{$row['filename']}-{$row['time_id']}-") . '[0-9]+x[0-9]+\.' . ltrim($row['file_extension'], '.') . '$:';
+ if ( preg_match($regexp, $dh) )
+ {
+ @unlink(ENANO_ROOT . "/cache/$dh");
+ }
+ }
+ @closedir($dr);
+ }
+ }
+
+ $q = $db->sql_query('DELETE FROM ' . table_prefix . "files WHERE page_id = '{$db->escape($page_id)}';");
+ if ( !$q )
+ $db->die();
+
+ return true;
+ }
+
+ /**
+ * Increments the deletion votes for a page by 1, and adds the current username/IP to the list of users that have voted for the page to prevent dual-voting
+ * @param $page_id the page ID
+ * @param $namespace the namespace
+ * @return string
+ */
+
+ public static function delvote($page_id, $namespace)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+ global $cache;
+
+ if ( !$session->get_permissions('vote_delete') )
+ {
+ return $lang->get('etc_access_denied');
+ }
+
+ if ( $namespace == 'Admin' || $namespace == 'Special' || $namespace == 'System' )
+ {
+ return 'Special pages and system messages can\'t be voted for deletion.';
+ }
+
+ $pname = $paths->nslist[$namespace] . sanitize_page_id($page_id);
+
+ if ( !isPage($pname) )
+ {
+ return 'The page does not exist.';
+ }
+
+ $ns = namespace_factory($page_id, $namespace);
+ $cdata = $ns->get_cdata();
+
+ $cv =& $cdata['delvotes'];
+ $ips =& $cdata['delvote_ips'];
+
+ if ( empty($ips) )
+ {
+ $ips = array(
+ 'ip' => array(),
+ 'u' => array()
+ );
+ }
+ else
+ {
+ $ips = @unserialize($ips);
+ if ( !$ips )
+ {
+ $ips = array(
+ 'ip' => array(),
+ 'u' => array()
+ );
+ }
+ }
+
+ if ( in_array($session->username, $ips['u']) || in_array($_SERVER['REMOTE_ADDR'], $ips['ip']) )
+ {
+ return $lang->get('ajax_delvote_already_voted');
+ }
+
+ $ips['u'][] = $session->username;
+ $ips['ip'][] = $_SERVER['REMOTE_ADDR'];
+ $ips = $db->escape( serialize($ips) );
+
+ $cv++;
+
+ $q = 'UPDATE ' . table_prefix.'pages SET delvotes=' . $cv . ',delvote_ips=\'' . $ips . '\' WHERE urlname=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'';
+ $w = $db->sql_query($q);
+ if ( !$w )
+ $db->_die();
+
+ // all done, flush page cache to mark it up
+ $cache->purge('page_meta');
+
+ return $lang->get('ajax_delvote_success');
+ }
+
+ /**
+ * Resets the number of votes against a page to 0.
+ * @param $page_id the page ID
+ * @param $namespace the namespace
+ * @return string
+ */
+
+ public static function resetdelvotes($page_id, $namespace)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+ global $cache;
+
+ if ( !$session->get_permissions('vote_reset') )
+ {
+ return $lang->get('etc_access_denied');
+ }
+
+ $page_id = $db->escape($page_id);
+ $namespace = $db->escape($namespace);
+
+ // pull existing info
+ $q = $db->sql_query('SELECT delvotes, delvote_ips FROM ' . table_prefix . "pages WHERE urlname = '$page_id' AND namespace = '$namespace'");
+ if ( !$q )
+ $db->_die();
+ if ( $db->numrows() < 1 )
+ return $lang->get('page_err_page_not_exist');
+
+ list($delvotes, $delvote_ips) = $db->fetchrow_num();
+ $db->free_result();
+ $delvote_ips = $db->escape($delvote_ips);
+ $username = $db->escape($session->username);
+
+ // log action
+ $time = time();
+ $q = $db->sql_query('INSERT INTO ' . table_prefix . "logs (time_id, log_type, action, edit_summary, page_text, author, author_uid, page_id, namespace) VALUES\n"
+ . " ( $time, 'page', 'votereset', '$delvotes', '$delvote_ips', '$username', $session->user_id, '$page_id', '$namespace' )");
+ if ( !$q )
+ $db->_die();
+
+ // reset votes
+ $empty_vote_record = $db->escape(serialize(array('ip'=>array(),'u'=>array())));
+ $q = 'UPDATE ' . table_prefix.'pages SET delvotes=0,delvote_ips=\'' . $empty_vote_record . '\' WHERE urlname=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'';
+ $e = $db->sql_query($q);
+ if ( !$e )
+ {
+ $db->_die('The number of delete votes was not reset.');
+ }
+ else
+ {
+ $cache->purge('page_meta');
+ return $lang->get('ajax_delvote_reset_success');
+ }
+ }
+
+ /**
+ * Gets a list of styles for a given theme name. As of Banshee, this returns JSON.
+ * @param $id the name of the directory for the theme
+ * @return string JSON string with an array containing a list of themes
+ */
+
+ public static function getstyles()
+ {
+
+ if ( !preg_match('/^([a-z0-9_-]+)$/', $_GET['id']) )
+ return enano_json_encode(false);
+
+ $dir = './themes/' . $_GET['id'] . '/css/';
+ $list = Array();
+ // Open a known directory, and proceed to read its contents
+ if (is_dir($dir)) {
+ if ($dh = opendir($dir)) {
+ while (($file = readdir($dh)) !== false) {
+ if ( preg_match('#^(.*?)\.css$#is', $file) && $file != '_printable.css' ) // _printable.css should be included with every theme
+ { // it should be a copy of the original style, but
+ // mostly black and white
+ // Note to self: document this
+ $list[] = substr($file, 0, strlen($file)-4);
+ }
+ }
+ closedir($dh);
+ }
+ }
+ else
+ {
+ return(enano_json_encode(Array('mode' => 'error', 'error' => $dir.' is not a dir')));
+ }
+
+ return enano_json_encode($list);
+ }
+
+ /**
+ * Assembles a Javascript app with category information
+ * @param $page_id the page ID
+ * @param $namespace the namespace
+ * @return string Javascript code
+ */
+
+ public static function catedit($page_id, $namespace)
+ {
+ $d = PageUtils::catedit_raw($page_id, $namespace);
+ return $d[0] . ' /* BEGIN CONTENT */ document.getElementById("ajaxEditContainer").innerHTML = unescape(\''.rawurlencode($d[1]).'\');';
+ }
+
+ /**
+ * Does the actual HTML/javascript generation for cat editing, but returns an array
+ * @access private
+ */
+
+ public static function catedit_raw($page_id, $namespace)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ ob_start();
+ $_ob = '';
+ $e = $db->sql_query('SELECT category_id FROM ' . table_prefix.'categories WHERE page_id=\'' . $paths->page_id . '\' AND namespace=\'' . $paths->namespace . '\'');
+ if(!$e) jsdie('Error selecting category information for current page: '.$db->get_error());
+ $cat_current = Array();
+ while($r = $db->fetchrow())
+ {
+ $cat_current[] = $r;
+ }
+ $db->free_result();
+
+ $cat_all = array();
+ $q = $db->sql_query('SELECT * FROM ' . table_prefix . 'pages WHERE namespace = \'Category\';');
+ if ( !$q )
+ $db->_die();
+
+ while ( $row = $db->fetchrow() )
+ {
+ $cat_all[] = Namespace_Default::bake_cdata($row);
+ }
+
+ // Make $cat_all an associative array, like $paths->pages
+ $sz = sizeof($cat_all);
+ for($i=0;$i<$sz;$i++)
+ {
+ $cat_all[$cat_all[$i]['urlname_nons']] = $cat_all[$i];
+ }
+ // Now, the "zipper" function - join the list of categories with the list of cats that this page is a part of
+ $cat_info = $cat_all;
+ for($i=0;$iget('catedit_title') . '
+ ';
+
+ $cont = ob_get_contents();
+ ob_end_clean();
+ return Array($cont, $_ob);
+ }
+
+ /**
+ * Saves category information
+ * WARNING: If $which_cats is empty, all the category information for the selected page will be nuked!
+ * @param $page_id string the page ID
+ * @param $namespace string the namespace
+ * @param $which_cats array associative array of categories to put the page in
+ * @return string "GOOD" on success, error string on failure
+ */
+
+ public static function catsave($page_id, $namespace, $which_cats)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ if(!$session->get_permissions('edit_cat')) return('Insufficient privileges to change category information');
+
+ $page_perms = $session->fetch_page_acl($page_id, $namespace);
+ $ns = namespace_factory($page_id, $namespace);
+ $page_data = $ns->get_cdata();
+
+ $cat_all = array();
+ $q = $db->sql_query('SELECT * FROM ' . table_prefix . 'pages WHERE namespace = \'Category\';');
+ if ( !$q )
+ $db->_die();
+
+ while ( $row = $db->fetchrow() )
+ {
+ $cat_all[] = Namespace_Default::bake_cdata($row);
+ }
+
+ // Make $cat_all an associative array, like $paths->pages
+ $sz = sizeof($cat_all);
+ for($i=0;$i<$sz;$i++)
+ {
+ $cat_all[$cat_all[$i]['urlname_nons']] = $cat_all[$i];
+ }
+
+ $rowlist = Array();
+
+ for($i=0;$ifetch_page_acl($cat_all[$i]['urlname_nons'], 'Category');
+ if ( !$session->get_permissions('edit_cat') || !$perms->get_permissions('edit_cat') ||
+ ( $cat_all[$i]['really_protected'] && !$perms->get_permissions('even_when_protected') ) ||
+ ( !$page_perms->get_permissions('even_when_protected') && $page_data['protected'] == '1' ) )
+ $auth = false;
+ if(!$auth)
+ {
+ // Find out if the page is currently in the category
+ $q = $db->sql_query('SELECT * FROM ' . table_prefix.'categories WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';');
+ if(!$q)
+ return 'MySQL error: ' . $db->get_error();
+ if($db->numrows() > 0)
+ {
+ $auth = true;
+ $which_cats[$cat_all[$i]['urlname_nons']] = true; // Force the category to stay in its current state
+ }
+ $db->free_result();
+ }
+ if(isset($which_cats[$cat_all[$i]['urlname_nons']]) && $which_cats[$cat_all[$i]['urlname_nons']] == true /* for clarity ;-) */ && $auth ) $rowlist[] = '(\'' . $page_id . '\', \'' . $namespace . '\', \'' . $cat_all[$i]['urlname_nons'] . '\')';
+ }
+ if(sizeof($rowlist) > 0)
+ {
+ $val = implode(',', $rowlist);
+ $q = 'INSERT INTO ' . table_prefix.'categories(page_id,namespace,category_id) VALUES' . $val . ';';
+ $e = $db->sql_query('DELETE FROM ' . table_prefix.'categories WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';');
+ if(!$e) $db->_die('The old category data could not be deleted.');
+ $e = $db->sql_query($q);
+ if(!$e) $db->_die('The new category data could not be inserted.');
+ return('GOOD');
+ }
+ else
+ {
+ $e = $db->sql_query('DELETE FROM ' . table_prefix.'categories WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';');
+ if(!$e) $db->_die('The old category data could not be deleted.');
+ return('GOOD');
+ }
+ }
+
+ /**
+ * Sets the wiki mode level for a page.
+ * @param $page_id string the page ID
+ * @param $namespace string the namespace
+ * @param $level int 0 for off, 1 for on, 2 for use global setting
+ * @return string "GOOD" on success, error string on failure
+ */
+
+ public static function setwikimode($page_id, $namespace, $level)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $cache;
+
+ if(!$session->get_permissions('set_wiki_mode')) return('Insufficient access rights');
+ if ( !isset($level) || ( isset($level) && !preg_match('#^([0-2]){1}$#', (string)$level) ) )
+ {
+ return('Invalid mode string');
+ }
+ $q = $db->sql_query('UPDATE ' . table_prefix.'pages SET wiki_mode=' . $level . ' WHERE urlname=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';');
+ if ( !$q )
+ {
+ return('Error during update query: '.$db->get_error()."\n\nSQL Backtrace:\n".$db->sql_backtrace());
+ }
+
+ $cache->purge('page_meta');
+ return('GOOD');
+ }
+
+ /**
+ * Sets the access password for a page.
+ * @param $page_id string the page ID
+ * @param $namespace string the namespace
+ * @param $pass string the SHA1 hash of the password - if the password doesn't match the regex ^([0-9a-f]*){40,40}$ it will be sha1'ed
+ * @return string
+ */
+
+ public static function setpass($page_id, $namespace, $pass)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang, $cache;
+ // Determine permissions
+ $ns = namespace_factory($page_id, $namespace);
+ $cdata = $ns->get_cdata();
+ if ( $cdata['password'] != '' )
+ $a = $session->get_permissions('password_reset');
+ else
+ $a = $session->get_permissions('password_set');
+ if ( !$a )
+ return $lang->get('etc_access_denied');
+ if ( !isset($pass) )
+ return('Password was not set on URL');
+ $p = $pass;
+ if ( !preg_match('#([0-9a-f]){40,40}#', $p) )
+ {
+ $p = sha1($p);
+ }
+ if ( $p == 'da39a3ee5e6b4b0d3255bfef95601890afd80709' )
+ // sha1('') = da39a3ee5e6b4b0d3255bfef95601890afd80709
+ $p = '';
+ $e = $db->sql_query('UPDATE ' . table_prefix.'pages SET password=\'' . $p . '\' WHERE urlname=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';');
+ if ( !$e )
+ {
+ die('PageUtils::setpass(): Error during update query: '.$db->get_error()."\n\nSQL Backtrace:\n".$db->sql_backtrace());
+ }
+ // Is the new password blank?
+ if ( $p == '' )
+ {
+ return $lang->get('ajax_password_disable_success');
+ }
+ else
+ {
+ return $lang->get('ajax_password_success');
+ }
+ }
+
+ /**
+ * Generates some preview HTML
+ * @param $text string the wikitext to use
+ * @return string
+ */
+
+ public static function genPreview($text)
+ {
+ global $lang;
+ $ret = '' . $lang->get('editor_preview_blurb') . '';
+ $text = RenderMan::render(RenderMan::preprocess_text($text, false, false));
+ ob_start();
+ eval('?>' . $text);
+ $text = ob_get_contents();
+ ob_end_clean();
+ $ret .= $text;
+ $ret .= '';
+ return $ret;
+ }
+
+ /**
+ * Makes a scrollable box
+ * @param string $text the inner HTML
+ * @param int $height Optional - the maximum height. Defaults to 250.
+ * @return string
+ */
+
+ public static function scrollBox($text, $height = 250)
+ {
+ return '' . $text . '';
+ }
+
+ /**
+ * Generates a diff summary between two page revisions.
+ * @param $page_id the page ID
+ * @param $namespace the namespace
+ * @param $id1 the time ID of the first revision
+ * @param $id2 the time ID of the second revision
+ * @return string XHTML-formatted diff
+ */
+
+ public static function pagediff($page_id, $namespace, $id1, $id2)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ if ( !$session->get_permissions('history_view') )
+ return $lang->get('etc_access_denied');
+
+ if(!preg_match('#^([0-9]+)$#', (string)$id1) ||
+ !preg_match('#^([0-9]+)$#', (string)$id2 )) return 'SQL injection attempt';
+ // OK we made it through security
+ // Safest way to make sure we don't end up with the revisions in wrong columns is to make 2 queries
+ if ( !$q1 = $db->sql_query('SELECT time_id,page_text,char_tag,author,edit_summary FROM ' . table_prefix.'logs WHERE log_id = ' . $id1 . ' AND log_type=\'page\' AND action=\'edit\' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';')) return 'MySQL error: ' . $db->get_error();
+ if ( !$q2 = $db->sql_query('SELECT time_id,page_text,char_tag,author,edit_summary FROM ' . table_prefix.'logs WHERE log_id = ' . $id2 . ' AND log_type=\'page\' AND action=\'edit\' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';')) return 'MySQL error: ' . $db->get_error();
+ $row1 = $db->fetchrow($q1);
+ $db->free_result($q1);
+ $row2 = $db->fetchrow($q2);
+ $db->free_result($q2);
+ if(sizeof($row1) < 1 || sizeof($row2) < 2)
+ {
+ if ( !$q1 = $db->sql_query('SELECT time_id,page_text,char_tag,author,edit_summary FROM ' . table_prefix.'logs WHERE time_id = ' . $id1 . ' AND log_type=\'page\' AND action=\'edit\' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';')) return 'MySQL error: ' . $db->get_error();
+ if ( !$q2 = $db->sql_query('SELECT time_id,page_text,char_tag,author,edit_summary FROM ' . table_prefix.'logs WHERE time_id = ' . $id2 . ' AND log_type=\'page\' AND action=\'edit\' AND page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\';')) return 'MySQL error: ' . $db->get_error();
+ $row1 = $db->fetchrow($q1);
+ $db->free_result($q1);
+ $row2 = $db->fetchrow($q2);
+ $db->free_result($q2);
+ if(sizeof($row1) < 1 || sizeof($row2) < 2)
+ return 'Couldn\'t find any rows that matched the query. The time ID probably doesn\'t exist in the logs table.';
+ }
+ $text1 = $row1['page_text'];
+ $text2 = $row2['page_text'];
+ $time1 = enano_date(ED_DATE | ED_TIME, $row1['time_id']);
+ $time2 = enano_date(ED_DATE | ED_TIME, $row2['time_id']);
+ $_ob = "
+ " . $lang->get('history_lbl_comparingrevisions') . " {$time1} → {$time2}
+ ";
+ // Free some memory
+ unset($row1, $row2, $q1, $q2);
+
+ $_ob .= RenderMan::diff($text1, $text2);
+ return $_ob;
+ }
+
+ /**
+ * Gets ACL information about the selected page for target type X and target ID Y.
+ * @param array $parms What to select. This is an array purely for JSON compatibility. It should be an associative array with keys target_type and target_id.
+ * @return array
+ */
+
+ public static function acl_editor($parms = Array())
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ if(!$session->get_permissions('edit_acl') && ( $session->user_level < USER_LEVEL_ADMIN || !defined('ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL')) )
+ {
+ return Array(
+ 'mode' => 'error',
+ 'error' => $lang->get('acl_err_access_denied')
+ );
+ }
+ if ( !$session->sid_super )
+ {
+ return Array(
+ 'mode' => 'error',
+ 'error' => $lang->get('etc_access_denied_need_reauth')
+ );
+ }
+ $parms['page_id'] = ( isset($parms['page_id']) ) ? $parms['page_id'] : false;
+ $parms['namespace'] = ( isset($parms['namespace']) ) ? $parms['namespace'] : false;
+ $page_id =& $parms['page_id'];
+ $namespace =& $parms['namespace'];
+ $page_where_clause = ( empty($page_id) || empty($namespace) ) ? 'AND a.page_id IS NULL AND a.namespace IS NULL' : 'AND a.page_id=\'' . $db->escape($page_id) . '\' AND a.namespace=\'' . $db->escape($namespace) . '\'';
+ $page_where_clause_lite = ( empty($page_id) || empty($namespace) ) ? 'AND page_id IS NULL AND namespace IS NULL' : 'AND page_id=\'' . $db->escape($page_id) . '\' AND namespace=\'' . $db->escape($namespace) . '\'';
+ //die(print_r($page_id,true));
+ $template->load_theme();
+ // $perms_obj = $session->fetch_page_acl($page_id, $namespace);
+ $perms_obj =& $session;
+ $return = Array();
+ if ( !file_exists(ENANO_ROOT . '/themes/' . $session->theme . '/acledit.tpl') )
+ {
+ return Array(
+ 'mode' => 'error',
+ 'error' => $lang->get('acl_err_missing_template'),
+ );
+ }
+ $return['template'] = $template->extract_vars('acledit.tpl');
+ $return['page_id'] = $page_id;
+ $return['namespace'] = $namespace;
+ if(isset($parms['mode']))
+ {
+ switch($parms['mode'])
+ {
+ case 'listgroups':
+ $return['groups'] = Array();
+ $q = $db->sql_query('SELECT group_id,group_name FROM ' . table_prefix.'groups ORDER BY group_name ASC;');
+ while($row = $db->fetchrow())
+ {
+ $return['groups'][] = Array(
+ 'id' => $row['group_id'],
+ 'name' => $row['group_name'],
+ );
+ }
+ $db->free_result();
+ $return['page_groups'] = Array();
+ $q = $db->sql_query('SELECT pg_id,pg_name FROM ' . table_prefix.'page_groups ORDER BY pg_name ASC;');
+ if ( !$q )
+ return Array(
+ 'mode' => 'error',
+ 'error' => $db->get_error()
+ );
+ while ( $row = $db->fetchrow() )
+ {
+ $return['page_groups'][] = Array(
+ 'id' => $row['pg_id'],
+ 'name' => $row['pg_name']
+ );
+ }
+ break;
+ case 'seltarget_id':
+ if ( !is_int($parms['target_id']) )
+ {
+ return Array(
+ 'mode' => 'error',
+ 'error' => 'Expected parameter target_id type int'
+ );
+ }
+ $q = $db->sql_query('SELECT target_id, target_type, page_id, namespace, rules FROM ' . table_prefix . "acl WHERE rule_id = {$parms['target_id']};");
+ if ( !$q )
+ return Array(
+ 'mode' => 'error',
+ 'error' => $db->get_error()
+ );
+ if ( $db->numrows() < 1 )
+ return Array(
+ 'mode' => 'error',
+ 'error' => "No rule with ID {$parms['target_id']} found"
+ );
+ $parms = $db->fetchrow();
+ $db->free_result();
+
+ // regenerate page selection
+ $parms['page_id'] = ( isset($parms['page_id']) ) ? $parms['page_id'] : false;
+ $parms['namespace'] = ( isset($parms['namespace']) ) ? $parms['namespace'] : false;
+ $parms['mode'] = 'seltarget_id';
+ $page_id =& $parms['page_id'];
+ $namespace =& $parms['namespace'];
+ $page_where_clause = ( empty($page_id) || empty($namespace) ) ? 'AND a.page_id IS NULL AND a.namespace IS NULL' : 'AND a.page_id=\'' . $db->escape($page_id) . '\' AND a.namespace=\'' . $db->escape($namespace) . '\'';
+ $page_where_clause_lite = ( empty($page_id) || empty($namespace) ) ? 'AND page_id IS NULL AND namespace IS NULL' : 'AND page_id=\'' . $db->escape($page_id) . '\' AND namespace=\'' . $db->escape($namespace) . '\'';
+
+ $return['page_id'] = $parms['page_id'];
+ $return['namespace'] = $parms['namespace'];
+
+ // From here, let the seltarget handler take over
+ case 'seltarget':
+ $return['mode'] = 'seltarget';
+ $return['acl_types'] = $perms_obj->acl_types;
+ $return['acl_deps'] = $perms_obj->acl_deps;
+ $return['acl_descs'] = $perms_obj->acl_descs;
+ $return['target_type'] = $parms['target_type'];
+ $return['target_id'] = $parms['target_id'];
+ switch($parms['target_type'])
+ {
+ case ACL_TYPE_USER:
+ $user_col = ( $parms['mode'] == 'seltarget_id' ) ? 'user_id' : 'username';
+ $q = $db->sql_query('SELECT a.rules,u.user_id,u.username FROM ' . table_prefix.'users AS u
+ LEFT JOIN ' . table_prefix.'acl AS a
+ ON a.target_id=u.user_id
+ WHERE a.target_type='.ACL_TYPE_USER.'
+ AND u.' . $user_col . ' = \'' . $db->escape($parms['target_id']) . '\'
+ ' . $page_where_clause . ';');
+ if(!$q)
+ return(Array('mode'=>'error','error'=>$db->get_error()));
+ if($db->numrows() < 1)
+ {
+ $return['type'] = 'new';
+ $q = $db->sql_query('SELECT user_id,username FROM ' . table_prefix.'users WHERE username=\'' . $db->escape($parms['target_id']) . '\';');
+ if(!$q)
+ return(Array('mode'=>'error','error'=>$db->get_error()));
+ if($db->numrows() < 1)
+ return Array('mode'=>'error','error'=>$lang->get('acl_err_user_not_found'),'debug' => $db->sql_backtrace());
+ $row = $db->fetchrow();
+ $return['target_name'] = $row['username'];
+ $return['target_id'] = intval($row['user_id']);
+ $return['current_perms'] = array();
+ }
+ else
+ {
+ $return['type'] = 'edit';
+ $row = $db->fetchrow();
+ $return['target_name'] = $row['username'];
+ $return['target_id'] = intval($row['user_id']);
+ $return['current_perms'] = $session->string_to_perm($row['rules']);
+ }
+ $db->free_result();
+ // Eliminate types that don't apply to this namespace
+ if ( $namespace && $namespace != '__PageGroup' )
+ {
+ foreach ( $return['current_perms'] AS $i => $perm )
+ {
+ if ( ( $page_id != null && $namespace != null ) && ( !in_array ( $namespace, $session->acl_scope[$i] ) && !in_array('All', $session->acl_scope[$i]) ) )
+ {
+ // echo "// SCOPE CONTROL: eliminating: $i\n";
+ unset($return['current_perms'][$i]);
+ unset($return['acl_types'][$i]);
+ unset($return['acl_descs'][$i]);
+ unset($return['acl_deps'][$i]);
+ }
+ }
+ }
+ break;
+ case ACL_TYPE_GROUP:
+ $q = $db->sql_query('SELECT a.rules,g.group_name,g.group_id FROM ' . table_prefix.'groups AS g
+ LEFT JOIN ' . table_prefix.'acl AS a
+ ON a.target_id=g.group_id
+ WHERE a.target_type='.ACL_TYPE_GROUP.'
+ AND g.group_id=\''.intval($parms['target_id']).'\'
+ ' . $page_where_clause . ';');
+ if(!$q)
+ return(Array('mode'=>'error','error'=>$db->get_error()));
+ if($db->numrows() < 1)
+ {
+ $return['type'] = 'new';
+ $q = $db->sql_query('SELECT group_id,group_name FROM ' . table_prefix.'groups WHERE group_id=\''.intval($parms['target_id']).'\';');
+ if(!$q)
+ return(Array('mode'=>'error','error'=>$db->get_error()));
+ if($db->numrows() < 1)
+ return Array('mode'=>'error','error'=>$lang->get('acl_err_bad_group_id'));
+ $row = $db->fetchrow();
+ $return['target_name'] = $row['group_name'];
+ $return['target_id'] = intval($row['group_id']);
+ $return['current_perms'] = array();
+ }
+ else
+ {
+ $return['type'] = 'edit';
+ $row = $db->fetchrow();
+ $return['target_name'] = $row['group_name'];
+ $return['target_id'] = intval($row['group_id']);
+ $return['current_perms'] = $session->string_to_perm($row['rules']);
+ }
+ $db->free_result();
+ // Eliminate types that don't apply to this namespace
+ if ( $namespace && $namespace != '__PageGroup' )
+ {
+ foreach ( $return['current_perms'] AS $i => $perm )
+ {
+ if ( ( $page_id != false && $namespace != false ) && ( !in_array ( $namespace, $session->acl_scope[$i] ) && !in_array('All', $session->acl_scope[$i]) ) )
+ {
+ // echo "// SCOPE CONTROL: eliminating: $i\n"; //; ".print_r($namespace,true).":".print_r($page_id,true)."\n";
+ unset($return['current_perms'][$i]);
+ unset($return['acl_types'][$i]);
+ unset($return['acl_descs'][$i]);
+ unset($return['acl_deps'][$i]);
+ }
+ }
+ }
+ //return Array('mode'=>'debug','text'=>print_r($return, true));
+ break;
+ default:
+ return Array('mode'=>'error','error','Invalid ACL type ID');
+ break;
+ }
+ return $return;
+ break;
+ case 'save_new':
+ case 'save_edit':
+ if ( defined('ENANO_DEMO_MODE') )
+ {
+ return Array('mode'=>'error','error'=>$lang->get('acl_err_demo'));
+ }
+ $q = $db->sql_query('DELETE FROM ' . table_prefix.'acl WHERE target_type='.intval($parms['target_type']).' AND target_id='.intval($parms['target_id']).'
+ ' . $page_where_clause_lite . ';');
+ if(!$q)
+ return Array('mode'=>'error','error'=>$db->get_error());
+ if ( sizeof ( $parms['perms'] ) < 1 )
+ {
+ // As of 1.1.x, this returns success because the rule length is zero if the user selected "inherit" in all columns
+ return Array(
+ 'mode' => 'success',
+ 'target_type' => $parms['target_type'],
+ 'target_id' => $parms['target_id'],
+ 'target_name' => $parms['target_name'],
+ 'page_id' => $page_id,
+ 'namespace' => $namespace,
+ );
+ }
+ $rules = $session->perm_to_string($parms['perms']);
+ $q = ($page_id && $namespace) ? 'INSERT INTO ' . table_prefix.'acl ( target_type, target_id, page_id, namespace, rules )
+ VALUES( '.intval($parms['target_type']).', '.intval($parms['target_id']).', \'' . $db->escape($page_id) . '\', \'' . $db->escape($namespace) . '\', \'' . $db->escape($rules) . '\' )' :
+ 'INSERT INTO ' . table_prefix.'acl ( target_type, target_id, rules )
+ VALUES( '.intval($parms['target_type']).', '.intval($parms['target_id']).', \'' . $db->escape($rules) . '\' )';
+ if(!$db->sql_query($q)) return Array('mode'=>'error','error'=>$db->get_error());
+ return Array(
+ 'mode' => 'success',
+ 'target_type' => $parms['target_type'],
+ 'target_id' => $parms['target_id'],
+ 'target_name' => $parms['target_name'],
+ 'page_id' => $page_id,
+ 'namespace' => $namespace,
+ );
+ break;
+ case 'delete':
+ if ( defined('ENANO_DEMO_MODE') )
+ {
+ return Array('mode'=>'error','error'=>$lang->get('acl_err_demo'));
+ }
+ $sql = 'DELETE FROM ' . table_prefix.'acl WHERE target_type='.intval($parms['target_type']).' AND target_id='.intval($parms['target_id']).'
+ ' . $page_where_clause_lite . ';';
+ $q = $db->sql_query($sql);
+ if(!$q)
+ return Array('mode'=>'error','error'=>$db->get_error());
+ return Array(
+ 'mode' => 'delete',
+ 'target_type' => $parms['target_type'],
+ 'target_id' => $parms['target_id'],
+ 'target_name' => $parms['target_name'],
+ 'page_id' => $page_id,
+ 'namespace' => $namespace,
+ );
+ break;
+ case 'list_existing':
+
+ $return = array(
+ 'mode' => 'list_existing',
+ 'key' => acl_list_draw_key(),
+ 'rules' => array()
+ );
+
+ $acl_columns = 'a.' . implode(', a.', $db->columns_in(table_prefix . 'acl'));
+ $users_columns = 'u.' . implode(', u.', $db->columns_in(table_prefix . 'users'));
+ $groups_columns = 'g.' . implode(', g.', $db->columns_in(table_prefix . 'groups'));
+ $pg_columns = 'p.' . implode(', p.', array('pg_id', 'pg_type', 'pg_name', 'pg_target'));
+
+ $q = $db->sql_query("SELECT a.rule_id, u.username, g.group_name, a.target_type, a.target_id, a.page_id, a.namespace, a.rules, p.pg_name\n"
+ . " FROM " . table_prefix . "acl AS a\n"
+ . " LEFT JOIN " . table_prefix . "users AS u\n"
+ . " ON ( (a.target_type = " . ACL_TYPE_USER . " AND a.target_id = u.user_id) OR (u.user_id IS NULL) )\n"
+ . " LEFT JOIN " . table_prefix . "groups AS g\n"
+ . " ON ( (a.target_type = " . ACL_TYPE_GROUP . " AND a.target_id = g.group_id) OR (g.group_id IS NULL) )\n"
+ . " LEFT JOIN " . table_prefix . "page_groups as p\n"
+ . " ON ( (a.namespace = '__PageGroup' AND a.page_id = CAST(p.pg_id AS CHAR)) OR (p.pg_id IS NULL) )\n"
+ . " WHERE ( a.target_type = " . ACL_TYPE_USER . " OR a.target_type = " . ACL_TYPE_GROUP . " )\n"
+ . " GROUP BY a.rule_id, $acl_columns, $users_columns, $groups_columns, $pg_columns\n"
+ . " ORDER BY a.target_type ASC, a.rule_id ASC;"
+ );
+
+ if ( !$q )
+ $db->_die();
+
+ while ( $row = $db->fetchrow($q) )
+ {
+ if ( $row['target_type'] == ACL_TYPE_USER && empty($row['username']) )
+ {
+ // This is only done if we have an ACL affecting a user that doesn't exist.
+ // Nice little bit of maintenance to have.
+ if ( !$db->sql_query("DELETE FROM " . table_prefix . "acl WHERE rule_id = {$row['rule_id']};") )
+ $db->_die();
+ continue;
+ }
+ $score = get_acl_rule_score($row['rules']);
+ $deep_limit = ACL_SCALE_MINIMAL_SHADE;
+ // Determine background color of cell by score
+ if ( $score > 5 )
+ {
+ // high score, show in green
+ $color = 2.5 * $score;
+ if ( $color > 255 )
+ $color = 255;
+ $color = round($color);
+ // blend with the colordepth limit
+ $color = $deep_limit + ( ( 0xFF - $deep_limit ) - ( ( $color / 0xFF ) * ( 0xFF - $deep_limit ) ) );
+ $color = dechex($color);
+ $color = "{$color}ff{$color}";
+ }
+ else if ( $score < -5 )
+ {
+ // low score, show in red
+ $color = 0 - $score;
+ $color = 2.5 * $color;
+ if ( $color > 255 )
+ $color = 255;
+ $color = round($color);
+ // blend with the colordepth limit
+ $color = $deep_limit + ( ( 0xFF - $deep_limit ) - ( ( $color / 0xFF ) * ( 0xFF - $deep_limit ) ) );
+ $color = dechex($color);
+ $color = "ff{$color}{$color}";
+ }
+ else
+ {
+ $color = 'efefef';
+ }
+
+ // Rate rule textually based on its score
+ if ( $score >= 70 )
+ $desc = $lang->get('acl_msg_scale_allow');
+ else if ( $score >= 50 )
+ $desc = $lang->get('acl_msg_scale_mostly_allow');
+ else if ( $score >= 25 )
+ $desc = $lang->get('acl_msg_scale_some_allow');
+ else if ( $score >= -25 )
+ $desc = $lang->get('acl_msg_scale_mixed');
+ else if ( $score <= -70 )
+ $desc = $lang->get('acl_msg_scale_deny');
+ else if ( $score <= -50 )
+ $desc = $lang->get('acl_msg_scale_mostly_deny');
+ else if ( $score <= -25 )
+ $desc = $lang->get('acl_msg_scale_some_deny');
+
+ // group and user target info
+ $info = '';
+ if ( $row['target_type'] == ACL_TYPE_USER )
+ $info = $lang->get('acl_msg_list_user', array( 'username' => $row['username'] )); // "(User: {$row['username']})";
+ else if ( $row['target_type'] == ACL_TYPE_GROUP )
+ $info = $lang->get('acl_msg_list_group', array( 'group' => $row['group_name'] ));
+
+ // affected pages info
+ if ( $row['page_id'] && $row['namespace'] && $row['namespace'] != '__PageGroup' )
+ $info .= $lang->get('acl_msg_list_on_page', array( 'page_name' => "{$row['namespace']}:{$row['page_id']}" ));
+ else if ( $row['page_id'] && $row['namespace'] && $row['namespace'] == '__PageGroup' )
+ $info .= $lang->get('acl_msg_list_on_page_group', array( 'page_group' => $row['pg_name'] ));
+ else
+ $info .= $lang->get('acl_msg_list_entire_site');
+
+ $score_string = $lang->get('acl_msg_list_score', array
+ (
+ 'score' => $score,
+ 'desc' => $desc,
+ 'info' => $info
+ ));
+ $return['rules'][] = array(
+ 'score_string' => $score_string,
+ 'rule_id' => $row['rule_id'],
+ 'color' => $color
+ );
+ }
+
+ break;
+ case 'list_presets':
+ $presets = array();
+ $q = $db->sql_query('SELECT page_id AS preset_name, rule_id, rules FROM ' . table_prefix . "acl WHERE target_type = " . ACL_TYPE_PRESET . ";");
+ if ( !$q )
+ $db->die_json();
+
+ while ( $row = $db->fetchrow() )
+ {
+ $row['rules'] = $session->string_to_perm($row['rules']);
+ $presets[] = $row;
+ }
+
+ return array(
+ 'mode' => 'list_existing',
+ 'presets' => $presets
+ );
+ break;
+ case 'save_preset':
+ if ( empty($parms['preset_name']) )
+ {
+ return array(
+ 'mode' => 'error',
+ 'error' => $lang->get('acl_err_preset_name_empty')
+ );
+ }
+ $preset_name = $db->escape($parms['preset_name']);
+ $q = $db->sql_query('DELETE FROM ' . table_prefix . "acl WHERE target_type = " . ACL_TYPE_PRESET . " AND page_id = '$preset_name';");
+ if ( !$q )
+ $db->die_json();
+
+ $perms = $session->perm_to_string($parms['perms']);
+ if ( !$perms )
+ {
+ return array(
+ 'mode' => 'error',
+ 'error' => $lang->get('acl_err_preset_is_blank')
+ );
+ }
+
+ $perms = $db->escape($perms);
+ $q = $db->sql_query('INSERT INTO ' . table_prefix . "acl(page_id, target_type, rules) VALUES\n"
+ . " ( '$preset_name', " . ACL_TYPE_PRESET . ", '$perms' );");
+ if ( !$q )
+ $db->die_json();
+
+ return array(
+ 'mode' => 'success'
+ );
+ break;
+ case 'trace':
+ list($targetpid, $targetns) = RenderMan::strToPageID($parms['page']);
+ try
+ {
+ $perms = $session->fetch_page_acl_user($parms['user'], $targetpid, $targetns);
+ $perm_table = array(
+ AUTH_ALLOW => 'acl_lbl_field_allow',
+ AUTH_WIKIMODE => 'acl_lbl_field_wikimode',
+ AUTH_DISALLOW => 'acl_lbl_field_disallow',
+ AUTH_DENY => 'acl_lbl_field_deny'
+ );
+
+ $return = array(
+ 'mode' => 'trace',
+ 'perms' => array()
+ );
+
+ foreach ( $perms->perm_resolve_table as $perm_type => $lookup_data )
+ {
+ if ( !$session->check_acl_scope($perm_type, $targetns) )
+ continue;
+
+ $src_l10n = $lang->get($session->acl_inherit_lang_table[$lookup_data['src']], $lookup_data);
+ $divclass = preg_replace('/^acl_inherit_/', '', $session->acl_inherit_lang_table[$lookup_data['src']]);
+ $perm_string = $lang->get($perm_table[$perms->perms[$perm_type]]);
+ $perm_name = $lang->get($session->acl_descs[$perm_type]);
+
+ $return['perms'][$perm_type] = array(
+ 'divclass' => "acl_inherit acl_$divclass",
+ 'perm_type' => $perm_type,
+ 'perm_name' => $perm_name,
+ 'perm_value' => $perm_string,
+ 'perm_src' => $src_l10n,
+ 'rule_id' => intval($lookup_data['rule_id']),
+ 'bad_deps' => $perms->acl_check_deps($perm_type, true)
+ );
+ }
+
+ // group rules if possible
+ $return['groups'] = array();
+ foreach ( $return['perms'] as $rule )
+ {
+ if ( !isset($return['groups'][$rule['rule_id']]) )
+ {
+ $return['groups'][$rule['rule_id']] = array();
+ }
+ $return['groups'][$rule['rule_id']][] = $rule['perm_type'];
+ }
+ }
+ catch ( Exception $e )
+ {
+ $return = array(
+ 'mode' => 'error',
+ 'error' => $e->getMessage()
+ );
+ }
+
+ break;
+ default:
+ return Array('mode'=>'error','error'=>'Hacking attempt');
+ break;
+ }
+ }
+ return $return;
+ }
+
+ /**
+ * Same as PageUtils::acl_editor(), but the parms are a JSON string instead of an array. This also returns a JSON string.
+ * @param string $parms Same as PageUtils::acl_editor/$parms, but should be a valid JSON string.
+ * @return string
+ */
+
+ public static function acl_json($parms = '{ }')
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ try
+ {
+ $parms = enano_json_decode($parms);
+ }
+ catch ( Zend_Json_Exception $e )
+ {
+ $parms = array();
+ }
+ $ret = PageUtils::acl_editor($parms);
+ $ret = enano_json_encode($ret);
+ return $ret;
+ }
+
+ /**
+ * A non-Javascript frontend for the ACL API.
+ * @param array The request data, if any, this should be in the format required by PageUtils::acl_editor()
+ */
+
+ public static function aclmanager($parms)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+ ob_start();
+ // Convenience
+ $formstart = '';
+ $parms = PageUtils::acl_preprocess($parms);
+ $response = PageUtils::acl_editor($parms);
+ $response = PageUtils::acl_postprocess($response);
+
+ //die('' . htmlspecialchars(print_r($response, true)) . '
');
+
+ switch($response['mode'])
+ {
+ case 'debug':
+ echo '' . htmlspecialchars($response['text']) . '
';
+ break;
+ case 'stage1':
+ echo '' . $lang->get('acl_lbl_welcome_title') . '
+ ' . $lang->get('acl_lbl_welcome_body') . '
';
+ echo $formstart;
+ echo '
+
+
+ ' . $template->username_field('data[target_id_user]') . '
+ ' . $lang->get('acl_lbl_scope') . '
+
+ ' . $groupsel . '
+
+
+
+
+
+
+ ';
+ echo $formend;
+ break;
+ case 'success':
+ echo '
+ ' . $lang->get('acl_lbl_save_success_title') . '
+ ' . $lang->get('acl_lbl_save_success_body', array( 'target_name' => $response['target_name'] )) . '
+ ' . $formstart . '
+
+
+
+
+
+
+
+
+ ' . $formend . '
+ ';
+ break;
+ case 'delete':
+ echo '
+ ' . $lang->get('acl_lbl_delete_success_title') . '
+ ' . $lang->get('acl_lbl_delete_success_body', array('target_name' => $response['target_name'])) . '
+ ' . $formstart . '
+
+
+
+
+
+
+
+
+ ' . $formend . '
+ ';
+ break;
+ case 'seltarget':
+ if ( $response['type'] == 'edit' )
+ {
+ echo '' . $lang->get('acl_lbl_editwin_title_edit') . '
';
+ }
+ else
+ {
+ echo '' . $lang->get('acl_lbl_editwin_title_create') . '
';
+ }
+ $type = ( $response['target_type'] == ACL_TYPE_GROUP ) ? $lang->get('acl_target_type_group') : $lang->get('acl_target_type_user');
+ $scope = ( $response['page_id'] ) ? ( $response['namespace'] == '__PageGroup' ? $lang->get('acl_scope_type_pagegroup') : $lang->get('acl_scope_type_thispage') ) : $lang->get('acl_scope_type_wholesite');
+ $subs = array(
+ 'target_type' => $type,
+ 'target' => $response['target_name'],
+ 'scope_type' => $scope
+ );
+ echo $lang->get('acl_lbl_editwin_body', $subs);
+ echo $formstart;
+ $parser = $template->makeParserText( $response['template']['acl_field_begin'] );
+ echo $parser->run();
+ $parser = $template->makeParserText( $response['template']['acl_field_item'] );
+ $cls = 'row2';
+ foreach ( $response['acl_types'] as $acl_type => $value )
+ {
+ $vars = Array(
+ 'FIELD_INHERIT_CHECKED' => '',
+ 'FIELD_DENY_CHECKED' => '',
+ 'FIELD_DISALLOW_CHECKED' => '',
+ 'FIELD_WIKIMODE_CHECKED' => '',
+ 'FIELD_ALLOW_CHECKED' => '',
+ );
+ $cls = ( $cls == 'row1' ) ? 'row2' : 'row1';
+ $vars['ROW_CLASS'] = $cls;
+
+ switch ( $response['current_perms'][$acl_type] )
+ {
+ case 'i':
+ default:
+ $vars['FIELD_INHERIT_CHECKED'] = 'checked="checked"';
+ break;
+ case AUTH_ALLOW:
+ $vars['FIELD_ALLOW_CHECKED'] = 'checked="checked"';
+ break;
+ case AUTH_WIKIMODE:
+ $vars['FIELD_WIKIMODE_CHECKED'] = 'checked="checked"';
+ break;
+ case AUTH_DISALLOW:
+ $vars['FIELD_DISALLOW_CHECKED'] = 'checked="checked"';
+ break;
+ case AUTH_DENY:
+ $vars['FIELD_DENY_CHECKED'] = 'checked="checked"';
+ break;
+ }
+ $vars['FIELD_NAME'] = 'data[perms][' . $acl_type . ']';
+ if ( preg_match('/^([a-z0-9_]+)$/', $response['acl_descs'][$acl_type]) )
+ {
+ $vars['FIELD_DESC'] = $lang->get($response['acl_descs'][$acl_type]);
+ }
+ else
+ {
+ $vars['FIELD_DESC'] = $response['acl_descs'][$acl_type];
+ }
+ $parser->assign_vars($vars);
+ echo $parser->run();
+ }
+ $parser = $template->makeParserText( $response['template']['acl_field_end'] );
+ echo $parser->run();
+ echo '
+
+
+
+
+
+
+ ' . ( ( $response['type'] == 'edit' ) ? ' ' : '' ) . '
+ ';
+ echo $formend;
+ break;
+ case 'error':
+ ob_end_clean();
+ die_friendly('Error occurred', 'Error returned by permissions API:
' . htmlspecialchars($response['error']) . '
');
+ break;
+ }
+ $ret = ob_get_contents();
+ ob_end_clean();
+ echo
+ $template->getHeader() .
+ $ret .
+ $template->getFooter();
+ }
+
+ /**
+ * Preprocessor to turn the form-submitted data from the ACL editor into something the backend can handle
+ * @param array The posted data
+ * @return array
+ * @access private
+ */
+
+ public static function acl_preprocess($parms)
+ {
+ if ( !isset($parms['mode']) )
+ // Nothing to do
+ return $parms;
+ switch ( $parms['mode'] )
+ {
+ case 'seltarget':
+
+ // Who's affected?
+ $parms['target_type'] = intval( $parms['target_type'] );
+ $parms['target_id'] = ( $parms['target_type'] == ACL_TYPE_GROUP ) ? $parms['target_id_grp'] : $parms['target_id_user'];
+
+ case 'save_edit':
+ case 'save_new':
+ if ( isset($parms['act_delete_rule']) )
+ {
+ $parms['mode'] = 'delete';
+ }
+
+ // Scope (just this page or entire site?)
+ if ( $parms['scope'] == 'entire_site' || ( $parms['page_id'] == 'false' && $parms['namespace'] == 'false' ) )
+ {
+ $parms['page_id'] = false;
+ $parms['namespace'] = false;
+ }
+ else if ( $parms['scope'] == 'page_group' )
+ {
+ $parms['page_id'] = $parms['pg_id'];
+ $parms['namespace'] = '__PageGroup';
+ }
+
+ break;
+ }
+
+ if ( isset($parms['act_go_stage1']) )
+ {
+ $parms = array(
+ 'mode' => 'listgroups'
+ );
+ }
+
+ return $parms;
+ }
+
+ public static function acl_postprocess($response)
+ {
+ if(!isset($response['mode']))
+ {
+ if ( isset($response['groups']) )
+ $response['mode'] = 'stage1';
+ else
+ $response = Array(
+ 'mode' => 'error',
+ 'error' => 'Invalid action passed by API backend.',
+ );
+ }
+ return $response;
+ }
+
}
/**
@@ -2462,32 +2462,32 @@
function acl_list_draw_key()
{
- $out = '';
- $out .= '← Deny';
- $out .= 'Allow →';
- $out .= 'Neutral';
- $out .= '';
- // 11 boxes on each side of the center
- $inc = ceil ( ( 0xFF - ACL_SCALE_MINIMAL_SHADE ) / 11 );
- for ( $i = ACL_SCALE_MINIMAL_SHADE; $i <= 0xFF; $i+= $inc )
- {
- $octet = dechex($i);
- $color = "ff$octet$octet";
- $out .= ' ';
- }
- $out .= ' ';
- for ( $i = 0xFF; $i >= ACL_SCALE_MINIMAL_SHADE; $i-= $inc )
- {
- $octet = dechex($i);
- $color = "{$octet}ff{$octet}";
- $out .= ' ';
- }
- $out .= '';
- $out .= '-100';
- $out .= '+100';
- $out .= '0';
- $out .= '';
- return $out;
+ $out = '';
+ $out .= '← Deny';
+ $out .= 'Allow →';
+ $out .= 'Neutral';
+ $out .= '';
+ // 11 boxes on each side of the center
+ $inc = ceil ( ( 0xFF - ACL_SCALE_MINIMAL_SHADE ) / 11 );
+ for ( $i = ACL_SCALE_MINIMAL_SHADE; $i <= 0xFF; $i+= $inc )
+ {
+ $octet = dechex($i);
+ $color = "ff$octet$octet";
+ $out .= ' ';
+ }
+ $out .= ' ';
+ for ( $i = 0xFF; $i >= ACL_SCALE_MINIMAL_SHADE; $i-= $inc )
+ {
+ $octet = dechex($i);
+ $color = "{$octet}ff{$octet}";
+ $out .= ' ';
+ }
+ $out .= '';
+ $out .= '-100';
+ $out .= '+100';
+ $out .= '0';
+ $out .= '';
+ return $out;
}
/**
@@ -2496,43 +2496,43 @@
function get_acl_rule_score($perms)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
- if ( is_string($perms) )
- $perms = $session->string_to_perm($perms);
- else if ( !is_array($perms) )
- return false;
- $score = 0;
- foreach ( $perms as $item )
- {
- switch ( $item )
- {
- case AUTH_ALLOW :
- $inc = 2;
- break;
- case AUTH_WIKIMODE:
- $inc = 1;
- break;
- case AUTH_DISALLOW:
- $inc = -1;
- break;
- case AUTH_DENY:
- $inc = -2;
- break;
- default:
- $inc = 0;
- break;
- }
- $score += $inc;
- }
- // this is different from the beta; calculate highest score and
- // get percentage to be fairer to smaller/less broad rules
- $divisor = count($perms) * 2;
- if ( $divisor == 0 )
- {
- return 0;
- }
- $score = 100 * ( $score / $divisor );
- return round($score);
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ if ( is_string($perms) )
+ $perms = $session->string_to_perm($perms);
+ else if ( !is_array($perms) )
+ return false;
+ $score = 0;
+ foreach ( $perms as $item )
+ {
+ switch ( $item )
+ {
+ case AUTH_ALLOW :
+ $inc = 2;
+ break;
+ case AUTH_WIKIMODE:
+ $inc = 1;
+ break;
+ case AUTH_DISALLOW:
+ $inc = -1;
+ break;
+ case AUTH_DENY:
+ $inc = -2;
+ break;
+ default:
+ $inc = 0;
+ break;
+ }
+ $score += $inc;
+ }
+ // this is different from the beta; calculate highest score and
+ // get percentage to be fairer to smaller/less broad rules
+ $divisor = count($perms) * 2;
+ if ( $divisor == 0 )
+ {
+ return 0;
+ }
+ $score = 100 * ( $score / $divisor );
+ return round($score);
}
?>
diff -r de56132c008d -r bdac73ed481e includes/paths.php
--- a/includes/paths.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/paths.php Sun Mar 28 23:10:46 2010 -0400
@@ -18,1083 +18,1083 @@
class pathManager
{
- public $title, $pages, $custom_page, $cpage, $page, $fullpage, $page_exists, $page_id, $namespace, $nslist, $admin_tree, $wiki_mode, $page_protected, $template_cache, $external_api_page;
-
- /**
- * List of custom processing functions for namespaces. This is protected so trying to do anything with it will throw an error.
- * @access private
- * @var array
- */
-
- protected $namespace_processors;
-
- function __construct()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $GLOBALS['paths'] =& $this;
- $this->pages = Array();
-
- // DEFINE NAMESPACES HERE
- // The key names should NOT EVER be changed, or Enano will be very broken
- $namespace_delimiter = ( defined('WINDOWS_MOD_REWRITE_WORKAROUNDS') ) ? '.' : ':';
- $this->nslist = Array(
- 'Article' => '',
- 'User' => 'User' . $namespace_delimiter,
- 'File' => 'File' . $namespace_delimiter,
- 'Help' => 'Help' . $namespace_delimiter,
- 'Admin' => 'Admin' . $namespace_delimiter,
- 'Special' => 'Special' . $namespace_delimiter,
- 'System' => 'Enano' . $namespace_delimiter,
- 'Template' => 'Template' . $namespace_delimiter,
- 'Category' => 'Category' . $namespace_delimiter,
- 'API' => 'SystemAPI' . $namespace_delimiter,
- 'Project' => sanitize_page_id(getConfig('site_name')) . $namespace_delimiter,
- );
-
- // ACL types
- // These can also be added from within plugins
-
- $session->register_acl_type('read', AUTH_ALLOW, 'perm_read');
- $session->register_acl_type('post_comments', AUTH_ALLOW, 'perm_post_comments', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('edit_comments', AUTH_ALLOW, 'perm_edit_comments', Array('post_comments'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('edit_page', AUTH_WIKIMODE, 'perm_edit_page', Array('view_source'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('edit_wysiwyg', AUTH_ALLOW, 'perm_edit_wysiwyg', Array(), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('view_source', AUTH_WIKIMODE, 'perm_view_source', Array('read'), 'Article|User|Project|Template|File|Help|System|Category'); // Only used if the page is protected
- $session->register_acl_type('mod_comments', AUTH_DISALLOW, 'perm_mod_comments', Array('edit_comments'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('history_view', AUTH_WIKIMODE, 'perm_history_view', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('history_rollback', AUTH_DISALLOW, 'perm_history_rollback', Array('history_view'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('history_rollback_extra', AUTH_DISALLOW, 'perm_history_rollback_extra', Array('history_rollback'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('protect', AUTH_DISALLOW, 'perm_protect', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('rename', AUTH_WIKIMODE, 'perm_rename', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('clear_logs', AUTH_DISALLOW, 'perm_clear_logs', Array('read', 'protect', 'even_when_protected'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('vote_delete', AUTH_ALLOW, 'perm_vote_delete', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('vote_reset', AUTH_DISALLOW, 'perm_vote_reset', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('delete_page', AUTH_DISALLOW, 'perm_delete_page', Array(), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('tag_create', AUTH_ALLOW, 'perm_tag_create', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('tag_delete_own', AUTH_ALLOW, 'perm_tag_delete_own', Array('read', 'tag_create'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('tag_delete_other', AUTH_DISALLOW, 'perm_tag_delete_other', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('set_wiki_mode', AUTH_DISALLOW, 'perm_set_wiki_mode', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('password_set', AUTH_DISALLOW, 'perm_password_set', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('password_reset', AUTH_DISALLOW, 'perm_password_reset', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('mod_misc', AUTH_DISALLOW, 'perm_mod_misc', Array(), 'All');
- $session->register_acl_type('edit_cat', AUTH_WIKIMODE, 'perm_edit_cat', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('even_when_protected', AUTH_DISALLOW, 'perm_even_when_protected', Array('edit_page', 'rename', 'mod_comments', 'edit_cat'), 'Article|User|Project|Template|File|Help|System|Category');
- $session->register_acl_type('create_page', AUTH_WIKIMODE, 'perm_create_page', Array(), 'All');
- $session->register_acl_type('upload_files', AUTH_DISALLOW, 'perm_upload_files', Array('create_page'), 'All');
- $session->register_acl_type('upload_new_version', AUTH_WIKIMODE, 'perm_upload_new_version', Array('upload_files'), 'All');
- $session->register_acl_type('html_in_pages', AUTH_DISALLOW, 'perm_html_in_pages', Array('edit_page'), 'Article|User|Project|Template|File|Help|System|Category|Admin');
- $session->register_acl_type('php_in_pages', AUTH_DISALLOW, 'perm_php_in_pages', Array('edit_page', 'html_in_pages'), 'Article|User|Project|Template|File|Help|System|Category|Admin');
- $session->register_acl_type('custom_user_title', AUTH_DISALLOW, 'perm_custom_user_title', Array(), 'User|Special');
- $session->register_acl_type('edit_acl', AUTH_DISALLOW, 'perm_edit_acl', Array());
-
- // DO NOT add new admin pages here! Use a plugin to call $paths->addAdminNode();
- $this->addAdminNode('adm_cat_general', 'adm_page_general_config', 'GeneralConfig', array(2, 2));
- $this->addAdminNode('adm_cat_general', 'adm_page_file_uploads', 'UploadConfig', array(2, 5));
- $this->addAdminNode('adm_cat_general', 'adm_page_file_types', 'UploadAllowedMimeTypes', array(1, 5));
- $this->addAdminNode('adm_cat_content', 'adm_page_manager', 'PageManager', array(1, 4));
- $this->addAdminNode('adm_cat_content', 'adm_page_editor', 'PageEditor', array(3, 3));
- $this->addAdminNode('adm_cat_content', 'adm_page_pg_groups', 'PageGroups', array(4, 3));
- $this->addAdminNode('adm_cat_appearance', 'adm_page_themes', 'ThemeManager', array(4, 4));
- $this->addAdminNode('adm_cat_appearance', 'adm_page_plugins', 'PluginManager', array(2, 4));
- $this->addAdminNode('adm_cat_appearance', 'adm_page_db_backup', 'DBBackup', array(1, 2));
- $this->addAdminNode('adm_cat_appearance', 'adm_page_lang_manager', 'LangManager', array(1, 3));
- $this->addAdminNode('adm_cat_appearance', 'adm_page_cache_manager', 'CacheManager', array(3, 1));
- $this->addAdminNode('adm_cat_users', 'adm_page_users', 'UserManager', array(3, 5));
- $this->addAdminNode('adm_cat_users', 'adm_page_user_groups', 'GroupManager', array(3, 2));
- $this->addAdminNode('adm_cat_users', 'adm_page_coppa', 'COPPA', array(4, 1));
- $this->addAdminNode('adm_cat_users', 'adm_page_mass_email', 'MassEmail', array(2, 3));
- $this->addAdminNode('adm_cat_users', 'adm_page_user_ranks', 'UserRanks', array(4, 5));
- $this->addAdminNode('adm_cat_security', 'adm_page_security_log', 'SecurityLog', array(3, 4));
- $this->addAdminNode('adm_cat_security', 'adm_page_ban_control', 'BanControl', array(2, 1));
-
- $code = $plugins->setHook('acl_rule_init');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- $this->wiki_mode = ( getConfig('wiki_mode') == '1' ) ? 1 : 0;
- $this->template_cache = Array();
- }
-
- function init($title)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- global $cache;
-
- $code = $plugins->setHook('paths_init_before');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- if ( defined('ENANO_INTERFACE_INDEX') || defined('ENANO_INTERFACE_AJAX') || defined('IN_ENANO_UPGRADE') )
- {
- if ( empty($title) )
- $title = get_title();
-
- if ( empty($title) && !have_blank_urlname_page() )
- {
- $this->main_page();
- }
- if ( strstr($title, ' ') || strstr($title, '+') || strstr($title, '%20') )
- {
- $title = sanitize_page_id($title);
- redirect(makeUrl($title), '', '', 0);
- }
- $title = sanitize_page_id($title);
- // We've got the title, pull the namespace from it
- $namespace = 'Article';
- $page_id = $title;
- foreach ( $this->nslist as $ns => $prefix )
- {
- $prefix_len = strlen($prefix);
- if ( substr($title, 0, $prefix_len) == $prefix )
- {
- $page_id = substr($title, $prefix_len);
- $namespace = $ns;
- }
- }
- $this->namespace = $namespace;
- $this->fullpage = $title;
- if ( $namespace == 'Special' || $namespace == 'Admin' )
- {
- list($page_id) = explode('/', $page_id);
- }
- $this->page = $this->nslist[$namespace] . $page_id;
- $this->page_id = $page_id;
- // die("All done setting parameters. What we've got:
namespace: $namespace
fullpage: $this->fullpage
page: $this->page
page_id: $this->page_id");
- }
- else
- {
- // Starting up Enano with the API from a page that wants to do its own thing. Generate
- // metadata for an anonymous page and avoid redirection at all costs.
- if ( isset($GLOBALS['title']) )
- {
- $title =& $GLOBALS['title'];
- }
- else
- {
- $title = basename($_SERVER['SCRIPT_NAME']);
- }
- $base_uri = scriptPath == '' ? ltrim($_SERVER['SCRIPT_NAME'], '/') : str_replace( scriptPath . '/', '', $_SERVER['SCRIPT_NAME'] );
-
- $this->page = $this->nslist['API'] . sanitize_page_id($base_uri);
- $this->fullpage = $this->nslist['API'] . sanitize_page_id($base_uri);
- $this->namespace = 'API';
- $this->cpage = array(
- 'name' => $title,
- 'urlname' => sanitize_page_id($base_uri),
- 'namespace' => 'API',
- 'special' => 1,
- 'visible' => 1,
- 'comments_on' => 1,
- 'protected' => 1,
- 'delvotes' => 0,
- 'delvote_ips' => '',
- 'page_format' => getConfig('default_page_format', 'wikitext')
- );
- $this->external_api_page = true;
- $code = $plugins->setHook('paths_external_api_page');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
- }
-
- $this->page = sanitize_page_id($this->page);
- $this->fullpage = sanitize_page_id($this->fullpage);
-
- if(isset($this->pages[$this->page]))
- {
- $this->page_exists = true;
- $this->cpage = $this->pages[$this->page];
- $this->page_id =& $this->cpage['urlname_nons'];
- $this->namespace = $this->cpage['namespace'];
- if(!isset($this->cpage['wiki_mode'])) $this->cpage['wiki_mode'] = 2;
-
- // Determine the wiki mode for this page, now that we have this->cpage established
- if($this->cpage['wiki_mode'] == 2)
- {
- $this->wiki_mode = (int)getConfig('wiki_mode');
- }
- else
- {
- $this->wiki_mode = $this->cpage['wiki_mode'];
- }
- // Allow the user to create/modify his user page uncondtionally (admins can still protect the page)
- if($this->page == $this->nslist['User'].str_replace(' ', '_', $session->username))
- {
- $this->wiki_mode = true;
- }
- // And above all, if the site requires wiki mode to be off for non-logged-in users, disable it now
- if(getConfig('wiki_mode_require_login')=='1' && !$session->user_logged_in)
- {
- $this->wiki_mode = false;
- }
- if($this->cpage['protected'] == 2)
- {
- // The page is semi-protected, determine permissions
- if($session->user_logged_in && $session->reg_time + 60*60*24*4 < time())
- {
- $this->page_protected = 0;
- }
- else
- {
- $this->page_protected = 1;
- }
- }
- else
- {
- $this->page_protected = $this->cpage['protected'];
- }
- }
- else
- {
- $this->page_exists = false;
- $page_name = dirtify_page_id($this->page);
- $page_name = str_replace('_', ' ', $page_name);
-
- $pid_cleaned = sanitize_page_id($this->page);
- if ( $pid_cleaned != $this->page )
- {
- redirect(makeUrl($pid_cleaned), 'Sanitizer message', 'page id sanitized', 0);
- }
-
- if ( !is_array($this->cpage) )
- {
- $this->cpage = Array(
- 'name' => $page_name,
- 'urlname' => $this->page,
- 'namespace' => 'Article',
- 'special' => 0,
- 'visible' => 0,
- 'comments_on' => 1,
- 'protected' => 0,
- 'delvotes' => 0,
- 'delvote_ips' => '',
- 'wiki_mode' => 2,
- 'page_format' => getConfig('default_page_format', 'wikitext')
- );
- }
- // Look for a namespace prefix in the urlname, and assign a different namespace, if necessary
- $k = array_keys($this->nslist);
- for($i=0;$inslist);$i++)
- {
- $ln = strlen($this->nslist[$k[$i]]);
- if( substr($this->page, 0, $ln) == $this->nslist[$k[$i]] )
- {
- $this->cpage['namespace'] = $k[$i];
- $this->cpage['urlname_nons'] = substr($this->page, strlen($this->nslist[$this->cpage['namespace']]), strlen($this->page));
- if(!isset($this->cpage['wiki_mode']))
- {
- $this->cpage['wiki_mode'] = 2;
- }
- }
- }
- $this->namespace = $this->cpage['namespace'];
- $this->page_id =& $this->cpage['urlname_nons'];
-
- if($this->namespace=='System')
- {
- $this->cpage['protected'] = 1;
- }
- if($this->namespace == 'Special' && !$this->external_api_page)
- {
- // Can't load nonexistent pages
- if( is_string(get_main_page()) )
- {
- $main_page = makeUrl(get_main_page());
- }
- else
- {
- $main_page = makeUrl($this->pages[0]['urlname']);
- }
- redirect($main_page, $lang->get('page_msg_special_404_title'), $lang->get('page_msg_special_404_body', array('sp_link' => makeUrlNS('Special', 'SpecialPages'))), 15);
- exit;
- }
- // Allow the user to create/modify his user page uncondtionally (admins can still protect the page)
- if($this->page == $this->nslist['User'].str_replace(' ', '_', $session->username))
- {
- $this->wiki_mode = true;
- }
- }
- // This is used in the admin panel to keep track of form submission targets
- $this->cpage['module'] = $this->cpage['urlname'];
-
- $this->cpage['require_admin'] = ( $this->cpage['namespace'] === 'Admin' );
-
- // Page is set up, call any hooks
- $code = $plugins->setHook('page_set');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- profiler_log('Paths and CMS core initted');
- $session->init_permissions();
- }
-
- /**
- * Fetch cdata (metadata) for a page.
- * @param string Page ID
- * @param string Namespace
- * @return array
- */
-
- function get_cdata($page_id, $namespace)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $pathskey = $this->get_pathskey($page_id, $namespace);
- if ( isset($this->pages[$pathskey]) )
- return $this->pages[$pathskey];
-
- $page = namespace_factory($page_id, $namespace);
- $cdata = $page->get_cdata();
-
- $this->pages[$pathskey] = $cdata;
- return $cdata;
- }
-
- /**
- * For a given page ID and namespace, generate a flat string that can be used to access $paths->pages.
- * @param string Page ID
- * @param string Namespace
- */
-
- function get_pathskey($page_id, $namespace)
- {
- return ( isset($this->nslist[$namespace]) ) ? "{$this->nslist[$namespace]}{$page_id}" : "{$namespace}:{$page_id}";
- }
-
- function add_page($flags)
- {
- global $lang;
- $flags['urlname_nons'] = $flags['urlname'];
- $flags['urlname'] = $this->nslist[$flags['namespace']] . $flags['urlname']; // Applies the User:/File:/etc prefixes to the URL names
-
- if ( is_object($lang) )
- {
- if ( preg_match('/^[a-z0-9]+_[a-z0-9_]+$/', $flags['name']) )
- $flags['name'] = $lang->get($flags['name']);
- }
-
- $flags['require_admin'] = ( $flags['namespace'] === 'Admin' );
- $flags['page_exists'] = true;
-
- $this->pages[$flags['urlname']] = $flags;
- }
-
- function main_page()
- {
- if( is_string(get_main_page()) )
- {
- $main_page = makeUrl(get_main_page());
- }
- else
- {
- $main_page = makeUrl($this->pages[0]['urlname']);
- }
- redirect($main_page, 'Redirecting...', 'Invalid request, redirecting to main page', 0);
- exit;
- }
-
- function sysmsg($n)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- static $sm_cache = array();
-
- if ( isset($sm_cache[$n]) )
- return $sm_cache[$n];
-
- // sometimes this gets called during die_semicritical()...
- if ( !is_object($db) )
- return false;
-
- if ( !@$db->_conn )
- return false;
-
- $q = $db->sql_query('SELECT page_text, char_tag FROM '.table_prefix.'page_text WHERE page_id=\''.$db->escape(sanitize_page_id($n)).'\' AND namespace=\'System\'');
- if( !$q )
- {
- $db->_die('Error during generic selection of system page data.');
- }
- if($db->numrows() < 1)
- {
- return false;
- //$db->_die('Error during generic selection of system page data: there were no rows in the text table that matched the page text query.');
- }
- $r = $db->fetchrow();
- $db->free_result();
- $message = $r['page_text'];
-
- $message = preg_replace('/(.*?)<\/noinclude>/is', '', $message);
- $message = preg_replace('/(.*?)<\/nodisplay>/is', '\\1', $message);
-
- $sm_cache[$n] = $message;
-
- return $message;
- }
- function get_pageid_from_url()
- {
- return get_title(true, true);
- }
- // Parses a (very carefully formed) array into Javascript code compatible with the Tigra Tree Menu used in the admin menu
- function parseAdminTree()
- {
- global $lang;
-
- $k = array_keys($this->admin_tree);
- $i = 0;
- $ret = '';
- $icon = $this->make_sprite_icon(4, 2);
- $ret .= "var TREE_ITEMS = ";
- $tree = array(
- array($icon . $lang->get('adm_btn_home'), "javascript:ajaxPage('{$this->nslist['Admin']}Home');")
- );
-
- $root =& $tree[0];
-
- foreach($k as $key)
- {
- $i++;
- $name = $lang->get($key);
- $group = array($name, "javascript:trees[0].toggle($i)");
-
- foreach($this->admin_tree[$key] as $nodeid => $c)
- {
- $i++;
- $name = $lang->get($c['name']);
- if ( $c['icon'] && $c['icon'] != cdnPath . '/images/spacer.gif' )
- {
- if ( is_array($c['icon']) )
- {
- // this is a sprite reference
- list($ix, $iy) = $c['icon'];
- $icon = $this->make_sprite_icon($ix, $iy);
- }
- else
- {
- $icon = "![\"\"](\"{$c['icon']}\")
";
- }
- }
- else
- {
- $icon = '';
- }
- $group[] = array("$icon$name", "javascript:ajaxPage('{$this->nslist['Admin']}{$c['pageid']}');");
- }
-
- $root[] = $group;
- }
- $icon = $this->make_sprite_icon(1, 1);
- $root[] = array(
- $icon . $lang->get('adm_btn_logout'),
- "javascript:ajaxPage('{$this->nslist['Admin']}AdminLogout');"
- );
- $root[] = array(
- "" . $lang->get('adm_btn_keepalive_loading') . "",
- "javascript:ajaxToggleKeepalive();",
- array(
- $lang->get('adm_btn_keepalive_about'),
- "javascript:aboutKeepAlive();"
- )
- );
-
- $ret .= enano_json_encode($tree) . ';';
-
- // I used this while I painstakingly wrote the Runt code that auto-expands certain nodes based on the value of a bitfield stored in a cookie. *shudders*
- // $ret .= " ['(debug) Clear menu bitfield', 'javascript:createCookie(\\'admin_menu_state\\', \\'1\\', 365);'],\n";
- return $ret;
- }
-
- /**
- * Internal function to generate HTML code for an icon in the admin panel tree which is sprited.
- * @param int X index of icon
- * @param int Y index of icon
- * @return string
- */
-
- function make_sprite_icon($ix, $iy)
- {
- $xpos = 16 * ( $ix - 1 );
- $ypos = 16 * ( $iy - 1 );
- return "![\"\"](\"")
";
- }
-
- /**
- * Creates a new entry in the administration panel's navigation tree.
- * @param string Section name - if this is a language string identifier, it will be sent through $lang->get()
- * @param string The title of the page, also may be a language string identifier
- * @param string The page ID of the admin page, the namespace Admin is assumed
- * @param string Optional. The path to a 16x16 image that will be displayed as the icon for this admin page
- */
-
- function addAdminNode($section, $page_title, $url, $icon = false)
- {
- if ( !$icon )
- {
- $icon = cdnPath . '/images/spacer.gif';
- }
- if(!isset($this->admin_tree[$section]))
- {
- $this->admin_tree[$section] = Array();
- }
- $this->admin_tree[$section][] = Array(
- 'name' => $page_title,
- 'pageid' => $url,
- 'icon' => $icon
- );
- }
- function getParam($id = 0)
- {
- $title = $this->fullpage;
- list(, $ns) = RenderMan::strToPageID($title);
- $title = substr($title, strlen($this->nslist[$ns]));
- $regex = '/^' . str_replace('/', '\\/', preg_quote($this->nslist[$ns])) . '\\/?/';
- $title = preg_replace($regex, '', $title);
- $title = explode('/', $title);
- $id = $id + 1;
- return ( isset($title[$id]) ) ? $title[$id] : false;
- }
-
- function getAllParams()
- {
- $title = $this->fullpage;
- $regex = '/^' . str_replace('/', '\\/', preg_quote($this->nslist[$this->namespace])) . '\\/?/';
- $title = preg_replace($regex, '', $title);
- $title = explode('/', $title);
- unset($title[0]);
- return implode('/', $title);
- }
-
- /**
- * Creates a new namespace in memory
- * @param string $id the namespace ID
- * @param string $prefix the URL prefix, must not be blank or already used
- * @return bool true on success false on failure
- */
-
- function create_namespace($id, $prefix)
- {
- if(in_array($prefix, $this->nslist))
- {
- // echo 'Warning: pathManager::create_namespace: Prefix "'.$prefix.'" is already taken
';
- return false;
- }
- if( isset($this->nslist[$id]) )
- {
- // echo 'Warning: pathManager::create_namespace: Namespace ID "'.$prefix.'" is already taken
';
- return false;
- }
- $this->nslist[$id] = $prefix;
- }
-
- /**
- * Deprecated.
- */
-
- function update_metadata_cache()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- return false;
- }
-
- /**
- * Takes a result row from the pages table and calculates correct values for it.
- * @param array
- * @return array
- */
-
- function calculate_metadata_from_row($r)
- {
- return Namespace_Default::bake_cdata($r);
- }
-
- /**
- * Registers a handler to manually process a namespace instead of the default PageProcessor behavior.
- * The first and only parameter passed to the processing function will be the PageProcessor instance.
- * @param string Namespace to process
- * @param mixed Function address. Either a function name or an array of the form array(0 => mixed (string:class name or object), 1 => string:method)
- */
-
- function register_namespace_processor($namespace, $function)
- {
- if ( isset($this->namespace_processors[$namespace]) )
- {
- $processorname = ( is_string($this->namespace_processors[$namespace]) ) ?
- $this->namespace_processors[$namespace] :
- ( is_object($this->namespace_processors[$namespace][0]) ? get_class($this->namespace_processors[$namespace][0]) : $this->namespace_processors[$namespace][0] ) . '::' .
- $this->namespace_processors[$namespace][1];
-
- trigger_error("Namespace \"$namespace\" is already being processed by $processorname - replacing caller", E_USER_WARNING);
- }
- if ( !is_string($function) )
- {
- if ( !is_array($function) )
- return false;
- if ( count($function) != 2 )
- return false;
- if ( !is_string($function[0]) && !is_object($function[0]) )
- return false;
- if ( !is_string($function[1]) )
- return false;
- }
-
- // security: don't allow Special or Admin namespaces to be overridden
- if ( $namespace == 'Special' || $namespace == 'Admin' )
- {
- trigger_error("Security manager denied attempt to override processor for $namespace", E_USER_ERROR);
- }
-
- $this->namespace_processors[$namespace] = $function;
- }
-
- /**
- * Returns a namespace processor if one exists, otherwise returns false.
- * @param string Namespace
- * @return mixed
- */
-
- function get_namespace_processor($namespace)
- {
- return ( isset($this->namespace_processors[$namespace]) ) ? $this->namespace_processors[$namespace] : false;
- }
-
- /**
- * Fetches the page texts for searching
- */
-
- function fetch_page_search_texts()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $texts = Array();
- $q = $db->sql_query('SELECT t.page_id,t.namespace,t.page_text,t.char_tag FROM '.table_prefix.'page_text AS t
- LEFT JOIN '.table_prefix.'pages AS p
- ON t.page_id=p.urlname
- WHERE p.namespace=t.namespace
- AND ( p.password=\'\' OR p.password=\'da39a3ee5e6b4b0d3255bfef95601890afd80709\' )
- AND p.visible=1;'); // Only indexes "visible" pages
-
- if( !$q )
- {
- return false;
- }
- while($row = $db->fetchrow())
- {
- $pid = $this->nslist[$row['namespace']] . $row['page_id'];
- $texts[$pid] = $row['page_text'];
- }
- $db->free_result();
-
- return $texts;
- }
-
- /**
- * Generates an SQL query to grab all of the text
- */
-
- function fetch_page_search_resource()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- // sha1('') returns "da39a3ee5e6b4b0d3255bfef95601890afd80709"
-
- $concat_column = ( ENANO_DBLAYER == 'MYSQL' ) ?
- 'CONCAT(\'ns=\',t.namespace,\';pid=\',t.page_id)' :
- "'ns=' || t.namespace || ';pid=' || t.page_id";
-
- $texts = 'SELECT t.page_text, ' . $concat_column . ' AS page_idstring, t.page_id, t.namespace FROM '.table_prefix.'page_text AS t
- LEFT JOIN '.table_prefix.'pages AS p
- ON ( t.page_id=p.urlname AND t.namespace=p.namespace )
- WHERE p.namespace=t.namespace
- AND ( p.password=\'\' OR p.password=\'da39a3ee5e6b4b0d3255bfef95601890afd80709\' )
- AND p.visible=1;'; // Only indexes "visible" pages
- return $texts;
- }
-
- /**
- * Builds a word list for search indexing.
- * @param string Text to index
- * @param string Page ID of the page being indexed
- * @param string Title of the page being indexed
- * @return array List of words
- */
-
- function calculate_word_list($text, $page_id, $page_name)
- {
- $page_id = dirtify_page_id($page_id);
- $text = preg_replace('/[^a-z0-9\']/i', ' ', $text);
- $page_id = preg_replace('/[^a-z0-9\']/i', ' ', $page_id);
- $page_name = preg_replace('/[^a-z0-9\']/i', ' ', $page_name);
- $text .= " $page_id $page_name";
- $text = explode(' ', $text);
- foreach ( $text as $i => &$word )
- {
- if ( strstr($word, "''") )
- $word = preg_replace("/[']{2,}/", '', $word);
- if ( strlen($word) < 2 )
- unset($text[$i]);
- }
- $text = array_unique(array_values($text));
- // for debugging purposes (usually XSS safe because of character stripping)
- // echo ' ' . implode(' ', $text) . '
';
- return $text;
- }
-
- /**
- * Rebuilds the site's entire search index. Considerably more exciting if run from the command line.
- * @param bool If true, verbose output.
- * @param bool If true, verbose + debugging output.
- */
-
- function rebuild_search_index($verbose = false, $debug = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- require_once(ENANO_ROOT . '/includes/search.php');
-
- $progress = false;
- if ( class_exists('ProgressBar') )
- {
- // CLI only.
- $progress = new ProgressBar('Rebuilding search index: [', ']', 'Initializing...', 'green', 'blue', 'white', 'yellow');
- $verbose = false;
- $debug = false;
- $progress->start();
- }
-
- @set_time_limit(0);
-
- $q = $db->sql_query('DELETE FROM ' . table_prefix . 'search_index;');
- if ( !$q )
- $db->_die();
-
- $sha1_blank = sha1('');
-
- //
- // Index $pages_in_batch pages at a time
- //
- $pages_in_batch = 15;
-
- // First find out how many pages there are
- $q = $db->sql_query('SELECT COUNT(p.urlname) AS num_pages FROM ' . table_prefix . "page_text AS t\n"
- . " LEFT JOIN " . table_prefix . "pages AS p\n"
- . " ON ( p.urlname = t.page_id AND p.namespace = t.namespace )\n"
- . " WHERE ( p.password = '' OR p.password = '$sha1_blank' )\n"
- . " AND ( p.visible = 1 );");
- if ( !$q )
- $db->_die();
-
- list($num_pages) = $db->fetchrow_num();
- $num_pages = intval($num_pages);
- $loops = ceil($num_pages / $pages_in_batch);
- $master_word_list = array();
- $stopwords = get_stopwords();
-
- for ( $j = 0; $j < $loops; )
- {
- $offset = $j * $pages_in_batch;
-
- $j++;
-
- if ( $verbose && $debug )
- {
- echo "Running indexing round $j of $loops (offset $offset)\n" . ( isset($_SERVER['REQUEST_URI']) ? '
' : '' );
- }
-
- // this is friendly to both MySQL and PostgreSQL.
- $texts = $db->sql_query('SELECT p.name, p.visible, t.page_id, t.namespace, t.page_text FROM ' . table_prefix . "page_text AS t\n"
- . " LEFT JOIN " . table_prefix . "pages AS p\n"
- . " ON ( p.urlname = t.page_id AND p.namespace = t.namespace )\n"
- . " WHERE ( p.password = '' OR p.password = '$sha1_blank' )\n"
- . " AND ( p.visible = 1 )\n"
- . " LIMIT $pages_in_batch OFFSET $offset;", false);
- if ( !$texts )
- $db->_die();
-
- $k = $offset;
-
- if ( $row = $db->fetchrow($texts) )
- {
- do
- {
- $k++;
- if ( $verbose )
- {
- $mu = memory_get_usage();
- echo " Indexing page $k of $num_pages: {$row['namespace']}:{$row['page_id']}";
- if ( $debug )
- echo ", mem = $mu...";
- flush();
- }
- else if ( is_object($progress) )
- {
- $progress->update_text_quiet("$k/$num_pages {$row['namespace']}:{$row['page_id']}");
- $progress->set($k, $num_pages);
- }
-
- // skip this page if it's not supposed to be indexed
- if ( $row['visible'] == 0 )
- {
- if ( $verbose )
- {
- echo "skipped";
- if ( isset($_SERVER['REQUEST_URI']) )
- echo '
';
- echo "\n";
- }
- continue;
- }
-
- // Indexing identifier for the page in the DB
- $page_uniqid = "ns={$row['namespace']};pid=" . sanitize_page_id($row['page_id']);
- $page_uniqid = $db->escape($page_uniqid);
-
- // List of words on the page
- $wordlist = $this->calculate_word_list($row['page_text'], $row['page_id'], $row['name']);
-
- // Index calculation complete -- run inserts
- $inserts = array();
- foreach ( $wordlist as $word )
- {
- if ( in_array($word, $stopwords) || strval(intval($word)) === $word || strlen($word) < 3 )
- continue;
- $word_db = $db->escape($word);
- $word_db_lc = $db->escape(strtolower($word));
- if ( !in_array($word, $master_word_list) )
- {
- $inserts[] = "( '$word_db', '$word_db_lc', '$page_uniqid' )";
- }
- else
- {
- if ( $verbose && $debug )
- echo '.';
- $pid_col = ( ENANO_DBLAYER == 'MYSQL' ) ?
- "CONCAT( page_names, ',$page_uniqid' )":
- "page_names || ',$page_uniqid'";
- $q = $db->sql_query('UPDATE ' . table_prefix . "search_index SET page_names = $pid_col WHERE word = '$word_db';", false);
- if ( !$q )
- $db->_die();
- }
- }
- if ( count($inserts) > 0 )
- {
- if ( $verbose && $debug )
- echo 'i';
- $inserts = implode(",\n ", $inserts);
- $q = $db->sql_query('INSERT INTO ' . table_prefix . "search_index(word, word_lcase, page_names) VALUES\n $inserts;", false);
- if ( !$q )
- $db->_die();
- }
-
- $master_word_list = array_unique(array_merge($master_word_list, $wordlist));
- if ( $verbose )
- {
- if ( isset($_SERVER['REQUEST_URI']) )
- echo '
';
- echo "\n";
- }
- unset($inserts, $wordlist, $page_uniqid, $word_db, $q, $word, $row);
- }
- while ( $row = $db->fetchrow($texts) );
- }
- $db->free_result($texts);
- }
- if ( $verbose )
- {
- echo "Indexing complete.";
- if ( isset($_SERVER['REQUEST_URI']) )
- echo '
';
- echo "\n";
- }
- else if ( is_object($progress) )
- {
- $progress->update_text('Complete.');
- $progress->end();
- }
- return true;
- }
-
- /**
- * Partially rebuilds the search index, removing/inserting entries only for the current page
- * @param string $page_id
- * @param string $namespace
- */
-
- function rebuild_page_index($page_id, $namespace)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- require_once(ENANO_ROOT . '/includes/search.php');
-
- if(!$db->sql_query('SELECT page_text FROM '.table_prefix.'page_text
- WHERE page_id=\''.$db->escape($page_id).'\' AND namespace=\''.$db->escape($namespace).'\';'))
- {
- return $db->get_error();
- }
- if ( $db->numrows() < 1 )
- return 'E: No rows';
- $idstring = $this->nslist[$namespace] . sanitize_page_id($page_id);
- if ( !isset($this->pages[$idstring]) )
- {
- return 'E: Can\'t find page metadata';
- }
- $row = $db->fetchrow();
- $db->free_result();
- $search = new Searcher();
-
- // if the page shouldn't be indexed, send a blank set of strings to the indexing engine
- if ( $this->pages[$idstring]['visible'] == 0 )
- {
- $search->buildIndex(Array("ns={$namespace};pid={$page_id}"=>''));
- }
- else
- {
- $search->buildIndex(Array("ns={$namespace};pid={$page_id}"=>$row['page_text'] . ' ' . $this->pages[$idstring]['name']));
- }
-
- $new_index = $search->index;
-
- if ( count($search->index) == 0 )
- // o_O
- // nothing indexed.
- return true;
-
- if ( ENANO_DBLAYER == 'MYSQL' )
- {
- $keys = array_keys($search->index);
- foreach($keys as $i => $k)
- {
- $c =& $keys[$i];
- $c = hexencode($c, '', '');
- }
- $keys = "word=0x" . implode ( " OR word=0x", $keys ) . "";
- }
- else
- {
- $keys = array_keys($search->index);
- foreach($keys as $i => $k)
- {
- $c =& $keys[$i];
- $c = $db->escape($c);
- }
- $keys = "word='" . implode ( "' OR word='", $keys ) . "'";
- }
-
- $query = $db->sql_query('SELECT word,page_names FROM '.table_prefix.'search_index WHERE '.$keys.';');
-
- while($row = $db->fetchrow())
- {
- $row['word'] = rtrim($row['word'], "\0");
- $new_index[ $row['word'] ] = $row['page_names'] . ',' . $search->index[ $row['word'] ];
- }
- $db->free_result();
-
- $db->sql_query('DELETE FROM '.table_prefix.'search_index WHERE '.$keys.';');
-
- $secs = Array();
- $q = 'INSERT INTO '.table_prefix.'search_index(word,word_lcase,page_names) VALUES';
- foreach($new_index as $word => $pages)
- {
- $secs[] = '(\''.$db->escape($word).'\', \'' . $db->escape(strtolower($word)) . '\', \''.$db->escape($pages).'\')';
- }
- $q .= implode(',', $secs);
- unset($secs);
- $q .= ';';
- if(!$db->check_query($q))
- {
- die('BUG: PathManager::rebuild_page_index: Query rejected by SQL parser:'.$q.'
');
- }
- $result = $db->sql_query($q);
- if($result)
- return true;
- else
- $db->_die('The search index was trying to rebuild itself when the error occured.');
-
- }
-
- /**
- * Returns a list of groups that a given page is a member of.
- * @param string Page ID
- * @param string Namespace
- * @return array
- */
-
- function get_page_groups($page_id, $namespace)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- static $cache = array();
-
- if ( count($cache) == 0 )
- {
- foreach ( $this->nslist as $key => $_ )
- {
- $cache[$key] = array();
- }
- }
-
- if ( !isset($this->nslist[$namespace]) )
- die('$paths->get_page_groups(): HACKING ATTEMPT: namespace "'. htmlspecialchars($namespace) .'" doesn\'t exist');
-
- $page_id_unescaped = $paths->nslist[$namespace] .
- dirtify_page_id($page_id);
- $page_id_str = $paths->nslist[$namespace] .
- sanitize_page_id($page_id);
-
- $page_id = $db->escape(sanitize_page_id($page_id));
-
- if ( isset($cache[$namespace][$page_id]) )
- {
- return $cache[$namespace][$page_id];
- }
-
- $group_list = array();
-
- // What linked categories have this page?
- $q = $db->sql_unbuffered_query('SELECT g.pg_id, g.pg_type, g.pg_target FROM '.table_prefix.'page_groups AS g
- LEFT JOIN '.table_prefix.'categories AS c
- ON ( ( c.category_id = g.pg_target AND g.pg_type = ' . PAGE_GRP_CATLINK . ' ) OR c.category_id IS NULL )
- LEFT JOIN '.table_prefix.'page_group_members AS m
- ON ( ( g.pg_id = m.pg_id AND g.pg_type = ' . PAGE_GRP_NORMAL . ' ) OR ( m.pg_id IS NULL ) )
- LEFT JOIN '.table_prefix.'tags AS t
- ON ( ( t.tag_name = g.pg_target AND pg_type = ' . PAGE_GRP_TAGGED . ' ) OR t.tag_name IS NULL )
- WHERE
- ( c.page_id=\'' . $page_id . '\' AND c.namespace=\'' . $namespace . '\' ) OR
- ( t.page_id=\'' . $page_id . '\' AND t.namespace=\'' . $namespace . '\' ) OR
- ( m.page_id=\'' . $page_id . '\' AND m.namespace=\'' . $namespace . '\' ) OR
- ( g.pg_type = ' . PAGE_GRP_REGEX . ' );');
- if ( !$q )
- $db->_die();
-
- while ( $row = $db->fetchrow() )
- {
- if ( $row['pg_type'] == PAGE_GRP_REGEX )
- {
- //echo "<debug> matching page " . htmlspecialchars($page_id_unescaped) . " against regex " . htmlspecialchars($row['pg_target']) . ".";
- if ( @preg_match($row['pg_target'], $page_id_unescaped) || @preg_match($row['pg_target'], $page_id_str) )
- {
- //echo "..matched";
- $group_list[] = $row['pg_id'];
- }
- //echo "
";
- }
- else
- {
- $group_list[] = $row['pg_id'];
- }
- }
-
- $db->free_result();
-
- $cache[$namespace][$page_id] = $group_list;
-
- return $group_list;
-
- }
-
+ public $title, $pages, $custom_page, $cpage, $page, $fullpage, $page_exists, $page_id, $namespace, $nslist, $admin_tree, $wiki_mode, $page_protected, $template_cache, $external_api_page;
+
+ /**
+ * List of custom processing functions for namespaces. This is protected so trying to do anything with it will throw an error.
+ * @access private
+ * @var array
+ */
+
+ protected $namespace_processors;
+
+ function __construct()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $GLOBALS['paths'] =& $this;
+ $this->pages = Array();
+
+ // DEFINE NAMESPACES HERE
+ // The key names should NOT EVER be changed, or Enano will be very broken
+ $namespace_delimiter = ( defined('WINDOWS_MOD_REWRITE_WORKAROUNDS') ) ? '.' : ':';
+ $this->nslist = Array(
+ 'Article' => '',
+ 'User' => 'User' . $namespace_delimiter,
+ 'File' => 'File' . $namespace_delimiter,
+ 'Help' => 'Help' . $namespace_delimiter,
+ 'Admin' => 'Admin' . $namespace_delimiter,
+ 'Special' => 'Special' . $namespace_delimiter,
+ 'System' => 'Enano' . $namespace_delimiter,
+ 'Template' => 'Template' . $namespace_delimiter,
+ 'Category' => 'Category' . $namespace_delimiter,
+ 'API' => 'SystemAPI' . $namespace_delimiter,
+ 'Project' => sanitize_page_id(getConfig('site_name')) . $namespace_delimiter,
+ );
+
+ // ACL types
+ // These can also be added from within plugins
+
+ $session->register_acl_type('read', AUTH_ALLOW, 'perm_read');
+ $session->register_acl_type('post_comments', AUTH_ALLOW, 'perm_post_comments', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('edit_comments', AUTH_ALLOW, 'perm_edit_comments', Array('post_comments'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('edit_page', AUTH_WIKIMODE, 'perm_edit_page', Array('view_source'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('edit_wysiwyg', AUTH_ALLOW, 'perm_edit_wysiwyg', Array(), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('view_source', AUTH_WIKIMODE, 'perm_view_source', Array('read'), 'Article|User|Project|Template|File|Help|System|Category'); // Only used if the page is protected
+ $session->register_acl_type('mod_comments', AUTH_DISALLOW, 'perm_mod_comments', Array('edit_comments'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('history_view', AUTH_WIKIMODE, 'perm_history_view', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('history_rollback', AUTH_DISALLOW, 'perm_history_rollback', Array('history_view'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('history_rollback_extra', AUTH_DISALLOW, 'perm_history_rollback_extra', Array('history_rollback'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('protect', AUTH_DISALLOW, 'perm_protect', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('rename', AUTH_WIKIMODE, 'perm_rename', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('clear_logs', AUTH_DISALLOW, 'perm_clear_logs', Array('read', 'protect', 'even_when_protected'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('vote_delete', AUTH_ALLOW, 'perm_vote_delete', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('vote_reset', AUTH_DISALLOW, 'perm_vote_reset', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('delete_page', AUTH_DISALLOW, 'perm_delete_page', Array(), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('tag_create', AUTH_ALLOW, 'perm_tag_create', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('tag_delete_own', AUTH_ALLOW, 'perm_tag_delete_own', Array('read', 'tag_create'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('tag_delete_other', AUTH_DISALLOW, 'perm_tag_delete_other', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('set_wiki_mode', AUTH_DISALLOW, 'perm_set_wiki_mode', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('password_set', AUTH_DISALLOW, 'perm_password_set', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('password_reset', AUTH_DISALLOW, 'perm_password_reset', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('mod_misc', AUTH_DISALLOW, 'perm_mod_misc', Array(), 'All');
+ $session->register_acl_type('edit_cat', AUTH_WIKIMODE, 'perm_edit_cat', Array('read'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('even_when_protected', AUTH_DISALLOW, 'perm_even_when_protected', Array('edit_page', 'rename', 'mod_comments', 'edit_cat'), 'Article|User|Project|Template|File|Help|System|Category');
+ $session->register_acl_type('create_page', AUTH_WIKIMODE, 'perm_create_page', Array(), 'All');
+ $session->register_acl_type('upload_files', AUTH_DISALLOW, 'perm_upload_files', Array('create_page'), 'All');
+ $session->register_acl_type('upload_new_version', AUTH_WIKIMODE, 'perm_upload_new_version', Array('upload_files'), 'All');
+ $session->register_acl_type('html_in_pages', AUTH_DISALLOW, 'perm_html_in_pages', Array('edit_page'), 'Article|User|Project|Template|File|Help|System|Category|Admin');
+ $session->register_acl_type('php_in_pages', AUTH_DISALLOW, 'perm_php_in_pages', Array('edit_page', 'html_in_pages'), 'Article|User|Project|Template|File|Help|System|Category|Admin');
+ $session->register_acl_type('custom_user_title', AUTH_DISALLOW, 'perm_custom_user_title', Array(), 'User|Special');
+ $session->register_acl_type('edit_acl', AUTH_DISALLOW, 'perm_edit_acl', Array());
+
+ // DO NOT add new admin pages here! Use a plugin to call $paths->addAdminNode();
+ $this->addAdminNode('adm_cat_general', 'adm_page_general_config', 'GeneralConfig', array(2, 2));
+ $this->addAdminNode('adm_cat_general', 'adm_page_file_uploads', 'UploadConfig', array(2, 5));
+ $this->addAdminNode('adm_cat_general', 'adm_page_file_types', 'UploadAllowedMimeTypes', array(1, 5));
+ $this->addAdminNode('adm_cat_content', 'adm_page_manager', 'PageManager', array(1, 4));
+ $this->addAdminNode('adm_cat_content', 'adm_page_editor', 'PageEditor', array(3, 3));
+ $this->addAdminNode('adm_cat_content', 'adm_page_pg_groups', 'PageGroups', array(4, 3));
+ $this->addAdminNode('adm_cat_appearance', 'adm_page_themes', 'ThemeManager', array(4, 4));
+ $this->addAdminNode('adm_cat_appearance', 'adm_page_plugins', 'PluginManager', array(2, 4));
+ $this->addAdminNode('adm_cat_appearance', 'adm_page_db_backup', 'DBBackup', array(1, 2));
+ $this->addAdminNode('adm_cat_appearance', 'adm_page_lang_manager', 'LangManager', array(1, 3));
+ $this->addAdminNode('adm_cat_appearance', 'adm_page_cache_manager', 'CacheManager', array(3, 1));
+ $this->addAdminNode('adm_cat_users', 'adm_page_users', 'UserManager', array(3, 5));
+ $this->addAdminNode('adm_cat_users', 'adm_page_user_groups', 'GroupManager', array(3, 2));
+ $this->addAdminNode('adm_cat_users', 'adm_page_coppa', 'COPPA', array(4, 1));
+ $this->addAdminNode('adm_cat_users', 'adm_page_mass_email', 'MassEmail', array(2, 3));
+ $this->addAdminNode('adm_cat_users', 'adm_page_user_ranks', 'UserRanks', array(4, 5));
+ $this->addAdminNode('adm_cat_security', 'adm_page_security_log', 'SecurityLog', array(3, 4));
+ $this->addAdminNode('adm_cat_security', 'adm_page_ban_control', 'BanControl', array(2, 1));
+
+ $code = $plugins->setHook('acl_rule_init');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ $this->wiki_mode = ( getConfig('wiki_mode') == '1' ) ? 1 : 0;
+ $this->template_cache = Array();
+ }
+
+ function init($title)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+ global $cache;
+
+ $code = $plugins->setHook('paths_init_before');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ if ( defined('ENANO_INTERFACE_INDEX') || defined('ENANO_INTERFACE_AJAX') || defined('IN_ENANO_UPGRADE') )
+ {
+ if ( empty($title) )
+ $title = get_title();
+
+ if ( empty($title) && !have_blank_urlname_page() )
+ {
+ $this->main_page();
+ }
+ if ( strstr($title, ' ') || strstr($title, '+') || strstr($title, '%20') )
+ {
+ $title = sanitize_page_id($title);
+ redirect(makeUrl($title), '', '', 0);
+ }
+ $title = sanitize_page_id($title);
+ // We've got the title, pull the namespace from it
+ $namespace = 'Article';
+ $page_id = $title;
+ foreach ( $this->nslist as $ns => $prefix )
+ {
+ $prefix_len = strlen($prefix);
+ if ( substr($title, 0, $prefix_len) == $prefix )
+ {
+ $page_id = substr($title, $prefix_len);
+ $namespace = $ns;
+ }
+ }
+ $this->namespace = $namespace;
+ $this->fullpage = $title;
+ if ( $namespace == 'Special' || $namespace == 'Admin' )
+ {
+ list($page_id) = explode('/', $page_id);
+ }
+ $this->page = $this->nslist[$namespace] . $page_id;
+ $this->page_id = $page_id;
+ // die("All done setting parameters. What we've got:
namespace: $namespace
fullpage: $this->fullpage
page: $this->page
page_id: $this->page_id");
+ }
+ else
+ {
+ // Starting up Enano with the API from a page that wants to do its own thing. Generate
+ // metadata for an anonymous page and avoid redirection at all costs.
+ if ( isset($GLOBALS['title']) )
+ {
+ $title =& $GLOBALS['title'];
+ }
+ else
+ {
+ $title = basename($_SERVER['SCRIPT_NAME']);
+ }
+ $base_uri = scriptPath == '' ? ltrim($_SERVER['SCRIPT_NAME'], '/') : str_replace( scriptPath . '/', '', $_SERVER['SCRIPT_NAME'] );
+
+ $this->page = $this->nslist['API'] . sanitize_page_id($base_uri);
+ $this->fullpage = $this->nslist['API'] . sanitize_page_id($base_uri);
+ $this->namespace = 'API';
+ $this->cpage = array(
+ 'name' => $title,
+ 'urlname' => sanitize_page_id($base_uri),
+ 'namespace' => 'API',
+ 'special' => 1,
+ 'visible' => 1,
+ 'comments_on' => 1,
+ 'protected' => 1,
+ 'delvotes' => 0,
+ 'delvote_ips' => '',
+ 'page_format' => getConfig('default_page_format', 'wikitext')
+ );
+ $this->external_api_page = true;
+ $code = $plugins->setHook('paths_external_api_page');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+ }
+
+ $this->page = sanitize_page_id($this->page);
+ $this->fullpage = sanitize_page_id($this->fullpage);
+
+ if(isset($this->pages[$this->page]))
+ {
+ $this->page_exists = true;
+ $this->cpage = $this->pages[$this->page];
+ $this->page_id =& $this->cpage['urlname_nons'];
+ $this->namespace = $this->cpage['namespace'];
+ if(!isset($this->cpage['wiki_mode'])) $this->cpage['wiki_mode'] = 2;
+
+ // Determine the wiki mode for this page, now that we have this->cpage established
+ if($this->cpage['wiki_mode'] == 2)
+ {
+ $this->wiki_mode = (int)getConfig('wiki_mode');
+ }
+ else
+ {
+ $this->wiki_mode = $this->cpage['wiki_mode'];
+ }
+ // Allow the user to create/modify his user page uncondtionally (admins can still protect the page)
+ if($this->page == $this->nslist['User'].str_replace(' ', '_', $session->username))
+ {
+ $this->wiki_mode = true;
+ }
+ // And above all, if the site requires wiki mode to be off for non-logged-in users, disable it now
+ if(getConfig('wiki_mode_require_login')=='1' && !$session->user_logged_in)
+ {
+ $this->wiki_mode = false;
+ }
+ if($this->cpage['protected'] == 2)
+ {
+ // The page is semi-protected, determine permissions
+ if($session->user_logged_in && $session->reg_time + 60*60*24*4 < time())
+ {
+ $this->page_protected = 0;
+ }
+ else
+ {
+ $this->page_protected = 1;
+ }
+ }
+ else
+ {
+ $this->page_protected = $this->cpage['protected'];
+ }
+ }
+ else
+ {
+ $this->page_exists = false;
+ $page_name = dirtify_page_id($this->page);
+ $page_name = str_replace('_', ' ', $page_name);
+
+ $pid_cleaned = sanitize_page_id($this->page);
+ if ( $pid_cleaned != $this->page )
+ {
+ redirect(makeUrl($pid_cleaned), 'Sanitizer message', 'page id sanitized', 0);
+ }
+
+ if ( !is_array($this->cpage) )
+ {
+ $this->cpage = Array(
+ 'name' => $page_name,
+ 'urlname' => $this->page,
+ 'namespace' => 'Article',
+ 'special' => 0,
+ 'visible' => 0,
+ 'comments_on' => 1,
+ 'protected' => 0,
+ 'delvotes' => 0,
+ 'delvote_ips' => '',
+ 'wiki_mode' => 2,
+ 'page_format' => getConfig('default_page_format', 'wikitext')
+ );
+ }
+ // Look for a namespace prefix in the urlname, and assign a different namespace, if necessary
+ $k = array_keys($this->nslist);
+ for($i=0;$inslist);$i++)
+ {
+ $ln = strlen($this->nslist[$k[$i]]);
+ if( substr($this->page, 0, $ln) == $this->nslist[$k[$i]] )
+ {
+ $this->cpage['namespace'] = $k[$i];
+ $this->cpage['urlname_nons'] = substr($this->page, strlen($this->nslist[$this->cpage['namespace']]), strlen($this->page));
+ if(!isset($this->cpage['wiki_mode']))
+ {
+ $this->cpage['wiki_mode'] = 2;
+ }
+ }
+ }
+ $this->namespace = $this->cpage['namespace'];
+ $this->page_id =& $this->cpage['urlname_nons'];
+
+ if($this->namespace=='System')
+ {
+ $this->cpage['protected'] = 1;
+ }
+ if($this->namespace == 'Special' && !$this->external_api_page)
+ {
+ // Can't load nonexistent pages
+ if( is_string(get_main_page()) )
+ {
+ $main_page = makeUrl(get_main_page());
+ }
+ else
+ {
+ $main_page = makeUrl($this->pages[0]['urlname']);
+ }
+ redirect($main_page, $lang->get('page_msg_special_404_title'), $lang->get('page_msg_special_404_body', array('sp_link' => makeUrlNS('Special', 'SpecialPages'))), 15);
+ exit;
+ }
+ // Allow the user to create/modify his user page uncondtionally (admins can still protect the page)
+ if($this->page == $this->nslist['User'].str_replace(' ', '_', $session->username))
+ {
+ $this->wiki_mode = true;
+ }
+ }
+ // This is used in the admin panel to keep track of form submission targets
+ $this->cpage['module'] = $this->cpage['urlname'];
+
+ $this->cpage['require_admin'] = ( $this->cpage['namespace'] === 'Admin' );
+
+ // Page is set up, call any hooks
+ $code = $plugins->setHook('page_set');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ profiler_log('Paths and CMS core initted');
+ $session->init_permissions();
+ }
+
+ /**
+ * Fetch cdata (metadata) for a page.
+ * @param string Page ID
+ * @param string Namespace
+ * @return array
+ */
+
+ function get_cdata($page_id, $namespace)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $pathskey = $this->get_pathskey($page_id, $namespace);
+ if ( isset($this->pages[$pathskey]) )
+ return $this->pages[$pathskey];
+
+ $page = namespace_factory($page_id, $namespace);
+ $cdata = $page->get_cdata();
+
+ $this->pages[$pathskey] = $cdata;
+ return $cdata;
+ }
+
+ /**
+ * For a given page ID and namespace, generate a flat string that can be used to access $paths->pages.
+ * @param string Page ID
+ * @param string Namespace
+ */
+
+ function get_pathskey($page_id, $namespace)
+ {
+ return ( isset($this->nslist[$namespace]) ) ? "{$this->nslist[$namespace]}{$page_id}" : "{$namespace}:{$page_id}";
+ }
+
+ function add_page($flags)
+ {
+ global $lang;
+ $flags['urlname_nons'] = $flags['urlname'];
+ $flags['urlname'] = $this->nslist[$flags['namespace']] . $flags['urlname']; // Applies the User:/File:/etc prefixes to the URL names
+
+ if ( is_object($lang) )
+ {
+ if ( preg_match('/^[a-z0-9]+_[a-z0-9_]+$/', $flags['name']) )
+ $flags['name'] = $lang->get($flags['name']);
+ }
+
+ $flags['require_admin'] = ( $flags['namespace'] === 'Admin' );
+ $flags['page_exists'] = true;
+
+ $this->pages[$flags['urlname']] = $flags;
+ }
+
+ function main_page()
+ {
+ if( is_string(get_main_page()) )
+ {
+ $main_page = makeUrl(get_main_page());
+ }
+ else
+ {
+ $main_page = makeUrl($this->pages[0]['urlname']);
+ }
+ redirect($main_page, 'Redirecting...', 'Invalid request, redirecting to main page', 0);
+ exit;
+ }
+
+ function sysmsg($n)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ static $sm_cache = array();
+
+ if ( isset($sm_cache[$n]) )
+ return $sm_cache[$n];
+
+ // sometimes this gets called during die_semicritical()...
+ if ( !is_object($db) )
+ return false;
+
+ if ( !@$db->_conn )
+ return false;
+
+ $q = $db->sql_query('SELECT page_text, char_tag FROM '.table_prefix.'page_text WHERE page_id=\''.$db->escape(sanitize_page_id($n)).'\' AND namespace=\'System\'');
+ if( !$q )
+ {
+ $db->_die('Error during generic selection of system page data.');
+ }
+ if($db->numrows() < 1)
+ {
+ return false;
+ //$db->_die('Error during generic selection of system page data: there were no rows in the text table that matched the page text query.');
+ }
+ $r = $db->fetchrow();
+ $db->free_result();
+ $message = $r['page_text'];
+
+ $message = preg_replace('/(.*?)<\/noinclude>/is', '', $message);
+ $message = preg_replace('/(.*?)<\/nodisplay>/is', '\\1', $message);
+
+ $sm_cache[$n] = $message;
+
+ return $message;
+ }
+ function get_pageid_from_url()
+ {
+ return get_title(true, true);
+ }
+ // Parses a (very carefully formed) array into Javascript code compatible with the Tigra Tree Menu used in the admin menu
+ function parseAdminTree()
+ {
+ global $lang;
+
+ $k = array_keys($this->admin_tree);
+ $i = 0;
+ $ret = '';
+ $icon = $this->make_sprite_icon(4, 2);
+ $ret .= "var TREE_ITEMS = ";
+ $tree = array(
+ array($icon . $lang->get('adm_btn_home'), "javascript:ajaxPage('{$this->nslist['Admin']}Home');")
+ );
+
+ $root =& $tree[0];
+
+ foreach($k as $key)
+ {
+ $i++;
+ $name = $lang->get($key);
+ $group = array($name, "javascript:trees[0].toggle($i)");
+
+ foreach($this->admin_tree[$key] as $nodeid => $c)
+ {
+ $i++;
+ $name = $lang->get($c['name']);
+ if ( $c['icon'] && $c['icon'] != cdnPath . '/images/spacer.gif' )
+ {
+ if ( is_array($c['icon']) )
+ {
+ // this is a sprite reference
+ list($ix, $iy) = $c['icon'];
+ $icon = $this->make_sprite_icon($ix, $iy);
+ }
+ else
+ {
+ $icon = " ";
+ }
+ }
+ else
+ {
+ $icon = '';
+ }
+ $group[] = array("$icon$name", "javascript:ajaxPage('{$this->nslist['Admin']}{$c['pageid']}');");
+ }
+
+ $root[] = $group;
+ }
+ $icon = $this->make_sprite_icon(1, 1);
+ $root[] = array(
+ $icon . $lang->get('adm_btn_logout'),
+ "javascript:ajaxPage('{$this->nslist['Admin']}AdminLogout');"
+ );
+ $root[] = array(
+ "" . $lang->get('adm_btn_keepalive_loading') . "",
+ "javascript:ajaxToggleKeepalive();",
+ array(
+ $lang->get('adm_btn_keepalive_about'),
+ "javascript:aboutKeepAlive();"
+ )
+ );
+
+ $ret .= enano_json_encode($tree) . ';';
+
+ // I used this while I painstakingly wrote the Runt code that auto-expands certain nodes based on the value of a bitfield stored in a cookie. *shudders*
+ // $ret .= " ['(debug) Clear menu bitfield', 'javascript:createCookie(\\'admin_menu_state\\', \\'1\\', 365);'],\n";
+ return $ret;
+ }
+
+ /**
+ * Internal function to generate HTML code for an icon in the admin panel tree which is sprited.
+ * @param int X index of icon
+ * @param int Y index of icon
+ * @return string
+ */
+
+ function make_sprite_icon($ix, $iy)
+ {
+ $xpos = 16 * ( $ix - 1 );
+ $ypos = 16 * ( $iy - 1 );
+ return " ";
+ }
+
+ /**
+ * Creates a new entry in the administration panel's navigation tree.
+ * @param string Section name - if this is a language string identifier, it will be sent through $lang->get()
+ * @param string The title of the page, also may be a language string identifier
+ * @param string The page ID of the admin page, the namespace Admin is assumed
+ * @param string Optional. The path to a 16x16 image that will be displayed as the icon for this admin page
+ */
+
+ function addAdminNode($section, $page_title, $url, $icon = false)
+ {
+ if ( !$icon )
+ {
+ $icon = cdnPath . '/images/spacer.gif';
+ }
+ if(!isset($this->admin_tree[$section]))
+ {
+ $this->admin_tree[$section] = Array();
+ }
+ $this->admin_tree[$section][] = Array(
+ 'name' => $page_title,
+ 'pageid' => $url,
+ 'icon' => $icon
+ );
+ }
+ function getParam($id = 0)
+ {
+ $title = $this->fullpage;
+ list(, $ns) = RenderMan::strToPageID($title);
+ $title = substr($title, strlen($this->nslist[$ns]));
+ $regex = '/^' . str_replace('/', '\\/', preg_quote($this->nslist[$ns])) . '\\/?/';
+ $title = preg_replace($regex, '', $title);
+ $title = explode('/', $title);
+ $id = $id + 1;
+ return ( isset($title[$id]) ) ? $title[$id] : false;
+ }
+
+ function getAllParams()
+ {
+ $title = $this->fullpage;
+ $regex = '/^' . str_replace('/', '\\/', preg_quote($this->nslist[$this->namespace])) . '\\/?/';
+ $title = preg_replace($regex, '', $title);
+ $title = explode('/', $title);
+ unset($title[0]);
+ return implode('/', $title);
+ }
+
+ /**
+ * Creates a new namespace in memory
+ * @param string $id the namespace ID
+ * @param string $prefix the URL prefix, must not be blank or already used
+ * @return bool true on success false on failure
+ */
+
+ function create_namespace($id, $prefix)
+ {
+ if(in_array($prefix, $this->nslist))
+ {
+ // echo 'Warning: pathManager::create_namespace: Prefix "'.$prefix.'" is already taken
';
+ return false;
+ }
+ if( isset($this->nslist[$id]) )
+ {
+ // echo 'Warning: pathManager::create_namespace: Namespace ID "'.$prefix.'" is already taken
';
+ return false;
+ }
+ $this->nslist[$id] = $prefix;
+ }
+
+ /**
+ * Deprecated.
+ */
+
+ function update_metadata_cache()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ return false;
+ }
+
+ /**
+ * Takes a result row from the pages table and calculates correct values for it.
+ * @param array
+ * @return array
+ */
+
+ function calculate_metadata_from_row($r)
+ {
+ return Namespace_Default::bake_cdata($r);
+ }
+
+ /**
+ * Registers a handler to manually process a namespace instead of the default PageProcessor behavior.
+ * The first and only parameter passed to the processing function will be the PageProcessor instance.
+ * @param string Namespace to process
+ * @param mixed Function address. Either a function name or an array of the form array(0 => mixed (string:class name or object), 1 => string:method)
+ */
+
+ function register_namespace_processor($namespace, $function)
+ {
+ if ( isset($this->namespace_processors[$namespace]) )
+ {
+ $processorname = ( is_string($this->namespace_processors[$namespace]) ) ?
+ $this->namespace_processors[$namespace] :
+ ( is_object($this->namespace_processors[$namespace][0]) ? get_class($this->namespace_processors[$namespace][0]) : $this->namespace_processors[$namespace][0] ) . '::' .
+ $this->namespace_processors[$namespace][1];
+
+ trigger_error("Namespace \"$namespace\" is already being processed by $processorname - replacing caller", E_USER_WARNING);
+ }
+ if ( !is_string($function) )
+ {
+ if ( !is_array($function) )
+ return false;
+ if ( count($function) != 2 )
+ return false;
+ if ( !is_string($function[0]) && !is_object($function[0]) )
+ return false;
+ if ( !is_string($function[1]) )
+ return false;
+ }
+
+ // security: don't allow Special or Admin namespaces to be overridden
+ if ( $namespace == 'Special' || $namespace == 'Admin' )
+ {
+ trigger_error("Security manager denied attempt to override processor for $namespace", E_USER_ERROR);
+ }
+
+ $this->namespace_processors[$namespace] = $function;
+ }
+
+ /**
+ * Returns a namespace processor if one exists, otherwise returns false.
+ * @param string Namespace
+ * @return mixed
+ */
+
+ function get_namespace_processor($namespace)
+ {
+ return ( isset($this->namespace_processors[$namespace]) ) ? $this->namespace_processors[$namespace] : false;
+ }
+
+ /**
+ * Fetches the page texts for searching
+ */
+
+ function fetch_page_search_texts()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $texts = Array();
+ $q = $db->sql_query('SELECT t.page_id,t.namespace,t.page_text,t.char_tag FROM '.table_prefix.'page_text AS t
+ LEFT JOIN '.table_prefix.'pages AS p
+ ON t.page_id=p.urlname
+ WHERE p.namespace=t.namespace
+ AND ( p.password=\'\' OR p.password=\'da39a3ee5e6b4b0d3255bfef95601890afd80709\' )
+ AND p.visible=1;'); // Only indexes "visible" pages
+
+ if( !$q )
+ {
+ return false;
+ }
+ while($row = $db->fetchrow())
+ {
+ $pid = $this->nslist[$row['namespace']] . $row['page_id'];
+ $texts[$pid] = $row['page_text'];
+ }
+ $db->free_result();
+
+ return $texts;
+ }
+
+ /**
+ * Generates an SQL query to grab all of the text
+ */
+
+ function fetch_page_search_resource()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ // sha1('') returns "da39a3ee5e6b4b0d3255bfef95601890afd80709"
+
+ $concat_column = ( ENANO_DBLAYER == 'MYSQL' ) ?
+ 'CONCAT(\'ns=\',t.namespace,\';pid=\',t.page_id)' :
+ "'ns=' || t.namespace || ';pid=' || t.page_id";
+
+ $texts = 'SELECT t.page_text, ' . $concat_column . ' AS page_idstring, t.page_id, t.namespace FROM '.table_prefix.'page_text AS t
+ LEFT JOIN '.table_prefix.'pages AS p
+ ON ( t.page_id=p.urlname AND t.namespace=p.namespace )
+ WHERE p.namespace=t.namespace
+ AND ( p.password=\'\' OR p.password=\'da39a3ee5e6b4b0d3255bfef95601890afd80709\' )
+ AND p.visible=1;'; // Only indexes "visible" pages
+ return $texts;
+ }
+
+ /**
+ * Builds a word list for search indexing.
+ * @param string Text to index
+ * @param string Page ID of the page being indexed
+ * @param string Title of the page being indexed
+ * @return array List of words
+ */
+
+ function calculate_word_list($text, $page_id, $page_name)
+ {
+ $page_id = dirtify_page_id($page_id);
+ $text = preg_replace('/[^a-z0-9\']/i', ' ', $text);
+ $page_id = preg_replace('/[^a-z0-9\']/i', ' ', $page_id);
+ $page_name = preg_replace('/[^a-z0-9\']/i', ' ', $page_name);
+ $text .= " $page_id $page_name";
+ $text = explode(' ', $text);
+ foreach ( $text as $i => &$word )
+ {
+ if ( strstr($word, "''") )
+ $word = preg_replace("/[']{2,}/", '', $word);
+ if ( strlen($word) < 2 )
+ unset($text[$i]);
+ }
+ $text = array_unique(array_values($text));
+ // for debugging purposes (usually XSS safe because of character stripping)
+ // echo ' ' . implode(' ', $text) . '
';
+ return $text;
+ }
+
+ /**
+ * Rebuilds the site's entire search index. Considerably more exciting if run from the command line.
+ * @param bool If true, verbose output.
+ * @param bool If true, verbose + debugging output.
+ */
+
+ function rebuild_search_index($verbose = false, $debug = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ require_once(ENANO_ROOT . '/includes/search.php');
+
+ $progress = false;
+ if ( class_exists('ProgressBar') )
+ {
+ // CLI only.
+ $progress = new ProgressBar('Rebuilding search index: [', ']', 'Initializing...', 'green', 'blue', 'white', 'yellow');
+ $verbose = false;
+ $debug = false;
+ $progress->start();
+ }
+
+ @set_time_limit(0);
+
+ $q = $db->sql_query('DELETE FROM ' . table_prefix . 'search_index;');
+ if ( !$q )
+ $db->_die();
+
+ $sha1_blank = sha1('');
+
+ //
+ // Index $pages_in_batch pages at a time
+ //
+ $pages_in_batch = 15;
+
+ // First find out how many pages there are
+ $q = $db->sql_query('SELECT COUNT(p.urlname) AS num_pages FROM ' . table_prefix . "page_text AS t\n"
+ . " LEFT JOIN " . table_prefix . "pages AS p\n"
+ . " ON ( p.urlname = t.page_id AND p.namespace = t.namespace )\n"
+ . " WHERE ( p.password = '' OR p.password = '$sha1_blank' )\n"
+ . " AND ( p.visible = 1 );");
+ if ( !$q )
+ $db->_die();
+
+ list($num_pages) = $db->fetchrow_num();
+ $num_pages = intval($num_pages);
+ $loops = ceil($num_pages / $pages_in_batch);
+ $master_word_list = array();
+ $stopwords = get_stopwords();
+
+ for ( $j = 0; $j < $loops; )
+ {
+ $offset = $j * $pages_in_batch;
+
+ $j++;
+
+ if ( $verbose && $debug )
+ {
+ echo "Running indexing round $j of $loops (offset $offset)\n" . ( isset($_SERVER['REQUEST_URI']) ? '
' : '' );
+ }
+
+ // this is friendly to both MySQL and PostgreSQL.
+ $texts = $db->sql_query('SELECT p.name, p.visible, t.page_id, t.namespace, t.page_text FROM ' . table_prefix . "page_text AS t\n"
+ . " LEFT JOIN " . table_prefix . "pages AS p\n"
+ . " ON ( p.urlname = t.page_id AND p.namespace = t.namespace )\n"
+ . " WHERE ( p.password = '' OR p.password = '$sha1_blank' )\n"
+ . " AND ( p.visible = 1 )\n"
+ . " LIMIT $pages_in_batch OFFSET $offset;", false);
+ if ( !$texts )
+ $db->_die();
+
+ $k = $offset;
+
+ if ( $row = $db->fetchrow($texts) )
+ {
+ do
+ {
+ $k++;
+ if ( $verbose )
+ {
+ $mu = memory_get_usage();
+ echo " Indexing page $k of $num_pages: {$row['namespace']}:{$row['page_id']}";
+ if ( $debug )
+ echo ", mem = $mu...";
+ flush();
+ }
+ else if ( is_object($progress) )
+ {
+ $progress->update_text_quiet("$k/$num_pages {$row['namespace']}:{$row['page_id']}");
+ $progress->set($k, $num_pages);
+ }
+
+ // skip this page if it's not supposed to be indexed
+ if ( $row['visible'] == 0 )
+ {
+ if ( $verbose )
+ {
+ echo "skipped";
+ if ( isset($_SERVER['REQUEST_URI']) )
+ echo '
';
+ echo "\n";
+ }
+ continue;
+ }
+
+ // Indexing identifier for the page in the DB
+ $page_uniqid = "ns={$row['namespace']};pid=" . sanitize_page_id($row['page_id']);
+ $page_uniqid = $db->escape($page_uniqid);
+
+ // List of words on the page
+ $wordlist = $this->calculate_word_list($row['page_text'], $row['page_id'], $row['name']);
+
+ // Index calculation complete -- run inserts
+ $inserts = array();
+ foreach ( $wordlist as $word )
+ {
+ if ( in_array($word, $stopwords) || strval(intval($word)) === $word || strlen($word) < 3 )
+ continue;
+ $word_db = $db->escape($word);
+ $word_db_lc = $db->escape(strtolower($word));
+ if ( !in_array($word, $master_word_list) )
+ {
+ $inserts[] = "( '$word_db', '$word_db_lc', '$page_uniqid' )";
+ }
+ else
+ {
+ if ( $verbose && $debug )
+ echo '.';
+ $pid_col = ( ENANO_DBLAYER == 'MYSQL' ) ?
+ "CONCAT( page_names, ',$page_uniqid' )":
+ "page_names || ',$page_uniqid'";
+ $q = $db->sql_query('UPDATE ' . table_prefix . "search_index SET page_names = $pid_col WHERE word = '$word_db';", false);
+ if ( !$q )
+ $db->_die();
+ }
+ }
+ if ( count($inserts) > 0 )
+ {
+ if ( $verbose && $debug )
+ echo 'i';
+ $inserts = implode(",\n ", $inserts);
+ $q = $db->sql_query('INSERT INTO ' . table_prefix . "search_index(word, word_lcase, page_names) VALUES\n $inserts;", false);
+ if ( !$q )
+ $db->_die();
+ }
+
+ $master_word_list = array_unique(array_merge($master_word_list, $wordlist));
+ if ( $verbose )
+ {
+ if ( isset($_SERVER['REQUEST_URI']) )
+ echo '
';
+ echo "\n";
+ }
+ unset($inserts, $wordlist, $page_uniqid, $word_db, $q, $word, $row);
+ }
+ while ( $row = $db->fetchrow($texts) );
+ }
+ $db->free_result($texts);
+ }
+ if ( $verbose )
+ {
+ echo "Indexing complete.";
+ if ( isset($_SERVER['REQUEST_URI']) )
+ echo '
';
+ echo "\n";
+ }
+ else if ( is_object($progress) )
+ {
+ $progress->update_text('Complete.');
+ $progress->end();
+ }
+ return true;
+ }
+
+ /**
+ * Partially rebuilds the search index, removing/inserting entries only for the current page
+ * @param string $page_id
+ * @param string $namespace
+ */
+
+ function rebuild_page_index($page_id, $namespace)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ require_once(ENANO_ROOT . '/includes/search.php');
+
+ if(!$db->sql_query('SELECT page_text FROM '.table_prefix.'page_text
+ WHERE page_id=\''.$db->escape($page_id).'\' AND namespace=\''.$db->escape($namespace).'\';'))
+ {
+ return $db->get_error();
+ }
+ if ( $db->numrows() < 1 )
+ return 'E: No rows';
+ $idstring = $this->nslist[$namespace] . sanitize_page_id($page_id);
+ if ( !isset($this->pages[$idstring]) )
+ {
+ return 'E: Can\'t find page metadata';
+ }
+ $row = $db->fetchrow();
+ $db->free_result();
+ $search = new Searcher();
+
+ // if the page shouldn't be indexed, send a blank set of strings to the indexing engine
+ if ( $this->pages[$idstring]['visible'] == 0 )
+ {
+ $search->buildIndex(Array("ns={$namespace};pid={$page_id}"=>''));
+ }
+ else
+ {
+ $search->buildIndex(Array("ns={$namespace};pid={$page_id}"=>$row['page_text'] . ' ' . $this->pages[$idstring]['name']));
+ }
+
+ $new_index = $search->index;
+
+ if ( count($search->index) == 0 )
+ // o_O
+ // nothing indexed.
+ return true;
+
+ if ( ENANO_DBLAYER == 'MYSQL' )
+ {
+ $keys = array_keys($search->index);
+ foreach($keys as $i => $k)
+ {
+ $c =& $keys[$i];
+ $c = hexencode($c, '', '');
+ }
+ $keys = "word=0x" . implode ( " OR word=0x", $keys ) . "";
+ }
+ else
+ {
+ $keys = array_keys($search->index);
+ foreach($keys as $i => $k)
+ {
+ $c =& $keys[$i];
+ $c = $db->escape($c);
+ }
+ $keys = "word='" . implode ( "' OR word='", $keys ) . "'";
+ }
+
+ $query = $db->sql_query('SELECT word,page_names FROM '.table_prefix.'search_index WHERE '.$keys.';');
+
+ while($row = $db->fetchrow())
+ {
+ $row['word'] = rtrim($row['word'], "\0");
+ $new_index[ $row['word'] ] = $row['page_names'] . ',' . $search->index[ $row['word'] ];
+ }
+ $db->free_result();
+
+ $db->sql_query('DELETE FROM '.table_prefix.'search_index WHERE '.$keys.';');
+
+ $secs = Array();
+ $q = 'INSERT INTO '.table_prefix.'search_index(word,word_lcase,page_names) VALUES';
+ foreach($new_index as $word => $pages)
+ {
+ $secs[] = '(\''.$db->escape($word).'\', \'' . $db->escape(strtolower($word)) . '\', \''.$db->escape($pages).'\')';
+ }
+ $q .= implode(',', $secs);
+ unset($secs);
+ $q .= ';';
+ if(!$db->check_query($q))
+ {
+ die('BUG: PathManager::rebuild_page_index: Query rejected by SQL parser:'.$q.'
');
+ }
+ $result = $db->sql_query($q);
+ if($result)
+ return true;
+ else
+ $db->_die('The search index was trying to rebuild itself when the error occured.');
+
+ }
+
+ /**
+ * Returns a list of groups that a given page is a member of.
+ * @param string Page ID
+ * @param string Namespace
+ * @return array
+ */
+
+ function get_page_groups($page_id, $namespace)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ static $cache = array();
+
+ if ( count($cache) == 0 )
+ {
+ foreach ( $this->nslist as $key => $_ )
+ {
+ $cache[$key] = array();
+ }
+ }
+
+ if ( !isset($this->nslist[$namespace]) )
+ die('$paths->get_page_groups(): HACKING ATTEMPT: namespace "'. htmlspecialchars($namespace) .'" doesn\'t exist');
+
+ $page_id_unescaped = $paths->nslist[$namespace] .
+ dirtify_page_id($page_id);
+ $page_id_str = $paths->nslist[$namespace] .
+ sanitize_page_id($page_id);
+
+ $page_id = $db->escape(sanitize_page_id($page_id));
+
+ if ( isset($cache[$namespace][$page_id]) )
+ {
+ return $cache[$namespace][$page_id];
+ }
+
+ $group_list = array();
+
+ // What linked categories have this page?
+ $q = $db->sql_unbuffered_query('SELECT g.pg_id, g.pg_type, g.pg_target FROM '.table_prefix.'page_groups AS g
+ LEFT JOIN '.table_prefix.'categories AS c
+ ON ( ( c.category_id = g.pg_target AND g.pg_type = ' . PAGE_GRP_CATLINK . ' ) OR c.category_id IS NULL )
+ LEFT JOIN '.table_prefix.'page_group_members AS m
+ ON ( ( g.pg_id = m.pg_id AND g.pg_type = ' . PAGE_GRP_NORMAL . ' ) OR ( m.pg_id IS NULL ) )
+ LEFT JOIN '.table_prefix.'tags AS t
+ ON ( ( t.tag_name = g.pg_target AND pg_type = ' . PAGE_GRP_TAGGED . ' ) OR t.tag_name IS NULL )
+ WHERE
+ ( c.page_id=\'' . $page_id . '\' AND c.namespace=\'' . $namespace . '\' ) OR
+ ( t.page_id=\'' . $page_id . '\' AND t.namespace=\'' . $namespace . '\' ) OR
+ ( m.page_id=\'' . $page_id . '\' AND m.namespace=\'' . $namespace . '\' ) OR
+ ( g.pg_type = ' . PAGE_GRP_REGEX . ' );');
+ if ( !$q )
+ $db->_die();
+
+ while ( $row = $db->fetchrow() )
+ {
+ if ( $row['pg_type'] == PAGE_GRP_REGEX )
+ {
+ //echo "<debug> matching page " . htmlspecialchars($page_id_unescaped) . " against regex " . htmlspecialchars($row['pg_target']) . ".";
+ if ( @preg_match($row['pg_target'], $page_id_unescaped) || @preg_match($row['pg_target'], $page_id_str) )
+ {
+ //echo "..matched";
+ $group_list[] = $row['pg_id'];
+ }
+ //echo "
";
+ }
+ else
+ {
+ $group_list[] = $row['pg_id'];
+ }
+ }
+
+ $db->free_result();
+
+ $cache[$namespace][$page_id] = $group_list;
+
+ return $group_list;
+
+ }
+
}
/**
@@ -1106,19 +1106,19 @@
function register_special_page($urlname, $name, $visible = true)
{
- global $paths;
-
- return $paths->add_page(Array(
- 'name' => $name,
- 'urlname' => $urlname,
- 'namespace' => 'Special',
- 'special' => 0,
- 'visible' => $visible ? 1 : 0,
- 'comments_on' => 0,
- 'protected' => 1,
- 'delvotes' => 0,
- 'delvote_ips' => '',
- ));
+ global $paths;
+
+ return $paths->add_page(Array(
+ 'name' => $name,
+ 'urlname' => $urlname,
+ 'namespace' => 'Special',
+ 'special' => 0,
+ 'visible' => $visible ? 1 : 0,
+ 'comments_on' => 0,
+ 'protected' => 1,
+ 'delvotes' => 0,
+ 'delvote_ips' => '',
+ ));
}
?>
diff -r de56132c008d -r bdac73ed481e includes/plugins.php
--- a/includes/plugins.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/plugins.php Sun Mar 28 23:10:46 2010 -0400
@@ -20,1111 +20,1111 @@
*/
class pluginLoader {
-
- /**
- * The list of hooks registered.
- * @var array
- * @access private
- */
-
- var $hook_list;
-
- /**
- * The list of plugins that should be loaded. Used only by common.php.
- * @var array
- * @access private
- */
-
- var $load_list;
-
- /**
- * The list of plugins that are loaded currently. This is only used by the loaded() method which in turn is
- * used by template files with the special tag.
- * @var array
- * @access private
- */
-
- var $loaded_plugins;
-
- /**
- * The list of plugins that are always loaded because they're part of the Enano core. This cannot be modified
- * by any external code because user plugins are loaded after the load_list is calculated. Can be useful in
- * alternative administration panel frameworks that need the list of system plugins.
- * @var array
- */
-
- var $system_plugins = Array('SpecialUserFuncs.php','SpecialUserPrefs.php','SpecialPageFuncs.php','SpecialAdmin.php','SpecialCSS.php','SpecialUpdownload.php','SpecialSearch.php','PrivateMessages.php','SpecialGroups.php', 'SpecialLog.php', 'DemoMode.php');
-
- /**
- * Name kept for compatibility. Effectively a constructor. Calculates the list of plugins that should be loaded
- * and puts that list in the $load_list property. Plugin developers have absolutely no use for this whatsoever.
- */
-
- function loadAll()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $GLOBALS['plugins_cache'] = array();
-
- // if we're in an upgrade, just skip this step
- if ( defined('IN_ENANO_UPGRADE') )
- {
- $this->load_list = array();
- return false;
- }
-
- $dir = ENANO_ROOT.'/plugins/';
-
- $plugin_list = $this->get_plugin_list();
- $this->load_list = array();
-
- foreach ( $plugin_list as $filename => $data )
- {
- if ( !$data['system plugin'] && ( $data['status'] & PLUGIN_OUTOFDATE || $data['status'] & PLUGIN_DISABLED || !$data['installed'] ) )
- continue;
-
- $this->load_list[] = $filename;
- $this->loaded_plugins[$filename] = $data;
- }
- }
-
- /**
- * Name kept for compatibility. This method is used to add a new hook into the code somewhere. Plugins are encouraged
- * to set hooks and hook into other plugins in a fail-safe way, this encourages reuse of code. Returns an array, whose
- * values should be eval'ed.
- * @example
- $code = $plugins->setHook('my_hook_name');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- * @param string The name of the hook.
- * @param array Deprecated.
- */
-
- function setHook($name, $dont_split = false)
- {
- if ( !empty($this->hook_list[$name]) && is_array($this->hook_list[$name]) )
- {
- if ( $dont_split )
- return $this->hook_list[$name];
-
- return array(implode("\n", $this->hook_list[$name]));
- }
- else
- {
- return Array();
- }
- }
-
- /**
- * Attaches to a hook effectively scheduling some code to be run at that point. You should try to keep hooks clean by
- * making a function that has variables that need to be modified passed by reference.
- * @example Simple example:
- $plugins->attachHook('render_wikiformat_pre', '$text = str_replace("Goodbye, Mr. Chips", "Hello, Mr. Carrots", $text);');
-
- * @example More complicated example:
- $plugins->attachHook('render_wikiformat_pre', 'myplugin_parser_ext($text);');
-
- // Notice that $text is passed by reference.
- function myplugin_parser_ext(&$text)
- {
- $text = str_replace("Goodbye, Mr. Chips", "Hello, Mr. Carrots", $text);
- }
-
- */
-
- function attachHook($name, $code)
- {
- if ( !isset($this->hook_list[$name]) )
- {
- $this->hook_list[$name] = Array();
- }
- $this->hook_list[$name][] = $code;
- }
-
- /**
- * Tell whether a plugin is loaded or not.
- * @param string The filename of the plugin
- * @return bool
- */
-
- function loaded($plugid)
- {
- return isset( $this->loaded_plugins[$plugid] );
- }
-
- /**
- * Parses all special comment blocks in a plugin and returns an array in the format:
-
- array(
- 0 => array(
- 'block' => 'upgrade',
- // parsed from the block's parameters section
- 'release_from' => '1.0b1',
- 'release_to' => '1.0b2',
- 'value' => 'foo'
- ),
- 1 => array(
- ...
- )
- );
-
- * @param string Path to plugin file
- * @param string Optional. The type of block to fetch. If this is specified, only the block type specified will be read, all others will be discarded.
- * @return array
- */
-
- public static function parse_plugin_blocks($file, $type = false)
- {
- if ( !file_exists($file) )
- {
- return array();
- }
- $blocks = array();
- $contents = @file_get_contents($file);
- if ( empty($contents) )
- {
- return array();
- }
-
- // The "\r?" in this regular expression is the result of an embarrassing failure during a job related meeting.
- // I was demoing the authoring of an Enano plugin and simply could not figure out why the plugin would not
- // show up in the admin panel.
+
+ /**
+ * The list of hooks registered.
+ * @var array
+ * @access private
+ */
+
+ var $hook_list;
+
+ /**
+ * The list of plugins that should be loaded. Used only by common.php.
+ * @var array
+ * @access private
+ */
+
+ var $load_list;
+
+ /**
+ * The list of plugins that are loaded currently. This is only used by the loaded() method which in turn is
+ * used by template files with the special tag.
+ * @var array
+ * @access private
+ */
+
+ var $loaded_plugins;
+
+ /**
+ * The list of plugins that are always loaded because they're part of the Enano core. This cannot be modified
+ * by any external code because user plugins are loaded after the load_list is calculated. Can be useful in
+ * alternative administration panel frameworks that need the list of system plugins.
+ * @var array
+ */
+
+ var $system_plugins = Array('SpecialUserFuncs.php','SpecialUserPrefs.php','SpecialPageFuncs.php','SpecialAdmin.php','SpecialCSS.php','SpecialUpdownload.php','SpecialSearch.php','PrivateMessages.php','SpecialGroups.php', 'SpecialLog.php', 'DemoMode.php');
+
+ /**
+ * Name kept for compatibility. Effectively a constructor. Calculates the list of plugins that should be loaded
+ * and puts that list in the $load_list property. Plugin developers have absolutely no use for this whatsoever.
+ */
+
+ function loadAll()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $GLOBALS['plugins_cache'] = array();
+
+ // if we're in an upgrade, just skip this step
+ if ( defined('IN_ENANO_UPGRADE') )
+ {
+ $this->load_list = array();
+ return false;
+ }
+
+ $dir = ENANO_ROOT.'/plugins/';
+
+ $plugin_list = $this->get_plugin_list();
+ $this->load_list = array();
+
+ foreach ( $plugin_list as $filename => $data )
+ {
+ if ( !$data['system plugin'] && ( $data['status'] & PLUGIN_OUTOFDATE || $data['status'] & PLUGIN_DISABLED || !$data['installed'] ) )
+ continue;
+
+ $this->load_list[] = $filename;
+ $this->loaded_plugins[$filename] = $data;
+ }
+ }
+
+ /**
+ * Name kept for compatibility. This method is used to add a new hook into the code somewhere. Plugins are encouraged
+ * to set hooks and hook into other plugins in a fail-safe way, this encourages reuse of code. Returns an array, whose
+ * values should be eval'ed.
+ * @example
+ $code = $plugins->setHook('my_hook_name');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ * @param string The name of the hook.
+ * @param array Deprecated.
+ */
+
+ function setHook($name, $dont_split = false)
+ {
+ if ( !empty($this->hook_list[$name]) && is_array($this->hook_list[$name]) )
+ {
+ if ( $dont_split )
+ return $this->hook_list[$name];
+
+ return array(implode("\n", $this->hook_list[$name]));
+ }
+ else
+ {
+ return Array();
+ }
+ }
+
+ /**
+ * Attaches to a hook effectively scheduling some code to be run at that point. You should try to keep hooks clean by
+ * making a function that has variables that need to be modified passed by reference.
+ * @example Simple example:
+ $plugins->attachHook('render_wikiformat_pre', '$text = str_replace("Goodbye, Mr. Chips", "Hello, Mr. Carrots", $text);');
+
+ * @example More complicated example:
+ $plugins->attachHook('render_wikiformat_pre', 'myplugin_parser_ext($text);');
+
+ // Notice that $text is passed by reference.
+ function myplugin_parser_ext(&$text)
+ {
+ $text = str_replace("Goodbye, Mr. Chips", "Hello, Mr. Carrots", $text);
+ }
+
+ */
+
+ function attachHook($name, $code)
+ {
+ if ( !isset($this->hook_list[$name]) )
+ {
+ $this->hook_list[$name] = Array();
+ }
+ $this->hook_list[$name][] = $code;
+ }
+
+ /**
+ * Tell whether a plugin is loaded or not.
+ * @param string The filename of the plugin
+ * @return bool
+ */
+
+ function loaded($plugid)
+ {
+ return isset( $this->loaded_plugins[$plugid] );
+ }
+
+ /**
+ * Parses all special comment blocks in a plugin and returns an array in the format:
+
+ array(
+ 0 => array(
+ 'block' => 'upgrade',
+ // parsed from the block's parameters section
+ 'release_from' => '1.0b1',
+ 'release_to' => '1.0b2',
+ 'value' => 'foo'
+ ),
+ 1 => array(
+ ...
+ )
+ );
+
+ * @param string Path to plugin file
+ * @param string Optional. The type of block to fetch. If this is specified, only the block type specified will be read, all others will be discarded.
+ * @return array
+ */
+
+ public static function parse_plugin_blocks($file, $type = false)
+ {
+ if ( !file_exists($file) )
+ {
+ return array();
+ }
+ $blocks = array();
+ $contents = @file_get_contents($file);
+ if ( empty($contents) )
+ {
+ return array();
+ }
+
+ // The "\r?" in this regular expression is the result of an embarrassing failure during a job related meeting.
+ // I was demoing the authoring of an Enano plugin and simply could not figure out why the plugin would not
+ // show up in the admin panel.
- $regexp = '#^/\*\*!([a-z0-9_]+)' // block header and type
- . '(([\s]+[a-z0-9_]+[\s]*=[\s]*".+?"[\s]*;)*)' // parameters
- . '[\s]*\*\*' . "\r?\n" // spacing and header close
- . '([\w\W]+?)' . "\r?\n" // value
- . '\*\*!\*/' // closing comment
- . '#m';
-
- // Match out all blocks
- $results = preg_match_all($regexp, $contents, $blocks);
-
- $return = array();
- foreach ( $blocks[0] as $i => $_ )
- {
- if ( is_string($type) && $blocks[1][$i] !== $type )
- continue;
-
- $value =& $blocks[4][$i];
- // parse includes
- preg_match_all('/^!include [\'"]?(.+?)[\'"]?$/m', $value, $includes);
- foreach ( $includes[0] as $i => $replace )
- {
- $filename = ENANO_ROOT . '/' . $includes[1][$i];
- if ( @file_exists( $filename ) && @is_readable( $filename ) )
- {
- $contents = @file_get_contents($filename);
- $value = str_replace_once($replace, $contents, $value);
- }
- }
-
- $el = self::parse_vars($blocks[2][$i]);
- $el['block'] = $blocks[1][$i];
- $el['value'] = $value;
- $return[] = $el;
- }
-
- return $return;
- }
-
- private static function parse_vars($var_block)
- {
- preg_match_all('/[\s]+([a-z0-9_]+)[\s]*=[\s]*"(.+?)";/', $var_block, $matches);
- $return = array();
- foreach ( $matches[0] as $i => $_ )
- {
- $return[ $matches[1][$i] ] = $matches[2][$i];
- }
- return $return;
- }
-
- /**
- * Reads all plugins in the filesystem and cross-references them with the database, providing a very complete summary of plugins
- * on the site.
- * @param array If specified, will restrict scanned files to this list. Defaults to null, which means all PHP files will be scanned.
- * @param bool If true, allows using cached information. Defaults to true.
- * @return array
- */
-
- function get_plugin_list($restrict = null, $use_cache = true)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- // Scan all plugins
- $plugin_list = array();
- $ta = 0;
- // won't load twice (failsafe automatic skip)
- $this->load_plugins_cache();
- global $plugins_cache;
- if ( $use_cache && !empty($plugins_cache) )
- {
- return $plugins_cache;
- }
- else
- {
- // blank array - effectively skips importing the cache
- $plugins_cache = array();
- }
-
- // List all plugins
- if ( $dirh = @opendir( ENANO_ROOT . '/plugins' ) )
- {
- while ( $dh = @readdir($dirh) )
- {
- if ( !preg_match('/\.php$/i', $dh) )
- continue;
-
- if ( is_array($restrict) )
- if ( !in_array($dh, $restrict) )
- continue;
-
- // it's a PHP file, attempt to read metadata
- $fullpath = ENANO_ROOT . "/plugins/$dh";
- $plugin_meta = $this->read_plugin_headers($fullpath, $use_cache);
-
- if ( is_array($plugin_meta) )
- {
- // all checks passed
- $plugin_list[$dh] = $plugin_meta;
- }
- }
- }
-
- // Populate with additional metadata from database
- $q = $db->sql_query('SELECT plugin_id, plugin_filename, plugin_version, plugin_flags FROM ' . table_prefix . 'plugins;');
- if ( !$q )
- $db->_die();
- while ( $row = $db->fetchrow() )
- {
- if ( !isset($plugin_list[ $row['plugin_filename'] ]) )
- {
- // missing plugin file, don't report (for now)
- continue;
- }
- $filename =& $row['plugin_filename'];
- $plugin_list[$filename]['installed'] = true;
- $plugin_list[$filename]['status'] = PLUGIN_INSTALLED;
- $plugin_list[$filename]['plugin id'] = $row['plugin_id'];
- if ( $row['plugin_version'] != $plugin_list[$filename]['version'] )
- {
- $plugin_list[$filename]['status'] |= PLUGIN_OUTOFDATE;
- $plugin_list[$filename]['version installed'] = $row['plugin_version'];
- }
- if ( $row['plugin_flags'] & PLUGIN_DISABLED )
- {
- $plugin_list[$filename]['status'] |= PLUGIN_DISABLED;
- }
- }
- $db->free_result();
-
- // sort it all out by filename
- ksort($plugin_list);
-
- // done
- return $plugin_list;
- }
-
- /**
- * Retrieves the metadata block from a plugin file
- * @param string Path to plugin file (full path)
- * @return array
- */
-
- function read_plugin_headers($fullpath, $use_cache = true)
- {
- global $plugins_cache;
- $dh = basename($fullpath);
-
- // first can we use cached info?
- if ( isset($plugins_cache[$dh]) && $plugins_cache[$dh]['file md5'] === $this->md5_header($fullpath) )
- {
- $plugin_meta = $plugins_cache[$dh];
- }
- else
- {
- // the cache is out of date if we reached here -- regenerate
- if ( $use_cache )
- $this->generate_plugins_cache();
-
- // pass 1: try to read a !info block
- $blockdata = $this->parse_plugin_blocks($fullpath, 'info');
- if ( empty($blockdata) )
- {
- // no !info block, check for old header
- $fh = @fopen($fullpath, 'r');
- if ( !$fh )
- // can't read, bail out
- return false;
- $plugin_data = array();
- for ( $i = 0; $i < 8; $i++ )
- {
- $plugin_data[] = @fgets($fh, 8096);
- }
- // close our file handle
- fclose($fh);
- // is the header correct?
- if ( trim($plugin_data[0]) != ' $value )
- {
- $plugin_meta[ strtolower($key) ] = $value;
- }
- }
- }
- if ( !isset($plugin_meta) || !is_array(@$plugin_meta) )
- {
- // parsing didn't work.
- return false;
- }
- // check for required keys
- $required_keys = array('plugin name', 'plugin uri', 'description', 'author', 'version', 'author uri');
- foreach ( $required_keys as $key )
- {
- if ( !isset($plugin_meta[$key]) )
- // not set, skip this plugin
- return false;
- }
- // decide if it's a system plugin
- $plugin_meta['system plugin'] = in_array($dh, $this->system_plugins);
- // reset installed variable
- $plugin_meta['installed'] = false;
- $plugin_meta['status'] = 0;
-
- return $plugin_meta;
- }
-
-
- /**
- * Attempts to cache plugin information in a file to speed fetching.
- */
-
- function generate_plugins_cache()
- {
- if ( getConfig('cache_thumbs') != '1' )
- return;
-
- // fetch the most current info
- $plugin_info = $this->get_plugin_list(null, false);
- foreach ( $plugin_info as $plugin => &$info )
- {
- $info['file md5'] = $this->md5_header(ENANO_ROOT . "/plugins/$plugin");
- }
-
- $this->update_plugins_cache($plugin_info);
- $GLOBALS['plugins_cache'] = $plugin_info;
-
- return true;
- }
-
- /**
- * Writes an information array to the cache file.
- * @param array
- * @access private
- */
-
- function update_plugins_cache($plugin_info)
- {
- global $cache;
- try
- {
- $result = $cache->store('plugins', $plugin_info, -1);
- }
- catch ( Exception $e )
- {
- return false;
- }
- return $result;
- }
-
- /**
- * Loads the plugins cache if any.
- */
-
- function load_plugins_cache()
- {
- global $cache;
- if ( $data = $cache->fetch('plugins') )
- {
- $GLOBALS['plugins_cache'] = $data;
- }
- }
-
- /**
- * Calculates the MD5 sum of the first 10 lines of a file. Useful for caching plugin header information.
- * @param string File
- * @return string
- */
-
- function md5_header($file)
- {
- $fh = @fopen($file, 'r');
- if ( !$fh )
- return false;
- $i = 0;
- $h = '';
- while ( $i < 10 )
- {
- $line = fgets($fh, 8096);
- $h .= $line . "\n";
- $i++;
- }
- fclose($fh);
- return md5($h);
- }
-
- /**
- * Determines if a file is an authentication extension by looking at the file contents.
- * @param string Plugin filename
- * @return bool
- */
-
- function is_file_auth_plugin($filename)
- {
- $filename = ENANO_ROOT . '/plugins/' . $filename;
- if ( !file_exists($filename) )
- return false;
-
- $info = $this->read_plugin_headers($filename);
- if ( isset($info['auth plugin']) )
- return true;
-
- $contents = @file_get_contents($filename);
- if ( strstr($contents, 'login_process_userdata_json') )
- return true;
-
- return false;
- }
-
- /**
- * Installs a plugin.
- * @param string Filename of plugin.
- * @param array The list of plugins as output by pluginLoader::get_plugin_list(). If not passed, the function is called, possibly wasting time.
- * @return array JSON-formatted but not encoded response
- */
-
- function install_plugin($filename, $plugin_list = null)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- global $cache;
-
- if ( defined('ENANO_DEMO_MODE') )
- {
- return array(
- 'mode' => 'error',
- 'error' => $lang->get('acppl_err_demo_mode')
- );
- }
-
- if ( !$plugin_list )
- $plugin_list = $this->get_plugin_list();
-
- // we're gonna need this
- require_once ( ENANO_ROOT . '/includes/sql_parse.php' );
-
- switch ( true ): case true:
-
- // is the plugin in the directory and awaiting installation?
- if ( !isset($plugin_list[$filename]) || (
- isset($plugin_list[$filename]) && $plugin_list[$filename]['installed']
- ))
- {
- $return = array(
- 'mode' => 'error',
- 'error' => 'Invalid plugin specified.',
- 'debug' => $filename
- );
- break;
- }
-
- $dataset =& $plugin_list[$filename];
-
- // load up the installer schema
- $schema = $this->parse_plugin_blocks( ENANO_ROOT . '/plugins/' . $filename, 'install' );
-
- $sql = array();
- global $dbdriver;
- if ( !empty($schema) )
- {
- // Decide which schema to use
- $use_schema = false;
- foreach ( $schema as $current_schema )
- {
- if ( isset($current_schema['dbms']) && $current_schema['dbms'] === $dbdriver )
- {
- $use_schema =& $current_schema['value'];
- break;
- }
- }
- if ( !$use_schema )
- {
- if ( !isset($schema[0]['dbms']) )
- {
- $use_schema =& $schema[0]['value'];
- }
- else
- {
- $return = array(
- 'mode' => 'error',
- 'error' => $lang->get('acppl_err_dmbs_not_supported', array('dbdriver' => $db->dbms_name))
- );
- break;
- }
- }
- // parse SQL
- $parser = new SQL_Parser($use_schema, true);
- $parser->assign_vars(array(
- 'TABLE_PREFIX' => table_prefix
- ));
- $sql = $parser->parse();
- }
-
- // schema is final, check queries
- foreach ( $sql as $query )
- {
- if ( !$db->check_query($query) )
- {
- // aww crap, a query is bad
- $return = array(
- 'mode' => 'error',
- 'error' => $lang->get('acppl_err_upgrade_bad_query'),
- );
- break 2;
- }
- }
-
- // this is it, perform installation
- foreach ( $sql as $query )
- {
- if ( substr($query, 0, 1) == '@' )
- {
- $query = substr($query, 1);
- $db->sql_query($query);
- }
- else
- {
- if ( !$db->sql_query($query) )
- {
- $return = array(
- 'mode' => 'error',
- 'error' => "[SQL] " . $db->sql_error()
- );
- break 2;
- }
- }
- }
-
- // log action
- $time = time();
- $ip_db = $db->escape($_SERVER['REMOTE_ADDR']);
- $username_db = $db->escape($session->username);
- $file_db = $db->escape($filename);
- $q = $db->sql_query('INSERT INTO '.table_prefix."logs(log_type, action, time_id, edit_summary, author, author_uid, page_text) VALUES\n"
- . " ('security', 'plugin_install', $time, '$ip_db', '$username_db', $session->user_id, '$file_db');");
- if ( !$q )
- $db->_die();
-
- // register plugin
- $version_db = $db->escape($dataset['version']);
- $filename_db = $db->escape($filename);
- $flags = PLUGIN_INSTALLED;
-
- $q = $db->sql_query('INSERT INTO ' . table_prefix . "plugins ( plugin_version, plugin_filename, plugin_flags )\n"
- . " VALUES ( '$version_db', '$filename_db', $flags );");
- if ( !$q )
- $db->die_json();
-
- $plugin_list[$filename]['installed'] = true;
- $this->reimport_plugin_strings($filename, $plugin_list);
-
- $return = array(
- 'success' => true
- );
-
- endswitch;
-
- $cache->purge('plugins');
- $cache->purge('page_meta');
- $cache->purge('anon_sidebar');
-
- return $return;
- }
-
- /**
- * Uninstalls a plugin, removing it completely from the database and calling any custom uninstallation code the plugin specifies.
- * @param string Filename of plugin.
- * @param array The list of plugins as output by pluginLoader::get_plugin_list(). If not passed, the function is called, possibly wasting time.
- * @return array JSON-formatted but not encoded response
- */
-
- function uninstall_plugin($filename, $plugin_list = null)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- global $cache;
-
- if ( defined('ENANO_DEMO_MODE') )
- {
- return array(
- 'mode' => 'error',
- 'error' => $lang->get('acppl_err_demo_mode')
- );
- }
-
- if ( !$plugin_list )
- $plugin_list = $this->get_plugin_list();
-
- // we're gonna need this
- require_once ( ENANO_ROOT . '/includes/sql_parse.php' );
-
- switch ( true ): case true:
-
- // is the plugin in the directory and already installed?
- if ( !isset($plugin_list[$filename]) || (
- isset($plugin_list[$filename]) && !$plugin_list[$filename]['installed']
- ))
- {
- $return = array(
- 'mode' => 'error',
- 'error' => 'Invalid plugin specified.',
- );
- break;
- }
- // get plugin id
- $dataset =& $plugin_list[$filename];
- if ( empty($dataset['plugin id']) )
- {
- $return = array(
- 'mode' => 'error',
- 'error' => 'Couldn\'t retrieve plugin ID.',
- );
- break;
- }
-
- // load up the installer schema
- $schema = $this->parse_plugin_blocks( ENANO_ROOT . '/plugins/' . $filename, 'uninstall' );
-
- $sql = array();
- global $dbdriver;
- if ( !empty($schema) )
- {
- // Decide which schema to use
- $use_schema = false;
- foreach ( $schema as $current_schema )
- {
- if ( isset($current_schema['dbms']) && $current_schema['dbms'] === $dbdriver )
- {
- $use_schema =& $current_schema['value'];
- break;
- }
- }
- if ( !$use_schema )
- {
- if ( !isset($schema[0]['dbms']) )
- {
- $use_schema =& $schema[0]['value'];
- }
- else
- {
- $return = array(
- 'mode' => 'error',
- 'error' => $lang->get('acppl_err_dmbs_not_supported', array('dbdriver' => $db->dbms_name))
- );
- break;
- }
- }
- // parse SQL
- $parser = new SQL_Parser($use_schema, true);
- $parser->assign_vars(array(
- 'TABLE_PREFIX' => table_prefix
- ));
- $sql = $parser->parse();
- }
-
- // schema is final, check queries
- foreach ( $sql as $query )
- {
- if ( !$db->check_query($query) )
- {
- // aww crap, a query is bad
- $return = array(
- 'mode' => 'error',
- 'error' => $lang->get('acppl_err_upgrade_bad_query'),
- );
- break 2;
- }
- }
-
- // this is it, perform uninstallation
- foreach ( $sql as $query )
- {
- if ( substr($query, 0, 1) == '@' )
- {
- $query = substr($query, 1);
- $db->sql_query($query);
- }
- else
- {
- if ( !$db->sql_query($query) )
- {
- $return = array(
- 'mode' => 'error',
- 'error' => "[SQL] " . $db->sql_error()
- );
- break 2;
- }
- }
- }
-
- // log action
- $time = time();
- $ip_db = $db->escape($_SERVER['REMOTE_ADDR']);
- $username_db = $db->escape($session->username);
- $file_db = $db->escape($filename);
- $q = $db->sql_query('INSERT INTO '.table_prefix."logs(log_type, action, time_id, edit_summary, author, author_uid, page_text) VALUES\n"
- . " ('security', 'plugin_uninstall', $time, '$ip_db', '$username_db', $session->user_id, '$file_db');");
- if ( !$q )
- $db->_die();
-
- // deregister plugin
- $q = $db->sql_query('DELETE FROM ' . table_prefix . "plugins WHERE plugin_id = {$dataset['plugin id']};");
- if ( !$q )
- $db->die_json();
-
- $return = array(
- 'success' => true
- );
-
- endswitch;
-
- $cache->purge('plugins');
- $cache->purge('page_meta');
- $cache->purge('anon_sidebar');
-
- return $return;
- }
-
- /**
- * Very intelligently upgrades a plugin to the version specified in the filesystem.
- * @param string Filename of plugin.
- * @param array The list of plugins as output by pluginLoader::get_plugin_list(). If not passed, the function is called, possibly wasting time.
- * @return array JSON-formatted but not encoded response
- */
-
- function upgrade_plugin($filename, $plugin_list = null)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang, $cache;
-
- if ( !$plugin_list )
- $plugin_list = $this->get_plugin_list();
-
- // we're gonna need this
- require_once ( ENANO_ROOT . '/includes/sql_parse.php' );
-
- switch ( true ): case true:
-
- // is the plugin in the directory and already installed?
- if ( !isset($plugin_list[$filename]) || (
- isset($plugin_list[$filename]) && !$plugin_list[$filename]['installed']
- ))
- {
- $return = array(
- 'mode' => 'error',
- 'error' => 'Invalid plugin specified.',
- );
- break;
- }
- // get plugin id
- $dataset =& $plugin_list[$filename];
- if ( empty($dataset['plugin id']) )
- {
- $return = array(
- 'mode' => 'error',
- 'error' => 'Couldn\'t retrieve plugin ID.',
- );
- break;
- }
-
- //
- // Here we go with the main upgrade process. This is the same logic that the
- // Enano official upgrader uses, in fact it's the same SQL parser. We need
- // list of all versions of the plugin to continue, though.
- //
-
- if ( !isset($dataset['version list']) || ( isset($dataset['version list']) && !is_array($dataset['version list']) ) )
- {
- // no version list - update the version number but leave the rest alone
- $version = $db->escape($dataset['version']);
- $q = $db->sql_query('UPDATE ' . table_prefix . "plugins SET plugin_version = '$version' WHERE plugin_id = {$dataset['plugin id']};");
- if ( !$q )
- $db->die_json();
-
- // send an error and notify the user even though it was technically a success
- $return = array(
- 'mode' => 'error',
- 'error' => $lang->get('acppl_err_upgrade_not_supported'),
- );
- break;
- }
-
- // build target list
- $versions = $dataset['version list'];
- $indices = array_flip($versions);
- $installed = $dataset['version installed'];
-
- // is the current version upgradeable?
- if ( !isset($indices[$installed]) )
- {
- $return = array(
- 'mode' => 'error',
- 'error' => $lang->get('acppl_err_upgrade_bad_version'),
- );
- break;
- }
-
- // does the plugin support upgrading to its own version?
- if ( !isset($indices[$installed]) )
- {
- $return = array(
- 'mode' => 'error',
- 'error' => $lang->get('acppl_err_upgrade_bad_target_version'),
- );
- break;
- }
-
- // list out which versions to do
- $index_start = @$indices[$installed];
- $index_stop = @$indices[$dataset['version']];
-
- // Are we trying to go backwards?
- if ( $index_stop <= $index_start )
- {
- $return = array(
- 'mode' => 'error',
- 'error' => $lang->get('acppl_err_upgrade_to_older'),
- // 'debug' => "going from $installed ($index_start) to {$dataset['version']} ($index_stop)"
- );
- break;
- }
-
- // build the list of version sets
- $ver_previous = $installed;
- $targets = array();
- for ( $i = $index_start; $i <= $index_stop; $i++ )
- {
- $targets[] = array($ver_previous, $versions[$i]);
- $ver_previous = $versions[$i];
- }
-
- // parse out upgrade sections in plugin file
- $plugin_blocks = $this->parse_plugin_blocks( ENANO_ROOT . '/plugins/' . $filename, 'upgrade' );
- $sql_blocks = array();
- foreach ( $plugin_blocks as $block )
- {
- if ( !isset($block['from']) || !isset($block['to']) )
- {
- continue;
- }
- $key = "{$block['from']} TO {$block['to']}";
- $sql_blocks[$key] = $block['value'];
- }
-
- // do version list check
- // for now we won't fret if a specific version set isn't found, we'll just
- // not do that version and assume there were no DB changes.
- foreach ( $targets as $i => $target )
- {
- list($from, $to) = $target;
- $key = "$from TO $to";
- if ( !isset($sql_blocks[$key]) )
- {
- unset($targets[$i]);
- }
- }
- $targets = array_values($targets);
-
- // parse and finalize schema
- $schema = array();
- foreach ( $targets as $i => $target )
- {
- list($from, $to) = $target;
- $key = "$from TO $to";
- try
- {
- $parser = new SQL_Parser($sql_blocks[$key], true);
- }
- catch ( Exception $e )
- {
- $return = array(
- 'mode' => 'error',
- 'error' => 'SQL parser init exception',
- 'debug' => "$e"
- );
- break 2;
- }
- $parser->assign_vars(array(
- 'TABLE_PREFIX' => table_prefix
- ));
- $parsed = $parser->parse();
- foreach ( $parsed as $query )
- {
- $schema[] = $query;
- }
- }
-
- // schema is final, check queries
- foreach ( $schema as $query )
- {
- if ( !$db->check_query($query) )
- {
- // aww crap, a query is bad
- $return = array(
- 'mode' => 'error',
- 'error' => $lang->get('acppl_err_upgrade_bad_query'),
- );
- break 2;
- }
- }
-
- // this is it, perform upgrade
- foreach ( $schema as $query )
- {
- if ( substr($query, 0, 1) == '@' )
- {
- $query = substr($query, 1);
- $db->sql_query($query);
- }
- else
- {
- if ( !$db->sql_query($query) )
- {
- $return = array(
- 'mode' => 'error',
- 'error' => "[SQL] " . $db->sql_error()
- );
- break 2;
- }
- }
- }
-
- // log action
- $time = time();
- $ip_db = $db->escape($_SERVER['REMOTE_ADDR']);
- $username_db = $db->escape($session->username);
- $file_db = $db->escape($filename);
- $q = $db->sql_query('INSERT INTO '.table_prefix."logs(log_type, action, time_id, edit_summary, author, author_uid, page_text) VALUES\n"
- . " ('security', 'plugin_upgrade', $time, '$ip_db', '$username_db', $session->user_id, '$file_db');");
- if ( !$q )
- $db->_die();
-
- // update version number
- $version = $db->escape($dataset['version']);
- $q = $db->sql_query('UPDATE ' . table_prefix . "plugins SET plugin_version = '$version' WHERE plugin_id = {$dataset['plugin id']};");
- if ( !$q )
- $db->die_json();
-
- // all done :-)
- $return = array(
- 'success' => true
- );
-
- endswitch;
-
- $cache->purge('plugins');
- $cache->purge('page_meta');
- $cache->purge('anon_sidebar');
-
- return $return;
- }
-
- /**
- * Re-imports the language strings from a plugin.
- * @param string File name
- * @return array Enano JSON response protocol
- */
-
- function reimport_plugin_strings($filename, $plugin_list = null)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- if ( !$plugin_list )
- $plugin_list = $this->get_plugin_list();
-
- switch ( true ): case true:
-
- // is the plugin in the directory and already installed?
- if ( !isset($plugin_list[$filename]) || (
- isset($plugin_list[$filename]) && !$plugin_list[$filename]['installed']
- ))
- {
- $return = array(
- 'mode' => 'error',
- 'error' => 'Invalid plugin specified.',
- );
- break;
- }
- // get plugin data
- $dataset =& $plugin_list[$filename];
-
- // check for a language block
- $blocks = self::parse_plugin_blocks(ENANO_ROOT . '/plugins/' . $filename, 'language');
- if ( count($blocks) < 1 )
- {
- return array(
- 'mode' => 'error',
- 'error' => $lang->get('acppl_err_import_no_strings')
- );
- }
-
- $result = $lang->import_plugin(ENANO_ROOT . '/plugins/' . $filename);
- if ( $result )
- {
- return array(
- 'success' => true
- );
- }
- else
- {
- return array(
- 'mode' => 'error',
- 'error' => 'Language API returned error'
- );
- }
-
- endswitch;
- }
+ $regexp = '#^/\*\*!([a-z0-9_]+)' // block header and type
+ . '(([\s]+[a-z0-9_]+[\s]*=[\s]*".+?"[\s]*;)*)' // parameters
+ . '[\s]*\*\*' . "\r?\n" // spacing and header close
+ . '([\w\W]+?)' . "\r?\n" // value
+ . '\*\*!\*/' // closing comment
+ . '#m';
+
+ // Match out all blocks
+ $results = preg_match_all($regexp, $contents, $blocks);
+
+ $return = array();
+ foreach ( $blocks[0] as $i => $_ )
+ {
+ if ( is_string($type) && $blocks[1][$i] !== $type )
+ continue;
+
+ $value =& $blocks[4][$i];
+ // parse includes
+ preg_match_all('/^!include [\'"]?(.+?)[\'"]?$/m', $value, $includes);
+ foreach ( $includes[0] as $i => $replace )
+ {
+ $filename = ENANO_ROOT . '/' . $includes[1][$i];
+ if ( @file_exists( $filename ) && @is_readable( $filename ) )
+ {
+ $contents = @file_get_contents($filename);
+ $value = str_replace_once($replace, $contents, $value);
+ }
+ }
+
+ $el = self::parse_vars($blocks[2][$i]);
+ $el['block'] = $blocks[1][$i];
+ $el['value'] = $value;
+ $return[] = $el;
+ }
+
+ return $return;
+ }
+
+ private static function parse_vars($var_block)
+ {
+ preg_match_all('/[\s]+([a-z0-9_]+)[\s]*=[\s]*"(.+?)";/', $var_block, $matches);
+ $return = array();
+ foreach ( $matches[0] as $i => $_ )
+ {
+ $return[ $matches[1][$i] ] = $matches[2][$i];
+ }
+ return $return;
+ }
+
+ /**
+ * Reads all plugins in the filesystem and cross-references them with the database, providing a very complete summary of plugins
+ * on the site.
+ * @param array If specified, will restrict scanned files to this list. Defaults to null, which means all PHP files will be scanned.
+ * @param bool If true, allows using cached information. Defaults to true.
+ * @return array
+ */
+
+ function get_plugin_list($restrict = null, $use_cache = true)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ // Scan all plugins
+ $plugin_list = array();
+ $ta = 0;
+ // won't load twice (failsafe automatic skip)
+ $this->load_plugins_cache();
+ global $plugins_cache;
+ if ( $use_cache && !empty($plugins_cache) )
+ {
+ return $plugins_cache;
+ }
+ else
+ {
+ // blank array - effectively skips importing the cache
+ $plugins_cache = array();
+ }
+
+ // List all plugins
+ if ( $dirh = @opendir( ENANO_ROOT . '/plugins' ) )
+ {
+ while ( $dh = @readdir($dirh) )
+ {
+ if ( !preg_match('/\.php$/i', $dh) )
+ continue;
+
+ if ( is_array($restrict) )
+ if ( !in_array($dh, $restrict) )
+ continue;
+
+ // it's a PHP file, attempt to read metadata
+ $fullpath = ENANO_ROOT . "/plugins/$dh";
+ $plugin_meta = $this->read_plugin_headers($fullpath, $use_cache);
+
+ if ( is_array($plugin_meta) )
+ {
+ // all checks passed
+ $plugin_list[$dh] = $plugin_meta;
+ }
+ }
+ }
+
+ // Populate with additional metadata from database
+ $q = $db->sql_query('SELECT plugin_id, plugin_filename, plugin_version, plugin_flags FROM ' . table_prefix . 'plugins;');
+ if ( !$q )
+ $db->_die();
+ while ( $row = $db->fetchrow() )
+ {
+ if ( !isset($plugin_list[ $row['plugin_filename'] ]) )
+ {
+ // missing plugin file, don't report (for now)
+ continue;
+ }
+ $filename =& $row['plugin_filename'];
+ $plugin_list[$filename]['installed'] = true;
+ $plugin_list[$filename]['status'] = PLUGIN_INSTALLED;
+ $plugin_list[$filename]['plugin id'] = $row['plugin_id'];
+ if ( $row['plugin_version'] != $plugin_list[$filename]['version'] )
+ {
+ $plugin_list[$filename]['status'] |= PLUGIN_OUTOFDATE;
+ $plugin_list[$filename]['version installed'] = $row['plugin_version'];
+ }
+ if ( $row['plugin_flags'] & PLUGIN_DISABLED )
+ {
+ $plugin_list[$filename]['status'] |= PLUGIN_DISABLED;
+ }
+ }
+ $db->free_result();
+
+ // sort it all out by filename
+ ksort($plugin_list);
+
+ // done
+ return $plugin_list;
+ }
+
+ /**
+ * Retrieves the metadata block from a plugin file
+ * @param string Path to plugin file (full path)
+ * @return array
+ */
+
+ function read_plugin_headers($fullpath, $use_cache = true)
+ {
+ global $plugins_cache;
+ $dh = basename($fullpath);
+
+ // first can we use cached info?
+ if ( isset($plugins_cache[$dh]) && $plugins_cache[$dh]['file md5'] === $this->md5_header($fullpath) )
+ {
+ $plugin_meta = $plugins_cache[$dh];
+ }
+ else
+ {
+ // the cache is out of date if we reached here -- regenerate
+ if ( $use_cache )
+ $this->generate_plugins_cache();
+
+ // pass 1: try to read a !info block
+ $blockdata = $this->parse_plugin_blocks($fullpath, 'info');
+ if ( empty($blockdata) )
+ {
+ // no !info block, check for old header
+ $fh = @fopen($fullpath, 'r');
+ if ( !$fh )
+ // can't read, bail out
+ return false;
+ $plugin_data = array();
+ for ( $i = 0; $i < 8; $i++ )
+ {
+ $plugin_data[] = @fgets($fh, 8096);
+ }
+ // close our file handle
+ fclose($fh);
+ // is the header correct?
+ if ( trim($plugin_data[0]) != ' $value )
+ {
+ $plugin_meta[ strtolower($key) ] = $value;
+ }
+ }
+ }
+ if ( !isset($plugin_meta) || !is_array(@$plugin_meta) )
+ {
+ // parsing didn't work.
+ return false;
+ }
+ // check for required keys
+ $required_keys = array('plugin name', 'plugin uri', 'description', 'author', 'version', 'author uri');
+ foreach ( $required_keys as $key )
+ {
+ if ( !isset($plugin_meta[$key]) )
+ // not set, skip this plugin
+ return false;
+ }
+ // decide if it's a system plugin
+ $plugin_meta['system plugin'] = in_array($dh, $this->system_plugins);
+ // reset installed variable
+ $plugin_meta['installed'] = false;
+ $plugin_meta['status'] = 0;
+
+ return $plugin_meta;
+ }
+
+
+ /**
+ * Attempts to cache plugin information in a file to speed fetching.
+ */
+
+ function generate_plugins_cache()
+ {
+ if ( getConfig('cache_thumbs') != '1' )
+ return;
+
+ // fetch the most current info
+ $plugin_info = $this->get_plugin_list(null, false);
+ foreach ( $plugin_info as $plugin => &$info )
+ {
+ $info['file md5'] = $this->md5_header(ENANO_ROOT . "/plugins/$plugin");
+ }
+
+ $this->update_plugins_cache($plugin_info);
+ $GLOBALS['plugins_cache'] = $plugin_info;
+
+ return true;
+ }
+
+ /**
+ * Writes an information array to the cache file.
+ * @param array
+ * @access private
+ */
+
+ function update_plugins_cache($plugin_info)
+ {
+ global $cache;
+ try
+ {
+ $result = $cache->store('plugins', $plugin_info, -1);
+ }
+ catch ( Exception $e )
+ {
+ return false;
+ }
+ return $result;
+ }
+
+ /**
+ * Loads the plugins cache if any.
+ */
+
+ function load_plugins_cache()
+ {
+ global $cache;
+ if ( $data = $cache->fetch('plugins') )
+ {
+ $GLOBALS['plugins_cache'] = $data;
+ }
+ }
+
+ /**
+ * Calculates the MD5 sum of the first 10 lines of a file. Useful for caching plugin header information.
+ * @param string File
+ * @return string
+ */
+
+ function md5_header($file)
+ {
+ $fh = @fopen($file, 'r');
+ if ( !$fh )
+ return false;
+ $i = 0;
+ $h = '';
+ while ( $i < 10 )
+ {
+ $line = fgets($fh, 8096);
+ $h .= $line . "\n";
+ $i++;
+ }
+ fclose($fh);
+ return md5($h);
+ }
+
+ /**
+ * Determines if a file is an authentication extension by looking at the file contents.
+ * @param string Plugin filename
+ * @return bool
+ */
+
+ function is_file_auth_plugin($filename)
+ {
+ $filename = ENANO_ROOT . '/plugins/' . $filename;
+ if ( !file_exists($filename) )
+ return false;
+
+ $info = $this->read_plugin_headers($filename);
+ if ( isset($info['auth plugin']) )
+ return true;
+
+ $contents = @file_get_contents($filename);
+ if ( strstr($contents, 'login_process_userdata_json') )
+ return true;
+
+ return false;
+ }
+
+ /**
+ * Installs a plugin.
+ * @param string Filename of plugin.
+ * @param array The list of plugins as output by pluginLoader::get_plugin_list(). If not passed, the function is called, possibly wasting time.
+ * @return array JSON-formatted but not encoded response
+ */
+
+ function install_plugin($filename, $plugin_list = null)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+ global $cache;
+
+ if ( defined('ENANO_DEMO_MODE') )
+ {
+ return array(
+ 'mode' => 'error',
+ 'error' => $lang->get('acppl_err_demo_mode')
+ );
+ }
+
+ if ( !$plugin_list )
+ $plugin_list = $this->get_plugin_list();
+
+ // we're gonna need this
+ require_once ( ENANO_ROOT . '/includes/sql_parse.php' );
+
+ switch ( true ): case true:
+
+ // is the plugin in the directory and awaiting installation?
+ if ( !isset($plugin_list[$filename]) || (
+ isset($plugin_list[$filename]) && $plugin_list[$filename]['installed']
+ ))
+ {
+ $return = array(
+ 'mode' => 'error',
+ 'error' => 'Invalid plugin specified.',
+ 'debug' => $filename
+ );
+ break;
+ }
+
+ $dataset =& $plugin_list[$filename];
+
+ // load up the installer schema
+ $schema = $this->parse_plugin_blocks( ENANO_ROOT . '/plugins/' . $filename, 'install' );
+
+ $sql = array();
+ global $dbdriver;
+ if ( !empty($schema) )
+ {
+ // Decide which schema to use
+ $use_schema = false;
+ foreach ( $schema as $current_schema )
+ {
+ if ( isset($current_schema['dbms']) && $current_schema['dbms'] === $dbdriver )
+ {
+ $use_schema =& $current_schema['value'];
+ break;
+ }
+ }
+ if ( !$use_schema )
+ {
+ if ( !isset($schema[0]['dbms']) )
+ {
+ $use_schema =& $schema[0]['value'];
+ }
+ else
+ {
+ $return = array(
+ 'mode' => 'error',
+ 'error' => $lang->get('acppl_err_dmbs_not_supported', array('dbdriver' => $db->dbms_name))
+ );
+ break;
+ }
+ }
+ // parse SQL
+ $parser = new SQL_Parser($use_schema, true);
+ $parser->assign_vars(array(
+ 'TABLE_PREFIX' => table_prefix
+ ));
+ $sql = $parser->parse();
+ }
+
+ // schema is final, check queries
+ foreach ( $sql as $query )
+ {
+ if ( !$db->check_query($query) )
+ {
+ // aww crap, a query is bad
+ $return = array(
+ 'mode' => 'error',
+ 'error' => $lang->get('acppl_err_upgrade_bad_query'),
+ );
+ break 2;
+ }
+ }
+
+ // this is it, perform installation
+ foreach ( $sql as $query )
+ {
+ if ( substr($query, 0, 1) == '@' )
+ {
+ $query = substr($query, 1);
+ $db->sql_query($query);
+ }
+ else
+ {
+ if ( !$db->sql_query($query) )
+ {
+ $return = array(
+ 'mode' => 'error',
+ 'error' => "[SQL] " . $db->sql_error()
+ );
+ break 2;
+ }
+ }
+ }
+
+ // log action
+ $time = time();
+ $ip_db = $db->escape($_SERVER['REMOTE_ADDR']);
+ $username_db = $db->escape($session->username);
+ $file_db = $db->escape($filename);
+ $q = $db->sql_query('INSERT INTO '.table_prefix."logs(log_type, action, time_id, edit_summary, author, author_uid, page_text) VALUES\n"
+ . " ('security', 'plugin_install', $time, '$ip_db', '$username_db', $session->user_id, '$file_db');");
+ if ( !$q )
+ $db->_die();
+
+ // register plugin
+ $version_db = $db->escape($dataset['version']);
+ $filename_db = $db->escape($filename);
+ $flags = PLUGIN_INSTALLED;
+
+ $q = $db->sql_query('INSERT INTO ' . table_prefix . "plugins ( plugin_version, plugin_filename, plugin_flags )\n"
+ . " VALUES ( '$version_db', '$filename_db', $flags );");
+ if ( !$q )
+ $db->die_json();
+
+ $plugin_list[$filename]['installed'] = true;
+ $this->reimport_plugin_strings($filename, $plugin_list);
+
+ $return = array(
+ 'success' => true
+ );
+
+ endswitch;
+
+ $cache->purge('plugins');
+ $cache->purge('page_meta');
+ $cache->purge('anon_sidebar');
+
+ return $return;
+ }
+
+ /**
+ * Uninstalls a plugin, removing it completely from the database and calling any custom uninstallation code the plugin specifies.
+ * @param string Filename of plugin.
+ * @param array The list of plugins as output by pluginLoader::get_plugin_list(). If not passed, the function is called, possibly wasting time.
+ * @return array JSON-formatted but not encoded response
+ */
+
+ function uninstall_plugin($filename, $plugin_list = null)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+ global $cache;
+
+ if ( defined('ENANO_DEMO_MODE') )
+ {
+ return array(
+ 'mode' => 'error',
+ 'error' => $lang->get('acppl_err_demo_mode')
+ );
+ }
+
+ if ( !$plugin_list )
+ $plugin_list = $this->get_plugin_list();
+
+ // we're gonna need this
+ require_once ( ENANO_ROOT . '/includes/sql_parse.php' );
+
+ switch ( true ): case true:
+
+ // is the plugin in the directory and already installed?
+ if ( !isset($plugin_list[$filename]) || (
+ isset($plugin_list[$filename]) && !$plugin_list[$filename]['installed']
+ ))
+ {
+ $return = array(
+ 'mode' => 'error',
+ 'error' => 'Invalid plugin specified.',
+ );
+ break;
+ }
+ // get plugin id
+ $dataset =& $plugin_list[$filename];
+ if ( empty($dataset['plugin id']) )
+ {
+ $return = array(
+ 'mode' => 'error',
+ 'error' => 'Couldn\'t retrieve plugin ID.',
+ );
+ break;
+ }
+
+ // load up the installer schema
+ $schema = $this->parse_plugin_blocks( ENANO_ROOT . '/plugins/' . $filename, 'uninstall' );
+
+ $sql = array();
+ global $dbdriver;
+ if ( !empty($schema) )
+ {
+ // Decide which schema to use
+ $use_schema = false;
+ foreach ( $schema as $current_schema )
+ {
+ if ( isset($current_schema['dbms']) && $current_schema['dbms'] === $dbdriver )
+ {
+ $use_schema =& $current_schema['value'];
+ break;
+ }
+ }
+ if ( !$use_schema )
+ {
+ if ( !isset($schema[0]['dbms']) )
+ {
+ $use_schema =& $schema[0]['value'];
+ }
+ else
+ {
+ $return = array(
+ 'mode' => 'error',
+ 'error' => $lang->get('acppl_err_dmbs_not_supported', array('dbdriver' => $db->dbms_name))
+ );
+ break;
+ }
+ }
+ // parse SQL
+ $parser = new SQL_Parser($use_schema, true);
+ $parser->assign_vars(array(
+ 'TABLE_PREFIX' => table_prefix
+ ));
+ $sql = $parser->parse();
+ }
+
+ // schema is final, check queries
+ foreach ( $sql as $query )
+ {
+ if ( !$db->check_query($query) )
+ {
+ // aww crap, a query is bad
+ $return = array(
+ 'mode' => 'error',
+ 'error' => $lang->get('acppl_err_upgrade_bad_query'),
+ );
+ break 2;
+ }
+ }
+
+ // this is it, perform uninstallation
+ foreach ( $sql as $query )
+ {
+ if ( substr($query, 0, 1) == '@' )
+ {
+ $query = substr($query, 1);
+ $db->sql_query($query);
+ }
+ else
+ {
+ if ( !$db->sql_query($query) )
+ {
+ $return = array(
+ 'mode' => 'error',
+ 'error' => "[SQL] " . $db->sql_error()
+ );
+ break 2;
+ }
+ }
+ }
+
+ // log action
+ $time = time();
+ $ip_db = $db->escape($_SERVER['REMOTE_ADDR']);
+ $username_db = $db->escape($session->username);
+ $file_db = $db->escape($filename);
+ $q = $db->sql_query('INSERT INTO '.table_prefix."logs(log_type, action, time_id, edit_summary, author, author_uid, page_text) VALUES\n"
+ . " ('security', 'plugin_uninstall', $time, '$ip_db', '$username_db', $session->user_id, '$file_db');");
+ if ( !$q )
+ $db->_die();
+
+ // deregister plugin
+ $q = $db->sql_query('DELETE FROM ' . table_prefix . "plugins WHERE plugin_id = {$dataset['plugin id']};");
+ if ( !$q )
+ $db->die_json();
+
+ $return = array(
+ 'success' => true
+ );
+
+ endswitch;
+
+ $cache->purge('plugins');
+ $cache->purge('page_meta');
+ $cache->purge('anon_sidebar');
+
+ return $return;
+ }
+
+ /**
+ * Very intelligently upgrades a plugin to the version specified in the filesystem.
+ * @param string Filename of plugin.
+ * @param array The list of plugins as output by pluginLoader::get_plugin_list(). If not passed, the function is called, possibly wasting time.
+ * @return array JSON-formatted but not encoded response
+ */
+
+ function upgrade_plugin($filename, $plugin_list = null)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang, $cache;
+
+ if ( !$plugin_list )
+ $plugin_list = $this->get_plugin_list();
+
+ // we're gonna need this
+ require_once ( ENANO_ROOT . '/includes/sql_parse.php' );
+
+ switch ( true ): case true:
+
+ // is the plugin in the directory and already installed?
+ if ( !isset($plugin_list[$filename]) || (
+ isset($plugin_list[$filename]) && !$plugin_list[$filename]['installed']
+ ))
+ {
+ $return = array(
+ 'mode' => 'error',
+ 'error' => 'Invalid plugin specified.',
+ );
+ break;
+ }
+ // get plugin id
+ $dataset =& $plugin_list[$filename];
+ if ( empty($dataset['plugin id']) )
+ {
+ $return = array(
+ 'mode' => 'error',
+ 'error' => 'Couldn\'t retrieve plugin ID.',
+ );
+ break;
+ }
+
+ //
+ // Here we go with the main upgrade process. This is the same logic that the
+ // Enano official upgrader uses, in fact it's the same SQL parser. We need
+ // list of all versions of the plugin to continue, though.
+ //
+
+ if ( !isset($dataset['version list']) || ( isset($dataset['version list']) && !is_array($dataset['version list']) ) )
+ {
+ // no version list - update the version number but leave the rest alone
+ $version = $db->escape($dataset['version']);
+ $q = $db->sql_query('UPDATE ' . table_prefix . "plugins SET plugin_version = '$version' WHERE plugin_id = {$dataset['plugin id']};");
+ if ( !$q )
+ $db->die_json();
+
+ // send an error and notify the user even though it was technically a success
+ $return = array(
+ 'mode' => 'error',
+ 'error' => $lang->get('acppl_err_upgrade_not_supported'),
+ );
+ break;
+ }
+
+ // build target list
+ $versions = $dataset['version list'];
+ $indices = array_flip($versions);
+ $installed = $dataset['version installed'];
+
+ // is the current version upgradeable?
+ if ( !isset($indices[$installed]) )
+ {
+ $return = array(
+ 'mode' => 'error',
+ 'error' => $lang->get('acppl_err_upgrade_bad_version'),
+ );
+ break;
+ }
+
+ // does the plugin support upgrading to its own version?
+ if ( !isset($indices[$installed]) )
+ {
+ $return = array(
+ 'mode' => 'error',
+ 'error' => $lang->get('acppl_err_upgrade_bad_target_version'),
+ );
+ break;
+ }
+
+ // list out which versions to do
+ $index_start = @$indices[$installed];
+ $index_stop = @$indices[$dataset['version']];
+
+ // Are we trying to go backwards?
+ if ( $index_stop <= $index_start )
+ {
+ $return = array(
+ 'mode' => 'error',
+ 'error' => $lang->get('acppl_err_upgrade_to_older'),
+ // 'debug' => "going from $installed ($index_start) to {$dataset['version']} ($index_stop)"
+ );
+ break;
+ }
+
+ // build the list of version sets
+ $ver_previous = $installed;
+ $targets = array();
+ for ( $i = $index_start; $i <= $index_stop; $i++ )
+ {
+ $targets[] = array($ver_previous, $versions[$i]);
+ $ver_previous = $versions[$i];
+ }
+
+ // parse out upgrade sections in plugin file
+ $plugin_blocks = $this->parse_plugin_blocks( ENANO_ROOT . '/plugins/' . $filename, 'upgrade' );
+ $sql_blocks = array();
+ foreach ( $plugin_blocks as $block )
+ {
+ if ( !isset($block['from']) || !isset($block['to']) )
+ {
+ continue;
+ }
+ $key = "{$block['from']} TO {$block['to']}";
+ $sql_blocks[$key] = $block['value'];
+ }
+
+ // do version list check
+ // for now we won't fret if a specific version set isn't found, we'll just
+ // not do that version and assume there were no DB changes.
+ foreach ( $targets as $i => $target )
+ {
+ list($from, $to) = $target;
+ $key = "$from TO $to";
+ if ( !isset($sql_blocks[$key]) )
+ {
+ unset($targets[$i]);
+ }
+ }
+ $targets = array_values($targets);
+
+ // parse and finalize schema
+ $schema = array();
+ foreach ( $targets as $i => $target )
+ {
+ list($from, $to) = $target;
+ $key = "$from TO $to";
+ try
+ {
+ $parser = new SQL_Parser($sql_blocks[$key], true);
+ }
+ catch ( Exception $e )
+ {
+ $return = array(
+ 'mode' => 'error',
+ 'error' => 'SQL parser init exception',
+ 'debug' => "$e"
+ );
+ break 2;
+ }
+ $parser->assign_vars(array(
+ 'TABLE_PREFIX' => table_prefix
+ ));
+ $parsed = $parser->parse();
+ foreach ( $parsed as $query )
+ {
+ $schema[] = $query;
+ }
+ }
+
+ // schema is final, check queries
+ foreach ( $schema as $query )
+ {
+ if ( !$db->check_query($query) )
+ {
+ // aww crap, a query is bad
+ $return = array(
+ 'mode' => 'error',
+ 'error' => $lang->get('acppl_err_upgrade_bad_query'),
+ );
+ break 2;
+ }
+ }
+
+ // this is it, perform upgrade
+ foreach ( $schema as $query )
+ {
+ if ( substr($query, 0, 1) == '@' )
+ {
+ $query = substr($query, 1);
+ $db->sql_query($query);
+ }
+ else
+ {
+ if ( !$db->sql_query($query) )
+ {
+ $return = array(
+ 'mode' => 'error',
+ 'error' => "[SQL] " . $db->sql_error()
+ );
+ break 2;
+ }
+ }
+ }
+
+ // log action
+ $time = time();
+ $ip_db = $db->escape($_SERVER['REMOTE_ADDR']);
+ $username_db = $db->escape($session->username);
+ $file_db = $db->escape($filename);
+ $q = $db->sql_query('INSERT INTO '.table_prefix."logs(log_type, action, time_id, edit_summary, author, author_uid, page_text) VALUES\n"
+ . " ('security', 'plugin_upgrade', $time, '$ip_db', '$username_db', $session->user_id, '$file_db');");
+ if ( !$q )
+ $db->_die();
+
+ // update version number
+ $version = $db->escape($dataset['version']);
+ $q = $db->sql_query('UPDATE ' . table_prefix . "plugins SET plugin_version = '$version' WHERE plugin_id = {$dataset['plugin id']};");
+ if ( !$q )
+ $db->die_json();
+
+ // all done :-)
+ $return = array(
+ 'success' => true
+ );
+
+ endswitch;
+
+ $cache->purge('plugins');
+ $cache->purge('page_meta');
+ $cache->purge('anon_sidebar');
+
+ return $return;
+ }
+
+ /**
+ * Re-imports the language strings from a plugin.
+ * @param string File name
+ * @return array Enano JSON response protocol
+ */
+
+ function reimport_plugin_strings($filename, $plugin_list = null)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ if ( !$plugin_list )
+ $plugin_list = $this->get_plugin_list();
+
+ switch ( true ): case true:
+
+ // is the plugin in the directory and already installed?
+ if ( !isset($plugin_list[$filename]) || (
+ isset($plugin_list[$filename]) && !$plugin_list[$filename]['installed']
+ ))
+ {
+ $return = array(
+ 'mode' => 'error',
+ 'error' => 'Invalid plugin specified.',
+ );
+ break;
+ }
+ // get plugin data
+ $dataset =& $plugin_list[$filename];
+
+ // check for a language block
+ $blocks = self::parse_plugin_blocks(ENANO_ROOT . '/plugins/' . $filename, 'language');
+ if ( count($blocks) < 1 )
+ {
+ return array(
+ 'mode' => 'error',
+ 'error' => $lang->get('acppl_err_import_no_strings')
+ );
+ }
+
+ $result = $lang->import_plugin(ENANO_ROOT . '/plugins/' . $filename);
+ if ( $result )
+ {
+ return array(
+ 'success' => true
+ );
+ }
+ else
+ {
+ return array(
+ 'mode' => 'error',
+ 'error' => 'Language API returned error'
+ );
+ }
+
+ endswitch;
+ }
}
?>
diff -r de56132c008d -r bdac73ed481e includes/render.php
--- a/includes/render.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/render.php Sun Mar 28 23:10:46 2010 -0400
@@ -13,1372 +13,1372 @@
*/
class RenderMan {
-
- public static function strToPageID($string)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $k = array_keys($paths->nslist);
- $proj_alt = 'Project:';
- if ( substr($string, 0, (strlen($proj_alt))) == $proj_alt )
- {
- $ns = 'Project';
- $pg = substr($string, strlen($proj_alt), strlen($string));
- return Array($pg, $ns);
- }
- for($i=0;$inslist);$i++)
- {
- $ln = strlen($paths->nslist[$k[$i]]);
- if(substr($string, 0, $ln) == $paths->nslist[$k[$i]])
- {
- $ns = $k[$i];
- $pg = substr($string, strlen($paths->nslist[$ns]), strlen($string));
- }
- }
- return Array($pg, $ns);
- }
-
- public static function getPage($page_id, $namespace, $wiki = 1, $smilies = true, $filter_links = true, $redir = true, $render = true)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $page = new PageProcessor($page_id, $namespace);
- $text = $page->fetch_text();
-
- if ( !$render )
- return $text;
-
- $text = self::render($text, $wiki, $smilies, $filter_links);
- return $text;
- }
-
- public static function getTemplate($id, $parms)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- if ( !isPage($paths->get_pathskey($id, 'Template')) )
- {
- return '[['.$paths->nslist['Template'].$id.']]';
- }
- if(isset($paths->template_cache[$id]))
- {
- $text = $paths->template_cache[$id];
- }
- else
- {
- $page = new PageProcessor($id, 'Template');
- $text = $page->fetch_text();
- $paths->template_cache[$id] = $text;
- }
-
- $text = preg_replace('/(.*?)<\/noinclude>/is', '', $text);
- $text = preg_replace('/(.*?)<\/nodisplay>/is', '\\1', $text);
-
- preg_match_all('#\(_([0-9]+)_\)#', $text, $matchlist);
-
- foreach($matchlist[1] as $m)
- {
- if(isset($parms[((int)$m)+1]))
- {
- $p = $parms[((int)$m)+1];
- }
- else
- {
- $p = 'Notice: RenderMan::getTemplate(): Parameter '.$m.' is not set';
- }
- $text = str_replace('(_'.$m.'_)', $p, $text);
- $text = str_replace('{{' . ( $m + 1 ) . '}}', $p, $text);
- }
- $text = RenderMan::include_templates($text);
- return $text;
- }
-
- public static function fetch_template_text($id)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $fetch_ns = 'Template';
- if ( !isPage($paths->get_pathskey($id, 'Template')) )
- {
- // Transclusion of another page
- // 1.1.5: Now You, Too, Can Be A Template, Even If You're Just A Plain Old Article! (TM)
- $nssep = substr($paths->nslist['Special'], -1);
- $nslist = $paths->nslist;
- foreach ( $nslist as &$ns )
- {
- if ( $ns == '' )
- $ns = $nssep;
- }
- $prefixlist = array_flip($nslist);
- foreach ( $nslist as &$ns )
- {
- $ns = preg_quote($ns);
- }
- $nslist = implode('|', $nslist);
- if ( preg_match("/^($nslist)(.*?)$/", $id, $match) )
- {
- // in practice this should always be true but just to be safe...
- if ( isset($prefixlist[$match[1]]) )
- {
- $new_id = $paths->nslist[ $prefixlist[$match[1]] ] . sanitize_page_id($match[2]);
- if ( !isPage($new_id) )
- {
- return "[[$new_id]]";
- }
- $fetch_ns = $prefixlist[$match[1]];
- $id = sanitize_page_id($match[2]);
- }
- }
- else
- {
- return '[['.$paths->nslist['Template'].$id.']]';
- }
- }
- if(isset($paths->template_cache[$id]))
- {
- $text = $paths->template_cache[$id];
- }
- else
- {
- $text = RenderMan::getPage($id, $fetch_ns, 0, false, false, false, false);
- $paths->template_cache[$id] = $text;
- }
-
- if ( is_string($text) )
- {
- $text = preg_replace('/(.*?)<\/noinclude>/is', '', $text);
- $text = preg_replace('/(.*?)<\/nodisplay>/is', '\\1', $text);
- }
-
- return $text;
- }
-
- /**
- * Renders a glob of text. Note that this is PHP-safe, so if returned text (or rather, "?>" . $returned) has PHP it can be eval'ed.
- * @param string Text to render
- * @param int Render parameters - see constants.php
- * @return string Rendered text
- */
-
- public static function render($text, $flags = RENDER_WIKI_DEFAULT, $smilies = true)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( !$smilies )
- $flags |= RENDER_NOSMILIES;
-
- if ( !($flags & RENDER_NOSMILIES) )
- {
- $text = RenderMan::smilieyize($text);
- }
- if ( $flags & RENDER_WIKI_DEFAULT )
- {
- $text = RenderMan::next_gen_wiki_format($text, $flags);
- }
- else if ( $flags & RENDER_WIKI_TEMPLATE )
- {
- $text = $template->tplWikiFormat($text);
- }
- return $text;
- }
-
- private static function next_gen_wiki_format($text, $flags = 0)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- profiler_log("RenderMan: starting wikitext render");
- require_once( ENANO_ROOT . '/includes/wikiformat.php' );
- require_once( ENANO_ROOT . '/includes/wikiengine/TagSanitizer.php' );
- require_once( ENANO_ROOT . '/includes/wikiengine/Tables.php' );
-
- // this is still needed by parser plugins
- $random_id = md5( time() . mt_rand() );
-
- // Strip out sections
- self::nowiki_strip($text, $nowiki_stripped);
-
- // Run early parsing plugins
- $code = $plugins->setHook('render_wikiformat_veryearly');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- // Strip out embedded PHP
- self::php_strip($text, $php_stripped);
-
- // Convert newlines for the parser
- $text = str_replace("\r\n", "\n", $text);
-
- // Perform render through the engine
- $carpenter = new Carpenter();
- $carpenter->flags = $flags;
- $carpenter->hook(array(__CLASS__, 'hook_pre'), PO_AFTER, 'lang');
- $carpenter->hook(array(__CLASS__, 'hook_posttemplates'), PO_AFTER, 'templates');
- if ( $flags & RENDER_WIKI_TEMPLATE )
- {
- // FIXME: Where is noinclude/nodisplay being processed in the pipeline? (Seems to be processed, but not here)
- }
-
- //
- // Set rules for the rendering process
- //
-
- if ( $flags & RENDER_BLOCK && !($flags & RENDER_INLINE) )
- {
- // block only
- $carpenter->disable_all_rules();
- foreach ( array('blockquote', 'tables', 'heading', 'hr', 'multilist', 'bold', 'italic', 'underline', 'paragraph', 'blockquotepost') as $rule )
- {
- $carpenter->enable_rule($rule);
- }
-
- $code = $plugins->setHook('render_block_only');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
- }
- else if ( $flags & RENDER_INLINE && !($flags & RENDER_BLOCK) )
- {
- // inline only
- $carpenter->disable_all_rules();
- foreach ( array('bold', 'italic', 'underline', 'externalwithtext', 'externalnotext', 'image', 'internallink') as $rule )
- {
- $carpenter->enable_rule($rule);
- }
-
- $code = $plugins->setHook('render_inline_only');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
- }
- else
- {
- // full render
- $code = $plugins->setHook('render_full');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
- }
- $text = $carpenter->render($text);
-
- // For plugin compat
- $result =& $text;
-
- // Post processing hook
- $code = $plugins->setHook('render_wikiformat_post');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- // Add PHP and nowiki back in
- self::nowiki_unstrip($text, $nowiki_stripped);
- self::php_unstrip($text, $php_stripped);
-
- profiler_log("RenderMan: finished wikitext render");
-
- return $text;
- }
-
- public static function hook_pre($text)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $code = $plugins->setHook('render_wikiformat_pre');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- return $text;
- }
-
- public static function hook_posttemplates($text)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $code = $plugins->setHook('render_wikiformat_posttemplates');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- return $text;
- }
-
- /**
- * Strip out tags (to bypass parsing on them)
- * @access private
- */
-
- private static function nowiki_strip(&$text, &$stripdata)
- {
- self::tag_strip('nowiki', $text, $stripdata);
- }
-
- /**
- * Restore stripped tags.
- * @access private
- */
-
- public static function nowiki_unstrip(&$text, &$stripdata)
- {
- self::tag_unstrip('nowiki', $text, $stripdata);
- }
-
- /**
- * Strip out an arbitrary HTML tag.
- * @access private
- */
-
- public static function tag_strip($tag, &$text, &$stripdata)
- {
- $random_id = md5( time() . mt_rand() );
-
- preg_match_all("#<$tag>(.*?)#is", $text, $blocks);
-
- foreach ( $blocks[0] as $i => $match )
- {
- $text = str_replace($match, "{{$tag}:{$random_id}:{$i}}", $text);
- }
-
- $stripdata = array(
- 'random_id' => $random_id,
- 'blocks' => $blocks[1]
- );
- }
-
- /**
- * Strip out an arbitrary HTML tag, pushing on to the existing list of stripped data.
- * @access private
- */
-
- public static function tag_strip_push($tag, &$text, &$stripdata)
- {
- if ( !is_array($stripdata) )
- {
- $stripdata = array(
- 'random_id' => md5( time() . mt_rand() ),
- 'blocks' => array()
- );
- }
- $random_id =& $stripdata['random_id'];
-
- preg_match_all("#<$tag>(.*?)#is", $text, $blocks);
-
- foreach ( $blocks[0] as $i => $match )
- {
- $j = count($stripdata['blocks']);
- $stripdata['blocks'][] = $blocks[1][$i];
- $text = str_replace($match, "{{$tag}:{$random_id}:{$j}}", $text);
- }
- }
-
- /**
- * Restore stripped tags.
- * @access private
- */
-
- public static function tag_unstrip($tag, &$text, &$stripdata, $keep = false)
- {
- $random_id = $stripdata['random_id'];
-
- foreach ( $stripdata['blocks'] as $i => $block )
- {
- $block = $keep ? "<$tag>$block" : $block;
- $text = str_replace("{{$tag}:{$random_id}:{$i}}", $block, $text);
- }
-
- $stripdata = array();
- }
-
- /**
- * Strip out PHP code (to prevent it from being sent through the parser). Private because it does not do what you think it does. (The method you are looking for is strip_php.)
- * @access private
- */
-
- private static function php_strip(&$text, &$stripdata)
- {
- $random_id = md5( time() . mt_rand() );
-
- preg_match_all('#<\?(?:php)?[\s=].+?\?>#is', $text, $blocks);
-
- foreach ( $blocks[0] as $i => $match )
- {
- $text = str_replace($match, "{PHP:$random_id:$i}", $text);
- }
-
- $stripdata = array(
- 'random_id' => $random_id,
- 'blocks' => $blocks[0]
- );
- }
-
- /**
- * Restore stripped PHP code
- * @access private
- */
-
- private static function php_unstrip(&$text, &$stripdata)
- {
- $random_id = $stripdata['random_id'];
-
- foreach ( $stripdata['blocks'] as $i => $block )
- {
- $text = str_replace("{PHP:$random_id:$i}", $block, $text);
- }
-
- $stripdata = array();
- }
-
- /**
- * Deprecated.
- */
-
- public static function wikiFormat($message, $filter_links = true, $do_params = false, $plaintext = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- return RenderMan::next_gen_wiki_format($message, $plaintext, $filter_links, $do_params);
- }
-
- public static function destroy_javascript($message, $_php = false)
- {
- $message = preg_replace('#<(script|object|applet|embed|iframe|frame|form|input|select)(.*?)>#is', '<\\1\\2>', $message);
- $message = preg_replace('##is', '</\\1\\2>', $message);
- $message = preg_replace('#(javascript|script|activex|chrome|about|applet):#is', '\\1:', $message);
- if ( $_php )
- {
- // Left in only for compatibility
- $message = preg_replace('#<(.*?)>#is', '<\\1>', $message);
- $message = preg_replace('#<(.*?)>#is', '<\\1>', $message);
- $message = preg_replace('#<(\?|\?php|%)(.*?)(\?|%)>#is', '<\\1\\2\\3>', $message);
- // strip -type attacks
- $message = preg_replace('#<([a-zA-Z:\-]+) (.*?)on([A-Za-z]*)=(.*?)>#is', '<\\1\\2on\\3=\\4>', $message);
- }
- return $message;
- }
-
- public static function strip_php($message)
- {
- return RenderMan::destroy_javascript($message, true);
- }
-
- public static function sanitize_html($text)
- {
- $text = htmlspecialchars($text);
- $allowed_tags = Array('b', 'i', 'u', 'pre', 'code', 'tt', 'br', 'p', 'nowiki', '!--([\w\W]+)--');
- foreach($allowed_tags as $t)
- {
- $text = preg_replace('#<'.$t.'>(.*?)</'.$t.'>#is', '<'.$t.'>\\1', $text);
- $text = preg_replace('#<'.$t.' />#is', '<'.$t.' />', $text);
- $text = preg_replace('#<'.$t.'>#is', '<'.$t.'>', $text);
- }
- return $text;
- }
-
- /**
- * Reverse-renders a blob of text (converts it from XHTML back to wikitext) by using parser hints and educated guesses.
- * @param string XHTML
- * @return string Wikitext
- */
-
- public static function reverse_render($text)
- {
- // convert \r\n to \n
- $text = str_replace("\r\n", "\n", $text);
-
- // Separate certain block level elements onto their own lines. This tidies up the tag
- // soup that TinyMCE sometimes produces.
- $block_elements = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'div', 'table', 'ul', 'pre');
- $block_elements = implode('|', $block_elements);
- $regex = "#()\n?<($block_elements)(>| .+?>)#i";
- $text = preg_replace($regex, "$1\n\n<$2$3", $text);
-
- $text = self::reverse_process_parser_hints($text);
- $text = self::reverse_process_headings($text);
- $text = self::reverse_process_lists($text);
- $text = self::reverse_process_tables($text);
-
- // Lastly, strip out paragraph tags.
- $text = preg_replace('|^ *(.+?)
*$|m', "\\1", $text);
-
- return $text;
- }
-
- public static function reverse_process_parser_hints($text)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( !preg_match_all('|([\w\W]*?)|s', $text, $matches) )
- return $text;
-
- foreach ( $matches[0] as $i => $match )
- {
- $tag =& $matches[1][$i];
- $attribs =& $matches[2][$i];
- $inner =& $matches[3][$i];
-
- $attribs = self::reverse_process_hint_attribs($attribs);
- switch($tag)
- {
- case 'smiley':
- case 'internallink':
- case 'imagelink':
- if ( isset($attribs['code']) )
- {
- $text = str_replace($match, $attribs['code'], $text);
- }
- else if ( isset($attribs['src']) )
- {
- $text = str_replace($match, $attribs['src'], $text);
- }
- break;
- }
- }
-
- return $text;
- }
-
- public static function reverse_process_hint_attribs($attribs)
- {
- $return = array();
- if ( !preg_match_all('/([a-z0-9_-]+)="([^"]+?)"/', $attribs, $matches) )
- return array();
-
- foreach ( $matches[0] as $i => $match )
- {
- $name =& $matches[1][$i];
- $value =& $matches[2][$i];
-
- $value = base64_decode($value);
-
- $return[$name] = $value;
- }
-
- return $return;
- }
-
- /**
- * Escapes a string so that it's safe to use as an attribute in a parser hint.
- * @param string
- * @return string
- */
-
- public static function escape_parser_hint_attrib($text)
- {
- return base64_encode($text);
- }
-
- public static function reverse_process_headings($text)
- {
- if ( !preg_match_all('|^(.*?)$|m', $text, $matches) )
- return $text;
-
- foreach ( $matches[0] as $i => $match )
- {
- // generate heading tag
- $heading_size = intval($matches[1][$i]);
- $eq = '';
- for ( $j = 0; $j < $heading_size; $j++ )
- $eq .= '=';
-
- $heading =& $matches[2][$i];
-
- $tag = "$eq $heading $eq";
- $text = str_replace($match, $tag, $text);
- }
-
- return $text;
- }
-
- public static function reverse_process_lists($text)
- {
- if ( !preg_match('!()!', $text) )
- return $text;
-
- $split = preg_split('!()!', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
-
- $stack_height = 0;
- $current_list = '';
- $old_current_list = '';
- $spaces = '';
- $marker = '*';
- $list_id = 0;
- $just_terminated = false;
- foreach ( $split as $tag )
- {
- switch($tag)
- {
- case '':
- case '':
- $stack_height++;
- $just_terminated = false;
- if ( $stack_height > 1 )
- $spaces .= $marker;
-
- $marker = ( $tag == 'ol' ) ? '#' : '*';
- if ( $stack_height > 1 )
- $current_list .= "\n";
-
- break;
- case '
':
- case '':
- $stack_height--;
- $spaces = substr($spaces, 1);
-
- if ( $stack_height == 0 )
- {
- // rotate
- $text = str_replace_once("{$old_current_list}{$tag}", trim($current_list), $text);
- $current_list = '';
- $old_current_list = '';
- }
- $just_terminated = true;
- break;
- case '':
- if ( $stack_height < 1 )
- break;
-
- $current_list .= "{$spaces}{$marker} ";
- break;
- case ' ':
- if ( $stack_height < 1 )
- break;
-
- if ( !$just_terminated )
- $current_list .= "\n";
-
- $just_terminated = false;
- break;
- default:
- if ( $stack_height > 0 )
- {
- $current_list .= trim($tag);
- }
- break;
- }
- if ( $stack_height > 0 )
- {
- $old_current_list .= $tag;
- }
- }
-
- return $text;
- }
-
- public static function reverse_process_tables($text)
- {
- return $text;
- }
-
- /**
- * Parses internal links (wikilinks) in a block of text.
- * @param string Text to process
- * @param string Optional. If included will be used as a template instead of using the default syntax.
- * @param bool If false, does not add wikilink-nonexistent or check for exsistence of pages. Can reduce DB queries; defualts to true.
- * @param string Page ID. If specified, class="currentpage" will be added to links if they match the given page ID and namespace
- * @param string Namespace. If specified, class="currentpage" will be added to links if they match the given page ID and namespace
- * @return string
- */
-
- public static function parse_internal_links($text, $tplcode = false, $do_exist_check = true, $match_page_id = false, $match_namespace = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $parser = is_string($tplcode) ? $template->makeParserText($tplcode) : false;
-
- // allow blank urlname?
- $repeater = have_blank_urlname_page() ? '*' : '+';
-
- // stage 1 - links with alternate text
- preg_match_all('/\[\[([^\[\]<>\{\}\|]' . $repeater . ')\|(.+?)\]\]/', $text, $matches);
- foreach ( $matches[0] as $i => $match )
- {
- list($page_id, $namespace) = RenderMan::strToPageID($matches[1][$i]);
- $link = self::generate_internal_link($namespace, $page_id, $matches[2][$i], $match, $parser, $do_exist_check, $match_page_id, $match_namespace);
- $text = str_replace($match, $link, $text);
- }
-
- // stage 2 - links with no alternate text
- preg_match_all('/\[\[([^\[\]<>\{\}\|]' . $repeater . ')\]\]/', $text, $matches);
- foreach ( $matches[0] as $i => $match )
- {
- list($page_id, $namespace) = RenderMan::strToPageID($matches[1][$i]);
- $pid_clean = $paths->nslist[$namespace] . sanitize_page_id($page_id);
- $inner_text = ( isPage($pid_clean) ) ? htmlspecialchars(get_page_title($pid_clean)) : htmlspecialchars($matches[1][$i]);
-
- $link = self::generate_internal_link($namespace, $page_id, $inner_text, $match, $parser, $do_exist_check, $match_page_id, $match_namespace);
-
- $text = str_replace($match, $link, $text);
- }
-
- return $text;
- }
-
- /**
- * Internal link generation function
- * @access private
- * @return string HTML
- */
-
- private static function generate_internal_link($namespace, $page_id, $inner_text, $match, $parser = false, $do_exist_check = true, $match_page_id = false, $match_namespace = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( ($pos = strrpos($page_id, '#')) !== false )
- {
- $hash = substr($page_id, $pos);
- $page_id = substr($page_id, 0, $pos);
- }
- else
- {
- $hash = '';
- }
-
- if ( $namespace == 'Admin' )
- {
- // No linking directly to Admin pages!
- $get = 'module=' . $paths->nslist[$namespace] . sanitize_page_id($page_id);
- $pid_clean = $paths->nslist['Special'] . 'Administration';
- $onclick = ' onclick="ajaxLoginNavTo(\'Special\', \'Administration\', USER_LEVEL_ADMIN, \'' . addslashes($get) . '\'); return false;"';
- }
- else
- {
- $get = false;
- $onclick = '';
- $pid_clean = $paths->nslist[$namespace] . sanitize_page_id($page_id);
- }
-
- $url = makeUrl($pid_clean, $get, true) . $hash;
- $quot = '"';
- $exists = ( ($do_exist_check && isPage($pid_clean)) || !$do_exist_check ) ? '' : ' class="wikilink-nonexistent"';
-
- if ( $match_page_id && $match_namespace && $pid_clean === $paths->get_pathskey($match_page_id, $match_namespace) )
- $exists .= ' class="currentpage"';
-
- if ( $parser )
- {
- $parser->assign_vars(array(
- 'HREF' => $url,
- 'FLAGS' => $exists,
- 'TEXT' => $inner_text
- ));
- $link = $parser->run();
- }
- else
- {
- $omatch = self::escape_parser_hint_attrib($match);
- $link = "{$inner_text} ";
- }
-
- return $link;
- }
-
- /**
- * Parses a partial template tag in wikitext, and return an array with the parameters.
- * @param string The portion of the template tag that contains the parameters.
- * @example
- *
- foo = lorem ipsum
- bar = dolor sit amet
- *
- * @return array Example:
- * [foo] => lorem ipsum
- * [bar] => dolor sit amet
- */
-
- public static function parse_template_vars($input, $newlinemode = true)
- {
- $parms = array();
- $input = trim($input);
- if ( $newlinemode )
- {
- // we're going by newlines.
- // split by parameter, then parse each one individually
- $input = explode("\n", str_replace("\r", '', $input));
- $lastparam = '';
- $i = 0;
- foreach ( $input as $line )
- {
- if ( preg_match('/^ *\|? *([A-z0-9_]+) *= *(.+)$/', $line, $match) )
- {
- // new parameter, named
- $parms[ $match[1] ] = $match[2];
- $lastparam = $match[1];
- }
- else if ( preg_match('/^ *\| *(.+)$/', $line, $match) || $lastparam === '' )
- {
- $parms[ $i ] = $match[1];
- $lastparam = $i;
- $i++;
- }
- else
- {
- $parms[ $lastparam ] .= "\n$line";
- }
- }
- }
- else
- {
- $result = preg_match_all('/
- (?:^|[ ]*)\| # start of parameter - string start or series of spaces
- [ ]*
- (?:
- ([A-z0-9_]+) # variable name
- [ ]* = [ ]* # assignment
- )? # name section is optional - if the parameter name is not given, a numerical index is assigned
- ([^\|]+|.+?\n[ ]*\|) # value
- /x', trim($input), $matches);
- if ( $result )
- {
- $pi = 0;
- for ( $i = 0; $i < count($matches[0]); $i++ )
- {
- $matches[1][$i] = trim($matches[1][$i]);
- $parmname = !empty($matches[1][$i]) ? $matches[1][$i] : strval(++$pi);
- $parms[ $parmname ] = $matches[2][$i];
- }
- }
- }
- // die('' . print_r($parms, true) . '
');
- return $parms;
- }
-
- /**
- * Processes all template tags within a block of wikitext.
- * Updated in 1.0.2 to also parse template tags in the format of {{Foo |a = b |b = c |c = therefore, a}}
- * @param string The text to process
- * @return string Formatted text
- * @example
- *
- $text = '{{Template
- | parm1 = Foo
- | parm2 = Bar
- }}';
- $text = RenderMan::include_templates($text);
- *
- */
-
- public static function include_templates($text)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- // $template_regex = "/\{\{([^\]]+?)((\n([ ]*?)[A-z0-9]+([ ]*?)=([ ]*?)(.+?))*)\}\}/is";
- // matches:
- // 1 - template name
- // 2 - parameter section
- $template_regex = "/
- \{\{ # opening
- ([^\n\t\a\r]+) # template name
- ((?:(?:[\s]+\|?)[ ]*(?:[A-z0-9_]+)[ ]*=[ ]*?(?:.+))*) # parameters
- \}\} # closing
- /isxU";
- if ( $count = preg_match_all($template_regex, $text, $matches) )
- {
- // die('' . print_r($matches, true) . '
');
- for ( $i = 0; $i < $count; $i++ )
- {
- $matches[1][$i] = sanitize_page_id($matches[1][$i]);
- $newlinemode = ( substr($matches[2][$i], 0, 1) == "\n" );
- $parmsection = trim($matches[2][$i]);
- if ( !empty($parmsection) )
- {
- $parms = RenderMan::parse_template_vars($parmsection, $newlinemode);
- if ( !is_array($parms) )
- // Syntax error
- $parms = array();
- }
- else
- {
- $parms = Array();
- }
- if ( $tpl_code = RenderMan::fetch_template_text($matches[1][$i]) )
- {
- // Intelligent paragraphs.
- // If:
- // * A line is fully wrapped in a tag
- // * The line contains a variable
- // * The variable contains newlines
- // Then:
- // * Drop the
tag, replace it fully paragraph-ized by newlines
-
- if ( preg_match_all('/^( *)(.*?\{([A-z0-9]+)\}.*?)<\/p> *$/m', $tpl_code, $paramatch) )
- {
- $parser = new Carpenter();
- $parser->exclusive_rule('paragraph');
-
- foreach ( $paramatch[0] as $j => $match )
- {
- // $line is trimmed (the is gone)
- $spacing =& $paramatch[1][$i];
- $para_attrs =& $paramatch[2][$j];
- $para_attrs = str_replace(array('$', '\\'), array('\$', '\\\\'), $para_attrs);
- $line =& $paramatch[3][$j];
- $varname =& $paramatch[4][$j];
- if ( isset($parms[$varname]) && strstr($parms[$varname], "\n") )
- {
- $newline = str_replace('{' . $varname . '}', $parms[$varname], $line);
- $paraized = $parser->render($newline);
- $paraized = preg_replace('/^
/m', "$spacing", $paraized);
- $paraized = $spacing . trim($paraized);
- $tpl_code = str_replace_once($match, $paraized, $tpl_code);
- }
- }
- }
-
- $parser = $template->makeParserText($tpl_code);
- $parser->assign_vars($parms);
- $text = str_replace($matches[0][$i], $parser->run(), $text);
- }
- }
- }
- return $text;
- }
-
- /**
- * Preprocesses an HTML text string prior to being sent to MySQL.
- * @param string $text
- * @param bool $strip_all_php - if true, strips all PHP regardless of user permissions. Else, strips PHP only if user level < USER_LEVEL_ADMIN. Defaults to true.
- * @param bool $sqlescape - if true, sends text through $db->escape(). Otherwise returns unescaped text. Defaults to true.
- * @param bool $reduceheadings - if true, finds HTML headings and replaces them with wikitext. Else, does not touch headings. Defaults to true.
- * @param Session_ACLPageInfo Optional permissions instance to check against, $session is used if not provided
- */
- public static function preprocess_text($text, $strip_all_php = true, $sqlescape = true, $reduceheadings = true, $perms = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $random_id = md5( time() . mt_rand() );
-
- $code = $plugins->setHook('render_sanitize_pre');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- if ( !is_object($perms) )
- {
- $namespace = $paths->namespace;
- $perms =& $session;
- }
- else
- {
- $namespace = $perms->namespace;
- }
-
- $can_do_php = ( !$strip_all_php && $perms->get_permissions('php_in_pages') );
- $can_do_html = $session->check_acl_scope('html_in_pages', $namespace) && $perms->get_permissions('html_in_pages');
-
- if ( $can_do_html && !$can_do_php )
- {
- $text = preg_replace('#<(\?|\?php|%)(.*?)(\?|%)>#is', '<\\1\\2\\3>', $text);
- }
- else if ( !$can_do_html && !$can_do_php )
- {
- $text = sanitize_html($text, true);
- // If we can't do PHP, we can't do Javascript either.
- $text = RenderMan::destroy_javascript($text);
- }
-
- // Strip out sections and PHP code
-
- $php = preg_match_all('#(<|<)\?php(.*?)\?(>|>)#is', $text, $phpsec);
-
- //die(''.htmlspecialchars(print_r($phpsec, true))."\n".htmlspecialchars(print_r($text, true)).'
');
-
- for($i=0;$i(.*?)<\/nowiki>#is', $text, $nowiki);
-
- for($i=0;$i'.$nowiki[1][$i].' ', '{NOWIKI:'.$random_id.':'.$i.'}', $text);
- }
-
- $text = str_replace('~~~~~', enano_date('G:i, j F Y (T)'), $text);
- $text = str_replace('~~~~', "[[User:$session->username|$session->username]] ".enano_date('G:i, j F Y (T)'), $text);
- $text = str_replace('~~~', "[[User:$session->username|$session->username]] ", $text);
-
- $code = $plugins->setHook('render_sanitize_post');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- // gently apply some reverse-processing to allow the parser to do magic with TOCs and stuff
- if ( $reduceheadings )
- $text = self::reverse_process_headings($text);
-
- // Reinsert sections
- for($i=0;$i<$nw;$i++)
- {
- $text = str_replace('{NOWIKI:'.$random_id.':'.$i.'}', ''.$nowiki[1][$i].' ', $text);
- }
- // Reinsert PHP
- for($i=0;$i<$php;$i++)
- {
- $phsec = ''.$phpsec[1][$i].'?php'.$phpsec[2][$i].'?'.$phpsec[3][$i].'';
- if ( $strip_all_php )
- $phsec = htmlspecialchars($phsec);
- $text = str_replace('{PHP:'.$random_id.':'.$i.'}', $phsec, $text);
- }
-
- $text = ( $sqlescape ) ? $db->escape($text) : $text;
-
- return $text;
- }
-
- public static function smilieyize($text, $complete_urls = false)
- {
-
- $random_id = md5( time() . mt_rand() );
-
- // Smileys array - eventually this will be fetched from the database by
- // RenderMan::initSmileys during initialization, but it will all be hardcoded for beta 2
-
- $smileys = Array(
- 'O:-)' => 'face-angel.png',
- 'O:)' => 'face-angel.png',
- 'O=)' => 'face-angel.png',
- ':-)' => 'face-smile.png',
- ':)' => 'face-smile.png',
- '=)' => 'face-smile-big.png',
- ':-(' => 'face-sad.png',
- ':(' => 'face-sad.png',
- ';(' => 'face-sad.png',
- ':-O' => 'face-surprise.png',
- ';-)' => 'face-wink.png',
- ';)' => 'face-wink.png',
- '8-)' => 'face-glasses.png',
- '8)' => 'face-glasses.png',
- ':-D' => 'face-grin.png',
- ':D' => 'face-grin.png',
- '=D' => 'face-grin.png',
- ':-*' => 'face-kiss.png',
- ':*' => 'face-kiss.png',
- '=*' => 'face-kiss.png',
- ':\'(' => 'face-crying.png',
- ':-|' => 'face-plain.png',
- ':-\\' => 'face-plain.png',
- ':-/' => 'face-plain.png',
- ':joke:' => 'face-plain.png',
- ']:->' => 'face-devil-grin.png',
- ']:->' => 'face-devil-grin.png',
- ':kiss:' => 'face-kiss.png',
- ':-P' => 'face-tongue-out.png',
- ':P' => 'face-tongue-out.png',
- ':-p' => 'face-tongue-out.png',
- ':p' => 'face-tongue-out.png',
- ':-X' => 'face-sick.png',
- ':X' => 'face-sick.png',
- ':sick:' => 'face-sick.png',
- ':-]' => 'face-oops.png',
- ':]' => 'face-oops.png',
- ':oops:' => 'face-oops.png',
- ':-[' => 'face-embarassed.png',
- ':[' => 'face-embarassed.png'
- );
-
- // Strip out sections
- //return ''.htmlspecialchars($text).'
';
- $nw = preg_match_all('#(.*?)<\/nowiki>#is', $text, $nowiki);
-
- for ( $i = 0; $i < count($nowiki[1]); $i++ )
- {
- $text = str_replace('' . $nowiki[1][$i] . ' ', '{NOWIKI:'.$random_id.':'.$i.'}', $text);
- }
-
- foreach ( $smileys as $smiley => $smiley_path )
- {
- $hex_smiley = hexencode($smiley, '&#x', ';');
- $pfx = ( $complete_urls ) ? get_server_url() : '';
- $text = str_replace(' ' . $smiley,
- '
-
- 
- ', $text);
- }
- //*/
-
- // Reinsert sections
- for ( $i = 0; $i < $nw; $i++ )
- {
- $text = str_replace('{NOWIKI:'.$random_id.':'.$i.'}', ''.$nowiki[1][$i].' ', $text);
- }
-
- return $text;
- }
-
- /**
- * Generates a summary of the differences between two texts, and formats it as XHTML.
- * @param $str1 string the first block of text
- * @param $str2 string the second block of text
- * @return string
- */
- public static function diff($str1, $str2)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- require_once(ENANO_ROOT.'/includes/diff.php');
- $str1 = explode("\n", $str1);
- $str2 = explode("\n", $str2);
- $diff = new Diff($str1, $str2);
- $renderer = new TableDiffFormatter();
- return ''.$renderer->format($diff).'
';
- }
-
- /**
- * Changes wikitext image tags to HTML.
- * @param string The wikitext to process
- * @param array Will be overwritten with the list of HTML tags (the system uses tokens for TextWiki compatibility)
- * @return string
- */
-
- public static function process_image_tags($text, &$taglist)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $s_delim = "\xFF";
- $f_delim = "\xFF";
- $taglist = array();
-
- // Wicked huh?
- $ns_file = str_replace('/', '\\/', preg_quote($paths->nslist['File']));
- $regex = '/
- \[\[ # starting delimiter
- :' . $ns_file . '([\w\s0-9_\(\)!@%\^\+\|\.-]+?\.(?:png|gif|jpg|jpeg)) # image filename
- (?:(?:\|(?:.+?))*) # parameters
- \]\] # ending delimiter
- /ix';
-
- preg_match_all($regex, $text, $matches);
-
- foreach ( $matches[0] as $i => $match )
- {
-
- $full_tag =& $matches[0][$i];
- $filename =& $matches[1][$i];
-
- // apply recursion (hack? @todo could this be done with (?R) in PCRE?)
- $tag_pos = strpos($text, $full_tag);
- $tag_end_pos = $tag_pos + strlen($full_tag);
- while ( get_char_count($full_tag, ']') < get_char_count($full_tag, '[') && $tag_end_pos < strlen($text) )
- {
- $full_tag .= substr($text, $tag_end_pos, 1);
- $tag_end_pos++;
- }
- if ( $tag_end_pos > strlen($text) )
- {
- // discard tag, not closed fully
- continue;
- }
-
- // init the various image parameters
- $width = null;
- $height = null;
- $scale_type = null;
- $raw_display = false;
- $clear = null;
- $caption = null;
-
- // trim tag and parse particles
- $tag_trim = rtrim(ltrim($full_tag, '['), ']');
- // trim off the filename from the start of the tag
- $filepart_len = 1 + strlen($paths->nslist['File']) + strlen($filename) + 1;
- $tag_trim = substr($tag_trim, $filepart_len);
- // explode and we should have parameters
- $tag_parts = explode('|', $tag_trim);
-
- // for each of the parameters, see if it matches a known option. If so, apply it;
- // otherwise, see if a plugin reserved that parameter and if not treat it as the caption
- foreach ( $tag_parts as $param )
- {
- switch($param)
- {
- case 'left':
- case 'right':
- $clear = $param;
- break;
- case 'thumb':
- $scale_type = 'thumb';
- break;
- case 'raw':
- $raw_display = true;
- break;
- default:
- // height specification
- if ( preg_match('/^([0-9]+)x([0-9]+)$/', $param, $dims) )
- {
- $width = intval($dims[1]);
- $height = intval($dims[2]);
- break;
- }
- // not the height, so see if a plugin took this over
- // this hook requires plugins to return true if they modified anything
- $code = $plugins->setHook('img_tag_parse_params');
- foreach ( $code as $cmd )
- {
- if ( eval($cmd) )
- break 2;
- }
- // we would have broken out by now if a plugin properly handled this,
- // so just set the caption now.
- $caption = $param;
- break;
- }
- }
-
- if ( !isPage( $paths->nslist['File'] . $filename ) )
- {
- $text = str_replace($full_tag, '[[' . $paths->nslist['File'] . $filename . ']]', $text);
- continue;
- }
-
- if ( $scale_type == 'thumb' )
- {
- $r_width = 225;
- $r_height = 225;
-
- $url = makeUrlNS('Special', 'DownloadFile/' . $filename, 'preview&width=' . $r_width . '&height=' . $r_height, true);
- }
- else if ( !empty($width) && !empty($height) )
- {
- $r_width = $width;
- $r_height = $height;
-
- $url = makeUrlNS('Special', 'DownloadFile/' . $filename, 'preview&width=' . $r_width . '&height=' . $r_height, true);
- }
- else
- {
- $url = makeUrlNS('Special', 'DownloadFile/' . $filename);
- }
-
- $img_tag = '
setHook('img_tag_parse_img');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- $img_tag .= '/>';
-
- $s_full_tag = self::escape_parser_hint_attrib($full_tag);
- $complete_tag = '';
-
- if ( !empty($scale_type) && !$raw_display )
- {
- $complete_tag .= '';
- $complete_tag .= $img_tag;
- $complete_tag .= '';
-
- $mag_button = '![[ + ]](' . scriptPath . '/images/thumbnail.png)
';
-
- if ( !empty($caption) )
- {
- $complete_tag .= $mag_button . $caption;
- }
-
- $complete_tag .= '';
- }
- else if ( $raw_display )
- {
- $complete_tag .= "$img_tag";
- $taglist[$i] = $complete_tag;
-
- $repl = "{$s_delim}e_img_{$i}{$f_delim}";
- $text = str_replace($full_tag, $repl, $text);
- continue;
- }
- else
- {
- $complete_tag .= 'setHook('img_tag_parse_link');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
- $complete_tag .= '>';
- $complete_tag .= $img_tag;
- $complete_tag .= '';
- }
-
- $complete_tag .= "";
- $taglist[$i] = $complete_tag;
-
- /*
- $pos = strpos($text, $full_tag);
-
- while(true)
- {
- $check1 = substr($text, $pos, 3);
- $check2 = substr($text, $pos, 1);
- if ( $check1 == '' || $pos == 0 || $check2 == "\n" )
- {
- // die('found at pos '.$pos);
- break;
- }
- $pos--;
- }
- */
-
- /*
- $repl = "{$s_delim}e_img_{$i}{$f_delim}";
- $text = substr($text, 0, $pos) . $repl . substr($text, $pos);
-
- $text = str_replace($full_tag, '', $text);
- */
- $text = str_replace_once($full_tag, $complete_tag, $text);
-
- unset($full_tag, $filename, $scale_type, $width, $height, $clear, $caption, $r_width, $r_height);
-
- }
-
- // if ( count($matches[0]) > 0 )
- // die('
' . htmlspecialchars($text) . '
');
-
- return $text;
- }
-
- /**
- * Finalizes processing of image tags.
- * @param string The preprocessed text
- * @param array The list of image tags created by RenderMan::process_image_tags()
- */
-
- public static function process_imgtags_stage2($text, $taglist)
- {
- $s_delim = "\xFF";
- $f_delim = "\xFF";
- foreach ( $taglist as $i => $tag )
- {
- $repl = "{$s_delim}e_img_{$i}{$f_delim}";
- $text = str_replace($repl, $tag, $text);
- }
- return $text;
- }
-
+
+ public static function strToPageID($string)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $k = array_keys($paths->nslist);
+ $proj_alt = 'Project:';
+ if ( substr($string, 0, (strlen($proj_alt))) == $proj_alt )
+ {
+ $ns = 'Project';
+ $pg = substr($string, strlen($proj_alt), strlen($string));
+ return Array($pg, $ns);
+ }
+ for($i=0;$inslist);$i++)
+ {
+ $ln = strlen($paths->nslist[$k[$i]]);
+ if(substr($string, 0, $ln) == $paths->nslist[$k[$i]])
+ {
+ $ns = $k[$i];
+ $pg = substr($string, strlen($paths->nslist[$ns]), strlen($string));
+ }
+ }
+ return Array($pg, $ns);
+ }
+
+ public static function getPage($page_id, $namespace, $wiki = 1, $smilies = true, $filter_links = true, $redir = true, $render = true)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $page = new PageProcessor($page_id, $namespace);
+ $text = $page->fetch_text();
+
+ if ( !$render )
+ return $text;
+
+ $text = self::render($text, $wiki, $smilies, $filter_links);
+ return $text;
+ }
+
+ public static function getTemplate($id, $parms)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ if ( !isPage($paths->get_pathskey($id, 'Template')) )
+ {
+ return '[['.$paths->nslist['Template'].$id.']]';
+ }
+ if(isset($paths->template_cache[$id]))
+ {
+ $text = $paths->template_cache[$id];
+ }
+ else
+ {
+ $page = new PageProcessor($id, 'Template');
+ $text = $page->fetch_text();
+ $paths->template_cache[$id] = $text;
+ }
+
+ $text = preg_replace('/(.*?)<\/noinclude>/is', '', $text);
+ $text = preg_replace('/(.*?)<\/nodisplay>/is', '\\1', $text);
+
+ preg_match_all('#\(_([0-9]+)_\)#', $text, $matchlist);
+
+ foreach($matchlist[1] as $m)
+ {
+ if(isset($parms[((int)$m)+1]))
+ {
+ $p = $parms[((int)$m)+1];
+ }
+ else
+ {
+ $p = 'Notice: RenderMan::getTemplate(): Parameter '.$m.' is not set';
+ }
+ $text = str_replace('(_'.$m.'_)', $p, $text);
+ $text = str_replace('{{' . ( $m + 1 ) . '}}', $p, $text);
+ }
+ $text = RenderMan::include_templates($text);
+ return $text;
+ }
+
+ public static function fetch_template_text($id)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $fetch_ns = 'Template';
+ if ( !isPage($paths->get_pathskey($id, 'Template')) )
+ {
+ // Transclusion of another page
+ // 1.1.5: Now You, Too, Can Be A Template, Even If You're Just A Plain Old Article! (TM)
+ $nssep = substr($paths->nslist['Special'], -1);
+ $nslist = $paths->nslist;
+ foreach ( $nslist as &$ns )
+ {
+ if ( $ns == '' )
+ $ns = $nssep;
+ }
+ $prefixlist = array_flip($nslist);
+ foreach ( $nslist as &$ns )
+ {
+ $ns = preg_quote($ns);
+ }
+ $nslist = implode('|', $nslist);
+ if ( preg_match("/^($nslist)(.*?)$/", $id, $match) )
+ {
+ // in practice this should always be true but just to be safe...
+ if ( isset($prefixlist[$match[1]]) )
+ {
+ $new_id = $paths->nslist[ $prefixlist[$match[1]] ] . sanitize_page_id($match[2]);
+ if ( !isPage($new_id) )
+ {
+ return "[[$new_id]]";
+ }
+ $fetch_ns = $prefixlist[$match[1]];
+ $id = sanitize_page_id($match[2]);
+ }
+ }
+ else
+ {
+ return '[['.$paths->nslist['Template'].$id.']]';
+ }
+ }
+ if(isset($paths->template_cache[$id]))
+ {
+ $text = $paths->template_cache[$id];
+ }
+ else
+ {
+ $text = RenderMan::getPage($id, $fetch_ns, 0, false, false, false, false);
+ $paths->template_cache[$id] = $text;
+ }
+
+ if ( is_string($text) )
+ {
+ $text = preg_replace('/(.*?)<\/noinclude>/is', '', $text);
+ $text = preg_replace('/(.*?)<\/nodisplay>/is', '\\1', $text);
+ }
+
+ return $text;
+ }
+
+ /**
+ * Renders a glob of text. Note that this is PHP-safe, so if returned text (or rather, "?>" . $returned) has PHP it can be eval'ed.
+ * @param string Text to render
+ * @param int Render parameters - see constants.php
+ * @return string Rendered text
+ */
+
+ public static function render($text, $flags = RENDER_WIKI_DEFAULT, $smilies = true)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( !$smilies )
+ $flags |= RENDER_NOSMILIES;
+
+ if ( !($flags & RENDER_NOSMILIES) )
+ {
+ $text = RenderMan::smilieyize($text);
+ }
+ if ( $flags & RENDER_WIKI_DEFAULT )
+ {
+ $text = RenderMan::next_gen_wiki_format($text, $flags);
+ }
+ else if ( $flags & RENDER_WIKI_TEMPLATE )
+ {
+ $text = $template->tplWikiFormat($text);
+ }
+ return $text;
+ }
+
+ private static function next_gen_wiki_format($text, $flags = 0)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ profiler_log("RenderMan: starting wikitext render");
+ require_once( ENANO_ROOT . '/includes/wikiformat.php' );
+ require_once( ENANO_ROOT . '/includes/wikiengine/TagSanitizer.php' );
+ require_once( ENANO_ROOT . '/includes/wikiengine/Tables.php' );
+
+ // this is still needed by parser plugins
+ $random_id = md5( time() . mt_rand() );
+
+ // Strip out sections
+ self::nowiki_strip($text, $nowiki_stripped);
+
+ // Run early parsing plugins
+ $code = $plugins->setHook('render_wikiformat_veryearly');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ // Strip out embedded PHP
+ self::php_strip($text, $php_stripped);
+
+ // Convert newlines for the parser
+ $text = str_replace("\r\n", "\n", $text);
+
+ // Perform render through the engine
+ $carpenter = new Carpenter();
+ $carpenter->flags = $flags;
+ $carpenter->hook(array(__CLASS__, 'hook_pre'), PO_AFTER, 'lang');
+ $carpenter->hook(array(__CLASS__, 'hook_posttemplates'), PO_AFTER, 'templates');
+ if ( $flags & RENDER_WIKI_TEMPLATE )
+ {
+ // FIXME: Where is noinclude/nodisplay being processed in the pipeline? (Seems to be processed, but not here)
+ }
+
+ //
+ // Set rules for the rendering process
+ //
+
+ if ( $flags & RENDER_BLOCK && !($flags & RENDER_INLINE) )
+ {
+ // block only
+ $carpenter->disable_all_rules();
+ foreach ( array('blockquote', 'tables', 'heading', 'hr', 'multilist', 'bold', 'italic', 'underline', 'paragraph', 'blockquotepost') as $rule )
+ {
+ $carpenter->enable_rule($rule);
+ }
+
+ $code = $plugins->setHook('render_block_only');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+ }
+ else if ( $flags & RENDER_INLINE && !($flags & RENDER_BLOCK) )
+ {
+ // inline only
+ $carpenter->disable_all_rules();
+ foreach ( array('bold', 'italic', 'underline', 'externalwithtext', 'externalnotext', 'image', 'internallink') as $rule )
+ {
+ $carpenter->enable_rule($rule);
+ }
+
+ $code = $plugins->setHook('render_inline_only');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+ }
+ else
+ {
+ // full render
+ $code = $plugins->setHook('render_full');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+ }
+ $text = $carpenter->render($text);
+
+ // For plugin compat
+ $result =& $text;
+
+ // Post processing hook
+ $code = $plugins->setHook('render_wikiformat_post');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ // Add PHP and nowiki back in
+ self::nowiki_unstrip($text, $nowiki_stripped);
+ self::php_unstrip($text, $php_stripped);
+
+ profiler_log("RenderMan: finished wikitext render");
+
+ return $text;
+ }
+
+ public static function hook_pre($text)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $code = $plugins->setHook('render_wikiformat_pre');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ return $text;
+ }
+
+ public static function hook_posttemplates($text)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $code = $plugins->setHook('render_wikiformat_posttemplates');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ return $text;
+ }
+
+ /**
+ * Strip out tags (to bypass parsing on them)
+ * @access private
+ */
+
+ private static function nowiki_strip(&$text, &$stripdata)
+ {
+ self::tag_strip('nowiki', $text, $stripdata);
+ }
+
+ /**
+ * Restore stripped tags.
+ * @access private
+ */
+
+ public static function nowiki_unstrip(&$text, &$stripdata)
+ {
+ self::tag_unstrip('nowiki', $text, $stripdata);
+ }
+
+ /**
+ * Strip out an arbitrary HTML tag.
+ * @access private
+ */
+
+ public static function tag_strip($tag, &$text, &$stripdata)
+ {
+ $random_id = md5( time() . mt_rand() );
+
+ preg_match_all("#<$tag>(.*?)#is", $text, $blocks);
+
+ foreach ( $blocks[0] as $i => $match )
+ {
+ $text = str_replace($match, "{{$tag}:{$random_id}:{$i}}", $text);
+ }
+
+ $stripdata = array(
+ 'random_id' => $random_id,
+ 'blocks' => $blocks[1]
+ );
+ }
+
+ /**
+ * Strip out an arbitrary HTML tag, pushing on to the existing list of stripped data.
+ * @access private
+ */
+
+ public static function tag_strip_push($tag, &$text, &$stripdata)
+ {
+ if ( !is_array($stripdata) )
+ {
+ $stripdata = array(
+ 'random_id' => md5( time() . mt_rand() ),
+ 'blocks' => array()
+ );
+ }
+ $random_id =& $stripdata['random_id'];
+
+ preg_match_all("#<$tag>(.*?)#is", $text, $blocks);
+
+ foreach ( $blocks[0] as $i => $match )
+ {
+ $j = count($stripdata['blocks']);
+ $stripdata['blocks'][] = $blocks[1][$i];
+ $text = str_replace($match, "{{$tag}:{$random_id}:{$j}}", $text);
+ }
+ }
+
+ /**
+ * Restore stripped tags.
+ * @access private
+ */
+
+ public static function tag_unstrip($tag, &$text, &$stripdata, $keep = false)
+ {
+ $random_id = $stripdata['random_id'];
+
+ foreach ( $stripdata['blocks'] as $i => $block )
+ {
+ $block = $keep ? "<$tag>$block" : $block;
+ $text = str_replace("{{$tag}:{$random_id}:{$i}}", $block, $text);
+ }
+
+ $stripdata = array();
+ }
+
+ /**
+ * Strip out PHP code (to prevent it from being sent through the parser). Private because it does not do what you think it does. (The method you are looking for is strip_php.)
+ * @access private
+ */
+
+ private static function php_strip(&$text, &$stripdata)
+ {
+ $random_id = md5( time() . mt_rand() );
+
+ preg_match_all('#<\?(?:php)?[\s=].+?\?>#is', $text, $blocks);
+
+ foreach ( $blocks[0] as $i => $match )
+ {
+ $text = str_replace($match, "{PHP:$random_id:$i}", $text);
+ }
+
+ $stripdata = array(
+ 'random_id' => $random_id,
+ 'blocks' => $blocks[0]
+ );
+ }
+
+ /**
+ * Restore stripped PHP code
+ * @access private
+ */
+
+ private static function php_unstrip(&$text, &$stripdata)
+ {
+ $random_id = $stripdata['random_id'];
+
+ foreach ( $stripdata['blocks'] as $i => $block )
+ {
+ $text = str_replace("{PHP:$random_id:$i}", $block, $text);
+ }
+
+ $stripdata = array();
+ }
+
+ /**
+ * Deprecated.
+ */
+
+ public static function wikiFormat($message, $filter_links = true, $do_params = false, $plaintext = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ return RenderMan::next_gen_wiki_format($message, $plaintext, $filter_links, $do_params);
+ }
+
+ public static function destroy_javascript($message, $_php = false)
+ {
+ $message = preg_replace('#<(script|object|applet|embed|iframe|frame|form|input|select)(.*?)>#is', '<\\1\\2>', $message);
+ $message = preg_replace('##is', '</\\1\\2>', $message);
+ $message = preg_replace('#(javascript|script|activex|chrome|about|applet):#is', '\\1:', $message);
+ if ( $_php )
+ {
+ // Left in only for compatibility
+ $message = preg_replace('#<(.*?)>#is', '<\\1>', $message);
+ $message = preg_replace('#<(.*?)>#is', '<\\1>', $message);
+ $message = preg_replace('#<(\?|\?php|%)(.*?)(\?|%)>#is', '<\\1\\2\\3>', $message);
+ // strip -type attacks
+ $message = preg_replace('#<([a-zA-Z:\-]+) (.*?)on([A-Za-z]*)=(.*?)>#is', '<\\1\\2on\\3=\\4>', $message);
+ }
+ return $message;
+ }
+
+ public static function strip_php($message)
+ {
+ return RenderMan::destroy_javascript($message, true);
+ }
+
+ public static function sanitize_html($text)
+ {
+ $text = htmlspecialchars($text);
+ $allowed_tags = Array('b', 'i', 'u', 'pre', 'code', 'tt', 'br', 'p', 'nowiki', '!--([\w\W]+)--');
+ foreach($allowed_tags as $t)
+ {
+ $text = preg_replace('#<'.$t.'>(.*?)</'.$t.'>#is', '<'.$t.'>\\1', $text);
+ $text = preg_replace('#<'.$t.' />#is', '<'.$t.' />', $text);
+ $text = preg_replace('#<'.$t.'>#is', '<'.$t.'>', $text);
+ }
+ return $text;
+ }
+
+ /**
+ * Reverse-renders a blob of text (converts it from XHTML back to wikitext) by using parser hints and educated guesses.
+ * @param string XHTML
+ * @return string Wikitext
+ */
+
+ public static function reverse_render($text)
+ {
+ // convert \r\n to \n
+ $text = str_replace("\r\n", "\n", $text);
+
+ // Separate certain block level elements onto their own lines. This tidies up the tag
+ // soup that TinyMCE sometimes produces.
+ $block_elements = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'div', 'table', 'ul', 'pre');
+ $block_elements = implode('|', $block_elements);
+ $regex = "#()\n?<($block_elements)(>| .+?>)#i";
+ $text = preg_replace($regex, "$1\n\n<$2$3", $text);
+
+ $text = self::reverse_process_parser_hints($text);
+ $text = self::reverse_process_headings($text);
+ $text = self::reverse_process_lists($text);
+ $text = self::reverse_process_tables($text);
+
+ // Lastly, strip out paragraph tags.
+ $text = preg_replace('|^ *(.+?)
*$|m', "\\1", $text);
+
+ return $text;
+ }
+
+ public static function reverse_process_parser_hints($text)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( !preg_match_all('|([\w\W]*?)|s', $text, $matches) )
+ return $text;
+
+ foreach ( $matches[0] as $i => $match )
+ {
+ $tag =& $matches[1][$i];
+ $attribs =& $matches[2][$i];
+ $inner =& $matches[3][$i];
+
+ $attribs = self::reverse_process_hint_attribs($attribs);
+ switch($tag)
+ {
+ case 'smiley':
+ case 'internallink':
+ case 'imagelink':
+ if ( isset($attribs['code']) )
+ {
+ $text = str_replace($match, $attribs['code'], $text);
+ }
+ else if ( isset($attribs['src']) )
+ {
+ $text = str_replace($match, $attribs['src'], $text);
+ }
+ break;
+ }
+ }
+
+ return $text;
+ }
+
+ public static function reverse_process_hint_attribs($attribs)
+ {
+ $return = array();
+ if ( !preg_match_all('/([a-z0-9_-]+)="([^"]+?)"/', $attribs, $matches) )
+ return array();
+
+ foreach ( $matches[0] as $i => $match )
+ {
+ $name =& $matches[1][$i];
+ $value =& $matches[2][$i];
+
+ $value = base64_decode($value);
+
+ $return[$name] = $value;
+ }
+
+ return $return;
+ }
+
+ /**
+ * Escapes a string so that it's safe to use as an attribute in a parser hint.
+ * @param string
+ * @return string
+ */
+
+ public static function escape_parser_hint_attrib($text)
+ {
+ return base64_encode($text);
+ }
+
+ public static function reverse_process_headings($text)
+ {
+ if ( !preg_match_all('|^(.*?)$|m', $text, $matches) )
+ return $text;
+
+ foreach ( $matches[0] as $i => $match )
+ {
+ // generate heading tag
+ $heading_size = intval($matches[1][$i]);
+ $eq = '';
+ for ( $j = 0; $j < $heading_size; $j++ )
+ $eq .= '=';
+
+ $heading =& $matches[2][$i];
+
+ $tag = "$eq $heading $eq";
+ $text = str_replace($match, $tag, $text);
+ }
+
+ return $text;
+ }
+
+ public static function reverse_process_lists($text)
+ {
+ if ( !preg_match('!()!', $text) )
+ return $text;
+
+ $split = preg_split('!()!', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+ $stack_height = 0;
+ $current_list = '';
+ $old_current_list = '';
+ $spaces = '';
+ $marker = '*';
+ $list_id = 0;
+ $just_terminated = false;
+ foreach ( $split as $tag )
+ {
+ switch($tag)
+ {
+ case '':
+ case '':
+ $stack_height++;
+ $just_terminated = false;
+ if ( $stack_height > 1 )
+ $spaces .= $marker;
+
+ $marker = ( $tag == 'ol' ) ? '#' : '*';
+ if ( $stack_height > 1 )
+ $current_list .= "\n";
+
+ break;
+ case '
':
+ case '':
+ $stack_height--;
+ $spaces = substr($spaces, 1);
+
+ if ( $stack_height == 0 )
+ {
+ // rotate
+ $text = str_replace_once("{$old_current_list}{$tag}", trim($current_list), $text);
+ $current_list = '';
+ $old_current_list = '';
+ }
+ $just_terminated = true;
+ break;
+ case '':
+ if ( $stack_height < 1 )
+ break;
+
+ $current_list .= "{$spaces}{$marker} ";
+ break;
+ case ' ':
+ if ( $stack_height < 1 )
+ break;
+
+ if ( !$just_terminated )
+ $current_list .= "\n";
+
+ $just_terminated = false;
+ break;
+ default:
+ if ( $stack_height > 0 )
+ {
+ $current_list .= trim($tag);
+ }
+ break;
+ }
+ if ( $stack_height > 0 )
+ {
+ $old_current_list .= $tag;
+ }
+ }
+
+ return $text;
+ }
+
+ public static function reverse_process_tables($text)
+ {
+ return $text;
+ }
+
+ /**
+ * Parses internal links (wikilinks) in a block of text.
+ * @param string Text to process
+ * @param string Optional. If included will be used as a template instead of using the default syntax.
+ * @param bool If false, does not add wikilink-nonexistent or check for exsistence of pages. Can reduce DB queries; defualts to true.
+ * @param string Page ID. If specified, class="currentpage" will be added to links if they match the given page ID and namespace
+ * @param string Namespace. If specified, class="currentpage" will be added to links if they match the given page ID and namespace
+ * @return string
+ */
+
+ public static function parse_internal_links($text, $tplcode = false, $do_exist_check = true, $match_page_id = false, $match_namespace = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $parser = is_string($tplcode) ? $template->makeParserText($tplcode) : false;
+
+ // allow blank urlname?
+ $repeater = have_blank_urlname_page() ? '*' : '+';
+
+ // stage 1 - links with alternate text
+ preg_match_all('/\[\[([^\[\]<>\{\}\|]' . $repeater . ')\|(.+?)\]\]/', $text, $matches);
+ foreach ( $matches[0] as $i => $match )
+ {
+ list($page_id, $namespace) = RenderMan::strToPageID($matches[1][$i]);
+ $link = self::generate_internal_link($namespace, $page_id, $matches[2][$i], $match, $parser, $do_exist_check, $match_page_id, $match_namespace);
+ $text = str_replace($match, $link, $text);
+ }
+
+ // stage 2 - links with no alternate text
+ preg_match_all('/\[\[([^\[\]<>\{\}\|]' . $repeater . ')\]\]/', $text, $matches);
+ foreach ( $matches[0] as $i => $match )
+ {
+ list($page_id, $namespace) = RenderMan::strToPageID($matches[1][$i]);
+ $pid_clean = $paths->nslist[$namespace] . sanitize_page_id($page_id);
+ $inner_text = ( isPage($pid_clean) ) ? htmlspecialchars(get_page_title($pid_clean)) : htmlspecialchars($matches[1][$i]);
+
+ $link = self::generate_internal_link($namespace, $page_id, $inner_text, $match, $parser, $do_exist_check, $match_page_id, $match_namespace);
+
+ $text = str_replace($match, $link, $text);
+ }
+
+ return $text;
+ }
+
+ /**
+ * Internal link generation function
+ * @access private
+ * @return string HTML
+ */
+
+ private static function generate_internal_link($namespace, $page_id, $inner_text, $match, $parser = false, $do_exist_check = true, $match_page_id = false, $match_namespace = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( ($pos = strrpos($page_id, '#')) !== false )
+ {
+ $hash = substr($page_id, $pos);
+ $page_id = substr($page_id, 0, $pos);
+ }
+ else
+ {
+ $hash = '';
+ }
+
+ if ( $namespace == 'Admin' )
+ {
+ // No linking directly to Admin pages!
+ $get = 'module=' . $paths->nslist[$namespace] . sanitize_page_id($page_id);
+ $pid_clean = $paths->nslist['Special'] . 'Administration';
+ $onclick = ' onclick="ajaxLoginNavTo(\'Special\', \'Administration\', USER_LEVEL_ADMIN, \'' . addslashes($get) . '\'); return false;"';
+ }
+ else
+ {
+ $get = false;
+ $onclick = '';
+ $pid_clean = $paths->nslist[$namespace] . sanitize_page_id($page_id);
+ }
+
+ $url = makeUrl($pid_clean, $get, true) . $hash;
+ $quot = '"';
+ $exists = ( ($do_exist_check && isPage($pid_clean)) || !$do_exist_check ) ? '' : ' class="wikilink-nonexistent"';
+
+ if ( $match_page_id && $match_namespace && $pid_clean === $paths->get_pathskey($match_page_id, $match_namespace) )
+ $exists .= ' class="currentpage"';
+
+ if ( $parser )
+ {
+ $parser->assign_vars(array(
+ 'HREF' => $url,
+ 'FLAGS' => $exists,
+ 'TEXT' => $inner_text
+ ));
+ $link = $parser->run();
+ }
+ else
+ {
+ $omatch = self::escape_parser_hint_attrib($match);
+ $link = "{$inner_text} ";
+ }
+
+ return $link;
+ }
+
+ /**
+ * Parses a partial template tag in wikitext, and return an array with the parameters.
+ * @param string The portion of the template tag that contains the parameters.
+ * @example
+ *
+ foo = lorem ipsum
+ bar = dolor sit amet
+ *
+ * @return array Example:
+ * [foo] => lorem ipsum
+ * [bar] => dolor sit amet
+ */
+
+ public static function parse_template_vars($input, $newlinemode = true)
+ {
+ $parms = array();
+ $input = trim($input);
+ if ( $newlinemode )
+ {
+ // we're going by newlines.
+ // split by parameter, then parse each one individually
+ $input = explode("\n", str_replace("\r", '', $input));
+ $lastparam = '';
+ $i = 0;
+ foreach ( $input as $line )
+ {
+ if ( preg_match('/^ *\|? *([A-z0-9_]+) *= *(.+)$/', $line, $match) )
+ {
+ // new parameter, named
+ $parms[ $match[1] ] = $match[2];
+ $lastparam = $match[1];
+ }
+ else if ( preg_match('/^ *\| *(.+)$/', $line, $match) || $lastparam === '' )
+ {
+ $parms[ $i ] = $match[1];
+ $lastparam = $i;
+ $i++;
+ }
+ else
+ {
+ $parms[ $lastparam ] .= "\n$line";
+ }
+ }
+ }
+ else
+ {
+ $result = preg_match_all('/
+ (?:^|[ ]*)\| # start of parameter - string start or series of spaces
+ [ ]*
+ (?:
+ ([A-z0-9_]+) # variable name
+ [ ]* = [ ]* # assignment
+ )? # name section is optional - if the parameter name is not given, a numerical index is assigned
+ ([^\|]+|.+?\n[ ]*\|) # value
+ /x', trim($input), $matches);
+ if ( $result )
+ {
+ $pi = 0;
+ for ( $i = 0; $i < count($matches[0]); $i++ )
+ {
+ $matches[1][$i] = trim($matches[1][$i]);
+ $parmname = !empty($matches[1][$i]) ? $matches[1][$i] : strval(++$pi);
+ $parms[ $parmname ] = $matches[2][$i];
+ }
+ }
+ }
+ // die('' . print_r($parms, true) . '
');
+ return $parms;
+ }
+
+ /**
+ * Processes all template tags within a block of wikitext.
+ * Updated in 1.0.2 to also parse template tags in the format of {{Foo |a = b |b = c |c = therefore, a}}
+ * @param string The text to process
+ * @return string Formatted text
+ * @example
+ *
+ $text = '{{Template
+ | parm1 = Foo
+ | parm2 = Bar
+ }}';
+ $text = RenderMan::include_templates($text);
+ *
+ */
+
+ public static function include_templates($text)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ // $template_regex = "/\{\{([^\]]+?)((\n([ ]*?)[A-z0-9]+([ ]*?)=([ ]*?)(.+?))*)\}\}/is";
+ // matches:
+ // 1 - template name
+ // 2 - parameter section
+ $template_regex = "/
+ \{\{ # opening
+ ([^\n\t\a\r]+) # template name
+ ((?:(?:[\s]+\|?)[ ]*(?:[A-z0-9_]+)[ ]*=[ ]*?(?:.+))*) # parameters
+ \}\} # closing
+ /isxU";
+ if ( $count = preg_match_all($template_regex, $text, $matches) )
+ {
+ // die('' . print_r($matches, true) . '
');
+ for ( $i = 0; $i < $count; $i++ )
+ {
+ $matches[1][$i] = sanitize_page_id($matches[1][$i]);
+ $newlinemode = ( substr($matches[2][$i], 0, 1) == "\n" );
+ $parmsection = trim($matches[2][$i]);
+ if ( !empty($parmsection) )
+ {
+ $parms = RenderMan::parse_template_vars($parmsection, $newlinemode);
+ if ( !is_array($parms) )
+ // Syntax error
+ $parms = array();
+ }
+ else
+ {
+ $parms = Array();
+ }
+ if ( $tpl_code = RenderMan::fetch_template_text($matches[1][$i]) )
+ {
+ // Intelligent paragraphs.
+ // If:
+ // * A line is fully wrapped in a tag
+ // * The line contains a variable
+ // * The variable contains newlines
+ // Then:
+ // * Drop the
tag, replace it fully paragraph-ized by newlines
+
+ if ( preg_match_all('/^( *)(.*?\{([A-z0-9]+)\}.*?)<\/p> *$/m', $tpl_code, $paramatch) )
+ {
+ $parser = new Carpenter();
+ $parser->exclusive_rule('paragraph');
+
+ foreach ( $paramatch[0] as $j => $match )
+ {
+ // $line is trimmed (the is gone)
+ $spacing =& $paramatch[1][$i];
+ $para_attrs =& $paramatch[2][$j];
+ $para_attrs = str_replace(array('$', '\\'), array('\$', '\\\\'), $para_attrs);
+ $line =& $paramatch[3][$j];
+ $varname =& $paramatch[4][$j];
+ if ( isset($parms[$varname]) && strstr($parms[$varname], "\n") )
+ {
+ $newline = str_replace('{' . $varname . '}', $parms[$varname], $line);
+ $paraized = $parser->render($newline);
+ $paraized = preg_replace('/^
/m', "$spacing", $paraized);
+ $paraized = $spacing . trim($paraized);
+ $tpl_code = str_replace_once($match, $paraized, $tpl_code);
+ }
+ }
+ }
+
+ $parser = $template->makeParserText($tpl_code);
+ $parser->assign_vars($parms);
+ $text = str_replace($matches[0][$i], $parser->run(), $text);
+ }
+ }
+ }
+ return $text;
+ }
+
+ /**
+ * Preprocesses an HTML text string prior to being sent to MySQL.
+ * @param string $text
+ * @param bool $strip_all_php - if true, strips all PHP regardless of user permissions. Else, strips PHP only if user level < USER_LEVEL_ADMIN. Defaults to true.
+ * @param bool $sqlescape - if true, sends text through $db->escape(). Otherwise returns unescaped text. Defaults to true.
+ * @param bool $reduceheadings - if true, finds HTML headings and replaces them with wikitext. Else, does not touch headings. Defaults to true.
+ * @param Session_ACLPageInfo Optional permissions instance to check against, $session is used if not provided
+ */
+ public static function preprocess_text($text, $strip_all_php = true, $sqlescape = true, $reduceheadings = true, $perms = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $random_id = md5( time() . mt_rand() );
+
+ $code = $plugins->setHook('render_sanitize_pre');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ if ( !is_object($perms) )
+ {
+ $namespace = $paths->namespace;
+ $perms =& $session;
+ }
+ else
+ {
+ $namespace = $perms->namespace;
+ }
+
+ $can_do_php = ( !$strip_all_php && $perms->get_permissions('php_in_pages') );
+ $can_do_html = $session->check_acl_scope('html_in_pages', $namespace) && $perms->get_permissions('html_in_pages');
+
+ if ( $can_do_html && !$can_do_php )
+ {
+ $text = preg_replace('#<(\?|\?php|%)(.*?)(\?|%)>#is', '<\\1\\2\\3>', $text);
+ }
+ else if ( !$can_do_html && !$can_do_php )
+ {
+ $text = sanitize_html($text, true);
+ // If we can't do PHP, we can't do Javascript either.
+ $text = RenderMan::destroy_javascript($text);
+ }
+
+ // Strip out sections and PHP code
+
+ $php = preg_match_all('#(<|<)\?php(.*?)\?(>|>)#is', $text, $phpsec);
+
+ //die(''.htmlspecialchars(print_r($phpsec, true))."\n".htmlspecialchars(print_r($text, true)).'
');
+
+ for($i=0;$i(.*?)<\/nowiki>#is', $text, $nowiki);
+
+ for($i=0;$i'.$nowiki[1][$i].' ', '{NOWIKI:'.$random_id.':'.$i.'}', $text);
+ }
+
+ $text = str_replace('~~~~~', enano_date('G:i, j F Y (T)'), $text);
+ $text = str_replace('~~~~', "[[User:$session->username|$session->username]] ".enano_date('G:i, j F Y (T)'), $text);
+ $text = str_replace('~~~', "[[User:$session->username|$session->username]] ", $text);
+
+ $code = $plugins->setHook('render_sanitize_post');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ // gently apply some reverse-processing to allow the parser to do magic with TOCs and stuff
+ if ( $reduceheadings )
+ $text = self::reverse_process_headings($text);
+
+ // Reinsert sections
+ for($i=0;$i<$nw;$i++)
+ {
+ $text = str_replace('{NOWIKI:'.$random_id.':'.$i.'}', ''.$nowiki[1][$i].' ', $text);
+ }
+ // Reinsert PHP
+ for($i=0;$i<$php;$i++)
+ {
+ $phsec = ''.$phpsec[1][$i].'?php'.$phpsec[2][$i].'?'.$phpsec[3][$i].'';
+ if ( $strip_all_php )
+ $phsec = htmlspecialchars($phsec);
+ $text = str_replace('{PHP:'.$random_id.':'.$i.'}', $phsec, $text);
+ }
+
+ $text = ( $sqlescape ) ? $db->escape($text) : $text;
+
+ return $text;
+ }
+
+ public static function smilieyize($text, $complete_urls = false)
+ {
+
+ $random_id = md5( time() . mt_rand() );
+
+ // Smileys array - eventually this will be fetched from the database by
+ // RenderMan::initSmileys during initialization, but it will all be hardcoded for beta 2
+
+ $smileys = Array(
+ 'O:-)' => 'face-angel.png',
+ 'O:)' => 'face-angel.png',
+ 'O=)' => 'face-angel.png',
+ ':-)' => 'face-smile.png',
+ ':)' => 'face-smile.png',
+ '=)' => 'face-smile-big.png',
+ ':-(' => 'face-sad.png',
+ ':(' => 'face-sad.png',
+ ';(' => 'face-sad.png',
+ ':-O' => 'face-surprise.png',
+ ';-)' => 'face-wink.png',
+ ';)' => 'face-wink.png',
+ '8-)' => 'face-glasses.png',
+ '8)' => 'face-glasses.png',
+ ':-D' => 'face-grin.png',
+ ':D' => 'face-grin.png',
+ '=D' => 'face-grin.png',
+ ':-*' => 'face-kiss.png',
+ ':*' => 'face-kiss.png',
+ '=*' => 'face-kiss.png',
+ ':\'(' => 'face-crying.png',
+ ':-|' => 'face-plain.png',
+ ':-\\' => 'face-plain.png',
+ ':-/' => 'face-plain.png',
+ ':joke:' => 'face-plain.png',
+ ']:->' => 'face-devil-grin.png',
+ ']:->' => 'face-devil-grin.png',
+ ':kiss:' => 'face-kiss.png',
+ ':-P' => 'face-tongue-out.png',
+ ':P' => 'face-tongue-out.png',
+ ':-p' => 'face-tongue-out.png',
+ ':p' => 'face-tongue-out.png',
+ ':-X' => 'face-sick.png',
+ ':X' => 'face-sick.png',
+ ':sick:' => 'face-sick.png',
+ ':-]' => 'face-oops.png',
+ ':]' => 'face-oops.png',
+ ':oops:' => 'face-oops.png',
+ ':-[' => 'face-embarassed.png',
+ ':[' => 'face-embarassed.png'
+ );
+
+ // Strip out sections
+ //return ''.htmlspecialchars($text).'
';
+ $nw = preg_match_all('#(.*?)<\/nowiki>#is', $text, $nowiki);
+
+ for ( $i = 0; $i < count($nowiki[1]); $i++ )
+ {
+ $text = str_replace('' . $nowiki[1][$i] . ' ', '{NOWIKI:'.$random_id.':'.$i.'}', $text);
+ }
+
+ foreach ( $smileys as $smiley => $smiley_path )
+ {
+ $hex_smiley = hexencode($smiley, '&#x', ';');
+ $pfx = ( $complete_urls ) ? get_server_url() : '';
+ $text = str_replace(' ' . $smiley,
+ '
+
+
+ ', $text);
+ }
+ //*/
+
+ // Reinsert sections
+ for ( $i = 0; $i < $nw; $i++ )
+ {
+ $text = str_replace('{NOWIKI:'.$random_id.':'.$i.'}', ''.$nowiki[1][$i].' ', $text);
+ }
+
+ return $text;
+ }
+
+ /**
+ * Generates a summary of the differences between two texts, and formats it as XHTML.
+ * @param $str1 string the first block of text
+ * @param $str2 string the second block of text
+ * @return string
+ */
+ public static function diff($str1, $str2)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ require_once(ENANO_ROOT.'/includes/diff.php');
+ $str1 = explode("\n", $str1);
+ $str2 = explode("\n", $str2);
+ $diff = new Diff($str1, $str2);
+ $renderer = new TableDiffFormatter();
+ return ''.$renderer->format($diff).'
';
+ }
+
+ /**
+ * Changes wikitext image tags to HTML.
+ * @param string The wikitext to process
+ * @param array Will be overwritten with the list of HTML tags (the system uses tokens for TextWiki compatibility)
+ * @return string
+ */
+
+ public static function process_image_tags($text, &$taglist)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $s_delim = "\xFF";
+ $f_delim = "\xFF";
+ $taglist = array();
+
+ // Wicked huh?
+ $ns_file = str_replace('/', '\\/', preg_quote($paths->nslist['File']));
+ $regex = '/
+ \[\[ # starting delimiter
+ :' . $ns_file . '([\w\s0-9_\(\)!@%\^\+\|\.-]+?\.(?:png|gif|jpg|jpeg)) # image filename
+ (?:(?:\|(?:.+?))*) # parameters
+ \]\] # ending delimiter
+ /ix';
+
+ preg_match_all($regex, $text, $matches);
+
+ foreach ( $matches[0] as $i => $match )
+ {
+
+ $full_tag =& $matches[0][$i];
+ $filename =& $matches[1][$i];
+
+ // apply recursion (hack? @todo could this be done with (?R) in PCRE?)
+ $tag_pos = strpos($text, $full_tag);
+ $tag_end_pos = $tag_pos + strlen($full_tag);
+ while ( get_char_count($full_tag, ']') < get_char_count($full_tag, '[') && $tag_end_pos < strlen($text) )
+ {
+ $full_tag .= substr($text, $tag_end_pos, 1);
+ $tag_end_pos++;
+ }
+ if ( $tag_end_pos > strlen($text) )
+ {
+ // discard tag, not closed fully
+ continue;
+ }
+
+ // init the various image parameters
+ $width = null;
+ $height = null;
+ $scale_type = null;
+ $raw_display = false;
+ $clear = null;
+ $caption = null;
+
+ // trim tag and parse particles
+ $tag_trim = rtrim(ltrim($full_tag, '['), ']');
+ // trim off the filename from the start of the tag
+ $filepart_len = 1 + strlen($paths->nslist['File']) + strlen($filename) + 1;
+ $tag_trim = substr($tag_trim, $filepart_len);
+ // explode and we should have parameters
+ $tag_parts = explode('|', $tag_trim);
+
+ // for each of the parameters, see if it matches a known option. If so, apply it;
+ // otherwise, see if a plugin reserved that parameter and if not treat it as the caption
+ foreach ( $tag_parts as $param )
+ {
+ switch($param)
+ {
+ case 'left':
+ case 'right':
+ $clear = $param;
+ break;
+ case 'thumb':
+ $scale_type = 'thumb';
+ break;
+ case 'raw':
+ $raw_display = true;
+ break;
+ default:
+ // height specification
+ if ( preg_match('/^([0-9]+)x([0-9]+)$/', $param, $dims) )
+ {
+ $width = intval($dims[1]);
+ $height = intval($dims[2]);
+ break;
+ }
+ // not the height, so see if a plugin took this over
+ // this hook requires plugins to return true if they modified anything
+ $code = $plugins->setHook('img_tag_parse_params');
+ foreach ( $code as $cmd )
+ {
+ if ( eval($cmd) )
+ break 2;
+ }
+ // we would have broken out by now if a plugin properly handled this,
+ // so just set the caption now.
+ $caption = $param;
+ break;
+ }
+ }
+
+ if ( !isPage( $paths->nslist['File'] . $filename ) )
+ {
+ $text = str_replace($full_tag, '[[' . $paths->nslist['File'] . $filename . ']]', $text);
+ continue;
+ }
+
+ if ( $scale_type == 'thumb' )
+ {
+ $r_width = 225;
+ $r_height = 225;
+
+ $url = makeUrlNS('Special', 'DownloadFile/' . $filename, 'preview&width=' . $r_width . '&height=' . $r_height, true);
+ }
+ else if ( !empty($width) && !empty($height) )
+ {
+ $r_width = $width;
+ $r_height = $height;
+
+ $url = makeUrlNS('Special', 'DownloadFile/' . $filename, 'preview&width=' . $r_width . '&height=' . $r_height, true);
+ }
+ else
+ {
+ $url = makeUrlNS('Special', 'DownloadFile/' . $filename);
+ }
+
+ $img_tag = 'setHook('img_tag_parse_img');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ $img_tag .= '/>';
+
+ $s_full_tag = self::escape_parser_hint_attrib($full_tag);
+ $complete_tag = '';
+
+ if ( !empty($scale_type) && !$raw_display )
+ {
+ $complete_tag .= '';
+ $complete_tag .= $img_tag;
+ $complete_tag .= '';
+
+ $mag_button = '';
+
+ if ( !empty($caption) )
+ {
+ $complete_tag .= $mag_button . $caption;
+ }
+
+ $complete_tag .= '';
+ }
+ else if ( $raw_display )
+ {
+ $complete_tag .= "$img_tag";
+ $taglist[$i] = $complete_tag;
+
+ $repl = "{$s_delim}e_img_{$i}{$f_delim}";
+ $text = str_replace($full_tag, $repl, $text);
+ continue;
+ }
+ else
+ {
+ $complete_tag .= 'setHook('img_tag_parse_link');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+ $complete_tag .= '>';
+ $complete_tag .= $img_tag;
+ $complete_tag .= '';
+ }
+
+ $complete_tag .= "";
+ $taglist[$i] = $complete_tag;
+
+ /*
+ $pos = strpos($text, $full_tag);
+
+ while(true)
+ {
+ $check1 = substr($text, $pos, 3);
+ $check2 = substr($text, $pos, 1);
+ if ( $check1 == '' || $pos == 0 || $check2 == "\n" )
+ {
+ // die('found at pos '.$pos);
+ break;
+ }
+ $pos--;
+ }
+ */
+
+ /*
+ $repl = "{$s_delim}e_img_{$i}{$f_delim}";
+ $text = substr($text, 0, $pos) . $repl . substr($text, $pos);
+
+ $text = str_replace($full_tag, '', $text);
+ */
+ $text = str_replace_once($full_tag, $complete_tag, $text);
+
+ unset($full_tag, $filename, $scale_type, $width, $height, $clear, $caption, $r_width, $r_height);
+
+ }
+
+ // if ( count($matches[0]) > 0 )
+ // die('
' . htmlspecialchars($text) . '
');
+
+ return $text;
+ }
+
+ /**
+ * Finalizes processing of image tags.
+ * @param string The preprocessed text
+ * @param array The list of image tags created by RenderMan::process_image_tags()
+ */
+
+ public static function process_imgtags_stage2($text, $taglist)
+ {
+ $s_delim = "\xFF";
+ $f_delim = "\xFF";
+ foreach ( $taglist as $i => $tag )
+ {
+ $repl = "{$s_delim}e_img_{$i}{$f_delim}";
+ $text = str_replace($repl, $tag, $text);
+ }
+ return $text;
+ }
+
}
?>
diff -r de56132c008d -r bdac73ed481e includes/rijndael.php
--- a/includes/rijndael.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/rijndael.php Sun Mar 28 23:10:46 2010 -0400
@@ -49,1355 +49,1355 @@
class librijndael2
{
- //////////////////// CONVERSION FUNCTIONS ///////////////////////////
+ //////////////////// CONVERSION FUNCTIONS ///////////////////////////
- // Byte to hex
- static function byte2hex($byte)
- {
- if ( strlen(dechex(ord($byte))) < 2 )
- return ( "0" . dechex(ord($byte)) );
- else
- return ( dechex(ord($byte)) );
- }
+ // Byte to hex
+ static function byte2hex($byte)
+ {
+ if ( strlen(dechex(ord($byte))) < 2 )
+ return ( "0" . dechex(ord($byte)) );
+ else
+ return ( dechex(ord($byte)) );
+ }
- /* Convert String to Hex String
- * Null byte cannot appear in middle of String.
- * this function is necessary because toString(16) does not
- * produces two hex caracters for 0 to 15.
- */
- static function string2hex ($s) {
- $hex = '';
- for ($x = 0; $x < strlen($s); $x++) {
- $byte = $s{$x};
- $hex .= librijndael2::byte2hex($byte);
- }
+ /* Convert String to Hex String
+ * Null byte cannot appear in middle of String.
+ * this function is necessary because toString(16) does not
+ * produces two hex caracters for 0 to 15.
+ */
+ static function string2hex ($s) {
+ $hex = '';
+ for ($x = 0; $x < strlen($s); $x++) {
+ $byte = $s{$x};
+ $hex .= librijndael2::byte2hex($byte);
+ }
- return $hex;
- }
-
- /* Convert Hex String to String
- * 00 (NULL) is not converted!
- * Hex String must be even number of chars (A must be 0A, F must be 0F, etc)
- */
- static function hex2string($hex) {
- $s = '';
- if (strlen($hex) % 2 == 1) {
- librijndael2::trace("Error: Hex String must be even number of chars");
- return -1;
- }
+ return $hex;
+ }
+
+ /* Convert Hex String to String
+ * 00 (NULL) is not converted!
+ * Hex String must be even number of chars (A must be 0A, F must be 0F, etc)
+ */
+ static function hex2string($hex) {
+ $s = '';
+ if (strlen($hex) % 2 == 1) {
+ librijndael2::trace("Error: Hex String must be even number of chars");
+ return -1;
+ }
- for ( $i = 0; $i < strlen($hex); $i+=2 )
- {
- $byte = $hex{$i} . $hex{$i+1};
- $s .= chr(hexdec($byte));
- }
-
- return $s;
- }
-
- static function trace($error)
- {
- // $bt = debug_backtrace();
- echo("$error\n");
- // echo '' . htmlspecialchars(print_r($bt, true)) . '
';
-
- exit();
- }
-
- static function parseInt($str)
- {
- if ( is_int($str) )
- return $str;
- if ( !is_string($str) )
- librijndael2::trace('Error: non-string (' . gettype($str) . ') passed to librijndael2::parseInt(' . $str . ')');
- if ( substr($str, 0, 2) == '0x' )
- {
- return ( preg_match('/^0x([a-f0-9][a-f0-9])+$/i', $str) ) ? eval("return $str;") : intval($str);
- }
- return intval($str);
- }
-
- static function ord2hex($byte)
- {
- if ( !is_int($byte) )
- librijndael2::trace('Error: non-integer passed to ord2hex()');
- $result = strval(dechex($byte));
- if ( strlen($result) < 2 )
- $result = "0$result";
- return $result;
- }
+ for ( $i = 0; $i < strlen($hex); $i+=2 )
+ {
+ $byte = $hex{$i} . $hex{$i+1};
+ $s .= chr(hexdec($byte));
+ }
+
+ return $s;
+ }
+
+ static function trace($error)
+ {
+ // $bt = debug_backtrace();
+ echo("$error\n");
+ // echo '' . htmlspecialchars(print_r($bt, true)) . '
';
+
+ exit();
+ }
+
+ static function parseInt($str)
+ {
+ if ( is_int($str) )
+ return $str;
+ if ( !is_string($str) )
+ librijndael2::trace('Error: non-string (' . gettype($str) . ') passed to librijndael2::parseInt(' . $str . ')');
+ if ( substr($str, 0, 2) == '0x' )
+ {
+ return ( preg_match('/^0x([a-f0-9][a-f0-9])+$/i', $str) ) ? eval("return $str;") : intval($str);
+ }
+ return intval($str);
+ }
+
+ static function ord2hex($byte)
+ {
+ if ( !is_int($byte) )
+ librijndael2::trace('Error: non-integer passed to ord2hex()');
+ $result = strval(dechex($byte));
+ if ( strlen($result) < 2 )
+ $result = "0$result";
+ return $result;
+ }
}
class Crypt_Rijndael
{
//////////////////// TABLES, STRUCTURES... ////////////////////////
-
- var $Te0 = array(
- 0xc66363a5, 0xf87c7c84, 0xee777799, 0xf67b7b8d,
- 0xfff2f20d, 0xd66b6bbd, 0xde6f6fb1, 0x91c5c554,
- 0x60303050, 0x02010103, 0xce6767a9, 0x562b2b7d,
- 0xe7fefe19, 0xb5d7d762, 0x4dababe6, 0xec76769a,
- 0x8fcaca45, 0x1f82829d, 0x89c9c940, 0xfa7d7d87,
- 0xeffafa15, 0xb25959eb, 0x8e4747c9, 0xfbf0f00b,
- 0x41adadec, 0xb3d4d467, 0x5fa2a2fd, 0x45afafea,
- 0x239c9cbf, 0x53a4a4f7, 0xe4727296, 0x9bc0c05b,
- 0x75b7b7c2, 0xe1fdfd1c, 0x3d9393ae, 0x4c26266a,
- 0x6c36365a, 0x7e3f3f41, 0xf5f7f702, 0x83cccc4f,
- 0x6834345c, 0x51a5a5f4, 0xd1e5e534, 0xf9f1f108,
- 0xe2717193, 0xabd8d873, 0x62313153, 0x2a15153f,
- 0x0804040c, 0x95c7c752, 0x46232365, 0x9dc3c35e,
- 0x30181828, 0x379696a1, 0x0a05050f, 0x2f9a9ab5,
- 0x0e070709, 0x24121236, 0x1b80809b, 0xdfe2e23d,
- 0xcdebeb26, 0x4e272769, 0x7fb2b2cd, 0xea75759f,
- 0x1209091b, 0x1d83839e, 0x582c2c74, 0x341a1a2e,
- 0x361b1b2d, 0xdc6e6eb2, 0xb45a5aee, 0x5ba0a0fb,
- 0xa45252f6, 0x763b3b4d, 0xb7d6d661, 0x7db3b3ce,
- 0x5229297b, 0xdde3e33e, 0x5e2f2f71, 0x13848497,
- 0xa65353f5, 0xb9d1d168, 0x00000000, 0xc1eded2c,
- 0x40202060, 0xe3fcfc1f, 0x79b1b1c8, 0xb65b5bed,
- 0xd46a6abe, 0x8dcbcb46, 0x67bebed9, 0x7239394b,
- 0x944a4ade, 0x984c4cd4, 0xb05858e8, 0x85cfcf4a,
- 0xbbd0d06b, 0xc5efef2a, 0x4faaaae5, 0xedfbfb16,
- 0x864343c5, 0x9a4d4dd7, 0x66333355, 0x11858594,
- 0x8a4545cf, 0xe9f9f910, 0x04020206, 0xfe7f7f81,
- 0xa05050f0, 0x783c3c44, 0x259f9fba, 0x4ba8a8e3,
- 0xa25151f3, 0x5da3a3fe, 0x804040c0, 0x058f8f8a,
- 0x3f9292ad, 0x219d9dbc, 0x70383848, 0xf1f5f504,
- 0x63bcbcdf, 0x77b6b6c1, 0xafdada75, 0x42212163,
- 0x20101030, 0xe5ffff1a, 0xfdf3f30e, 0xbfd2d26d,
- 0x81cdcd4c, 0x180c0c14, 0x26131335, 0xc3ecec2f,
- 0xbe5f5fe1, 0x359797a2, 0x884444cc, 0x2e171739,
- 0x93c4c457, 0x55a7a7f2, 0xfc7e7e82, 0x7a3d3d47,
- 0xc86464ac, 0xba5d5de7, 0x3219192b, 0xe6737395,
- 0xc06060a0, 0x19818198, 0x9e4f4fd1, 0xa3dcdc7f,
- 0x44222266, 0x542a2a7e, 0x3b9090ab, 0x0b888883,
- 0x8c4646ca, 0xc7eeee29, 0x6bb8b8d3, 0x2814143c,
- 0xa7dede79, 0xbc5e5ee2, 0x160b0b1d, 0xaddbdb76,
- 0xdbe0e03b, 0x64323256, 0x743a3a4e, 0x140a0a1e,
- 0x924949db, 0x0c06060a, 0x4824246c, 0xb85c5ce4,
- 0x9fc2c25d, 0xbdd3d36e, 0x43acacef, 0xc46262a6,
- 0x399191a8, 0x319595a4, 0xd3e4e437, 0xf279798b,
- 0xd5e7e732, 0x8bc8c843, 0x6e373759, 0xda6d6db7,
- 0x018d8d8c, 0xb1d5d564, 0x9c4e4ed2, 0x49a9a9e0,
- 0xd86c6cb4, 0xac5656fa, 0xf3f4f407, 0xcfeaea25,
- 0xca6565af, 0xf47a7a8e, 0x47aeaee9, 0x10080818,
- 0x6fbabad5, 0xf0787888, 0x4a25256f, 0x5c2e2e72,
- 0x381c1c24, 0x57a6a6f1, 0x73b4b4c7, 0x97c6c651,
- 0xcbe8e823, 0xa1dddd7c, 0xe874749c, 0x3e1f1f21,
- 0x964b4bdd, 0x61bdbddc, 0x0d8b8b86, 0x0f8a8a85,
- 0xe0707090, 0x7c3e3e42, 0x71b5b5c4, 0xcc6666aa,
- 0x904848d8, 0x06030305, 0xf7f6f601, 0x1c0e0e12,
- 0xc26161a3, 0x6a35355f, 0xae5757f9, 0x69b9b9d0,
- 0x17868691, 0x99c1c158, 0x3a1d1d27, 0x279e9eb9,
- 0xd9e1e138, 0xebf8f813, 0x2b9898b3, 0x22111133,
- 0xd26969bb, 0xa9d9d970, 0x078e8e89, 0x339494a7,
- 0x2d9b9bb6, 0x3c1e1e22, 0x15878792, 0xc9e9e920,
- 0x87cece49, 0xaa5555ff, 0x50282878, 0xa5dfdf7a,
- 0x038c8c8f, 0x59a1a1f8, 0x09898980, 0x1a0d0d17,
- 0x65bfbfda, 0xd7e6e631, 0x844242c6, 0xd06868b8,
- 0x824141c3, 0x299999b0, 0x5a2d2d77, 0x1e0f0f11,
- 0x7bb0b0cb, 0xa85454fc, 0x6dbbbbd6, 0x2c16163a
- );
-
- var $Te1 = array(
- 0xa5c66363, 0x84f87c7c, 0x99ee7777, 0x8df67b7b,
- 0x0dfff2f2, 0xbdd66b6b, 0xb1de6f6f, 0x5491c5c5,
- 0x50603030, 0x03020101, 0xa9ce6767, 0x7d562b2b,
- 0x19e7fefe, 0x62b5d7d7, 0xe64dabab, 0x9aec7676,
- 0x458fcaca, 0x9d1f8282, 0x4089c9c9, 0x87fa7d7d,
- 0x15effafa, 0xebb25959, 0xc98e4747, 0x0bfbf0f0,
- 0xec41adad, 0x67b3d4d4, 0xfd5fa2a2, 0xea45afaf,
- 0xbf239c9c, 0xf753a4a4, 0x96e47272, 0x5b9bc0c0,
- 0xc275b7b7, 0x1ce1fdfd, 0xae3d9393, 0x6a4c2626,
- 0x5a6c3636, 0x417e3f3f, 0x02f5f7f7, 0x4f83cccc,
- 0x5c683434, 0xf451a5a5, 0x34d1e5e5, 0x08f9f1f1,
- 0x93e27171, 0x73abd8d8, 0x53623131, 0x3f2a1515,
- 0x0c080404, 0x5295c7c7, 0x65462323, 0x5e9dc3c3,
- 0x28301818, 0xa1379696, 0x0f0a0505, 0xb52f9a9a,
- 0x090e0707, 0x36241212, 0x9b1b8080, 0x3ddfe2e2,
- 0x26cdebeb, 0x694e2727, 0xcd7fb2b2, 0x9fea7575,
- 0x1b120909, 0x9e1d8383, 0x74582c2c, 0x2e341a1a,
- 0x2d361b1b, 0xb2dc6e6e, 0xeeb45a5a, 0xfb5ba0a0,
- 0xf6a45252, 0x4d763b3b, 0x61b7d6d6, 0xce7db3b3,
- 0x7b522929, 0x3edde3e3, 0x715e2f2f, 0x97138484,
- 0xf5a65353, 0x68b9d1d1, 0x00000000, 0x2cc1eded,
- 0x60402020, 0x1fe3fcfc, 0xc879b1b1, 0xedb65b5b,
- 0xbed46a6a, 0x468dcbcb, 0xd967bebe, 0x4b723939,
- 0xde944a4a, 0xd4984c4c, 0xe8b05858, 0x4a85cfcf,
- 0x6bbbd0d0, 0x2ac5efef, 0xe54faaaa, 0x16edfbfb,
- 0xc5864343, 0xd79a4d4d, 0x55663333, 0x94118585,
- 0xcf8a4545, 0x10e9f9f9, 0x06040202, 0x81fe7f7f,
- 0xf0a05050, 0x44783c3c, 0xba259f9f, 0xe34ba8a8,
- 0xf3a25151, 0xfe5da3a3, 0xc0804040, 0x8a058f8f,
- 0xad3f9292, 0xbc219d9d, 0x48703838, 0x04f1f5f5,
- 0xdf63bcbc, 0xc177b6b6, 0x75afdada, 0x63422121,
- 0x30201010, 0x1ae5ffff, 0x0efdf3f3, 0x6dbfd2d2,
- 0x4c81cdcd, 0x14180c0c, 0x35261313, 0x2fc3ecec,
- 0xe1be5f5f, 0xa2359797, 0xcc884444, 0x392e1717,
- 0x5793c4c4, 0xf255a7a7, 0x82fc7e7e, 0x477a3d3d,
- 0xacc86464, 0xe7ba5d5d, 0x2b321919, 0x95e67373,
- 0xa0c06060, 0x98198181, 0xd19e4f4f, 0x7fa3dcdc,
- 0x66442222, 0x7e542a2a, 0xab3b9090, 0x830b8888,
- 0xca8c4646, 0x29c7eeee, 0xd36bb8b8, 0x3c281414,
- 0x79a7dede, 0xe2bc5e5e, 0x1d160b0b, 0x76addbdb,
- 0x3bdbe0e0, 0x56643232, 0x4e743a3a, 0x1e140a0a,
- 0xdb924949, 0x0a0c0606, 0x6c482424, 0xe4b85c5c,
- 0x5d9fc2c2, 0x6ebdd3d3, 0xef43acac, 0xa6c46262,
- 0xa8399191, 0xa4319595, 0x37d3e4e4, 0x8bf27979,
- 0x32d5e7e7, 0x438bc8c8, 0x596e3737, 0xb7da6d6d,
- 0x8c018d8d, 0x64b1d5d5, 0xd29c4e4e, 0xe049a9a9,
- 0xb4d86c6c, 0xfaac5656, 0x07f3f4f4, 0x25cfeaea,
- 0xafca6565, 0x8ef47a7a, 0xe947aeae, 0x18100808,
- 0xd56fbaba, 0x88f07878, 0x6f4a2525, 0x725c2e2e,
- 0x24381c1c, 0xf157a6a6, 0xc773b4b4, 0x5197c6c6,
- 0x23cbe8e8, 0x7ca1dddd, 0x9ce87474, 0x213e1f1f,
- 0xdd964b4b, 0xdc61bdbd, 0x860d8b8b, 0x850f8a8a,
- 0x90e07070, 0x427c3e3e, 0xc471b5b5, 0xaacc6666,
- 0xd8904848, 0x05060303, 0x01f7f6f6, 0x121c0e0e,
- 0xa3c26161, 0x5f6a3535, 0xf9ae5757, 0xd069b9b9,
- 0x91178686, 0x5899c1c1, 0x273a1d1d, 0xb9279e9e,
- 0x38d9e1e1, 0x13ebf8f8, 0xb32b9898, 0x33221111,
- 0xbbd26969, 0x70a9d9d9, 0x89078e8e, 0xa7339494,
- 0xb62d9b9b, 0x223c1e1e, 0x92158787, 0x20c9e9e9,
- 0x4987cece, 0xffaa5555, 0x78502828, 0x7aa5dfdf,
- 0x8f038c8c, 0xf859a1a1, 0x80098989, 0x171a0d0d,
- 0xda65bfbf, 0x31d7e6e6, 0xc6844242, 0xb8d06868,
- 0xc3824141, 0xb0299999, 0x775a2d2d, 0x111e0f0f,
- 0xcb7bb0b0, 0xfca85454, 0xd66dbbbb, 0x3a2c1616
- );
-
- var $Te2 = array(
- 0x63a5c663, 0x7c84f87c, 0x7799ee77, 0x7b8df67b,
- 0xf20dfff2, 0x6bbdd66b, 0x6fb1de6f, 0xc55491c5,
- 0x30506030, 0x01030201, 0x67a9ce67, 0x2b7d562b,
- 0xfe19e7fe, 0xd762b5d7, 0xabe64dab, 0x769aec76,
- 0xca458fca, 0x829d1f82, 0xc94089c9, 0x7d87fa7d,
- 0xfa15effa, 0x59ebb259, 0x47c98e47, 0xf00bfbf0,
- 0xadec41ad, 0xd467b3d4, 0xa2fd5fa2, 0xafea45af,
- 0x9cbf239c, 0xa4f753a4, 0x7296e472, 0xc05b9bc0,
- 0xb7c275b7, 0xfd1ce1fd, 0x93ae3d93, 0x266a4c26,
- 0x365a6c36, 0x3f417e3f, 0xf702f5f7, 0xcc4f83cc,
- 0x345c6834, 0xa5f451a5, 0xe534d1e5, 0xf108f9f1,
- 0x7193e271, 0xd873abd8, 0x31536231, 0x153f2a15,
- 0x040c0804, 0xc75295c7, 0x23654623, 0xc35e9dc3,
- 0x18283018, 0x96a13796, 0x050f0a05, 0x9ab52f9a,
- 0x07090e07, 0x12362412, 0x809b1b80, 0xe23ddfe2,
- 0xeb26cdeb, 0x27694e27, 0xb2cd7fb2, 0x759fea75,
- 0x091b1209, 0x839e1d83, 0x2c74582c, 0x1a2e341a,
- 0x1b2d361b, 0x6eb2dc6e, 0x5aeeb45a, 0xa0fb5ba0,
- 0x52f6a452, 0x3b4d763b, 0xd661b7d6, 0xb3ce7db3,
- 0x297b5229, 0xe33edde3, 0x2f715e2f, 0x84971384,
- 0x53f5a653, 0xd168b9d1, 0x00000000, 0xed2cc1ed,
- 0x20604020, 0xfc1fe3fc, 0xb1c879b1, 0x5bedb65b,
- 0x6abed46a, 0xcb468dcb, 0xbed967be, 0x394b7239,
- 0x4ade944a, 0x4cd4984c, 0x58e8b058, 0xcf4a85cf,
- 0xd06bbbd0, 0xef2ac5ef, 0xaae54faa, 0xfb16edfb,
- 0x43c58643, 0x4dd79a4d, 0x33556633, 0x85941185,
- 0x45cf8a45, 0xf910e9f9, 0x02060402, 0x7f81fe7f,
- 0x50f0a050, 0x3c44783c, 0x9fba259f, 0xa8e34ba8,
- 0x51f3a251, 0xa3fe5da3, 0x40c08040, 0x8f8a058f,
- 0x92ad3f92, 0x9dbc219d, 0x38487038, 0xf504f1f5,
- 0xbcdf63bc, 0xb6c177b6, 0xda75afda, 0x21634221,
- 0x10302010, 0xff1ae5ff, 0xf30efdf3, 0xd26dbfd2,
- 0xcd4c81cd, 0x0c14180c, 0x13352613, 0xec2fc3ec,
- 0x5fe1be5f, 0x97a23597, 0x44cc8844, 0x17392e17,
- 0xc45793c4, 0xa7f255a7, 0x7e82fc7e, 0x3d477a3d,
- 0x64acc864, 0x5de7ba5d, 0x192b3219, 0x7395e673,
- 0x60a0c060, 0x81981981, 0x4fd19e4f, 0xdc7fa3dc,
- 0x22664422, 0x2a7e542a, 0x90ab3b90, 0x88830b88,
- 0x46ca8c46, 0xee29c7ee, 0xb8d36bb8, 0x143c2814,
- 0xde79a7de, 0x5ee2bc5e, 0x0b1d160b, 0xdb76addb,
- 0xe03bdbe0, 0x32566432, 0x3a4e743a, 0x0a1e140a,
- 0x49db9249, 0x060a0c06, 0x246c4824, 0x5ce4b85c,
- 0xc25d9fc2, 0xd36ebdd3, 0xacef43ac, 0x62a6c462,
- 0x91a83991, 0x95a43195, 0xe437d3e4, 0x798bf279,
- 0xe732d5e7, 0xc8438bc8, 0x37596e37, 0x6db7da6d,
- 0x8d8c018d, 0xd564b1d5, 0x4ed29c4e, 0xa9e049a9,
- 0x6cb4d86c, 0x56faac56, 0xf407f3f4, 0xea25cfea,
- 0x65afca65, 0x7a8ef47a, 0xaee947ae, 0x08181008,
- 0xbad56fba, 0x7888f078, 0x256f4a25, 0x2e725c2e,
- 0x1c24381c, 0xa6f157a6, 0xb4c773b4, 0xc65197c6,
- 0xe823cbe8, 0xdd7ca1dd, 0x749ce874, 0x1f213e1f,
- 0x4bdd964b, 0xbddc61bd, 0x8b860d8b, 0x8a850f8a,
- 0x7090e070, 0x3e427c3e, 0xb5c471b5, 0x66aacc66,
- 0x48d89048, 0x03050603, 0xf601f7f6, 0x0e121c0e,
- 0x61a3c261, 0x355f6a35, 0x57f9ae57, 0xb9d069b9,
- 0x86911786, 0xc15899c1, 0x1d273a1d, 0x9eb9279e,
- 0xe138d9e1, 0xf813ebf8, 0x98b32b98, 0x11332211,
- 0x69bbd269, 0xd970a9d9, 0x8e89078e, 0x94a73394,
- 0x9bb62d9b, 0x1e223c1e, 0x87921587, 0xe920c9e9,
- 0xce4987ce, 0x55ffaa55, 0x28785028, 0xdf7aa5df,
- 0x8c8f038c, 0xa1f859a1, 0x89800989, 0x0d171a0d,
- 0xbfda65bf, 0xe631d7e6, 0x42c68442, 0x68b8d068,
- 0x41c38241, 0x99b02999, 0x2d775a2d, 0x0f111e0f,
- 0xb0cb7bb0, 0x54fca854, 0xbbd66dbb, 0x163a2c16
- );
-
- var $Te3 = array(
- 0x6363a5c6, 0x7c7c84f8, 0x777799ee, 0x7b7b8df6,
- 0xf2f20dff, 0x6b6bbdd6, 0x6f6fb1de, 0xc5c55491,
- 0x30305060, 0x01010302, 0x6767a9ce, 0x2b2b7d56,
- 0xfefe19e7, 0xd7d762b5, 0xababe64d, 0x76769aec,
- 0xcaca458f, 0x82829d1f, 0xc9c94089, 0x7d7d87fa,
- 0xfafa15ef, 0x5959ebb2, 0x4747c98e, 0xf0f00bfb,
- 0xadadec41, 0xd4d467b3, 0xa2a2fd5f, 0xafafea45,
- 0x9c9cbf23, 0xa4a4f753, 0x727296e4, 0xc0c05b9b,
- 0xb7b7c275, 0xfdfd1ce1, 0x9393ae3d, 0x26266a4c,
- 0x36365a6c, 0x3f3f417e, 0xf7f702f5, 0xcccc4f83,
- 0x34345c68, 0xa5a5f451, 0xe5e534d1, 0xf1f108f9,
- 0x717193e2, 0xd8d873ab, 0x31315362, 0x15153f2a,
- 0x04040c08, 0xc7c75295, 0x23236546, 0xc3c35e9d,
- 0x18182830, 0x9696a137, 0x05050f0a, 0x9a9ab52f,
- 0x0707090e, 0x12123624, 0x80809b1b, 0xe2e23ddf,
- 0xebeb26cd, 0x2727694e, 0xb2b2cd7f, 0x75759fea,
- 0x09091b12, 0x83839e1d, 0x2c2c7458, 0x1a1a2e34,
- 0x1b1b2d36, 0x6e6eb2dc, 0x5a5aeeb4, 0xa0a0fb5b,
- 0x5252f6a4, 0x3b3b4d76, 0xd6d661b7, 0xb3b3ce7d,
- 0x29297b52, 0xe3e33edd, 0x2f2f715e, 0x84849713,
- 0x5353f5a6, 0xd1d168b9, 0x00000000, 0xeded2cc1,
- 0x20206040, 0xfcfc1fe3, 0xb1b1c879, 0x5b5bedb6,
- 0x6a6abed4, 0xcbcb468d, 0xbebed967, 0x39394b72,
- 0x4a4ade94, 0x4c4cd498, 0x5858e8b0, 0xcfcf4a85,
- 0xd0d06bbb, 0xefef2ac5, 0xaaaae54f, 0xfbfb16ed,
- 0x4343c586, 0x4d4dd79a, 0x33335566, 0x85859411,
- 0x4545cf8a, 0xf9f910e9, 0x02020604, 0x7f7f81fe,
- 0x5050f0a0, 0x3c3c4478, 0x9f9fba25, 0xa8a8e34b,
- 0x5151f3a2, 0xa3a3fe5d, 0x4040c080, 0x8f8f8a05,
- 0x9292ad3f, 0x9d9dbc21, 0x38384870, 0xf5f504f1,
- 0xbcbcdf63, 0xb6b6c177, 0xdada75af, 0x21216342,
- 0x10103020, 0xffff1ae5, 0xf3f30efd, 0xd2d26dbf,
- 0xcdcd4c81, 0x0c0c1418, 0x13133526, 0xecec2fc3,
- 0x5f5fe1be, 0x9797a235, 0x4444cc88, 0x1717392e,
- 0xc4c45793, 0xa7a7f255, 0x7e7e82fc, 0x3d3d477a,
- 0x6464acc8, 0x5d5de7ba, 0x19192b32, 0x737395e6,
- 0x6060a0c0, 0x81819819, 0x4f4fd19e, 0xdcdc7fa3,
- 0x22226644, 0x2a2a7e54, 0x9090ab3b, 0x8888830b,
- 0x4646ca8c, 0xeeee29c7, 0xb8b8d36b, 0x14143c28,
- 0xdede79a7, 0x5e5ee2bc, 0x0b0b1d16, 0xdbdb76ad,
- 0xe0e03bdb, 0x32325664, 0x3a3a4e74, 0x0a0a1e14,
- 0x4949db92, 0x06060a0c, 0x24246c48, 0x5c5ce4b8,
- 0xc2c25d9f, 0xd3d36ebd, 0xacacef43, 0x6262a6c4,
- 0x9191a839, 0x9595a431, 0xe4e437d3, 0x79798bf2,
- 0xe7e732d5, 0xc8c8438b, 0x3737596e, 0x6d6db7da,
- 0x8d8d8c01, 0xd5d564b1, 0x4e4ed29c, 0xa9a9e049,
- 0x6c6cb4d8, 0x5656faac, 0xf4f407f3, 0xeaea25cf,
- 0x6565afca, 0x7a7a8ef4, 0xaeaee947, 0x08081810,
- 0xbabad56f, 0x787888f0, 0x25256f4a, 0x2e2e725c,
- 0x1c1c2438, 0xa6a6f157, 0xb4b4c773, 0xc6c65197,
- 0xe8e823cb, 0xdddd7ca1, 0x74749ce8, 0x1f1f213e,
- 0x4b4bdd96, 0xbdbddc61, 0x8b8b860d, 0x8a8a850f,
- 0x707090e0, 0x3e3e427c, 0xb5b5c471, 0x6666aacc,
- 0x4848d890, 0x03030506, 0xf6f601f7, 0x0e0e121c,
- 0x6161a3c2, 0x35355f6a, 0x5757f9ae, 0xb9b9d069,
- 0x86869117, 0xc1c15899, 0x1d1d273a, 0x9e9eb927,
- 0xe1e138d9, 0xf8f813eb, 0x9898b32b, 0x11113322,
- 0x6969bbd2, 0xd9d970a9, 0x8e8e8907, 0x9494a733,
- 0x9b9bb62d, 0x1e1e223c, 0x87879215, 0xe9e920c9,
- 0xcece4987, 0x5555ffaa, 0x28287850, 0xdfdf7aa5,
- 0x8c8c8f03, 0xa1a1f859, 0x89898009, 0x0d0d171a,
- 0xbfbfda65, 0xe6e631d7, 0x4242c684, 0x6868b8d0,
- 0x4141c382, 0x9999b029, 0x2d2d775a, 0x0f0f111e,
- 0xb0b0cb7b, 0x5454fca8, 0xbbbbd66d, 0x16163a2c
- );
-
- var $Te4 = array(
- 0x63636363, 0x7c7c7c7c, 0x77777777, 0x7b7b7b7b,
- 0xf2f2f2f2, 0x6b6b6b6b, 0x6f6f6f6f, 0xc5c5c5c5,
- 0x30303030, 0x01010101, 0x67676767, 0x2b2b2b2b,
- 0xfefefefe, 0xd7d7d7d7, 0xabababab, 0x76767676,
- 0xcacacaca, 0x82828282, 0xc9c9c9c9, 0x7d7d7d7d,
- 0xfafafafa, 0x59595959, 0x47474747, 0xf0f0f0f0,
- 0xadadadad, 0xd4d4d4d4, 0xa2a2a2a2, 0xafafafaf,
- 0x9c9c9c9c, 0xa4a4a4a4, 0x72727272, 0xc0c0c0c0,
- 0xb7b7b7b7, 0xfdfdfdfd, 0x93939393, 0x26262626,
- 0x36363636, 0x3f3f3f3f, 0xf7f7f7f7, 0xcccccccc,
- 0x34343434, 0xa5a5a5a5, 0xe5e5e5e5, 0xf1f1f1f1,
- 0x71717171, 0xd8d8d8d8, 0x31313131, 0x15151515,
- 0x04040404, 0xc7c7c7c7, 0x23232323, 0xc3c3c3c3,
- 0x18181818, 0x96969696, 0x05050505, 0x9a9a9a9a,
- 0x07070707, 0x12121212, 0x80808080, 0xe2e2e2e2,
- 0xebebebeb, 0x27272727, 0xb2b2b2b2, 0x75757575,
- 0x09090909, 0x83838383, 0x2c2c2c2c, 0x1a1a1a1a,
- 0x1b1b1b1b, 0x6e6e6e6e, 0x5a5a5a5a, 0xa0a0a0a0,
- 0x52525252, 0x3b3b3b3b, 0xd6d6d6d6, 0xb3b3b3b3,
- 0x29292929, 0xe3e3e3e3, 0x2f2f2f2f, 0x84848484,
- 0x53535353, 0xd1d1d1d1, 0x00000000, 0xedededed,
- 0x20202020, 0xfcfcfcfc, 0xb1b1b1b1, 0x5b5b5b5b,
- 0x6a6a6a6a, 0xcbcbcbcb, 0xbebebebe, 0x39393939,
- 0x4a4a4a4a, 0x4c4c4c4c, 0x58585858, 0xcfcfcfcf,
- 0xd0d0d0d0, 0xefefefef, 0xaaaaaaaa, 0xfbfbfbfb,
- 0x43434343, 0x4d4d4d4d, 0x33333333, 0x85858585,
- 0x45454545, 0xf9f9f9f9, 0x02020202, 0x7f7f7f7f,
- 0x50505050, 0x3c3c3c3c, 0x9f9f9f9f, 0xa8a8a8a8,
- 0x51515151, 0xa3a3a3a3, 0x40404040, 0x8f8f8f8f,
- 0x92929292, 0x9d9d9d9d, 0x38383838, 0xf5f5f5f5,
- 0xbcbcbcbc, 0xb6b6b6b6, 0xdadadada, 0x21212121,
- 0x10101010, 0xffffffff, 0xf3f3f3f3, 0xd2d2d2d2,
- 0xcdcdcdcd, 0x0c0c0c0c, 0x13131313, 0xecececec,
- 0x5f5f5f5f, 0x97979797, 0x44444444, 0x17171717,
- 0xc4c4c4c4, 0xa7a7a7a7, 0x7e7e7e7e, 0x3d3d3d3d,
- 0x64646464, 0x5d5d5d5d, 0x19191919, 0x73737373,
- 0x60606060, 0x81818181, 0x4f4f4f4f, 0xdcdcdcdc,
- 0x22222222, 0x2a2a2a2a, 0x90909090, 0x88888888,
- 0x46464646, 0xeeeeeeee, 0xb8b8b8b8, 0x14141414,
- 0xdededede, 0x5e5e5e5e, 0x0b0b0b0b, 0xdbdbdbdb,
- 0xe0e0e0e0, 0x32323232, 0x3a3a3a3a, 0x0a0a0a0a,
- 0x49494949, 0x06060606, 0x24242424, 0x5c5c5c5c,
- 0xc2c2c2c2, 0xd3d3d3d3, 0xacacacac, 0x62626262,
- 0x91919191, 0x95959595, 0xe4e4e4e4, 0x79797979,
- 0xe7e7e7e7, 0xc8c8c8c8, 0x37373737, 0x6d6d6d6d,
- 0x8d8d8d8d, 0xd5d5d5d5, 0x4e4e4e4e, 0xa9a9a9a9,
- 0x6c6c6c6c, 0x56565656, 0xf4f4f4f4, 0xeaeaeaea,
- 0x65656565, 0x7a7a7a7a, 0xaeaeaeae, 0x08080808,
- 0xbabababa, 0x78787878, 0x25252525, 0x2e2e2e2e,
- 0x1c1c1c1c, 0xa6a6a6a6, 0xb4b4b4b4, 0xc6c6c6c6,
- 0xe8e8e8e8, 0xdddddddd, 0x74747474, 0x1f1f1f1f,
- 0x4b4b4b4b, 0xbdbdbdbd, 0x8b8b8b8b, 0x8a8a8a8a,
- 0x70707070, 0x3e3e3e3e, 0xb5b5b5b5, 0x66666666,
- 0x48484848, 0x03030303, 0xf6f6f6f6, 0x0e0e0e0e,
- 0x61616161, 0x35353535, 0x57575757, 0xb9b9b9b9,
- 0x86868686, 0xc1c1c1c1, 0x1d1d1d1d, 0x9e9e9e9e,
- 0xe1e1e1e1, 0xf8f8f8f8, 0x98989898, 0x11111111,
- 0x69696969, 0xd9d9d9d9, 0x8e8e8e8e, 0x94949494,
- 0x9b9b9b9b, 0x1e1e1e1e, 0x87878787, 0xe9e9e9e9,
- 0xcececece, 0x55555555, 0x28282828, 0xdfdfdfdf,
- 0x8c8c8c8c, 0xa1a1a1a1, 0x89898989, 0x0d0d0d0d,
- 0xbfbfbfbf, 0xe6e6e6e6, 0x42424242, 0x68686868,
- 0x41414141, 0x99999999, 0x2d2d2d2d, 0x0f0f0f0f,
- 0xb0b0b0b0, 0x54545454, 0xbbbbbbbb, 0x16161616
- );
-
- var $Td0 = array(
- 0x51f4a750, 0x7e416553, 0x1a17a4c3, 0x3a275e96,
- 0x3bab6bcb, 0x1f9d45f1, 0xacfa58ab, 0x4be30393,
- 0x2030fa55, 0xad766df6, 0x88cc7691, 0xf5024c25,
- 0x4fe5d7fc, 0xc52acbd7, 0x26354480, 0xb562a38f,
- 0xdeb15a49, 0x25ba1b67, 0x45ea0e98, 0x5dfec0e1,
- 0xc32f7502, 0x814cf012, 0x8d4697a3, 0x6bd3f9c6,
- 0x038f5fe7, 0x15929c95, 0xbf6d7aeb, 0x955259da,
- 0xd4be832d, 0x587421d3, 0x49e06929, 0x8ec9c844,
- 0x75c2896a, 0xf48e7978, 0x99583e6b, 0x27b971dd,
- 0xbee14fb6, 0xf088ad17, 0xc920ac66, 0x7dce3ab4,
- 0x63df4a18, 0xe51a3182, 0x97513360, 0x62537f45,
- 0xb16477e0, 0xbb6bae84, 0xfe81a01c, 0xf9082b94,
- 0x70486858, 0x8f45fd19, 0x94de6c87, 0x527bf8b7,
- 0xab73d323, 0x724b02e2, 0xe31f8f57, 0x6655ab2a,
- 0xb2eb2807, 0x2fb5c203, 0x86c57b9a, 0xd33708a5,
- 0x302887f2, 0x23bfa5b2, 0x02036aba, 0xed16825c,
- 0x8acf1c2b, 0xa779b492, 0xf307f2f0, 0x4e69e2a1,
- 0x65daf4cd, 0x0605bed5, 0xd134621f, 0xc4a6fe8a,
- 0x342e539d, 0xa2f355a0, 0x058ae132, 0xa4f6eb75,
- 0x0b83ec39, 0x4060efaa, 0x5e719f06, 0xbd6e1051,
- 0x3e218af9, 0x96dd063d, 0xdd3e05ae, 0x4de6bd46,
- 0x91548db5, 0x71c45d05, 0x0406d46f, 0x605015ff,
- 0x1998fb24, 0xd6bde997, 0x894043cc, 0x67d99e77,
- 0xb0e842bd, 0x07898b88, 0xe7195b38, 0x79c8eedb,
- 0xa17c0a47, 0x7c420fe9, 0xf8841ec9, 0x00000000,
- 0x09808683, 0x322bed48, 0x1e1170ac, 0x6c5a724e,
- 0xfd0efffb, 0x0f853856, 0x3daed51e, 0x362d3927,
- 0x0a0fd964, 0x685ca621, 0x9b5b54d1, 0x24362e3a,
- 0x0c0a67b1, 0x9357e70f, 0xb4ee96d2, 0x1b9b919e,
- 0x80c0c54f, 0x61dc20a2, 0x5a774b69, 0x1c121a16,
- 0xe293ba0a, 0xc0a02ae5, 0x3c22e043, 0x121b171d,
- 0x0e090d0b, 0xf28bc7ad, 0x2db6a8b9, 0x141ea9c8,
- 0x57f11985, 0xaf75074c, 0xee99ddbb, 0xa37f60fd,
- 0xf701269f, 0x5c72f5bc, 0x44663bc5, 0x5bfb7e34,
- 0x8b432976, 0xcb23c6dc, 0xb6edfc68, 0xb8e4f163,
- 0xd731dcca, 0x42638510, 0x13972240, 0x84c61120,
- 0x854a247d, 0xd2bb3df8, 0xaef93211, 0xc729a16d,
- 0x1d9e2f4b, 0xdcb230f3, 0x0d8652ec, 0x77c1e3d0,
- 0x2bb3166c, 0xa970b999, 0x119448fa, 0x47e96422,
- 0xa8fc8cc4, 0xa0f03f1a, 0x567d2cd8, 0x223390ef,
- 0x87494ec7, 0xd938d1c1, 0x8ccaa2fe, 0x98d40b36,
- 0xa6f581cf, 0xa57ade28, 0xdab78e26, 0x3fadbfa4,
- 0x2c3a9de4, 0x5078920d, 0x6a5fcc9b, 0x547e4662,
- 0xf68d13c2, 0x90d8b8e8, 0x2e39f75e, 0x82c3aff5,
- 0x9f5d80be, 0x69d0937c, 0x6fd52da9, 0xcf2512b3,
- 0xc8ac993b, 0x10187da7, 0xe89c636e, 0xdb3bbb7b,
- 0xcd267809, 0x6e5918f4, 0xec9ab701, 0x834f9aa8,
- 0xe6956e65, 0xaaffe67e, 0x21bccf08, 0xef15e8e6,
- 0xbae79bd9, 0x4a6f36ce, 0xea9f09d4, 0x29b07cd6,
- 0x31a4b2af, 0x2a3f2331, 0xc6a59430, 0x35a266c0,
- 0x744ebc37, 0xfc82caa6, 0xe090d0b0, 0x33a7d815,
- 0xf104984a, 0x41ecdaf7, 0x7fcd500e, 0x1791f62f,
- 0x764dd68d, 0x43efb04d, 0xccaa4d54, 0xe49604df,
- 0x9ed1b5e3, 0x4c6a881b, 0xc12c1fb8, 0x4665517f,
- 0x9d5eea04, 0x018c355d, 0xfa877473, 0xfb0b412e,
- 0xb3671d5a, 0x92dbd252, 0xe9105633, 0x6dd64713,
- 0x9ad7618c, 0x37a10c7a, 0x59f8148e, 0xeb133c89,
- 0xcea927ee, 0xb761c935, 0xe11ce5ed, 0x7a47b13c,
- 0x9cd2df59, 0x55f2733f, 0x1814ce79, 0x73c737bf,
- 0x53f7cdea, 0x5ffdaa5b, 0xdf3d6f14, 0x7844db86,
- 0xcaaff381, 0xb968c43e, 0x3824342c, 0xc2a3405f,
- 0x161dc372, 0xbce2250c, 0x283c498b, 0xff0d9541,
- 0x39a80171, 0x080cb3de, 0xd8b4e49c, 0x6456c190,
- 0x7bcb8461, 0xd532b670, 0x486c5c74, 0xd0b85742
- );
-
- var $Td1 = array(
- 0x5051f4a7, 0x537e4165, 0xc31a17a4, 0x963a275e,
- 0xcb3bab6b, 0xf11f9d45, 0xabacfa58, 0x934be303,
- 0x552030fa, 0xf6ad766d, 0x9188cc76, 0x25f5024c,
- 0xfc4fe5d7, 0xd7c52acb, 0x80263544, 0x8fb562a3,
- 0x49deb15a, 0x6725ba1b, 0x9845ea0e, 0xe15dfec0,
- 0x02c32f75, 0x12814cf0, 0xa38d4697, 0xc66bd3f9,
- 0xe7038f5f, 0x9515929c, 0xebbf6d7a, 0xda955259,
- 0x2dd4be83, 0xd3587421, 0x2949e069, 0x448ec9c8,
- 0x6a75c289, 0x78f48e79, 0x6b99583e, 0xdd27b971,
- 0xb6bee14f, 0x17f088ad, 0x66c920ac, 0xb47dce3a,
- 0x1863df4a, 0x82e51a31, 0x60975133, 0x4562537f,
- 0xe0b16477, 0x84bb6bae, 0x1cfe81a0, 0x94f9082b,
- 0x58704868, 0x198f45fd, 0x8794de6c, 0xb7527bf8,
- 0x23ab73d3, 0xe2724b02, 0x57e31f8f, 0x2a6655ab,
- 0x07b2eb28, 0x032fb5c2, 0x9a86c57b, 0xa5d33708,
- 0xf2302887, 0xb223bfa5, 0xba02036a, 0x5ced1682,
- 0x2b8acf1c, 0x92a779b4, 0xf0f307f2, 0xa14e69e2,
- 0xcd65daf4, 0xd50605be, 0x1fd13462, 0x8ac4a6fe,
- 0x9d342e53, 0xa0a2f355, 0x32058ae1, 0x75a4f6eb,
- 0x390b83ec, 0xaa4060ef, 0x065e719f, 0x51bd6e10,
- 0xf93e218a, 0x3d96dd06, 0xaedd3e05, 0x464de6bd,
- 0xb591548d, 0x0571c45d, 0x6f0406d4, 0xff605015,
- 0x241998fb, 0x97d6bde9, 0xcc894043, 0x7767d99e,
- 0xbdb0e842, 0x8807898b, 0x38e7195b, 0xdb79c8ee,
- 0x47a17c0a, 0xe97c420f, 0xc9f8841e, 0x00000000,
- 0x83098086, 0x48322bed, 0xac1e1170, 0x4e6c5a72,
- 0xfbfd0eff, 0x560f8538, 0x1e3daed5, 0x27362d39,
- 0x640a0fd9, 0x21685ca6, 0xd19b5b54, 0x3a24362e,
- 0xb10c0a67, 0x0f9357e7, 0xd2b4ee96, 0x9e1b9b91,
- 0x4f80c0c5, 0xa261dc20, 0x695a774b, 0x161c121a,
- 0x0ae293ba, 0xe5c0a02a, 0x433c22e0, 0x1d121b17,
- 0x0b0e090d, 0xadf28bc7, 0xb92db6a8, 0xc8141ea9,
- 0x8557f119, 0x4caf7507, 0xbbee99dd, 0xfda37f60,
- 0x9ff70126, 0xbc5c72f5, 0xc544663b, 0x345bfb7e,
- 0x768b4329, 0xdccb23c6, 0x68b6edfc, 0x63b8e4f1,
- 0xcad731dc, 0x10426385, 0x40139722, 0x2084c611,
- 0x7d854a24, 0xf8d2bb3d, 0x11aef932, 0x6dc729a1,
- 0x4b1d9e2f, 0xf3dcb230, 0xec0d8652, 0xd077c1e3,
- 0x6c2bb316, 0x99a970b9, 0xfa119448, 0x2247e964,
- 0xc4a8fc8c, 0x1aa0f03f, 0xd8567d2c, 0xef223390,
- 0xc787494e, 0xc1d938d1, 0xfe8ccaa2, 0x3698d40b,
- 0xcfa6f581, 0x28a57ade, 0x26dab78e, 0xa43fadbf,
- 0xe42c3a9d, 0x0d507892, 0x9b6a5fcc, 0x62547e46,
- 0xc2f68d13, 0xe890d8b8, 0x5e2e39f7, 0xf582c3af,
- 0xbe9f5d80, 0x7c69d093, 0xa96fd52d, 0xb3cf2512,
- 0x3bc8ac99, 0xa710187d, 0x6ee89c63, 0x7bdb3bbb,
- 0x09cd2678, 0xf46e5918, 0x01ec9ab7, 0xa8834f9a,
- 0x65e6956e, 0x7eaaffe6, 0x0821bccf, 0xe6ef15e8,
- 0xd9bae79b, 0xce4a6f36, 0xd4ea9f09, 0xd629b07c,
- 0xaf31a4b2, 0x312a3f23, 0x30c6a594, 0xc035a266,
- 0x37744ebc, 0xa6fc82ca, 0xb0e090d0, 0x1533a7d8,
- 0x4af10498, 0xf741ecda, 0x0e7fcd50, 0x2f1791f6,
- 0x8d764dd6, 0x4d43efb0, 0x54ccaa4d, 0xdfe49604,
- 0xe39ed1b5, 0x1b4c6a88, 0xb8c12c1f, 0x7f466551,
- 0x049d5eea, 0x5d018c35, 0x73fa8774, 0x2efb0b41,
- 0x5ab3671d, 0x5292dbd2, 0x33e91056, 0x136dd647,
- 0x8c9ad761, 0x7a37a10c, 0x8e59f814, 0x89eb133c,
- 0xeecea927, 0x35b761c9, 0xede11ce5, 0x3c7a47b1,
- 0x599cd2df, 0x3f55f273, 0x791814ce, 0xbf73c737,
- 0xea53f7cd, 0x5b5ffdaa, 0x14df3d6f, 0x867844db,
- 0x81caaff3, 0x3eb968c4, 0x2c382434, 0x5fc2a340,
- 0x72161dc3, 0x0cbce225, 0x8b283c49, 0x41ff0d95,
- 0x7139a801, 0xde080cb3, 0x9cd8b4e4, 0x906456c1,
- 0x617bcb84, 0x70d532b6, 0x74486c5c, 0x42d0b857
- );
-
- var $Td2 = array(
- 0xa75051f4, 0x65537e41, 0xa4c31a17, 0x5e963a27,
- 0x6bcb3bab, 0x45f11f9d, 0x58abacfa, 0x03934be3,
- 0xfa552030, 0x6df6ad76, 0x769188cc, 0x4c25f502,
- 0xd7fc4fe5, 0xcbd7c52a, 0x44802635, 0xa38fb562,
- 0x5a49deb1, 0x1b6725ba, 0x0e9845ea, 0xc0e15dfe,
- 0x7502c32f, 0xf012814c, 0x97a38d46, 0xf9c66bd3,
- 0x5fe7038f, 0x9c951592, 0x7aebbf6d, 0x59da9552,
- 0x832dd4be, 0x21d35874, 0x692949e0, 0xc8448ec9,
- 0x896a75c2, 0x7978f48e, 0x3e6b9958, 0x71dd27b9,
- 0x4fb6bee1, 0xad17f088, 0xac66c920, 0x3ab47dce,
- 0x4a1863df, 0x3182e51a, 0x33609751, 0x7f456253,
- 0x77e0b164, 0xae84bb6b, 0xa01cfe81, 0x2b94f908,
- 0x68587048, 0xfd198f45, 0x6c8794de, 0xf8b7527b,
- 0xd323ab73, 0x02e2724b, 0x8f57e31f, 0xab2a6655,
- 0x2807b2eb, 0xc2032fb5, 0x7b9a86c5, 0x08a5d337,
- 0x87f23028, 0xa5b223bf, 0x6aba0203, 0x825ced16,
- 0x1c2b8acf, 0xb492a779, 0xf2f0f307, 0xe2a14e69,
- 0xf4cd65da, 0xbed50605, 0x621fd134, 0xfe8ac4a6,
- 0x539d342e, 0x55a0a2f3, 0xe132058a, 0xeb75a4f6,
- 0xec390b83, 0xefaa4060, 0x9f065e71, 0x1051bd6e,
- 0x8af93e21, 0x063d96dd, 0x05aedd3e, 0xbd464de6,
- 0x8db59154, 0x5d0571c4, 0xd46f0406, 0x15ff6050,
- 0xfb241998, 0xe997d6bd, 0x43cc8940, 0x9e7767d9,
- 0x42bdb0e8, 0x8b880789, 0x5b38e719, 0xeedb79c8,
- 0x0a47a17c, 0x0fe97c42, 0x1ec9f884, 0x00000000,
- 0x86830980, 0xed48322b, 0x70ac1e11, 0x724e6c5a,
- 0xfffbfd0e, 0x38560f85, 0xd51e3dae, 0x3927362d,
- 0xd9640a0f, 0xa621685c, 0x54d19b5b, 0x2e3a2436,
- 0x67b10c0a, 0xe70f9357, 0x96d2b4ee, 0x919e1b9b,
- 0xc54f80c0, 0x20a261dc, 0x4b695a77, 0x1a161c12,
- 0xba0ae293, 0x2ae5c0a0, 0xe0433c22, 0x171d121b,
- 0x0d0b0e09, 0xc7adf28b, 0xa8b92db6, 0xa9c8141e,
- 0x198557f1, 0x074caf75, 0xddbbee99, 0x60fda37f,
- 0x269ff701, 0xf5bc5c72, 0x3bc54466, 0x7e345bfb,
- 0x29768b43, 0xc6dccb23, 0xfc68b6ed, 0xf163b8e4,
- 0xdccad731, 0x85104263, 0x22401397, 0x112084c6,
- 0x247d854a, 0x3df8d2bb, 0x3211aef9, 0xa16dc729,
- 0x2f4b1d9e, 0x30f3dcb2, 0x52ec0d86, 0xe3d077c1,
- 0x166c2bb3, 0xb999a970, 0x48fa1194, 0x642247e9,
- 0x8cc4a8fc, 0x3f1aa0f0, 0x2cd8567d, 0x90ef2233,
- 0x4ec78749, 0xd1c1d938, 0xa2fe8cca, 0x0b3698d4,
- 0x81cfa6f5, 0xde28a57a, 0x8e26dab7, 0xbfa43fad,
- 0x9de42c3a, 0x920d5078, 0xcc9b6a5f, 0x4662547e,
- 0x13c2f68d, 0xb8e890d8, 0xf75e2e39, 0xaff582c3,
- 0x80be9f5d, 0x937c69d0, 0x2da96fd5, 0x12b3cf25,
- 0x993bc8ac, 0x7da71018, 0x636ee89c, 0xbb7bdb3b,
- 0x7809cd26, 0x18f46e59, 0xb701ec9a, 0x9aa8834f,
- 0x6e65e695, 0xe67eaaff, 0xcf0821bc, 0xe8e6ef15,
- 0x9bd9bae7, 0x36ce4a6f, 0x09d4ea9f, 0x7cd629b0,
- 0xb2af31a4, 0x23312a3f, 0x9430c6a5, 0x66c035a2,
- 0xbc37744e, 0xcaa6fc82, 0xd0b0e090, 0xd81533a7,
- 0x984af104, 0xdaf741ec, 0x500e7fcd, 0xf62f1791,
- 0xd68d764d, 0xb04d43ef, 0x4d54ccaa, 0x04dfe496,
- 0xb5e39ed1, 0x881b4c6a, 0x1fb8c12c, 0x517f4665,
- 0xea049d5e, 0x355d018c, 0x7473fa87, 0x412efb0b,
- 0x1d5ab367, 0xd25292db, 0x5633e910, 0x47136dd6,
- 0x618c9ad7, 0x0c7a37a1, 0x148e59f8, 0x3c89eb13,
- 0x27eecea9, 0xc935b761, 0xe5ede11c, 0xb13c7a47,
- 0xdf599cd2, 0x733f55f2, 0xce791814, 0x37bf73c7,
- 0xcdea53f7, 0xaa5b5ffd, 0x6f14df3d, 0xdb867844,
- 0xf381caaf, 0xc43eb968, 0x342c3824, 0x405fc2a3,
- 0xc372161d, 0x250cbce2, 0x498b283c, 0x9541ff0d,
- 0x017139a8, 0xb3de080c, 0xe49cd8b4, 0xc1906456,
- 0x84617bcb, 0xb670d532, 0x5c74486c, 0x5742d0b8
- );
-
- var $Td3 = array(
- 0xf4a75051, 0x4165537e, 0x17a4c31a, 0x275e963a,
- 0xab6bcb3b, 0x9d45f11f, 0xfa58abac, 0xe303934b,
- 0x30fa5520, 0x766df6ad, 0xcc769188, 0x024c25f5,
- 0xe5d7fc4f, 0x2acbd7c5, 0x35448026, 0x62a38fb5,
- 0xb15a49de, 0xba1b6725, 0xea0e9845, 0xfec0e15d,
- 0x2f7502c3, 0x4cf01281, 0x4697a38d, 0xd3f9c66b,
- 0x8f5fe703, 0x929c9515, 0x6d7aebbf, 0x5259da95,
- 0xbe832dd4, 0x7421d358, 0xe0692949, 0xc9c8448e,
- 0xc2896a75, 0x8e7978f4, 0x583e6b99, 0xb971dd27,
- 0xe14fb6be, 0x88ad17f0, 0x20ac66c9, 0xce3ab47d,
- 0xdf4a1863, 0x1a3182e5, 0x51336097, 0x537f4562,
- 0x6477e0b1, 0x6bae84bb, 0x81a01cfe, 0x082b94f9,
- 0x48685870, 0x45fd198f, 0xde6c8794, 0x7bf8b752,
- 0x73d323ab, 0x4b02e272, 0x1f8f57e3, 0x55ab2a66,
- 0xeb2807b2, 0xb5c2032f, 0xc57b9a86, 0x3708a5d3,
- 0x2887f230, 0xbfa5b223, 0x036aba02, 0x16825ced,
- 0xcf1c2b8a, 0x79b492a7, 0x07f2f0f3, 0x69e2a14e,
- 0xdaf4cd65, 0x05bed506, 0x34621fd1, 0xa6fe8ac4,
- 0x2e539d34, 0xf355a0a2, 0x8ae13205, 0xf6eb75a4,
- 0x83ec390b, 0x60efaa40, 0x719f065e, 0x6e1051bd,
- 0x218af93e, 0xdd063d96, 0x3e05aedd, 0xe6bd464d,
- 0x548db591, 0xc45d0571, 0x06d46f04, 0x5015ff60,
- 0x98fb2419, 0xbde997d6, 0x4043cc89, 0xd99e7767,
- 0xe842bdb0, 0x898b8807, 0x195b38e7, 0xc8eedb79,
- 0x7c0a47a1, 0x420fe97c, 0x841ec9f8, 0x00000000,
- 0x80868309, 0x2bed4832, 0x1170ac1e, 0x5a724e6c,
- 0x0efffbfd, 0x8538560f, 0xaed51e3d, 0x2d392736,
- 0x0fd9640a, 0x5ca62168, 0x5b54d19b, 0x362e3a24,
- 0x0a67b10c, 0x57e70f93, 0xee96d2b4, 0x9b919e1b,
- 0xc0c54f80, 0xdc20a261, 0x774b695a, 0x121a161c,
- 0x93ba0ae2, 0xa02ae5c0, 0x22e0433c, 0x1b171d12,
- 0x090d0b0e, 0x8bc7adf2, 0xb6a8b92d, 0x1ea9c814,
- 0xf1198557, 0x75074caf, 0x99ddbbee, 0x7f60fda3,
- 0x01269ff7, 0x72f5bc5c, 0x663bc544, 0xfb7e345b,
- 0x4329768b, 0x23c6dccb, 0xedfc68b6, 0xe4f163b8,
- 0x31dccad7, 0x63851042, 0x97224013, 0xc6112084,
- 0x4a247d85, 0xbb3df8d2, 0xf93211ae, 0x29a16dc7,
- 0x9e2f4b1d, 0xb230f3dc, 0x8652ec0d, 0xc1e3d077,
- 0xb3166c2b, 0x70b999a9, 0x9448fa11, 0xe9642247,
- 0xfc8cc4a8, 0xf03f1aa0, 0x7d2cd856, 0x3390ef22,
- 0x494ec787, 0x38d1c1d9, 0xcaa2fe8c, 0xd40b3698,
- 0xf581cfa6, 0x7ade28a5, 0xb78e26da, 0xadbfa43f,
- 0x3a9de42c, 0x78920d50, 0x5fcc9b6a, 0x7e466254,
- 0x8d13c2f6, 0xd8b8e890, 0x39f75e2e, 0xc3aff582,
- 0x5d80be9f, 0xd0937c69, 0xd52da96f, 0x2512b3cf,
- 0xac993bc8, 0x187da710, 0x9c636ee8, 0x3bbb7bdb,
- 0x267809cd, 0x5918f46e, 0x9ab701ec, 0x4f9aa883,
- 0x956e65e6, 0xffe67eaa, 0xbccf0821, 0x15e8e6ef,
- 0xe79bd9ba, 0x6f36ce4a, 0x9f09d4ea, 0xb07cd629,
- 0xa4b2af31, 0x3f23312a, 0xa59430c6, 0xa266c035,
- 0x4ebc3774, 0x82caa6fc, 0x90d0b0e0, 0xa7d81533,
- 0x04984af1, 0xecdaf741, 0xcd500e7f, 0x91f62f17,
- 0x4dd68d76, 0xefb04d43, 0xaa4d54cc, 0x9604dfe4,
- 0xd1b5e39e, 0x6a881b4c, 0x2c1fb8c1, 0x65517f46,
- 0x5eea049d, 0x8c355d01, 0x877473fa, 0x0b412efb,
- 0x671d5ab3, 0xdbd25292, 0x105633e9, 0xd647136d,
- 0xd7618c9a, 0xa10c7a37, 0xf8148e59, 0x133c89eb,
- 0xa927eece, 0x61c935b7, 0x1ce5ede1, 0x47b13c7a,
- 0xd2df599c, 0xf2733f55, 0x14ce7918, 0xc737bf73,
- 0xf7cdea53, 0xfdaa5b5f, 0x3d6f14df, 0x44db8678,
- 0xaff381ca, 0x68c43eb9, 0x24342c38, 0xa3405fc2,
- 0x1dc37216, 0xe2250cbc, 0x3c498b28, 0x0d9541ff,
- 0xa8017139, 0x0cb3de08, 0xb4e49cd8, 0x56c19064,
- 0xcb84617b, 0x32b670d5, 0x6c5c7448, 0xb85742d0
- );
-
- var $Td4 = array(
- 0x52525252, 0x09090909, 0x6a6a6a6a, 0xd5d5d5d5,
- 0x30303030, 0x36363636, 0xa5a5a5a5, 0x38383838,
- 0xbfbfbfbf, 0x40404040, 0xa3a3a3a3, 0x9e9e9e9e,
- 0x81818181, 0xf3f3f3f3, 0xd7d7d7d7, 0xfbfbfbfb,
- 0x7c7c7c7c, 0xe3e3e3e3, 0x39393939, 0x82828282,
- 0x9b9b9b9b, 0x2f2f2f2f, 0xffffffff, 0x87878787,
- 0x34343434, 0x8e8e8e8e, 0x43434343, 0x44444444,
- 0xc4c4c4c4, 0xdededede, 0xe9e9e9e9, 0xcbcbcbcb,
- 0x54545454, 0x7b7b7b7b, 0x94949494, 0x32323232,
- 0xa6a6a6a6, 0xc2c2c2c2, 0x23232323, 0x3d3d3d3d,
- 0xeeeeeeee, 0x4c4c4c4c, 0x95959595, 0x0b0b0b0b,
- 0x42424242, 0xfafafafa, 0xc3c3c3c3, 0x4e4e4e4e,
- 0x08080808, 0x2e2e2e2e, 0xa1a1a1a1, 0x66666666,
- 0x28282828, 0xd9d9d9d9, 0x24242424, 0xb2b2b2b2,
- 0x76767676, 0x5b5b5b5b, 0xa2a2a2a2, 0x49494949,
- 0x6d6d6d6d, 0x8b8b8b8b, 0xd1d1d1d1, 0x25252525,
- 0x72727272, 0xf8f8f8f8, 0xf6f6f6f6, 0x64646464,
- 0x86868686, 0x68686868, 0x98989898, 0x16161616,
- 0xd4d4d4d4, 0xa4a4a4a4, 0x5c5c5c5c, 0xcccccccc,
- 0x5d5d5d5d, 0x65656565, 0xb6b6b6b6, 0x92929292,
- 0x6c6c6c6c, 0x70707070, 0x48484848, 0x50505050,
- 0xfdfdfdfd, 0xedededed, 0xb9b9b9b9, 0xdadadada,
- 0x5e5e5e5e, 0x15151515, 0x46464646, 0x57575757,
- 0xa7a7a7a7, 0x8d8d8d8d, 0x9d9d9d9d, 0x84848484,
- 0x90909090, 0xd8d8d8d8, 0xabababab, 0x00000000,
- 0x8c8c8c8c, 0xbcbcbcbc, 0xd3d3d3d3, 0x0a0a0a0a,
- 0xf7f7f7f7, 0xe4e4e4e4, 0x58585858, 0x05050505,
- 0xb8b8b8b8, 0xb3b3b3b3, 0x45454545, 0x06060606,
- 0xd0d0d0d0, 0x2c2c2c2c, 0x1e1e1e1e, 0x8f8f8f8f,
- 0xcacacaca, 0x3f3f3f3f, 0x0f0f0f0f, 0x02020202,
- 0xc1c1c1c1, 0xafafafaf, 0xbdbdbdbd, 0x03030303,
- 0x01010101, 0x13131313, 0x8a8a8a8a, 0x6b6b6b6b,
- 0x3a3a3a3a, 0x91919191, 0x11111111, 0x41414141,
- 0x4f4f4f4f, 0x67676767, 0xdcdcdcdc, 0xeaeaeaea,
- 0x97979797, 0xf2f2f2f2, 0xcfcfcfcf, 0xcececece,
- 0xf0f0f0f0, 0xb4b4b4b4, 0xe6e6e6e6, 0x73737373,
- 0x96969696, 0xacacacac, 0x74747474, 0x22222222,
- 0xe7e7e7e7, 0xadadadad, 0x35353535, 0x85858585,
- 0xe2e2e2e2, 0xf9f9f9f9, 0x37373737, 0xe8e8e8e8,
- 0x1c1c1c1c, 0x75757575, 0xdfdfdfdf, 0x6e6e6e6e,
- 0x47474747, 0xf1f1f1f1, 0x1a1a1a1a, 0x71717171,
- 0x1d1d1d1d, 0x29292929, 0xc5c5c5c5, 0x89898989,
- 0x6f6f6f6f, 0xb7b7b7b7, 0x62626262, 0x0e0e0e0e,
- 0xaaaaaaaa, 0x18181818, 0xbebebebe, 0x1b1b1b1b,
- 0xfcfcfcfc, 0x56565656, 0x3e3e3e3e, 0x4b4b4b4b,
- 0xc6c6c6c6, 0xd2d2d2d2, 0x79797979, 0x20202020,
- 0x9a9a9a9a, 0xdbdbdbdb, 0xc0c0c0c0, 0xfefefefe,
- 0x78787878, 0xcdcdcdcd, 0x5a5a5a5a, 0xf4f4f4f4,
- 0x1f1f1f1f, 0xdddddddd, 0xa8a8a8a8, 0x33333333,
- 0x88888888, 0x07070707, 0xc7c7c7c7, 0x31313131,
- 0xb1b1b1b1, 0x12121212, 0x10101010, 0x59595959,
- 0x27272727, 0x80808080, 0xecececec, 0x5f5f5f5f,
- 0x60606060, 0x51515151, 0x7f7f7f7f, 0xa9a9a9a9,
- 0x19191919, 0xb5b5b5b5, 0x4a4a4a4a, 0x0d0d0d0d,
- 0x2d2d2d2d, 0xe5e5e5e5, 0x7a7a7a7a, 0x9f9f9f9f,
- 0x93939393, 0xc9c9c9c9, 0x9c9c9c9c, 0xefefefef,
- 0xa0a0a0a0, 0xe0e0e0e0, 0x3b3b3b3b, 0x4d4d4d4d,
- 0xaeaeaeae, 0x2a2a2a2a, 0xf5f5f5f5, 0xb0b0b0b0,
- 0xc8c8c8c8, 0xebebebeb, 0xbbbbbbbb, 0x3c3c3c3c,
- 0x83838383, 0x53535353, 0x99999999, 0x61616161,
- 0x17171717, 0x2b2b2b2b, 0x04040404, 0x7e7e7e7e,
- 0xbabababa, 0x77777777, 0xd6d6d6d6, 0x26262626,
- 0xe1e1e1e1, 0x69696969, 0x14141414, 0x63636363,
- 0x55555555, 0x21212121, 0x0c0c0c0c, 0x7d7d7d7d
- );
-
- var $rcon = array(
- 0x01000000, 0x02000000, 0x04000000, 0x08000000,
- 0x10000000, 0x20000000, 0x40000000, 0x80000000,
- 0x1B000000, 0x36000000
- );
+
+ var $Te0 = array(
+ 0xc66363a5, 0xf87c7c84, 0xee777799, 0xf67b7b8d,
+ 0xfff2f20d, 0xd66b6bbd, 0xde6f6fb1, 0x91c5c554,
+ 0x60303050, 0x02010103, 0xce6767a9, 0x562b2b7d,
+ 0xe7fefe19, 0xb5d7d762, 0x4dababe6, 0xec76769a,
+ 0x8fcaca45, 0x1f82829d, 0x89c9c940, 0xfa7d7d87,
+ 0xeffafa15, 0xb25959eb, 0x8e4747c9, 0xfbf0f00b,
+ 0x41adadec, 0xb3d4d467, 0x5fa2a2fd, 0x45afafea,
+ 0x239c9cbf, 0x53a4a4f7, 0xe4727296, 0x9bc0c05b,
+ 0x75b7b7c2, 0xe1fdfd1c, 0x3d9393ae, 0x4c26266a,
+ 0x6c36365a, 0x7e3f3f41, 0xf5f7f702, 0x83cccc4f,
+ 0x6834345c, 0x51a5a5f4, 0xd1e5e534, 0xf9f1f108,
+ 0xe2717193, 0xabd8d873, 0x62313153, 0x2a15153f,
+ 0x0804040c, 0x95c7c752, 0x46232365, 0x9dc3c35e,
+ 0x30181828, 0x379696a1, 0x0a05050f, 0x2f9a9ab5,
+ 0x0e070709, 0x24121236, 0x1b80809b, 0xdfe2e23d,
+ 0xcdebeb26, 0x4e272769, 0x7fb2b2cd, 0xea75759f,
+ 0x1209091b, 0x1d83839e, 0x582c2c74, 0x341a1a2e,
+ 0x361b1b2d, 0xdc6e6eb2, 0xb45a5aee, 0x5ba0a0fb,
+ 0xa45252f6, 0x763b3b4d, 0xb7d6d661, 0x7db3b3ce,
+ 0x5229297b, 0xdde3e33e, 0x5e2f2f71, 0x13848497,
+ 0xa65353f5, 0xb9d1d168, 0x00000000, 0xc1eded2c,
+ 0x40202060, 0xe3fcfc1f, 0x79b1b1c8, 0xb65b5bed,
+ 0xd46a6abe, 0x8dcbcb46, 0x67bebed9, 0x7239394b,
+ 0x944a4ade, 0x984c4cd4, 0xb05858e8, 0x85cfcf4a,
+ 0xbbd0d06b, 0xc5efef2a, 0x4faaaae5, 0xedfbfb16,
+ 0x864343c5, 0x9a4d4dd7, 0x66333355, 0x11858594,
+ 0x8a4545cf, 0xe9f9f910, 0x04020206, 0xfe7f7f81,
+ 0xa05050f0, 0x783c3c44, 0x259f9fba, 0x4ba8a8e3,
+ 0xa25151f3, 0x5da3a3fe, 0x804040c0, 0x058f8f8a,
+ 0x3f9292ad, 0x219d9dbc, 0x70383848, 0xf1f5f504,
+ 0x63bcbcdf, 0x77b6b6c1, 0xafdada75, 0x42212163,
+ 0x20101030, 0xe5ffff1a, 0xfdf3f30e, 0xbfd2d26d,
+ 0x81cdcd4c, 0x180c0c14, 0x26131335, 0xc3ecec2f,
+ 0xbe5f5fe1, 0x359797a2, 0x884444cc, 0x2e171739,
+ 0x93c4c457, 0x55a7a7f2, 0xfc7e7e82, 0x7a3d3d47,
+ 0xc86464ac, 0xba5d5de7, 0x3219192b, 0xe6737395,
+ 0xc06060a0, 0x19818198, 0x9e4f4fd1, 0xa3dcdc7f,
+ 0x44222266, 0x542a2a7e, 0x3b9090ab, 0x0b888883,
+ 0x8c4646ca, 0xc7eeee29, 0x6bb8b8d3, 0x2814143c,
+ 0xa7dede79, 0xbc5e5ee2, 0x160b0b1d, 0xaddbdb76,
+ 0xdbe0e03b, 0x64323256, 0x743a3a4e, 0x140a0a1e,
+ 0x924949db, 0x0c06060a, 0x4824246c, 0xb85c5ce4,
+ 0x9fc2c25d, 0xbdd3d36e, 0x43acacef, 0xc46262a6,
+ 0x399191a8, 0x319595a4, 0xd3e4e437, 0xf279798b,
+ 0xd5e7e732, 0x8bc8c843, 0x6e373759, 0xda6d6db7,
+ 0x018d8d8c, 0xb1d5d564, 0x9c4e4ed2, 0x49a9a9e0,
+ 0xd86c6cb4, 0xac5656fa, 0xf3f4f407, 0xcfeaea25,
+ 0xca6565af, 0xf47a7a8e, 0x47aeaee9, 0x10080818,
+ 0x6fbabad5, 0xf0787888, 0x4a25256f, 0x5c2e2e72,
+ 0x381c1c24, 0x57a6a6f1, 0x73b4b4c7, 0x97c6c651,
+ 0xcbe8e823, 0xa1dddd7c, 0xe874749c, 0x3e1f1f21,
+ 0x964b4bdd, 0x61bdbddc, 0x0d8b8b86, 0x0f8a8a85,
+ 0xe0707090, 0x7c3e3e42, 0x71b5b5c4, 0xcc6666aa,
+ 0x904848d8, 0x06030305, 0xf7f6f601, 0x1c0e0e12,
+ 0xc26161a3, 0x6a35355f, 0xae5757f9, 0x69b9b9d0,
+ 0x17868691, 0x99c1c158, 0x3a1d1d27, 0x279e9eb9,
+ 0xd9e1e138, 0xebf8f813, 0x2b9898b3, 0x22111133,
+ 0xd26969bb, 0xa9d9d970, 0x078e8e89, 0x339494a7,
+ 0x2d9b9bb6, 0x3c1e1e22, 0x15878792, 0xc9e9e920,
+ 0x87cece49, 0xaa5555ff, 0x50282878, 0xa5dfdf7a,
+ 0x038c8c8f, 0x59a1a1f8, 0x09898980, 0x1a0d0d17,
+ 0x65bfbfda, 0xd7e6e631, 0x844242c6, 0xd06868b8,
+ 0x824141c3, 0x299999b0, 0x5a2d2d77, 0x1e0f0f11,
+ 0x7bb0b0cb, 0xa85454fc, 0x6dbbbbd6, 0x2c16163a
+ );
+
+ var $Te1 = array(
+ 0xa5c66363, 0x84f87c7c, 0x99ee7777, 0x8df67b7b,
+ 0x0dfff2f2, 0xbdd66b6b, 0xb1de6f6f, 0x5491c5c5,
+ 0x50603030, 0x03020101, 0xa9ce6767, 0x7d562b2b,
+ 0x19e7fefe, 0x62b5d7d7, 0xe64dabab, 0x9aec7676,
+ 0x458fcaca, 0x9d1f8282, 0x4089c9c9, 0x87fa7d7d,
+ 0x15effafa, 0xebb25959, 0xc98e4747, 0x0bfbf0f0,
+ 0xec41adad, 0x67b3d4d4, 0xfd5fa2a2, 0xea45afaf,
+ 0xbf239c9c, 0xf753a4a4, 0x96e47272, 0x5b9bc0c0,
+ 0xc275b7b7, 0x1ce1fdfd, 0xae3d9393, 0x6a4c2626,
+ 0x5a6c3636, 0x417e3f3f, 0x02f5f7f7, 0x4f83cccc,
+ 0x5c683434, 0xf451a5a5, 0x34d1e5e5, 0x08f9f1f1,
+ 0x93e27171, 0x73abd8d8, 0x53623131, 0x3f2a1515,
+ 0x0c080404, 0x5295c7c7, 0x65462323, 0x5e9dc3c3,
+ 0x28301818, 0xa1379696, 0x0f0a0505, 0xb52f9a9a,
+ 0x090e0707, 0x36241212, 0x9b1b8080, 0x3ddfe2e2,
+ 0x26cdebeb, 0x694e2727, 0xcd7fb2b2, 0x9fea7575,
+ 0x1b120909, 0x9e1d8383, 0x74582c2c, 0x2e341a1a,
+ 0x2d361b1b, 0xb2dc6e6e, 0xeeb45a5a, 0xfb5ba0a0,
+ 0xf6a45252, 0x4d763b3b, 0x61b7d6d6, 0xce7db3b3,
+ 0x7b522929, 0x3edde3e3, 0x715e2f2f, 0x97138484,
+ 0xf5a65353, 0x68b9d1d1, 0x00000000, 0x2cc1eded,
+ 0x60402020, 0x1fe3fcfc, 0xc879b1b1, 0xedb65b5b,
+ 0xbed46a6a, 0x468dcbcb, 0xd967bebe, 0x4b723939,
+ 0xde944a4a, 0xd4984c4c, 0xe8b05858, 0x4a85cfcf,
+ 0x6bbbd0d0, 0x2ac5efef, 0xe54faaaa, 0x16edfbfb,
+ 0xc5864343, 0xd79a4d4d, 0x55663333, 0x94118585,
+ 0xcf8a4545, 0x10e9f9f9, 0x06040202, 0x81fe7f7f,
+ 0xf0a05050, 0x44783c3c, 0xba259f9f, 0xe34ba8a8,
+ 0xf3a25151, 0xfe5da3a3, 0xc0804040, 0x8a058f8f,
+ 0xad3f9292, 0xbc219d9d, 0x48703838, 0x04f1f5f5,
+ 0xdf63bcbc, 0xc177b6b6, 0x75afdada, 0x63422121,
+ 0x30201010, 0x1ae5ffff, 0x0efdf3f3, 0x6dbfd2d2,
+ 0x4c81cdcd, 0x14180c0c, 0x35261313, 0x2fc3ecec,
+ 0xe1be5f5f, 0xa2359797, 0xcc884444, 0x392e1717,
+ 0x5793c4c4, 0xf255a7a7, 0x82fc7e7e, 0x477a3d3d,
+ 0xacc86464, 0xe7ba5d5d, 0x2b321919, 0x95e67373,
+ 0xa0c06060, 0x98198181, 0xd19e4f4f, 0x7fa3dcdc,
+ 0x66442222, 0x7e542a2a, 0xab3b9090, 0x830b8888,
+ 0xca8c4646, 0x29c7eeee, 0xd36bb8b8, 0x3c281414,
+ 0x79a7dede, 0xe2bc5e5e, 0x1d160b0b, 0x76addbdb,
+ 0x3bdbe0e0, 0x56643232, 0x4e743a3a, 0x1e140a0a,
+ 0xdb924949, 0x0a0c0606, 0x6c482424, 0xe4b85c5c,
+ 0x5d9fc2c2, 0x6ebdd3d3, 0xef43acac, 0xa6c46262,
+ 0xa8399191, 0xa4319595, 0x37d3e4e4, 0x8bf27979,
+ 0x32d5e7e7, 0x438bc8c8, 0x596e3737, 0xb7da6d6d,
+ 0x8c018d8d, 0x64b1d5d5, 0xd29c4e4e, 0xe049a9a9,
+ 0xb4d86c6c, 0xfaac5656, 0x07f3f4f4, 0x25cfeaea,
+ 0xafca6565, 0x8ef47a7a, 0xe947aeae, 0x18100808,
+ 0xd56fbaba, 0x88f07878, 0x6f4a2525, 0x725c2e2e,
+ 0x24381c1c, 0xf157a6a6, 0xc773b4b4, 0x5197c6c6,
+ 0x23cbe8e8, 0x7ca1dddd, 0x9ce87474, 0x213e1f1f,
+ 0xdd964b4b, 0xdc61bdbd, 0x860d8b8b, 0x850f8a8a,
+ 0x90e07070, 0x427c3e3e, 0xc471b5b5, 0xaacc6666,
+ 0xd8904848, 0x05060303, 0x01f7f6f6, 0x121c0e0e,
+ 0xa3c26161, 0x5f6a3535, 0xf9ae5757, 0xd069b9b9,
+ 0x91178686, 0x5899c1c1, 0x273a1d1d, 0xb9279e9e,
+ 0x38d9e1e1, 0x13ebf8f8, 0xb32b9898, 0x33221111,
+ 0xbbd26969, 0x70a9d9d9, 0x89078e8e, 0xa7339494,
+ 0xb62d9b9b, 0x223c1e1e, 0x92158787, 0x20c9e9e9,
+ 0x4987cece, 0xffaa5555, 0x78502828, 0x7aa5dfdf,
+ 0x8f038c8c, 0xf859a1a1, 0x80098989, 0x171a0d0d,
+ 0xda65bfbf, 0x31d7e6e6, 0xc6844242, 0xb8d06868,
+ 0xc3824141, 0xb0299999, 0x775a2d2d, 0x111e0f0f,
+ 0xcb7bb0b0, 0xfca85454, 0xd66dbbbb, 0x3a2c1616
+ );
+
+ var $Te2 = array(
+ 0x63a5c663, 0x7c84f87c, 0x7799ee77, 0x7b8df67b,
+ 0xf20dfff2, 0x6bbdd66b, 0x6fb1de6f, 0xc55491c5,
+ 0x30506030, 0x01030201, 0x67a9ce67, 0x2b7d562b,
+ 0xfe19e7fe, 0xd762b5d7, 0xabe64dab, 0x769aec76,
+ 0xca458fca, 0x829d1f82, 0xc94089c9, 0x7d87fa7d,
+ 0xfa15effa, 0x59ebb259, 0x47c98e47, 0xf00bfbf0,
+ 0xadec41ad, 0xd467b3d4, 0xa2fd5fa2, 0xafea45af,
+ 0x9cbf239c, 0xa4f753a4, 0x7296e472, 0xc05b9bc0,
+ 0xb7c275b7, 0xfd1ce1fd, 0x93ae3d93, 0x266a4c26,
+ 0x365a6c36, 0x3f417e3f, 0xf702f5f7, 0xcc4f83cc,
+ 0x345c6834, 0xa5f451a5, 0xe534d1e5, 0xf108f9f1,
+ 0x7193e271, 0xd873abd8, 0x31536231, 0x153f2a15,
+ 0x040c0804, 0xc75295c7, 0x23654623, 0xc35e9dc3,
+ 0x18283018, 0x96a13796, 0x050f0a05, 0x9ab52f9a,
+ 0x07090e07, 0x12362412, 0x809b1b80, 0xe23ddfe2,
+ 0xeb26cdeb, 0x27694e27, 0xb2cd7fb2, 0x759fea75,
+ 0x091b1209, 0x839e1d83, 0x2c74582c, 0x1a2e341a,
+ 0x1b2d361b, 0x6eb2dc6e, 0x5aeeb45a, 0xa0fb5ba0,
+ 0x52f6a452, 0x3b4d763b, 0xd661b7d6, 0xb3ce7db3,
+ 0x297b5229, 0xe33edde3, 0x2f715e2f, 0x84971384,
+ 0x53f5a653, 0xd168b9d1, 0x00000000, 0xed2cc1ed,
+ 0x20604020, 0xfc1fe3fc, 0xb1c879b1, 0x5bedb65b,
+ 0x6abed46a, 0xcb468dcb, 0xbed967be, 0x394b7239,
+ 0x4ade944a, 0x4cd4984c, 0x58e8b058, 0xcf4a85cf,
+ 0xd06bbbd0, 0xef2ac5ef, 0xaae54faa, 0xfb16edfb,
+ 0x43c58643, 0x4dd79a4d, 0x33556633, 0x85941185,
+ 0x45cf8a45, 0xf910e9f9, 0x02060402, 0x7f81fe7f,
+ 0x50f0a050, 0x3c44783c, 0x9fba259f, 0xa8e34ba8,
+ 0x51f3a251, 0xa3fe5da3, 0x40c08040, 0x8f8a058f,
+ 0x92ad3f92, 0x9dbc219d, 0x38487038, 0xf504f1f5,
+ 0xbcdf63bc, 0xb6c177b6, 0xda75afda, 0x21634221,
+ 0x10302010, 0xff1ae5ff, 0xf30efdf3, 0xd26dbfd2,
+ 0xcd4c81cd, 0x0c14180c, 0x13352613, 0xec2fc3ec,
+ 0x5fe1be5f, 0x97a23597, 0x44cc8844, 0x17392e17,
+ 0xc45793c4, 0xa7f255a7, 0x7e82fc7e, 0x3d477a3d,
+ 0x64acc864, 0x5de7ba5d, 0x192b3219, 0x7395e673,
+ 0x60a0c060, 0x81981981, 0x4fd19e4f, 0xdc7fa3dc,
+ 0x22664422, 0x2a7e542a, 0x90ab3b90, 0x88830b88,
+ 0x46ca8c46, 0xee29c7ee, 0xb8d36bb8, 0x143c2814,
+ 0xde79a7de, 0x5ee2bc5e, 0x0b1d160b, 0xdb76addb,
+ 0xe03bdbe0, 0x32566432, 0x3a4e743a, 0x0a1e140a,
+ 0x49db9249, 0x060a0c06, 0x246c4824, 0x5ce4b85c,
+ 0xc25d9fc2, 0xd36ebdd3, 0xacef43ac, 0x62a6c462,
+ 0x91a83991, 0x95a43195, 0xe437d3e4, 0x798bf279,
+ 0xe732d5e7, 0xc8438bc8, 0x37596e37, 0x6db7da6d,
+ 0x8d8c018d, 0xd564b1d5, 0x4ed29c4e, 0xa9e049a9,
+ 0x6cb4d86c, 0x56faac56, 0xf407f3f4, 0xea25cfea,
+ 0x65afca65, 0x7a8ef47a, 0xaee947ae, 0x08181008,
+ 0xbad56fba, 0x7888f078, 0x256f4a25, 0x2e725c2e,
+ 0x1c24381c, 0xa6f157a6, 0xb4c773b4, 0xc65197c6,
+ 0xe823cbe8, 0xdd7ca1dd, 0x749ce874, 0x1f213e1f,
+ 0x4bdd964b, 0xbddc61bd, 0x8b860d8b, 0x8a850f8a,
+ 0x7090e070, 0x3e427c3e, 0xb5c471b5, 0x66aacc66,
+ 0x48d89048, 0x03050603, 0xf601f7f6, 0x0e121c0e,
+ 0x61a3c261, 0x355f6a35, 0x57f9ae57, 0xb9d069b9,
+ 0x86911786, 0xc15899c1, 0x1d273a1d, 0x9eb9279e,
+ 0xe138d9e1, 0xf813ebf8, 0x98b32b98, 0x11332211,
+ 0x69bbd269, 0xd970a9d9, 0x8e89078e, 0x94a73394,
+ 0x9bb62d9b, 0x1e223c1e, 0x87921587, 0xe920c9e9,
+ 0xce4987ce, 0x55ffaa55, 0x28785028, 0xdf7aa5df,
+ 0x8c8f038c, 0xa1f859a1, 0x89800989, 0x0d171a0d,
+ 0xbfda65bf, 0xe631d7e6, 0x42c68442, 0x68b8d068,
+ 0x41c38241, 0x99b02999, 0x2d775a2d, 0x0f111e0f,
+ 0xb0cb7bb0, 0x54fca854, 0xbbd66dbb, 0x163a2c16
+ );
+
+ var $Te3 = array(
+ 0x6363a5c6, 0x7c7c84f8, 0x777799ee, 0x7b7b8df6,
+ 0xf2f20dff, 0x6b6bbdd6, 0x6f6fb1de, 0xc5c55491,
+ 0x30305060, 0x01010302, 0x6767a9ce, 0x2b2b7d56,
+ 0xfefe19e7, 0xd7d762b5, 0xababe64d, 0x76769aec,
+ 0xcaca458f, 0x82829d1f, 0xc9c94089, 0x7d7d87fa,
+ 0xfafa15ef, 0x5959ebb2, 0x4747c98e, 0xf0f00bfb,
+ 0xadadec41, 0xd4d467b3, 0xa2a2fd5f, 0xafafea45,
+ 0x9c9cbf23, 0xa4a4f753, 0x727296e4, 0xc0c05b9b,
+ 0xb7b7c275, 0xfdfd1ce1, 0x9393ae3d, 0x26266a4c,
+ 0x36365a6c, 0x3f3f417e, 0xf7f702f5, 0xcccc4f83,
+ 0x34345c68, 0xa5a5f451, 0xe5e534d1, 0xf1f108f9,
+ 0x717193e2, 0xd8d873ab, 0x31315362, 0x15153f2a,
+ 0x04040c08, 0xc7c75295, 0x23236546, 0xc3c35e9d,
+ 0x18182830, 0x9696a137, 0x05050f0a, 0x9a9ab52f,
+ 0x0707090e, 0x12123624, 0x80809b1b, 0xe2e23ddf,
+ 0xebeb26cd, 0x2727694e, 0xb2b2cd7f, 0x75759fea,
+ 0x09091b12, 0x83839e1d, 0x2c2c7458, 0x1a1a2e34,
+ 0x1b1b2d36, 0x6e6eb2dc, 0x5a5aeeb4, 0xa0a0fb5b,
+ 0x5252f6a4, 0x3b3b4d76, 0xd6d661b7, 0xb3b3ce7d,
+ 0x29297b52, 0xe3e33edd, 0x2f2f715e, 0x84849713,
+ 0x5353f5a6, 0xd1d168b9, 0x00000000, 0xeded2cc1,
+ 0x20206040, 0xfcfc1fe3, 0xb1b1c879, 0x5b5bedb6,
+ 0x6a6abed4, 0xcbcb468d, 0xbebed967, 0x39394b72,
+ 0x4a4ade94, 0x4c4cd498, 0x5858e8b0, 0xcfcf4a85,
+ 0xd0d06bbb, 0xefef2ac5, 0xaaaae54f, 0xfbfb16ed,
+ 0x4343c586, 0x4d4dd79a, 0x33335566, 0x85859411,
+ 0x4545cf8a, 0xf9f910e9, 0x02020604, 0x7f7f81fe,
+ 0x5050f0a0, 0x3c3c4478, 0x9f9fba25, 0xa8a8e34b,
+ 0x5151f3a2, 0xa3a3fe5d, 0x4040c080, 0x8f8f8a05,
+ 0x9292ad3f, 0x9d9dbc21, 0x38384870, 0xf5f504f1,
+ 0xbcbcdf63, 0xb6b6c177, 0xdada75af, 0x21216342,
+ 0x10103020, 0xffff1ae5, 0xf3f30efd, 0xd2d26dbf,
+ 0xcdcd4c81, 0x0c0c1418, 0x13133526, 0xecec2fc3,
+ 0x5f5fe1be, 0x9797a235, 0x4444cc88, 0x1717392e,
+ 0xc4c45793, 0xa7a7f255, 0x7e7e82fc, 0x3d3d477a,
+ 0x6464acc8, 0x5d5de7ba, 0x19192b32, 0x737395e6,
+ 0x6060a0c0, 0x81819819, 0x4f4fd19e, 0xdcdc7fa3,
+ 0x22226644, 0x2a2a7e54, 0x9090ab3b, 0x8888830b,
+ 0x4646ca8c, 0xeeee29c7, 0xb8b8d36b, 0x14143c28,
+ 0xdede79a7, 0x5e5ee2bc, 0x0b0b1d16, 0xdbdb76ad,
+ 0xe0e03bdb, 0x32325664, 0x3a3a4e74, 0x0a0a1e14,
+ 0x4949db92, 0x06060a0c, 0x24246c48, 0x5c5ce4b8,
+ 0xc2c25d9f, 0xd3d36ebd, 0xacacef43, 0x6262a6c4,
+ 0x9191a839, 0x9595a431, 0xe4e437d3, 0x79798bf2,
+ 0xe7e732d5, 0xc8c8438b, 0x3737596e, 0x6d6db7da,
+ 0x8d8d8c01, 0xd5d564b1, 0x4e4ed29c, 0xa9a9e049,
+ 0x6c6cb4d8, 0x5656faac, 0xf4f407f3, 0xeaea25cf,
+ 0x6565afca, 0x7a7a8ef4, 0xaeaee947, 0x08081810,
+ 0xbabad56f, 0x787888f0, 0x25256f4a, 0x2e2e725c,
+ 0x1c1c2438, 0xa6a6f157, 0xb4b4c773, 0xc6c65197,
+ 0xe8e823cb, 0xdddd7ca1, 0x74749ce8, 0x1f1f213e,
+ 0x4b4bdd96, 0xbdbddc61, 0x8b8b860d, 0x8a8a850f,
+ 0x707090e0, 0x3e3e427c, 0xb5b5c471, 0x6666aacc,
+ 0x4848d890, 0x03030506, 0xf6f601f7, 0x0e0e121c,
+ 0x6161a3c2, 0x35355f6a, 0x5757f9ae, 0xb9b9d069,
+ 0x86869117, 0xc1c15899, 0x1d1d273a, 0x9e9eb927,
+ 0xe1e138d9, 0xf8f813eb, 0x9898b32b, 0x11113322,
+ 0x6969bbd2, 0xd9d970a9, 0x8e8e8907, 0x9494a733,
+ 0x9b9bb62d, 0x1e1e223c, 0x87879215, 0xe9e920c9,
+ 0xcece4987, 0x5555ffaa, 0x28287850, 0xdfdf7aa5,
+ 0x8c8c8f03, 0xa1a1f859, 0x89898009, 0x0d0d171a,
+ 0xbfbfda65, 0xe6e631d7, 0x4242c684, 0x6868b8d0,
+ 0x4141c382, 0x9999b029, 0x2d2d775a, 0x0f0f111e,
+ 0xb0b0cb7b, 0x5454fca8, 0xbbbbd66d, 0x16163a2c
+ );
+
+ var $Te4 = array(
+ 0x63636363, 0x7c7c7c7c, 0x77777777, 0x7b7b7b7b,
+ 0xf2f2f2f2, 0x6b6b6b6b, 0x6f6f6f6f, 0xc5c5c5c5,
+ 0x30303030, 0x01010101, 0x67676767, 0x2b2b2b2b,
+ 0xfefefefe, 0xd7d7d7d7, 0xabababab, 0x76767676,
+ 0xcacacaca, 0x82828282, 0xc9c9c9c9, 0x7d7d7d7d,
+ 0xfafafafa, 0x59595959, 0x47474747, 0xf0f0f0f0,
+ 0xadadadad, 0xd4d4d4d4, 0xa2a2a2a2, 0xafafafaf,
+ 0x9c9c9c9c, 0xa4a4a4a4, 0x72727272, 0xc0c0c0c0,
+ 0xb7b7b7b7, 0xfdfdfdfd, 0x93939393, 0x26262626,
+ 0x36363636, 0x3f3f3f3f, 0xf7f7f7f7, 0xcccccccc,
+ 0x34343434, 0xa5a5a5a5, 0xe5e5e5e5, 0xf1f1f1f1,
+ 0x71717171, 0xd8d8d8d8, 0x31313131, 0x15151515,
+ 0x04040404, 0xc7c7c7c7, 0x23232323, 0xc3c3c3c3,
+ 0x18181818, 0x96969696, 0x05050505, 0x9a9a9a9a,
+ 0x07070707, 0x12121212, 0x80808080, 0xe2e2e2e2,
+ 0xebebebeb, 0x27272727, 0xb2b2b2b2, 0x75757575,
+ 0x09090909, 0x83838383, 0x2c2c2c2c, 0x1a1a1a1a,
+ 0x1b1b1b1b, 0x6e6e6e6e, 0x5a5a5a5a, 0xa0a0a0a0,
+ 0x52525252, 0x3b3b3b3b, 0xd6d6d6d6, 0xb3b3b3b3,
+ 0x29292929, 0xe3e3e3e3, 0x2f2f2f2f, 0x84848484,
+ 0x53535353, 0xd1d1d1d1, 0x00000000, 0xedededed,
+ 0x20202020, 0xfcfcfcfc, 0xb1b1b1b1, 0x5b5b5b5b,
+ 0x6a6a6a6a, 0xcbcbcbcb, 0xbebebebe, 0x39393939,
+ 0x4a4a4a4a, 0x4c4c4c4c, 0x58585858, 0xcfcfcfcf,
+ 0xd0d0d0d0, 0xefefefef, 0xaaaaaaaa, 0xfbfbfbfb,
+ 0x43434343, 0x4d4d4d4d, 0x33333333, 0x85858585,
+ 0x45454545, 0xf9f9f9f9, 0x02020202, 0x7f7f7f7f,
+ 0x50505050, 0x3c3c3c3c, 0x9f9f9f9f, 0xa8a8a8a8,
+ 0x51515151, 0xa3a3a3a3, 0x40404040, 0x8f8f8f8f,
+ 0x92929292, 0x9d9d9d9d, 0x38383838, 0xf5f5f5f5,
+ 0xbcbcbcbc, 0xb6b6b6b6, 0xdadadada, 0x21212121,
+ 0x10101010, 0xffffffff, 0xf3f3f3f3, 0xd2d2d2d2,
+ 0xcdcdcdcd, 0x0c0c0c0c, 0x13131313, 0xecececec,
+ 0x5f5f5f5f, 0x97979797, 0x44444444, 0x17171717,
+ 0xc4c4c4c4, 0xa7a7a7a7, 0x7e7e7e7e, 0x3d3d3d3d,
+ 0x64646464, 0x5d5d5d5d, 0x19191919, 0x73737373,
+ 0x60606060, 0x81818181, 0x4f4f4f4f, 0xdcdcdcdc,
+ 0x22222222, 0x2a2a2a2a, 0x90909090, 0x88888888,
+ 0x46464646, 0xeeeeeeee, 0xb8b8b8b8, 0x14141414,
+ 0xdededede, 0x5e5e5e5e, 0x0b0b0b0b, 0xdbdbdbdb,
+ 0xe0e0e0e0, 0x32323232, 0x3a3a3a3a, 0x0a0a0a0a,
+ 0x49494949, 0x06060606, 0x24242424, 0x5c5c5c5c,
+ 0xc2c2c2c2, 0xd3d3d3d3, 0xacacacac, 0x62626262,
+ 0x91919191, 0x95959595, 0xe4e4e4e4, 0x79797979,
+ 0xe7e7e7e7, 0xc8c8c8c8, 0x37373737, 0x6d6d6d6d,
+ 0x8d8d8d8d, 0xd5d5d5d5, 0x4e4e4e4e, 0xa9a9a9a9,
+ 0x6c6c6c6c, 0x56565656, 0xf4f4f4f4, 0xeaeaeaea,
+ 0x65656565, 0x7a7a7a7a, 0xaeaeaeae, 0x08080808,
+ 0xbabababa, 0x78787878, 0x25252525, 0x2e2e2e2e,
+ 0x1c1c1c1c, 0xa6a6a6a6, 0xb4b4b4b4, 0xc6c6c6c6,
+ 0xe8e8e8e8, 0xdddddddd, 0x74747474, 0x1f1f1f1f,
+ 0x4b4b4b4b, 0xbdbdbdbd, 0x8b8b8b8b, 0x8a8a8a8a,
+ 0x70707070, 0x3e3e3e3e, 0xb5b5b5b5, 0x66666666,
+ 0x48484848, 0x03030303, 0xf6f6f6f6, 0x0e0e0e0e,
+ 0x61616161, 0x35353535, 0x57575757, 0xb9b9b9b9,
+ 0x86868686, 0xc1c1c1c1, 0x1d1d1d1d, 0x9e9e9e9e,
+ 0xe1e1e1e1, 0xf8f8f8f8, 0x98989898, 0x11111111,
+ 0x69696969, 0xd9d9d9d9, 0x8e8e8e8e, 0x94949494,
+ 0x9b9b9b9b, 0x1e1e1e1e, 0x87878787, 0xe9e9e9e9,
+ 0xcececece, 0x55555555, 0x28282828, 0xdfdfdfdf,
+ 0x8c8c8c8c, 0xa1a1a1a1, 0x89898989, 0x0d0d0d0d,
+ 0xbfbfbfbf, 0xe6e6e6e6, 0x42424242, 0x68686868,
+ 0x41414141, 0x99999999, 0x2d2d2d2d, 0x0f0f0f0f,
+ 0xb0b0b0b0, 0x54545454, 0xbbbbbbbb, 0x16161616
+ );
+
+ var $Td0 = array(
+ 0x51f4a750, 0x7e416553, 0x1a17a4c3, 0x3a275e96,
+ 0x3bab6bcb, 0x1f9d45f1, 0xacfa58ab, 0x4be30393,
+ 0x2030fa55, 0xad766df6, 0x88cc7691, 0xf5024c25,
+ 0x4fe5d7fc, 0xc52acbd7, 0x26354480, 0xb562a38f,
+ 0xdeb15a49, 0x25ba1b67, 0x45ea0e98, 0x5dfec0e1,
+ 0xc32f7502, 0x814cf012, 0x8d4697a3, 0x6bd3f9c6,
+ 0x038f5fe7, 0x15929c95, 0xbf6d7aeb, 0x955259da,
+ 0xd4be832d, 0x587421d3, 0x49e06929, 0x8ec9c844,
+ 0x75c2896a, 0xf48e7978, 0x99583e6b, 0x27b971dd,
+ 0xbee14fb6, 0xf088ad17, 0xc920ac66, 0x7dce3ab4,
+ 0x63df4a18, 0xe51a3182, 0x97513360, 0x62537f45,
+ 0xb16477e0, 0xbb6bae84, 0xfe81a01c, 0xf9082b94,
+ 0x70486858, 0x8f45fd19, 0x94de6c87, 0x527bf8b7,
+ 0xab73d323, 0x724b02e2, 0xe31f8f57, 0x6655ab2a,
+ 0xb2eb2807, 0x2fb5c203, 0x86c57b9a, 0xd33708a5,
+ 0x302887f2, 0x23bfa5b2, 0x02036aba, 0xed16825c,
+ 0x8acf1c2b, 0xa779b492, 0xf307f2f0, 0x4e69e2a1,
+ 0x65daf4cd, 0x0605bed5, 0xd134621f, 0xc4a6fe8a,
+ 0x342e539d, 0xa2f355a0, 0x058ae132, 0xa4f6eb75,
+ 0x0b83ec39, 0x4060efaa, 0x5e719f06, 0xbd6e1051,
+ 0x3e218af9, 0x96dd063d, 0xdd3e05ae, 0x4de6bd46,
+ 0x91548db5, 0x71c45d05, 0x0406d46f, 0x605015ff,
+ 0x1998fb24, 0xd6bde997, 0x894043cc, 0x67d99e77,
+ 0xb0e842bd, 0x07898b88, 0xe7195b38, 0x79c8eedb,
+ 0xa17c0a47, 0x7c420fe9, 0xf8841ec9, 0x00000000,
+ 0x09808683, 0x322bed48, 0x1e1170ac, 0x6c5a724e,
+ 0xfd0efffb, 0x0f853856, 0x3daed51e, 0x362d3927,
+ 0x0a0fd964, 0x685ca621, 0x9b5b54d1, 0x24362e3a,
+ 0x0c0a67b1, 0x9357e70f, 0xb4ee96d2, 0x1b9b919e,
+ 0x80c0c54f, 0x61dc20a2, 0x5a774b69, 0x1c121a16,
+ 0xe293ba0a, 0xc0a02ae5, 0x3c22e043, 0x121b171d,
+ 0x0e090d0b, 0xf28bc7ad, 0x2db6a8b9, 0x141ea9c8,
+ 0x57f11985, 0xaf75074c, 0xee99ddbb, 0xa37f60fd,
+ 0xf701269f, 0x5c72f5bc, 0x44663bc5, 0x5bfb7e34,
+ 0x8b432976, 0xcb23c6dc, 0xb6edfc68, 0xb8e4f163,
+ 0xd731dcca, 0x42638510, 0x13972240, 0x84c61120,
+ 0x854a247d, 0xd2bb3df8, 0xaef93211, 0xc729a16d,
+ 0x1d9e2f4b, 0xdcb230f3, 0x0d8652ec, 0x77c1e3d0,
+ 0x2bb3166c, 0xa970b999, 0x119448fa, 0x47e96422,
+ 0xa8fc8cc4, 0xa0f03f1a, 0x567d2cd8, 0x223390ef,
+ 0x87494ec7, 0xd938d1c1, 0x8ccaa2fe, 0x98d40b36,
+ 0xa6f581cf, 0xa57ade28, 0xdab78e26, 0x3fadbfa4,
+ 0x2c3a9de4, 0x5078920d, 0x6a5fcc9b, 0x547e4662,
+ 0xf68d13c2, 0x90d8b8e8, 0x2e39f75e, 0x82c3aff5,
+ 0x9f5d80be, 0x69d0937c, 0x6fd52da9, 0xcf2512b3,
+ 0xc8ac993b, 0x10187da7, 0xe89c636e, 0xdb3bbb7b,
+ 0xcd267809, 0x6e5918f4, 0xec9ab701, 0x834f9aa8,
+ 0xe6956e65, 0xaaffe67e, 0x21bccf08, 0xef15e8e6,
+ 0xbae79bd9, 0x4a6f36ce, 0xea9f09d4, 0x29b07cd6,
+ 0x31a4b2af, 0x2a3f2331, 0xc6a59430, 0x35a266c0,
+ 0x744ebc37, 0xfc82caa6, 0xe090d0b0, 0x33a7d815,
+ 0xf104984a, 0x41ecdaf7, 0x7fcd500e, 0x1791f62f,
+ 0x764dd68d, 0x43efb04d, 0xccaa4d54, 0xe49604df,
+ 0x9ed1b5e3, 0x4c6a881b, 0xc12c1fb8, 0x4665517f,
+ 0x9d5eea04, 0x018c355d, 0xfa877473, 0xfb0b412e,
+ 0xb3671d5a, 0x92dbd252, 0xe9105633, 0x6dd64713,
+ 0x9ad7618c, 0x37a10c7a, 0x59f8148e, 0xeb133c89,
+ 0xcea927ee, 0xb761c935, 0xe11ce5ed, 0x7a47b13c,
+ 0x9cd2df59, 0x55f2733f, 0x1814ce79, 0x73c737bf,
+ 0x53f7cdea, 0x5ffdaa5b, 0xdf3d6f14, 0x7844db86,
+ 0xcaaff381, 0xb968c43e, 0x3824342c, 0xc2a3405f,
+ 0x161dc372, 0xbce2250c, 0x283c498b, 0xff0d9541,
+ 0x39a80171, 0x080cb3de, 0xd8b4e49c, 0x6456c190,
+ 0x7bcb8461, 0xd532b670, 0x486c5c74, 0xd0b85742
+ );
+
+ var $Td1 = array(
+ 0x5051f4a7, 0x537e4165, 0xc31a17a4, 0x963a275e,
+ 0xcb3bab6b, 0xf11f9d45, 0xabacfa58, 0x934be303,
+ 0x552030fa, 0xf6ad766d, 0x9188cc76, 0x25f5024c,
+ 0xfc4fe5d7, 0xd7c52acb, 0x80263544, 0x8fb562a3,
+ 0x49deb15a, 0x6725ba1b, 0x9845ea0e, 0xe15dfec0,
+ 0x02c32f75, 0x12814cf0, 0xa38d4697, 0xc66bd3f9,
+ 0xe7038f5f, 0x9515929c, 0xebbf6d7a, 0xda955259,
+ 0x2dd4be83, 0xd3587421, 0x2949e069, 0x448ec9c8,
+ 0x6a75c289, 0x78f48e79, 0x6b99583e, 0xdd27b971,
+ 0xb6bee14f, 0x17f088ad, 0x66c920ac, 0xb47dce3a,
+ 0x1863df4a, 0x82e51a31, 0x60975133, 0x4562537f,
+ 0xe0b16477, 0x84bb6bae, 0x1cfe81a0, 0x94f9082b,
+ 0x58704868, 0x198f45fd, 0x8794de6c, 0xb7527bf8,
+ 0x23ab73d3, 0xe2724b02, 0x57e31f8f, 0x2a6655ab,
+ 0x07b2eb28, 0x032fb5c2, 0x9a86c57b, 0xa5d33708,
+ 0xf2302887, 0xb223bfa5, 0xba02036a, 0x5ced1682,
+ 0x2b8acf1c, 0x92a779b4, 0xf0f307f2, 0xa14e69e2,
+ 0xcd65daf4, 0xd50605be, 0x1fd13462, 0x8ac4a6fe,
+ 0x9d342e53, 0xa0a2f355, 0x32058ae1, 0x75a4f6eb,
+ 0x390b83ec, 0xaa4060ef, 0x065e719f, 0x51bd6e10,
+ 0xf93e218a, 0x3d96dd06, 0xaedd3e05, 0x464de6bd,
+ 0xb591548d, 0x0571c45d, 0x6f0406d4, 0xff605015,
+ 0x241998fb, 0x97d6bde9, 0xcc894043, 0x7767d99e,
+ 0xbdb0e842, 0x8807898b, 0x38e7195b, 0xdb79c8ee,
+ 0x47a17c0a, 0xe97c420f, 0xc9f8841e, 0x00000000,
+ 0x83098086, 0x48322bed, 0xac1e1170, 0x4e6c5a72,
+ 0xfbfd0eff, 0x560f8538, 0x1e3daed5, 0x27362d39,
+ 0x640a0fd9, 0x21685ca6, 0xd19b5b54, 0x3a24362e,
+ 0xb10c0a67, 0x0f9357e7, 0xd2b4ee96, 0x9e1b9b91,
+ 0x4f80c0c5, 0xa261dc20, 0x695a774b, 0x161c121a,
+ 0x0ae293ba, 0xe5c0a02a, 0x433c22e0, 0x1d121b17,
+ 0x0b0e090d, 0xadf28bc7, 0xb92db6a8, 0xc8141ea9,
+ 0x8557f119, 0x4caf7507, 0xbbee99dd, 0xfda37f60,
+ 0x9ff70126, 0xbc5c72f5, 0xc544663b, 0x345bfb7e,
+ 0x768b4329, 0xdccb23c6, 0x68b6edfc, 0x63b8e4f1,
+ 0xcad731dc, 0x10426385, 0x40139722, 0x2084c611,
+ 0x7d854a24, 0xf8d2bb3d, 0x11aef932, 0x6dc729a1,
+ 0x4b1d9e2f, 0xf3dcb230, 0xec0d8652, 0xd077c1e3,
+ 0x6c2bb316, 0x99a970b9, 0xfa119448, 0x2247e964,
+ 0xc4a8fc8c, 0x1aa0f03f, 0xd8567d2c, 0xef223390,
+ 0xc787494e, 0xc1d938d1, 0xfe8ccaa2, 0x3698d40b,
+ 0xcfa6f581, 0x28a57ade, 0x26dab78e, 0xa43fadbf,
+ 0xe42c3a9d, 0x0d507892, 0x9b6a5fcc, 0x62547e46,
+ 0xc2f68d13, 0xe890d8b8, 0x5e2e39f7, 0xf582c3af,
+ 0xbe9f5d80, 0x7c69d093, 0xa96fd52d, 0xb3cf2512,
+ 0x3bc8ac99, 0xa710187d, 0x6ee89c63, 0x7bdb3bbb,
+ 0x09cd2678, 0xf46e5918, 0x01ec9ab7, 0xa8834f9a,
+ 0x65e6956e, 0x7eaaffe6, 0x0821bccf, 0xe6ef15e8,
+ 0xd9bae79b, 0xce4a6f36, 0xd4ea9f09, 0xd629b07c,
+ 0xaf31a4b2, 0x312a3f23, 0x30c6a594, 0xc035a266,
+ 0x37744ebc, 0xa6fc82ca, 0xb0e090d0, 0x1533a7d8,
+ 0x4af10498, 0xf741ecda, 0x0e7fcd50, 0x2f1791f6,
+ 0x8d764dd6, 0x4d43efb0, 0x54ccaa4d, 0xdfe49604,
+ 0xe39ed1b5, 0x1b4c6a88, 0xb8c12c1f, 0x7f466551,
+ 0x049d5eea, 0x5d018c35, 0x73fa8774, 0x2efb0b41,
+ 0x5ab3671d, 0x5292dbd2, 0x33e91056, 0x136dd647,
+ 0x8c9ad761, 0x7a37a10c, 0x8e59f814, 0x89eb133c,
+ 0xeecea927, 0x35b761c9, 0xede11ce5, 0x3c7a47b1,
+ 0x599cd2df, 0x3f55f273, 0x791814ce, 0xbf73c737,
+ 0xea53f7cd, 0x5b5ffdaa, 0x14df3d6f, 0x867844db,
+ 0x81caaff3, 0x3eb968c4, 0x2c382434, 0x5fc2a340,
+ 0x72161dc3, 0x0cbce225, 0x8b283c49, 0x41ff0d95,
+ 0x7139a801, 0xde080cb3, 0x9cd8b4e4, 0x906456c1,
+ 0x617bcb84, 0x70d532b6, 0x74486c5c, 0x42d0b857
+ );
+
+ var $Td2 = array(
+ 0xa75051f4, 0x65537e41, 0xa4c31a17, 0x5e963a27,
+ 0x6bcb3bab, 0x45f11f9d, 0x58abacfa, 0x03934be3,
+ 0xfa552030, 0x6df6ad76, 0x769188cc, 0x4c25f502,
+ 0xd7fc4fe5, 0xcbd7c52a, 0x44802635, 0xa38fb562,
+ 0x5a49deb1, 0x1b6725ba, 0x0e9845ea, 0xc0e15dfe,
+ 0x7502c32f, 0xf012814c, 0x97a38d46, 0xf9c66bd3,
+ 0x5fe7038f, 0x9c951592, 0x7aebbf6d, 0x59da9552,
+ 0x832dd4be, 0x21d35874, 0x692949e0, 0xc8448ec9,
+ 0x896a75c2, 0x7978f48e, 0x3e6b9958, 0x71dd27b9,
+ 0x4fb6bee1, 0xad17f088, 0xac66c920, 0x3ab47dce,
+ 0x4a1863df, 0x3182e51a, 0x33609751, 0x7f456253,
+ 0x77e0b164, 0xae84bb6b, 0xa01cfe81, 0x2b94f908,
+ 0x68587048, 0xfd198f45, 0x6c8794de, 0xf8b7527b,
+ 0xd323ab73, 0x02e2724b, 0x8f57e31f, 0xab2a6655,
+ 0x2807b2eb, 0xc2032fb5, 0x7b9a86c5, 0x08a5d337,
+ 0x87f23028, 0xa5b223bf, 0x6aba0203, 0x825ced16,
+ 0x1c2b8acf, 0xb492a779, 0xf2f0f307, 0xe2a14e69,
+ 0xf4cd65da, 0xbed50605, 0x621fd134, 0xfe8ac4a6,
+ 0x539d342e, 0x55a0a2f3, 0xe132058a, 0xeb75a4f6,
+ 0xec390b83, 0xefaa4060, 0x9f065e71, 0x1051bd6e,
+ 0x8af93e21, 0x063d96dd, 0x05aedd3e, 0xbd464de6,
+ 0x8db59154, 0x5d0571c4, 0xd46f0406, 0x15ff6050,
+ 0xfb241998, 0xe997d6bd, 0x43cc8940, 0x9e7767d9,
+ 0x42bdb0e8, 0x8b880789, 0x5b38e719, 0xeedb79c8,
+ 0x0a47a17c, 0x0fe97c42, 0x1ec9f884, 0x00000000,
+ 0x86830980, 0xed48322b, 0x70ac1e11, 0x724e6c5a,
+ 0xfffbfd0e, 0x38560f85, 0xd51e3dae, 0x3927362d,
+ 0xd9640a0f, 0xa621685c, 0x54d19b5b, 0x2e3a2436,
+ 0x67b10c0a, 0xe70f9357, 0x96d2b4ee, 0x919e1b9b,
+ 0xc54f80c0, 0x20a261dc, 0x4b695a77, 0x1a161c12,
+ 0xba0ae293, 0x2ae5c0a0, 0xe0433c22, 0x171d121b,
+ 0x0d0b0e09, 0xc7adf28b, 0xa8b92db6, 0xa9c8141e,
+ 0x198557f1, 0x074caf75, 0xddbbee99, 0x60fda37f,
+ 0x269ff701, 0xf5bc5c72, 0x3bc54466, 0x7e345bfb,
+ 0x29768b43, 0xc6dccb23, 0xfc68b6ed, 0xf163b8e4,
+ 0xdccad731, 0x85104263, 0x22401397, 0x112084c6,
+ 0x247d854a, 0x3df8d2bb, 0x3211aef9, 0xa16dc729,
+ 0x2f4b1d9e, 0x30f3dcb2, 0x52ec0d86, 0xe3d077c1,
+ 0x166c2bb3, 0xb999a970, 0x48fa1194, 0x642247e9,
+ 0x8cc4a8fc, 0x3f1aa0f0, 0x2cd8567d, 0x90ef2233,
+ 0x4ec78749, 0xd1c1d938, 0xa2fe8cca, 0x0b3698d4,
+ 0x81cfa6f5, 0xde28a57a, 0x8e26dab7, 0xbfa43fad,
+ 0x9de42c3a, 0x920d5078, 0xcc9b6a5f, 0x4662547e,
+ 0x13c2f68d, 0xb8e890d8, 0xf75e2e39, 0xaff582c3,
+ 0x80be9f5d, 0x937c69d0, 0x2da96fd5, 0x12b3cf25,
+ 0x993bc8ac, 0x7da71018, 0x636ee89c, 0xbb7bdb3b,
+ 0x7809cd26, 0x18f46e59, 0xb701ec9a, 0x9aa8834f,
+ 0x6e65e695, 0xe67eaaff, 0xcf0821bc, 0xe8e6ef15,
+ 0x9bd9bae7, 0x36ce4a6f, 0x09d4ea9f, 0x7cd629b0,
+ 0xb2af31a4, 0x23312a3f, 0x9430c6a5, 0x66c035a2,
+ 0xbc37744e, 0xcaa6fc82, 0xd0b0e090, 0xd81533a7,
+ 0x984af104, 0xdaf741ec, 0x500e7fcd, 0xf62f1791,
+ 0xd68d764d, 0xb04d43ef, 0x4d54ccaa, 0x04dfe496,
+ 0xb5e39ed1, 0x881b4c6a, 0x1fb8c12c, 0x517f4665,
+ 0xea049d5e, 0x355d018c, 0x7473fa87, 0x412efb0b,
+ 0x1d5ab367, 0xd25292db, 0x5633e910, 0x47136dd6,
+ 0x618c9ad7, 0x0c7a37a1, 0x148e59f8, 0x3c89eb13,
+ 0x27eecea9, 0xc935b761, 0xe5ede11c, 0xb13c7a47,
+ 0xdf599cd2, 0x733f55f2, 0xce791814, 0x37bf73c7,
+ 0xcdea53f7, 0xaa5b5ffd, 0x6f14df3d, 0xdb867844,
+ 0xf381caaf, 0xc43eb968, 0x342c3824, 0x405fc2a3,
+ 0xc372161d, 0x250cbce2, 0x498b283c, 0x9541ff0d,
+ 0x017139a8, 0xb3de080c, 0xe49cd8b4, 0xc1906456,
+ 0x84617bcb, 0xb670d532, 0x5c74486c, 0x5742d0b8
+ );
+
+ var $Td3 = array(
+ 0xf4a75051, 0x4165537e, 0x17a4c31a, 0x275e963a,
+ 0xab6bcb3b, 0x9d45f11f, 0xfa58abac, 0xe303934b,
+ 0x30fa5520, 0x766df6ad, 0xcc769188, 0x024c25f5,
+ 0xe5d7fc4f, 0x2acbd7c5, 0x35448026, 0x62a38fb5,
+ 0xb15a49de, 0xba1b6725, 0xea0e9845, 0xfec0e15d,
+ 0x2f7502c3, 0x4cf01281, 0x4697a38d, 0xd3f9c66b,
+ 0x8f5fe703, 0x929c9515, 0x6d7aebbf, 0x5259da95,
+ 0xbe832dd4, 0x7421d358, 0xe0692949, 0xc9c8448e,
+ 0xc2896a75, 0x8e7978f4, 0x583e6b99, 0xb971dd27,
+ 0xe14fb6be, 0x88ad17f0, 0x20ac66c9, 0xce3ab47d,
+ 0xdf4a1863, 0x1a3182e5, 0x51336097, 0x537f4562,
+ 0x6477e0b1, 0x6bae84bb, 0x81a01cfe, 0x082b94f9,
+ 0x48685870, 0x45fd198f, 0xde6c8794, 0x7bf8b752,
+ 0x73d323ab, 0x4b02e272, 0x1f8f57e3, 0x55ab2a66,
+ 0xeb2807b2, 0xb5c2032f, 0xc57b9a86, 0x3708a5d3,
+ 0x2887f230, 0xbfa5b223, 0x036aba02, 0x16825ced,
+ 0xcf1c2b8a, 0x79b492a7, 0x07f2f0f3, 0x69e2a14e,
+ 0xdaf4cd65, 0x05bed506, 0x34621fd1, 0xa6fe8ac4,
+ 0x2e539d34, 0xf355a0a2, 0x8ae13205, 0xf6eb75a4,
+ 0x83ec390b, 0x60efaa40, 0x719f065e, 0x6e1051bd,
+ 0x218af93e, 0xdd063d96, 0x3e05aedd, 0xe6bd464d,
+ 0x548db591, 0xc45d0571, 0x06d46f04, 0x5015ff60,
+ 0x98fb2419, 0xbde997d6, 0x4043cc89, 0xd99e7767,
+ 0xe842bdb0, 0x898b8807, 0x195b38e7, 0xc8eedb79,
+ 0x7c0a47a1, 0x420fe97c, 0x841ec9f8, 0x00000000,
+ 0x80868309, 0x2bed4832, 0x1170ac1e, 0x5a724e6c,
+ 0x0efffbfd, 0x8538560f, 0xaed51e3d, 0x2d392736,
+ 0x0fd9640a, 0x5ca62168, 0x5b54d19b, 0x362e3a24,
+ 0x0a67b10c, 0x57e70f93, 0xee96d2b4, 0x9b919e1b,
+ 0xc0c54f80, 0xdc20a261, 0x774b695a, 0x121a161c,
+ 0x93ba0ae2, 0xa02ae5c0, 0x22e0433c, 0x1b171d12,
+ 0x090d0b0e, 0x8bc7adf2, 0xb6a8b92d, 0x1ea9c814,
+ 0xf1198557, 0x75074caf, 0x99ddbbee, 0x7f60fda3,
+ 0x01269ff7, 0x72f5bc5c, 0x663bc544, 0xfb7e345b,
+ 0x4329768b, 0x23c6dccb, 0xedfc68b6, 0xe4f163b8,
+ 0x31dccad7, 0x63851042, 0x97224013, 0xc6112084,
+ 0x4a247d85, 0xbb3df8d2, 0xf93211ae, 0x29a16dc7,
+ 0x9e2f4b1d, 0xb230f3dc, 0x8652ec0d, 0xc1e3d077,
+ 0xb3166c2b, 0x70b999a9, 0x9448fa11, 0xe9642247,
+ 0xfc8cc4a8, 0xf03f1aa0, 0x7d2cd856, 0x3390ef22,
+ 0x494ec787, 0x38d1c1d9, 0xcaa2fe8c, 0xd40b3698,
+ 0xf581cfa6, 0x7ade28a5, 0xb78e26da, 0xadbfa43f,
+ 0x3a9de42c, 0x78920d50, 0x5fcc9b6a, 0x7e466254,
+ 0x8d13c2f6, 0xd8b8e890, 0x39f75e2e, 0xc3aff582,
+ 0x5d80be9f, 0xd0937c69, 0xd52da96f, 0x2512b3cf,
+ 0xac993bc8, 0x187da710, 0x9c636ee8, 0x3bbb7bdb,
+ 0x267809cd, 0x5918f46e, 0x9ab701ec, 0x4f9aa883,
+ 0x956e65e6, 0xffe67eaa, 0xbccf0821, 0x15e8e6ef,
+ 0xe79bd9ba, 0x6f36ce4a, 0x9f09d4ea, 0xb07cd629,
+ 0xa4b2af31, 0x3f23312a, 0xa59430c6, 0xa266c035,
+ 0x4ebc3774, 0x82caa6fc, 0x90d0b0e0, 0xa7d81533,
+ 0x04984af1, 0xecdaf741, 0xcd500e7f, 0x91f62f17,
+ 0x4dd68d76, 0xefb04d43, 0xaa4d54cc, 0x9604dfe4,
+ 0xd1b5e39e, 0x6a881b4c, 0x2c1fb8c1, 0x65517f46,
+ 0x5eea049d, 0x8c355d01, 0x877473fa, 0x0b412efb,
+ 0x671d5ab3, 0xdbd25292, 0x105633e9, 0xd647136d,
+ 0xd7618c9a, 0xa10c7a37, 0xf8148e59, 0x133c89eb,
+ 0xa927eece, 0x61c935b7, 0x1ce5ede1, 0x47b13c7a,
+ 0xd2df599c, 0xf2733f55, 0x14ce7918, 0xc737bf73,
+ 0xf7cdea53, 0xfdaa5b5f, 0x3d6f14df, 0x44db8678,
+ 0xaff381ca, 0x68c43eb9, 0x24342c38, 0xa3405fc2,
+ 0x1dc37216, 0xe2250cbc, 0x3c498b28, 0x0d9541ff,
+ 0xa8017139, 0x0cb3de08, 0xb4e49cd8, 0x56c19064,
+ 0xcb84617b, 0x32b670d5, 0x6c5c7448, 0xb85742d0
+ );
+
+ var $Td4 = array(
+ 0x52525252, 0x09090909, 0x6a6a6a6a, 0xd5d5d5d5,
+ 0x30303030, 0x36363636, 0xa5a5a5a5, 0x38383838,
+ 0xbfbfbfbf, 0x40404040, 0xa3a3a3a3, 0x9e9e9e9e,
+ 0x81818181, 0xf3f3f3f3, 0xd7d7d7d7, 0xfbfbfbfb,
+ 0x7c7c7c7c, 0xe3e3e3e3, 0x39393939, 0x82828282,
+ 0x9b9b9b9b, 0x2f2f2f2f, 0xffffffff, 0x87878787,
+ 0x34343434, 0x8e8e8e8e, 0x43434343, 0x44444444,
+ 0xc4c4c4c4, 0xdededede, 0xe9e9e9e9, 0xcbcbcbcb,
+ 0x54545454, 0x7b7b7b7b, 0x94949494, 0x32323232,
+ 0xa6a6a6a6, 0xc2c2c2c2, 0x23232323, 0x3d3d3d3d,
+ 0xeeeeeeee, 0x4c4c4c4c, 0x95959595, 0x0b0b0b0b,
+ 0x42424242, 0xfafafafa, 0xc3c3c3c3, 0x4e4e4e4e,
+ 0x08080808, 0x2e2e2e2e, 0xa1a1a1a1, 0x66666666,
+ 0x28282828, 0xd9d9d9d9, 0x24242424, 0xb2b2b2b2,
+ 0x76767676, 0x5b5b5b5b, 0xa2a2a2a2, 0x49494949,
+ 0x6d6d6d6d, 0x8b8b8b8b, 0xd1d1d1d1, 0x25252525,
+ 0x72727272, 0xf8f8f8f8, 0xf6f6f6f6, 0x64646464,
+ 0x86868686, 0x68686868, 0x98989898, 0x16161616,
+ 0xd4d4d4d4, 0xa4a4a4a4, 0x5c5c5c5c, 0xcccccccc,
+ 0x5d5d5d5d, 0x65656565, 0xb6b6b6b6, 0x92929292,
+ 0x6c6c6c6c, 0x70707070, 0x48484848, 0x50505050,
+ 0xfdfdfdfd, 0xedededed, 0xb9b9b9b9, 0xdadadada,
+ 0x5e5e5e5e, 0x15151515, 0x46464646, 0x57575757,
+ 0xa7a7a7a7, 0x8d8d8d8d, 0x9d9d9d9d, 0x84848484,
+ 0x90909090, 0xd8d8d8d8, 0xabababab, 0x00000000,
+ 0x8c8c8c8c, 0xbcbcbcbc, 0xd3d3d3d3, 0x0a0a0a0a,
+ 0xf7f7f7f7, 0xe4e4e4e4, 0x58585858, 0x05050505,
+ 0xb8b8b8b8, 0xb3b3b3b3, 0x45454545, 0x06060606,
+ 0xd0d0d0d0, 0x2c2c2c2c, 0x1e1e1e1e, 0x8f8f8f8f,
+ 0xcacacaca, 0x3f3f3f3f, 0x0f0f0f0f, 0x02020202,
+ 0xc1c1c1c1, 0xafafafaf, 0xbdbdbdbd, 0x03030303,
+ 0x01010101, 0x13131313, 0x8a8a8a8a, 0x6b6b6b6b,
+ 0x3a3a3a3a, 0x91919191, 0x11111111, 0x41414141,
+ 0x4f4f4f4f, 0x67676767, 0xdcdcdcdc, 0xeaeaeaea,
+ 0x97979797, 0xf2f2f2f2, 0xcfcfcfcf, 0xcececece,
+ 0xf0f0f0f0, 0xb4b4b4b4, 0xe6e6e6e6, 0x73737373,
+ 0x96969696, 0xacacacac, 0x74747474, 0x22222222,
+ 0xe7e7e7e7, 0xadadadad, 0x35353535, 0x85858585,
+ 0xe2e2e2e2, 0xf9f9f9f9, 0x37373737, 0xe8e8e8e8,
+ 0x1c1c1c1c, 0x75757575, 0xdfdfdfdf, 0x6e6e6e6e,
+ 0x47474747, 0xf1f1f1f1, 0x1a1a1a1a, 0x71717171,
+ 0x1d1d1d1d, 0x29292929, 0xc5c5c5c5, 0x89898989,
+ 0x6f6f6f6f, 0xb7b7b7b7, 0x62626262, 0x0e0e0e0e,
+ 0xaaaaaaaa, 0x18181818, 0xbebebebe, 0x1b1b1b1b,
+ 0xfcfcfcfc, 0x56565656, 0x3e3e3e3e, 0x4b4b4b4b,
+ 0xc6c6c6c6, 0xd2d2d2d2, 0x79797979, 0x20202020,
+ 0x9a9a9a9a, 0xdbdbdbdb, 0xc0c0c0c0, 0xfefefefe,
+ 0x78787878, 0xcdcdcdcd, 0x5a5a5a5a, 0xf4f4f4f4,
+ 0x1f1f1f1f, 0xdddddddd, 0xa8a8a8a8, 0x33333333,
+ 0x88888888, 0x07070707, 0xc7c7c7c7, 0x31313131,
+ 0xb1b1b1b1, 0x12121212, 0x10101010, 0x59595959,
+ 0x27272727, 0x80808080, 0xecececec, 0x5f5f5f5f,
+ 0x60606060, 0x51515151, 0x7f7f7f7f, 0xa9a9a9a9,
+ 0x19191919, 0xb5b5b5b5, 0x4a4a4a4a, 0x0d0d0d0d,
+ 0x2d2d2d2d, 0xe5e5e5e5, 0x7a7a7a7a, 0x9f9f9f9f,
+ 0x93939393, 0xc9c9c9c9, 0x9c9c9c9c, 0xefefefef,
+ 0xa0a0a0a0, 0xe0e0e0e0, 0x3b3b3b3b, 0x4d4d4d4d,
+ 0xaeaeaeae, 0x2a2a2a2a, 0xf5f5f5f5, 0xb0b0b0b0,
+ 0xc8c8c8c8, 0xebebebeb, 0xbbbbbbbb, 0x3c3c3c3c,
+ 0x83838383, 0x53535353, 0x99999999, 0x61616161,
+ 0x17171717, 0x2b2b2b2b, 0x04040404, 0x7e7e7e7e,
+ 0xbabababa, 0x77777777, 0xd6d6d6d6, 0x26262626,
+ 0xe1e1e1e1, 0x69696969, 0x14141414, 0x63636363,
+ 0x55555555, 0x21212121, 0x0c0c0c0c, 0x7d7d7d7d
+ );
+
+ var $rcon = array(
+ 0x01000000, 0x02000000, 0x04000000, 0x08000000,
+ 0x10000000, 0x20000000, 0x40000000, 0x80000000,
+ 0x1B000000, 0x36000000
+ );
- //////////////////// CORE FUNCTIONS ///////////////////////////
+ //////////////////// CORE FUNCTIONS ///////////////////////////
- // Encrypt a single block (bin) and return (bout)
- function AES_encrypt($bin, $key)
- {
- $rk = 0;
-
- if ($bin == '' || $key == '') {
- librijndael2::trace("AES_encrypt: bin/key undefined");
- return;
- }
-
- // FIXME: BAD: we need rd_key
-
- // map byte array block to cipher state
- // and add initial round key:
-
- $s0 = librijndael2::parseInt("0x" . substr($bin, 0 , 8)) ^ $key->rd_key[0];
- $s1 = librijndael2::parseInt("0x" . substr($bin, 8 , 8)) ^ $key->rd_key[1];
- $s2 = librijndael2::parseInt("0x" . substr($bin, 16, 8)) ^ $key->rd_key[2];
- $s3 = librijndael2::parseInt("0x" . substr($bin, 24, 8)) ^ $key->rd_key[3];
-
- // Using Full Unroll (Bigger more a bit faster :) )
- // round 1:
- $t0 = $this->Te0[($s0 >> 24) & 0xff] ^ $this->Te1[($s1 >> 16) & 0xff] ^ $this->Te2[($s2 >> 8) & 0xff] ^ $this->Te3[$s3 & 0xff] ^ $key->rd_key[4];
- $t1 = $this->Te0[($s1 >> 24) & 0xff] ^ $this->Te1[($s2 >> 16) & 0xff] ^ $this->Te2[($s3 >> 8) & 0xff] ^ $this->Te3[$s0 & 0xff] ^ $key->rd_key[5];
- $t2 = $this->Te0[($s2 >> 24) & 0xff] ^ $this->Te1[($s3 >> 16) & 0xff] ^ $this->Te2[($s0 >> 8) & 0xff] ^ $this->Te3[$s1 & 0xff] ^ $key->rd_key[6];
- $t3 = $this->Te0[($s3 >> 24) & 0xff] ^ $this->Te1[($s0 >> 16) & 0xff] ^ $this->Te2[($s1 >> 8) & 0xff] ^ $this->Te3[$s2 & 0xff] ^ $key->rd_key[7];
- $s0 = $this->Te0[($t0 >> 24) & 0xff] ^ $this->Te1[($t1 >> 16) & 0xff] ^ $this->Te2[($t2 >> 8) & 0xff] ^ $this->Te3[$t3 & 0xff] ^ $key->rd_key[8];
- $s1 = $this->Te0[($t1 >> 24) & 0xff] ^ $this->Te1[($t2 >> 16) & 0xff] ^ $this->Te2[($t3 >> 8) & 0xff] ^ $this->Te3[$t0 & 0xff] ^ $key->rd_key[9];
- $s2 = $this->Te0[($t2 >> 24) & 0xff] ^ $this->Te1[($t3 >> 16) & 0xff] ^ $this->Te2[($t0 >> 8) & 0xff] ^ $this->Te3[$t1 & 0xff] ^ $key->rd_key[10];
- $s3 = $this->Te0[($t3 >> 24) & 0xff] ^ $this->Te1[($t0 >> 16) & 0xff] ^ $this->Te2[($t1 >> 8) & 0xff] ^ $this->Te3[$t2 & 0xff] ^ $key->rd_key[11];
- $t0 = $this->Te0[($s0 >> 24) & 0xff] ^ $this->Te1[($s1 >> 16) & 0xff] ^ $this->Te2[($s2 >> 8) & 0xff] ^ $this->Te3[$s3 & 0xff] ^ $key->rd_key[12];
- $t1 = $this->Te0[($s1 >> 24) & 0xff] ^ $this->Te1[($s2 >> 16) & 0xff] ^ $this->Te2[($s3 >> 8) & 0xff] ^ $this->Te3[$s0 & 0xff] ^ $key->rd_key[13];
- $t2 = $this->Te0[($s2 >> 24) & 0xff] ^ $this->Te1[($s3 >> 16) & 0xff] ^ $this->Te2[($s0 >> 8) & 0xff] ^ $this->Te3[$s1 & 0xff] ^ $key->rd_key[14];
- $t3 = $this->Te0[($s3 >> 24) & 0xff] ^ $this->Te1[($s0 >> 16) & 0xff] ^ $this->Te2[($s1 >> 8) & 0xff] ^ $this->Te3[$s2 & 0xff] ^ $key->rd_key[15];
- $s0 = $this->Te0[($t0 >> 24) & 0xff] ^ $this->Te1[($t1 >> 16) & 0xff] ^ $this->Te2[($t2 >> 8) & 0xff] ^ $this->Te3[$t3 & 0xff] ^ $key->rd_key[16];
- $s1 = $this->Te0[($t1 >> 24) & 0xff] ^ $this->Te1[($t2 >> 16) & 0xff] ^ $this->Te2[($t3 >> 8) & 0xff] ^ $this->Te3[$t0 & 0xff] ^ $key->rd_key[17];
- $s2 = $this->Te0[($t2 >> 24) & 0xff] ^ $this->Te1[($t3 >> 16) & 0xff] ^ $this->Te2[($t0 >> 8) & 0xff] ^ $this->Te3[$t1 & 0xff] ^ $key->rd_key[18];
- $s3 = $this->Te0[($t3 >> 24) & 0xff] ^ $this->Te1[($t0 >> 16) & 0xff] ^ $this->Te2[($t1 >> 8) & 0xff] ^ $this->Te3[$t2 & 0xff] ^ $key->rd_key[19];
- $t0 = $this->Te0[($s0 >> 24) & 0xff] ^ $this->Te1[($s1 >> 16) & 0xff] ^ $this->Te2[($s2 >> 8) & 0xff] ^ $this->Te3[$s3 & 0xff] ^ $key->rd_key[20];
- $t1 = $this->Te0[($s1 >> 24) & 0xff] ^ $this->Te1[($s2 >> 16) & 0xff] ^ $this->Te2[($s3 >> 8) & 0xff] ^ $this->Te3[$s0 & 0xff] ^ $key->rd_key[21];
- $t2 = $this->Te0[($s2 >> 24) & 0xff] ^ $this->Te1[($s3 >> 16) & 0xff] ^ $this->Te2[($s0 >> 8) & 0xff] ^ $this->Te3[$s1 & 0xff] ^ $key->rd_key[22];
- $t3 = $this->Te0[($s3 >> 24) & 0xff] ^ $this->Te1[($s0 >> 16) & 0xff] ^ $this->Te2[($s1 >> 8) & 0xff] ^ $this->Te3[$s2 & 0xff] ^ $key->rd_key[23];
- $s0 = $this->Te0[($t0 >> 24) & 0xff] ^ $this->Te1[($t1 >> 16) & 0xff] ^ $this->Te2[($t2 >> 8) & 0xff] ^ $this->Te3[$t3 & 0xff] ^ $key->rd_key[24];
- $s1 = $this->Te0[($t1 >> 24) & 0xff] ^ $this->Te1[($t2 >> 16) & 0xff] ^ $this->Te2[($t3 >> 8) & 0xff] ^ $this->Te3[$t0 & 0xff] ^ $key->rd_key[25];
- $s2 = $this->Te0[($t2 >> 24) & 0xff] ^ $this->Te1[($t3 >> 16) & 0xff] ^ $this->Te2[($t0 >> 8) & 0xff] ^ $this->Te3[$t1 & 0xff] ^ $key->rd_key[26];
- $s3 = $this->Te0[($t3 >> 24) & 0xff] ^ $this->Te1[($t0 >> 16) & 0xff] ^ $this->Te2[($t1 >> 8) & 0xff] ^ $this->Te3[$t2 & 0xff] ^ $key->rd_key[27];
- $t0 = $this->Te0[($s0 >> 24) & 0xff] ^ $this->Te1[($s1 >> 16) & 0xff] ^ $this->Te2[($s2 >> 8) & 0xff] ^ $this->Te3[$s3 & 0xff] ^ $key->rd_key[28];
- $t1 = $this->Te0[($s1 >> 24) & 0xff] ^ $this->Te1[($s2 >> 16) & 0xff] ^ $this->Te2[($s3 >> 8) & 0xff] ^ $this->Te3[$s0 & 0xff] ^ $key->rd_key[29];
- $t2 = $this->Te0[($s2 >> 24) & 0xff] ^ $this->Te1[($s3 >> 16) & 0xff] ^ $this->Te2[($s0 >> 8) & 0xff] ^ $this->Te3[$s1 & 0xff] ^ $key->rd_key[30];
- $t3 = $this->Te0[($s3 >> 24) & 0xff] ^ $this->Te1[($s0 >> 16) & 0xff] ^ $this->Te2[($s1 >> 8) & 0xff] ^ $this->Te3[$s2 & 0xff] ^ $key->rd_key[31];
- $s0 = $this->Te0[($t0 >> 24) & 0xff] ^ $this->Te1[($t1 >> 16) & 0xff] ^ $this->Te2[($t2 >> 8) & 0xff] ^ $this->Te3[$t3 & 0xff] ^ $key->rd_key[32];
- $s1 = $this->Te0[($t1 >> 24) & 0xff] ^ $this->Te1[($t2 >> 16) & 0xff] ^ $this->Te2[($t3 >> 8) & 0xff] ^ $this->Te3[$t0 & 0xff] ^ $key->rd_key[33];
- $s2 = $this->Te0[($t2 >> 24) & 0xff] ^ $this->Te1[($t3 >> 16) & 0xff] ^ $this->Te2[($t0 >> 8) & 0xff] ^ $this->Te3[$t1 & 0xff] ^ $key->rd_key[34];
- $s3 = $this->Te0[($t3 >> 24) & 0xff] ^ $this->Te1[($t0 >> 16) & 0xff] ^ $this->Te2[($t1 >> 8) & 0xff] ^ $this->Te3[$t2 & 0xff] ^ $key->rd_key[35];
- $t0 = $this->Te0[($s0 >> 24) & 0xff] ^ $this->Te1[($s1 >> 16) & 0xff] ^ $this->Te2[($s2 >> 8) & 0xff] ^ $this->Te3[$s3 & 0xff] ^ $key->rd_key[36];
- $t1 = $this->Te0[($s1 >> 24) & 0xff] ^ $this->Te1[($s2 >> 16) & 0xff] ^ $this->Te2[($s3 >> 8) & 0xff] ^ $this->Te3[$s0 & 0xff] ^ $key->rd_key[37];
- $t2 = $this->Te0[($s2 >> 24) & 0xff] ^ $this->Te1[($s3 >> 16) & 0xff] ^ $this->Te2[($s0 >> 8) & 0xff] ^ $this->Te3[$s1 & 0xff] ^ $key->rd_key[38];
- $t3 = $this->Te0[($s3 >> 24) & 0xff] ^ $this->Te1[($s0 >> 16) & 0xff] ^ $this->Te2[($s1 >> 8) & 0xff] ^ $this->Te3[$s2 & 0xff] ^ $key->rd_key[39];
-
- // FIXME: BAD: need $key->rounds
-
- if ($key->rounds > 10) {
- // round 10:
- $s0 = $this->Te0[($t0 >> 24) & 0xff] ^ $this->Te1[($t1 >> 16) & 0xff] ^ $this->Te2[($t2 >> 8) & 0xff] ^ $this->Te3[$t3 & 0xff] ^ $key->rd_key[40];
- $s1 = $this->Te0[($t1 >> 24) & 0xff] ^ $this->Te1[($t2 >> 16) & 0xff] ^ $this->Te2[($t3 >> 8) & 0xff] ^ $this->Te3[$t0 & 0xff] ^ $key->rd_key[41];
- $s2 = $this->Te0[($t2 >> 24) & 0xff] ^ $this->Te1[($t3 >> 16) & 0xff] ^ $this->Te2[($t0 >> 8) & 0xff] ^ $this->Te3[$t1 & 0xff] ^ $key->rd_key[42];
- $s3 = $this->Te0[($t3 >> 24) & 0xff] ^ $this->Te1[($t0 >> 16) & 0xff] ^ $this->Te2[($t1 >> 8) & 0xff] ^ $this->Te3[$t2 & 0xff] ^ $key->rd_key[43];
- $t0 = $this->Te0[($s0 >> 24) & 0xff] ^ $this->Te1[($s1 >> 16) & 0xff] ^ $this->Te2[($s2 >> 8) & 0xff] ^ $this->Te3[$s3 & 0xff] ^ $key->rd_key[44];
- $t1 = $this->Te0[($s1 >> 24) & 0xff] ^ $this->Te1[($s2 >> 16) & 0xff] ^ $this->Te2[($s3 >> 8) & 0xff] ^ $this->Te3[$s0 & 0xff] ^ $key->rd_key[45];
- $t2 = $this->Te0[($s2 >> 24) & 0xff] ^ $this->Te1[($s3 >> 16) & 0xff] ^ $this->Te2[($s0 >> 8) & 0xff] ^ $this->Te3[$s1 & 0xff] ^ $key->rd_key[46];
- $t3 = $this->Te0[($s3 >> 24) & 0xff] ^ $this->Te1[($s0 >> 16) & 0xff] ^ $this->Te2[($s1 >> 8) & 0xff] ^ $this->Te3[$s2 & 0xff] ^ $key->rd_key[47];
-
- if ($key->rounds > 12) {
- $s0 = $this->Te0[($t0 >> 24) & 0xff] ^ $this->Te1[($t1 >> 16) & 0xff] ^ $this->Te2[($t2 >> 8) & 0xff] ^ $this->Te3[$t3 & 0xff] ^ $key->rd_key[48];
- $s1 = $this->Te0[($t1 >> 24) & 0xff] ^ $this->Te1[($t2 >> 16) & 0xff] ^ $this->Te2[($t3 >> 8) & 0xff] ^ $this->Te3[$t0 & 0xff] ^ $key->rd_key[49];
- $s2 = $this->Te0[($t2 >> 24) & 0xff] ^ $this->Te1[($t3 >> 16) & 0xff] ^ $this->Te2[($t0 >> 8) & 0xff] ^ $this->Te3[$t1 & 0xff] ^ $key->rd_key[50];
- $s3 = $this->Te0[($t3 >> 24) & 0xff] ^ $this->Te1[($t0 >> 16) & 0xff] ^ $this->Te2[($t1 >> 8) & 0xff] ^ $this->Te3[$t2 & 0xff] ^ $key->rd_key[51];
- $t0 = $this->Te0[($s0 >> 24) & 0xff] ^ $this->Te1[($s1 >> 16) & 0xff] ^ $this->Te2[($s2 >> 8) & 0xff] ^ $this->Te3[$s3 & 0xff] ^ $key->rd_key[52];
- $t1 = $this->Te0[($s1 >> 24) & 0xff] ^ $this->Te1[($s2 >> 16) & 0xff] ^ $this->Te2[($s3 >> 8) & 0xff] ^ $this->Te3[$s0 & 0xff] ^ $key->rd_key[53];
- $t2 = $this->Te0[($s2 >> 24) & 0xff] ^ $this->Te1[($s3 >> 16) & 0xff] ^ $this->Te2[($s0 >> 8) & 0xff] ^ $this->Te3[$s1 & 0xff] ^ $key->rd_key[54];
- $t3 = $this->Te0[($s3 >> 24) & 0xff] ^ $this->Te1[($s0 >> 16) & 0xff] ^ $this->Te2[($s1 >> 8) & 0xff] ^ $this->Te3[$s2 & 0xff] ^ $key->rd_key[55];
- }
- }
-
- // This is correct
- $rk = $key->rounds << 2;
-
-
- /*
- // No Full Unroll
- */
-
- // Apply last round and
- // map cipher state to byte array block:
-
- $s0 = ($this->Te4[($t0 >> 24) & 0xff] & 0xff000000) ^
- ($this->Te4[($t1 >> 16) & 0xff] & 0x00ff0000) ^
- ($this->Te4[($t2 >> 8) & 0xff] & 0x0000ff00) ^
- ($this->Te4[($t3 ) & 0xff] & 0x000000ff) ^
- $key->rd_key[$rk];
-
- $out = librijndael2::ord2hex(($s0 >> 24) & 0xff);
- $out .= librijndael2::ord2hex(($s0 >> 16) & 0xff);
- $out .= librijndael2::ord2hex(($s0 >> 8) & 0xff);
- $out .= librijndael2::ord2hex($s0 & 0xff);
+ // Encrypt a single block (bin) and return (bout)
+ function AES_encrypt($bin, $key)
+ {
+ $rk = 0;
+
+ if ($bin == '' || $key == '') {
+ librijndael2::trace("AES_encrypt: bin/key undefined");
+ return;
+ }
+
+ // FIXME: BAD: we need rd_key
+
+ // map byte array block to cipher state
+ // and add initial round key:
+
+ $s0 = librijndael2::parseInt("0x" . substr($bin, 0 , 8)) ^ $key->rd_key[0];
+ $s1 = librijndael2::parseInt("0x" . substr($bin, 8 , 8)) ^ $key->rd_key[1];
+ $s2 = librijndael2::parseInt("0x" . substr($bin, 16, 8)) ^ $key->rd_key[2];
+ $s3 = librijndael2::parseInt("0x" . substr($bin, 24, 8)) ^ $key->rd_key[3];
+
+ // Using Full Unroll (Bigger more a bit faster :) )
+ // round 1:
+ $t0 = $this->Te0[($s0 >> 24) & 0xff] ^ $this->Te1[($s1 >> 16) & 0xff] ^ $this->Te2[($s2 >> 8) & 0xff] ^ $this->Te3[$s3 & 0xff] ^ $key->rd_key[4];
+ $t1 = $this->Te0[($s1 >> 24) & 0xff] ^ $this->Te1[($s2 >> 16) & 0xff] ^ $this->Te2[($s3 >> 8) & 0xff] ^ $this->Te3[$s0 & 0xff] ^ $key->rd_key[5];
+ $t2 = $this->Te0[($s2 >> 24) & 0xff] ^ $this->Te1[($s3 >> 16) & 0xff] ^ $this->Te2[($s0 >> 8) & 0xff] ^ $this->Te3[$s1 & 0xff] ^ $key->rd_key[6];
+ $t3 = $this->Te0[($s3 >> 24) & 0xff] ^ $this->Te1[($s0 >> 16) & 0xff] ^ $this->Te2[($s1 >> 8) & 0xff] ^ $this->Te3[$s2 & 0xff] ^ $key->rd_key[7];
+ $s0 = $this->Te0[($t0 >> 24) & 0xff] ^ $this->Te1[($t1 >> 16) & 0xff] ^ $this->Te2[($t2 >> 8) & 0xff] ^ $this->Te3[$t3 & 0xff] ^ $key->rd_key[8];
+ $s1 = $this->Te0[($t1 >> 24) & 0xff] ^ $this->Te1[($t2 >> 16) & 0xff] ^ $this->Te2[($t3 >> 8) & 0xff] ^ $this->Te3[$t0 & 0xff] ^ $key->rd_key[9];
+ $s2 = $this->Te0[($t2 >> 24) & 0xff] ^ $this->Te1[($t3 >> 16) & 0xff] ^ $this->Te2[($t0 >> 8) & 0xff] ^ $this->Te3[$t1 & 0xff] ^ $key->rd_key[10];
+ $s3 = $this->Te0[($t3 >> 24) & 0xff] ^ $this->Te1[($t0 >> 16) & 0xff] ^ $this->Te2[($t1 >> 8) & 0xff] ^ $this->Te3[$t2 & 0xff] ^ $key->rd_key[11];
+ $t0 = $this->Te0[($s0 >> 24) & 0xff] ^ $this->Te1[($s1 >> 16) & 0xff] ^ $this->Te2[($s2 >> 8) & 0xff] ^ $this->Te3[$s3 & 0xff] ^ $key->rd_key[12];
+ $t1 = $this->Te0[($s1 >> 24) & 0xff] ^ $this->Te1[($s2 >> 16) & 0xff] ^ $this->Te2[($s3 >> 8) & 0xff] ^ $this->Te3[$s0 & 0xff] ^ $key->rd_key[13];
+ $t2 = $this->Te0[($s2 >> 24) & 0xff] ^ $this->Te1[($s3 >> 16) & 0xff] ^ $this->Te2[($s0 >> 8) & 0xff] ^ $this->Te3[$s1 & 0xff] ^ $key->rd_key[14];
+ $t3 = $this->Te0[($s3 >> 24) & 0xff] ^ $this->Te1[($s0 >> 16) & 0xff] ^ $this->Te2[($s1 >> 8) & 0xff] ^ $this->Te3[$s2 & 0xff] ^ $key->rd_key[15];
+ $s0 = $this->Te0[($t0 >> 24) & 0xff] ^ $this->Te1[($t1 >> 16) & 0xff] ^ $this->Te2[($t2 >> 8) & 0xff] ^ $this->Te3[$t3 & 0xff] ^ $key->rd_key[16];
+ $s1 = $this->Te0[($t1 >> 24) & 0xff] ^ $this->Te1[($t2 >> 16) & 0xff] ^ $this->Te2[($t3 >> 8) & 0xff] ^ $this->Te3[$t0 & 0xff] ^ $key->rd_key[17];
+ $s2 = $this->Te0[($t2 >> 24) & 0xff] ^ $this->Te1[($t3 >> 16) & 0xff] ^ $this->Te2[($t0 >> 8) & 0xff] ^ $this->Te3[$t1 & 0xff] ^ $key->rd_key[18];
+ $s3 = $this->Te0[($t3 >> 24) & 0xff] ^ $this->Te1[($t0 >> 16) & 0xff] ^ $this->Te2[($t1 >> 8) & 0xff] ^ $this->Te3[$t2 & 0xff] ^ $key->rd_key[19];
+ $t0 = $this->Te0[($s0 >> 24) & 0xff] ^ $this->Te1[($s1 >> 16) & 0xff] ^ $this->Te2[($s2 >> 8) & 0xff] ^ $this->Te3[$s3 & 0xff] ^ $key->rd_key[20];
+ $t1 = $this->Te0[($s1 >> 24) & 0xff] ^ $this->Te1[($s2 >> 16) & 0xff] ^ $this->Te2[($s3 >> 8) & 0xff] ^ $this->Te3[$s0 & 0xff] ^ $key->rd_key[21];
+ $t2 = $this->Te0[($s2 >> 24) & 0xff] ^ $this->Te1[($s3 >> 16) & 0xff] ^ $this->Te2[($s0 >> 8) & 0xff] ^ $this->Te3[$s1 & 0xff] ^ $key->rd_key[22];
+ $t3 = $this->Te0[($s3 >> 24) & 0xff] ^ $this->Te1[($s0 >> 16) & 0xff] ^ $this->Te2[($s1 >> 8) & 0xff] ^ $this->Te3[$s2 & 0xff] ^ $key->rd_key[23];
+ $s0 = $this->Te0[($t0 >> 24) & 0xff] ^ $this->Te1[($t1 >> 16) & 0xff] ^ $this->Te2[($t2 >> 8) & 0xff] ^ $this->Te3[$t3 & 0xff] ^ $key->rd_key[24];
+ $s1 = $this->Te0[($t1 >> 24) & 0xff] ^ $this->Te1[($t2 >> 16) & 0xff] ^ $this->Te2[($t3 >> 8) & 0xff] ^ $this->Te3[$t0 & 0xff] ^ $key->rd_key[25];
+ $s2 = $this->Te0[($t2 >> 24) & 0xff] ^ $this->Te1[($t3 >> 16) & 0xff] ^ $this->Te2[($t0 >> 8) & 0xff] ^ $this->Te3[$t1 & 0xff] ^ $key->rd_key[26];
+ $s3 = $this->Te0[($t3 >> 24) & 0xff] ^ $this->Te1[($t0 >> 16) & 0xff] ^ $this->Te2[($t1 >> 8) & 0xff] ^ $this->Te3[$t2 & 0xff] ^ $key->rd_key[27];
+ $t0 = $this->Te0[($s0 >> 24) & 0xff] ^ $this->Te1[($s1 >> 16) & 0xff] ^ $this->Te2[($s2 >> 8) & 0xff] ^ $this->Te3[$s3 & 0xff] ^ $key->rd_key[28];
+ $t1 = $this->Te0[($s1 >> 24) & 0xff] ^ $this->Te1[($s2 >> 16) & 0xff] ^ $this->Te2[($s3 >> 8) & 0xff] ^ $this->Te3[$s0 & 0xff] ^ $key->rd_key[29];
+ $t2 = $this->Te0[($s2 >> 24) & 0xff] ^ $this->Te1[($s3 >> 16) & 0xff] ^ $this->Te2[($s0 >> 8) & 0xff] ^ $this->Te3[$s1 & 0xff] ^ $key->rd_key[30];
+ $t3 = $this->Te0[($s3 >> 24) & 0xff] ^ $this->Te1[($s0 >> 16) & 0xff] ^ $this->Te2[($s1 >> 8) & 0xff] ^ $this->Te3[$s2 & 0xff] ^ $key->rd_key[31];
+ $s0 = $this->Te0[($t0 >> 24) & 0xff] ^ $this->Te1[($t1 >> 16) & 0xff] ^ $this->Te2[($t2 >> 8) & 0xff] ^ $this->Te3[$t3 & 0xff] ^ $key->rd_key[32];
+ $s1 = $this->Te0[($t1 >> 24) & 0xff] ^ $this->Te1[($t2 >> 16) & 0xff] ^ $this->Te2[($t3 >> 8) & 0xff] ^ $this->Te3[$t0 & 0xff] ^ $key->rd_key[33];
+ $s2 = $this->Te0[($t2 >> 24) & 0xff] ^ $this->Te1[($t3 >> 16) & 0xff] ^ $this->Te2[($t0 >> 8) & 0xff] ^ $this->Te3[$t1 & 0xff] ^ $key->rd_key[34];
+ $s3 = $this->Te0[($t3 >> 24) & 0xff] ^ $this->Te1[($t0 >> 16) & 0xff] ^ $this->Te2[($t1 >> 8) & 0xff] ^ $this->Te3[$t2 & 0xff] ^ $key->rd_key[35];
+ $t0 = $this->Te0[($s0 >> 24) & 0xff] ^ $this->Te1[($s1 >> 16) & 0xff] ^ $this->Te2[($s2 >> 8) & 0xff] ^ $this->Te3[$s3 & 0xff] ^ $key->rd_key[36];
+ $t1 = $this->Te0[($s1 >> 24) & 0xff] ^ $this->Te1[($s2 >> 16) & 0xff] ^ $this->Te2[($s3 >> 8) & 0xff] ^ $this->Te3[$s0 & 0xff] ^ $key->rd_key[37];
+ $t2 = $this->Te0[($s2 >> 24) & 0xff] ^ $this->Te1[($s3 >> 16) & 0xff] ^ $this->Te2[($s0 >> 8) & 0xff] ^ $this->Te3[$s1 & 0xff] ^ $key->rd_key[38];
+ $t3 = $this->Te0[($s3 >> 24) & 0xff] ^ $this->Te1[($s0 >> 16) & 0xff] ^ $this->Te2[($s1 >> 8) & 0xff] ^ $this->Te3[$s2 & 0xff] ^ $key->rd_key[39];
+
+ // FIXME: BAD: need $key->rounds
+
+ if ($key->rounds > 10) {
+ // round 10:
+ $s0 = $this->Te0[($t0 >> 24) & 0xff] ^ $this->Te1[($t1 >> 16) & 0xff] ^ $this->Te2[($t2 >> 8) & 0xff] ^ $this->Te3[$t3 & 0xff] ^ $key->rd_key[40];
+ $s1 = $this->Te0[($t1 >> 24) & 0xff] ^ $this->Te1[($t2 >> 16) & 0xff] ^ $this->Te2[($t3 >> 8) & 0xff] ^ $this->Te3[$t0 & 0xff] ^ $key->rd_key[41];
+ $s2 = $this->Te0[($t2 >> 24) & 0xff] ^ $this->Te1[($t3 >> 16) & 0xff] ^ $this->Te2[($t0 >> 8) & 0xff] ^ $this->Te3[$t1 & 0xff] ^ $key->rd_key[42];
+ $s3 = $this->Te0[($t3 >> 24) & 0xff] ^ $this->Te1[($t0 >> 16) & 0xff] ^ $this->Te2[($t1 >> 8) & 0xff] ^ $this->Te3[$t2 & 0xff] ^ $key->rd_key[43];
+ $t0 = $this->Te0[($s0 >> 24) & 0xff] ^ $this->Te1[($s1 >> 16) & 0xff] ^ $this->Te2[($s2 >> 8) & 0xff] ^ $this->Te3[$s3 & 0xff] ^ $key->rd_key[44];
+ $t1 = $this->Te0[($s1 >> 24) & 0xff] ^ $this->Te1[($s2 >> 16) & 0xff] ^ $this->Te2[($s3 >> 8) & 0xff] ^ $this->Te3[$s0 & 0xff] ^ $key->rd_key[45];
+ $t2 = $this->Te0[($s2 >> 24) & 0xff] ^ $this->Te1[($s3 >> 16) & 0xff] ^ $this->Te2[($s0 >> 8) & 0xff] ^ $this->Te3[$s1 & 0xff] ^ $key->rd_key[46];
+ $t3 = $this->Te0[($s3 >> 24) & 0xff] ^ $this->Te1[($s0 >> 16) & 0xff] ^ $this->Te2[($s1 >> 8) & 0xff] ^ $this->Te3[$s2 & 0xff] ^ $key->rd_key[47];
+
+ if ($key->rounds > 12) {
+ $s0 = $this->Te0[($t0 >> 24) & 0xff] ^ $this->Te1[($t1 >> 16) & 0xff] ^ $this->Te2[($t2 >> 8) & 0xff] ^ $this->Te3[$t3 & 0xff] ^ $key->rd_key[48];
+ $s1 = $this->Te0[($t1 >> 24) & 0xff] ^ $this->Te1[($t2 >> 16) & 0xff] ^ $this->Te2[($t3 >> 8) & 0xff] ^ $this->Te3[$t0 & 0xff] ^ $key->rd_key[49];
+ $s2 = $this->Te0[($t2 >> 24) & 0xff] ^ $this->Te1[($t3 >> 16) & 0xff] ^ $this->Te2[($t0 >> 8) & 0xff] ^ $this->Te3[$t1 & 0xff] ^ $key->rd_key[50];
+ $s3 = $this->Te0[($t3 >> 24) & 0xff] ^ $this->Te1[($t0 >> 16) & 0xff] ^ $this->Te2[($t1 >> 8) & 0xff] ^ $this->Te3[$t2 & 0xff] ^ $key->rd_key[51];
+ $t0 = $this->Te0[($s0 >> 24) & 0xff] ^ $this->Te1[($s1 >> 16) & 0xff] ^ $this->Te2[($s2 >> 8) & 0xff] ^ $this->Te3[$s3 & 0xff] ^ $key->rd_key[52];
+ $t1 = $this->Te0[($s1 >> 24) & 0xff] ^ $this->Te1[($s2 >> 16) & 0xff] ^ $this->Te2[($s3 >> 8) & 0xff] ^ $this->Te3[$s0 & 0xff] ^ $key->rd_key[53];
+ $t2 = $this->Te0[($s2 >> 24) & 0xff] ^ $this->Te1[($s3 >> 16) & 0xff] ^ $this->Te2[($s0 >> 8) & 0xff] ^ $this->Te3[$s1 & 0xff] ^ $key->rd_key[54];
+ $t3 = $this->Te0[($s3 >> 24) & 0xff] ^ $this->Te1[($s0 >> 16) & 0xff] ^ $this->Te2[($s1 >> 8) & 0xff] ^ $this->Te3[$s2 & 0xff] ^ $key->rd_key[55];
+ }
+ }
+
+ // This is correct
+ $rk = $key->rounds << 2;
+
+
+ /*
+ // No Full Unroll
+ */
+
+ // Apply last round and
+ // map cipher state to byte array block:
+
+ $s0 = ($this->Te4[($t0 >> 24) & 0xff] & 0xff000000) ^
+ ($this->Te4[($t1 >> 16) & 0xff] & 0x00ff0000) ^
+ ($this->Te4[($t2 >> 8) & 0xff] & 0x0000ff00) ^
+ ($this->Te4[($t3 ) & 0xff] & 0x000000ff) ^
+ $key->rd_key[$rk];
+
+ $out = librijndael2::ord2hex(($s0 >> 24) & 0xff);
+ $out .= librijndael2::ord2hex(($s0 >> 16) & 0xff);
+ $out .= librijndael2::ord2hex(($s0 >> 8) & 0xff);
+ $out .= librijndael2::ord2hex($s0 & 0xff);
- $s1 = ($this->Te4[($t1 >> 24) & 0xff] & 0xff000000) ^
- ($this->Te4[($t2 >> 16) & 0xff] & 0x00ff0000) ^
- ($this->Te4[($t3 >> 8) & 0xff] & 0x0000ff00) ^
- ($this->Te4[($t0 ) & 0xff] & 0x000000ff) ^
- $key->rd_key[$rk+1];
-
- $out .= librijndael2::ord2hex(($s1 >> 24) & 0xff);
- $out .= librijndael2::ord2hex(($s1 >> 16) & 0xff);
- $out .= librijndael2::ord2hex(($s1 >> 8) & 0xff);
- $out .= librijndael2::ord2hex($s1 & 0xff);
-
- $s2 = ($this->Te4[($t2 >> 24) & 0xff] & 0xff000000) ^
- ($this->Te4[($t3 >> 16) & 0xff] & 0x00ff0000) ^
- ($this->Te4[($t0 >> 8) & 0xff] & 0x0000ff00) ^
- ($this->Te4[($t1 ) & 0xff] & 0x000000ff) ^
- $key->rd_key[$rk+2];
+ $s1 = ($this->Te4[($t1 >> 24) & 0xff] & 0xff000000) ^
+ ($this->Te4[($t2 >> 16) & 0xff] & 0x00ff0000) ^
+ ($this->Te4[($t3 >> 8) & 0xff] & 0x0000ff00) ^
+ ($this->Te4[($t0 ) & 0xff] & 0x000000ff) ^
+ $key->rd_key[$rk+1];
+
+ $out .= librijndael2::ord2hex(($s1 >> 24) & 0xff);
+ $out .= librijndael2::ord2hex(($s1 >> 16) & 0xff);
+ $out .= librijndael2::ord2hex(($s1 >> 8) & 0xff);
+ $out .= librijndael2::ord2hex($s1 & 0xff);
+
+ $s2 = ($this->Te4[($t2 >> 24) & 0xff] & 0xff000000) ^
+ ($this->Te4[($t3 >> 16) & 0xff] & 0x00ff0000) ^
+ ($this->Te4[($t0 >> 8) & 0xff] & 0x0000ff00) ^
+ ($this->Te4[($t1 ) & 0xff] & 0x000000ff) ^
+ $key->rd_key[$rk+2];
- $out .= librijndael2::ord2hex(($s2 >> 24) & 0xff);
- $out .= librijndael2::ord2hex(($s2 >> 16) & 0xff);
- $out .= librijndael2::ord2hex(($s2 >> 8) & 0xff);
- $out .= librijndael2::ord2hex($s2 & 0xff);
-
- $s3 = ($this->Te4[($t3 >> 24) & 0xff] & 0xff000000) ^
- ($this->Te4[($t0 >> 16) & 0xff] & 0x00ff0000) ^
- ($this->Te4[($t1 >> 8) & 0xff] & 0x0000ff00) ^
- ($this->Te4[($t2 ) & 0xff] & 0x000000ff) ^
- $key->rd_key[$rk+3];
-
- $out .= librijndael2::ord2hex(($s3 >> 24) & 0xff);
- $out .= librijndael2::ord2hex(($s3 >> 16) & 0xff);
- $out .= librijndael2::ord2hex(($s3 >> 8) & 0xff);
- $out .= librijndael2::ord2hex($s3 & 0xff);
-
- return $out;
- }
+ $out .= librijndael2::ord2hex(($s2 >> 24) & 0xff);
+ $out .= librijndael2::ord2hex(($s2 >> 16) & 0xff);
+ $out .= librijndael2::ord2hex(($s2 >> 8) & 0xff);
+ $out .= librijndael2::ord2hex($s2 & 0xff);
+
+ $s3 = ($this->Te4[($t3 >> 24) & 0xff] & 0xff000000) ^
+ ($this->Te4[($t0 >> 16) & 0xff] & 0x00ff0000) ^
+ ($this->Te4[($t1 >> 8) & 0xff] & 0x0000ff00) ^
+ ($this->Te4[($t2 ) & 0xff] & 0x000000ff) ^
+ $key->rd_key[$rk+3];
+
+ $out .= librijndael2::ord2hex(($s3 >> 24) & 0xff);
+ $out .= librijndael2::ord2hex(($s3 >> 16) & 0xff);
+ $out .= librijndael2::ord2hex(($s3 >> 8) & 0xff);
+ $out .= librijndael2::ord2hex($s3 & 0xff);
+
+ return $out;
+ }
- // Decrypt a single block (bin) and return (bout)
- function AES_decrypt($bin, $key)
- {
- $rk = 0;
- // var r; // No Full Unroll
+ // Decrypt a single block (bin) and return (bout)
+ function AES_decrypt($bin, $key)
+ {
+ $rk = 0;
+ // var r; // No Full Unroll
- if ($bin == '' || $key == '')
- {
- librijndael2::trace("AES_decrypt: bin/key undefined");
- return;
- }
-
- // FIXME: BAD: need $key->rd_key
+ if ($bin == '' || $key == '')
+ {
+ librijndael2::trace("AES_decrypt: bin/key undefined");
+ return;
+ }
+
+ // FIXME: BAD: need $key->rd_key
- // map byte array block to cipher state
- // and add initial round key:
- $s0 = librijndael2::parseInt("0x" . substr($bin, 0 , 8)) ^ $key->rd_key[0];
- $s1 = librijndael2::parseInt("0x" . substr($bin, 8 , 8)) ^ $key->rd_key[1];
- $s2 = librijndael2::parseInt("0x" . substr($bin, 16, 8)) ^ $key->rd_key[2];
- $s3 = librijndael2::parseInt("0x" . substr($bin, 24, 8)) ^ $key->rd_key[3];
-
- // Using Full Unroll (Bigger more a bit faster :) )
- $t0 = $this->Td0[($s0 >> 24) & 0xff] ^ $this->Td1[($s3 >> 16) & 0xff] ^ $this->Td2[($s2 >> 8) & 0xff] ^ $this->Td3[$s1 & 0xff] ^ $key->rd_key[4]; // ROUND 1
- $t1 = $this->Td0[($s1 >> 24) & 0xff] ^ $this->Td1[($s0 >> 16) & 0xff] ^ $this->Td2[($s3 >> 8) & 0xff] ^ $this->Td3[$s2 & 0xff] ^ $key->rd_key[5];
- $t2 = $this->Td0[($s2 >> 24) & 0xff] ^ $this->Td1[($s1 >> 16) & 0xff] ^ $this->Td2[($s0 >> 8) & 0xff] ^ $this->Td3[$s3 & 0xff] ^ $key->rd_key[6];
- $t3 = $this->Td0[($s3 >> 24) & 0xff] ^ $this->Td1[($s2 >> 16) & 0xff] ^ $this->Td2[($s1 >> 8) & 0xff] ^ $this->Td3[$s0 & 0xff] ^ $key->rd_key[7];
- $s0 = $this->Td0[($t0 >> 24) & 0xff] ^ $this->Td1[($t3 >> 16) & 0xff] ^ $this->Td2[($t2 >> 8) & 0xff] ^ $this->Td3[$t1 & 0xff] ^ $key->rd_key[8]; // ROUND 2
- $s1 = $this->Td0[($t1 >> 24) & 0xff] ^ $this->Td1[($t0 >> 16) & 0xff] ^ $this->Td2[($t3 >> 8) & 0xff] ^ $this->Td3[$t2 & 0xff] ^ $key->rd_key[9];
- $s2 = $this->Td0[($t2 >> 24) & 0xff] ^ $this->Td1[($t1 >> 16) & 0xff] ^ $this->Td2[($t0 >> 8) & 0xff] ^ $this->Td3[$t3 & 0xff] ^ $key->rd_key[10];
- $s3 = $this->Td0[($t3 >> 24) & 0xff] ^ $this->Td1[($t2 >> 16) & 0xff] ^ $this->Td2[($t1 >> 8) & 0xff] ^ $this->Td3[$t0 & 0xff] ^ $key->rd_key[11];
- $t0 = $this->Td0[($s0 >> 24) & 0xff] ^ $this->Td1[($s3 >> 16) & 0xff] ^ $this->Td2[($s2 >> 8) & 0xff] ^ $this->Td3[$s1 & 0xff] ^ $key->rd_key[12]; // ROUND 3
- $t1 = $this->Td0[($s1 >> 24) & 0xff] ^ $this->Td1[($s0 >> 16) & 0xff] ^ $this->Td2[($s3 >> 8) & 0xff] ^ $this->Td3[$s2 & 0xff] ^ $key->rd_key[13];
- $t2 = $this->Td0[($s2 >> 24) & 0xff] ^ $this->Td1[($s1 >> 16) & 0xff] ^ $this->Td2[($s0 >> 8) & 0xff] ^ $this->Td3[$s3 & 0xff] ^ $key->rd_key[14];
- $t3 = $this->Td0[($s3 >> 24) & 0xff] ^ $this->Td1[($s2 >> 16) & 0xff] ^ $this->Td2[($s1 >> 8) & 0xff] ^ $this->Td3[$s0 & 0xff] ^ $key->rd_key[15];
- $s0 = $this->Td0[($t0 >> 24) & 0xff] ^ $this->Td1[($t3 >> 16) & 0xff] ^ $this->Td2[($t2 >> 8) & 0xff] ^ $this->Td3[$t1 & 0xff] ^ $key->rd_key[16]; // ROUND 4
- $s1 = $this->Td0[($t1 >> 24) & 0xff] ^ $this->Td1[($t0 >> 16) & 0xff] ^ $this->Td2[($t3 >> 8) & 0xff] ^ $this->Td3[$t2 & 0xff] ^ $key->rd_key[17];
- $s2 = $this->Td0[($t2 >> 24) & 0xff] ^ $this->Td1[($t1 >> 16) & 0xff] ^ $this->Td2[($t0 >> 8) & 0xff] ^ $this->Td3[$t3 & 0xff] ^ $key->rd_key[18];
- $s3 = $this->Td0[($t3 >> 24) & 0xff] ^ $this->Td1[($t2 >> 16) & 0xff] ^ $this->Td2[($t1 >> 8) & 0xff] ^ $this->Td3[$t0 & 0xff] ^ $key->rd_key[19];
- $t0 = $this->Td0[($s0 >> 24) & 0xff] ^ $this->Td1[($s3 >> 16) & 0xff] ^ $this->Td2[($s2 >> 8) & 0xff] ^ $this->Td3[$s1 & 0xff] ^ $key->rd_key[20]; // ROUND 5
- $t1 = $this->Td0[($s1 >> 24) & 0xff] ^ $this->Td1[($s0 >> 16) & 0xff] ^ $this->Td2[($s3 >> 8) & 0xff] ^ $this->Td3[$s2 & 0xff] ^ $key->rd_key[21];
- $t2 = $this->Td0[($s2 >> 24) & 0xff] ^ $this->Td1[($s1 >> 16) & 0xff] ^ $this->Td2[($s0 >> 8) & 0xff] ^ $this->Td3[$s3 & 0xff] ^ $key->rd_key[22];
- $t3 = $this->Td0[($s3 >> 24) & 0xff] ^ $this->Td1[($s2 >> 16) & 0xff] ^ $this->Td2[($s1 >> 8) & 0xff] ^ $this->Td3[$s0 & 0xff] ^ $key->rd_key[23];
- $s0 = $this->Td0[($t0 >> 24) & 0xff] ^ $this->Td1[($t3 >> 16) & 0xff] ^ $this->Td2[($t2 >> 8) & 0xff] ^ $this->Td3[$t1 & 0xff] ^ $key->rd_key[24]; // ROUND 6
- $s1 = $this->Td0[($t1 >> 24) & 0xff] ^ $this->Td1[($t0 >> 16) & 0xff] ^ $this->Td2[($t3 >> 8) & 0xff] ^ $this->Td3[$t2 & 0xff] ^ $key->rd_key[25];
- $s2 = $this->Td0[($t2 >> 24) & 0xff] ^ $this->Td1[($t1 >> 16) & 0xff] ^ $this->Td2[($t0 >> 8) & 0xff] ^ $this->Td3[$t3 & 0xff] ^ $key->rd_key[26];
- $s3 = $this->Td0[($t3 >> 24) & 0xff] ^ $this->Td1[($t2 >> 16) & 0xff] ^ $this->Td2[($t1 >> 8) & 0xff] ^ $this->Td3[$t0 & 0xff] ^ $key->rd_key[27];
- $t0 = $this->Td0[($s0 >> 24) & 0xff] ^ $this->Td1[($s3 >> 16) & 0xff] ^ $this->Td2[($s2 >> 8) & 0xff] ^ $this->Td3[$s1 & 0xff] ^ $key->rd_key[28]; // ROUND 7
- $t1 = $this->Td0[($s1 >> 24) & 0xff] ^ $this->Td1[($s0 >> 16) & 0xff] ^ $this->Td2[($s3 >> 8) & 0xff] ^ $this->Td3[$s2 & 0xff] ^ $key->rd_key[29];
- $t2 = $this->Td0[($s2 >> 24) & 0xff] ^ $this->Td1[($s1 >> 16) & 0xff] ^ $this->Td2[($s0 >> 8) & 0xff] ^ $this->Td3[$s3 & 0xff] ^ $key->rd_key[30];
- $t3 = $this->Td0[($s3 >> 24) & 0xff] ^ $this->Td1[($s2 >> 16) & 0xff] ^ $this->Td2[($s1 >> 8) & 0xff] ^ $this->Td3[$s0 & 0xff] ^ $key->rd_key[31];
- $s0 = $this->Td0[($t0 >> 24) & 0xff] ^ $this->Td1[($t3 >> 16) & 0xff] ^ $this->Td2[($t2 >> 8) & 0xff] ^ $this->Td3[$t1 & 0xff] ^ $key->rd_key[32]; // ROUND 8
- $s1 = $this->Td0[($t1 >> 24) & 0xff] ^ $this->Td1[($t0 >> 16) & 0xff] ^ $this->Td2[($t3 >> 8) & 0xff] ^ $this->Td3[$t2 & 0xff] ^ $key->rd_key[33];
- $s2 = $this->Td0[($t2 >> 24) & 0xff] ^ $this->Td1[($t1 >> 16) & 0xff] ^ $this->Td2[($t0 >> 8) & 0xff] ^ $this->Td3[$t3 & 0xff] ^ $key->rd_key[34];
- $s3 = $this->Td0[($t3 >> 24) & 0xff] ^ $this->Td1[($t2 >> 16) & 0xff] ^ $this->Td2[($t1 >> 8) & 0xff] ^ $this->Td3[$t0 & 0xff] ^ $key->rd_key[35];
- $t0 = $this->Td0[($s0 >> 24) & 0xff] ^ $this->Td1[($s3 >> 16) & 0xff] ^ $this->Td2[($s2 >> 8) & 0xff] ^ $this->Td3[$s1 & 0xff] ^ $key->rd_key[36]; // ROUND 9
- $t1 = $this->Td0[($s1 >> 24) & 0xff] ^ $this->Td1[($s0 >> 16) & 0xff] ^ $this->Td2[($s3 >> 8) & 0xff] ^ $this->Td3[$s2 & 0xff] ^ $key->rd_key[37];
- $t2 = $this->Td0[($s2 >> 24) & 0xff] ^ $this->Td1[($s1 >> 16) & 0xff] ^ $this->Td2[($s0 >> 8) & 0xff] ^ $this->Td3[$s3 & 0xff] ^ $key->rd_key[38];
- $t3 = $this->Td0[($s3 >> 24) & 0xff] ^ $this->Td1[($s2 >> 16) & 0xff] ^ $this->Td2[($s1 >> 8) & 0xff] ^ $this->Td3[$s0 & 0xff] ^ $key->rd_key[39];
-
- // FIXME: BAD: need $key->rounds
-
- if ($key->rounds > 10)
- {
- $s0 = $this->Td0[($t0 >> 24) & 0xff] ^ $this->Td1[($t3 >> 16) & 0xff] ^ $this->Td2[($t2 >> 8) & 0xff] ^ $this->Td3[$t1 & 0xff] ^ $key->rd_key[40]; // ROUND 10
- $s1 = $this->Td0[($t1 >> 24) & 0xff] ^ $this->Td1[($t0 >> 16) & 0xff] ^ $this->Td2[($t3 >> 8) & 0xff] ^ $this->Td3[$t2 & 0xff] ^ $key->rd_key[41];
- $s2 = $this->Td0[($t2 >> 24) & 0xff] ^ $this->Td1[($t1 >> 16) & 0xff] ^ $this->Td2[($t0 >> 8) & 0xff] ^ $this->Td3[$t3 & 0xff] ^ $key->rd_key[42];
- $s3 = $this->Td0[($t3 >> 24) & 0xff] ^ $this->Td1[($t2 >> 16) & 0xff] ^ $this->Td2[($t1 >> 8) & 0xff] ^ $this->Td3[$t0 & 0xff] ^ $key->rd_key[43];
- $t0 = $this->Td0[($s0 >> 24) & 0xff] ^ $this->Td1[($s3 >> 16) & 0xff] ^ $this->Td2[($s2 >> 8) & 0xff] ^ $this->Td3[$s1 & 0xff] ^ $key->rd_key[44]; // ROUND 11
- $t1 = $this->Td0[($s1 >> 24) & 0xff] ^ $this->Td1[($s0 >> 16) & 0xff] ^ $this->Td2[($s3 >> 8) & 0xff] ^ $this->Td3[$s2 & 0xff] ^ $key->rd_key[45];
- $t2 = $this->Td0[($s2 >> 24) & 0xff] ^ $this->Td1[($s1 >> 16) & 0xff] ^ $this->Td2[($s0 >> 8) & 0xff] ^ $this->Td3[$s3 & 0xff] ^ $key->rd_key[46];
- $t3 = $this->Td0[($s3 >> 24) & 0xff] ^ $this->Td1[($s2 >> 16) & 0xff] ^ $this->Td2[($s1 >> 8) & 0xff] ^ $this->Td3[$s0 & 0xff] ^ $key->rd_key[47];
-
- if ($key->rounds > 12)
- {
- $s0 = $this->Td0[($t0 >> 24) & 0xff] ^ $this->Td1[($t3 >> 16) & 0xff] ^ $this->Td2[($t2 >> 8) & 0xff] ^ $this->Td3[$t1 & 0xff] ^ $key->rd_key[48]; // ROUND 12
- $s1 = $this->Td0[($t1 >> 24) & 0xff] ^ $this->Td1[($t0 >> 16) & 0xff] ^ $this->Td2[($t3 >> 8) & 0xff] ^ $this->Td3[$t2 & 0xff] ^ $key->rd_key[49];
- $s2 = $this->Td0[($t2 >> 24) & 0xff] ^ $this->Td1[($t1 >> 16) & 0xff] ^ $this->Td2[($t0 >> 8) & 0xff] ^ $this->Td3[$t3 & 0xff] ^ $key->rd_key[50];
- $s3 = $this->Td0[($t3 >> 24) & 0xff] ^ $this->Td1[($t2 >> 16) & 0xff] ^ $this->Td2[($t1 >> 8) & 0xff] ^ $this->Td3[$t0 & 0xff] ^ $key->rd_key[51];
- $t0 = $this->Td0[($s0 >> 24) & 0xff] ^ $this->Td1[($s3 >> 16) & 0xff] ^ $this->Td2[($s2 >> 8) & 0xff] ^ $this->Td3[$s1 & 0xff] ^ $key->rd_key[52]; // ROUND 13
- $t1 = $this->Td0[($s1 >> 24) & 0xff] ^ $this->Td1[($s0 >> 16) & 0xff] ^ $this->Td2[($s3 >> 8) & 0xff] ^ $this->Td3[$s2 & 0xff] ^ $key->rd_key[53];
- $t2 = $this->Td0[($s2 >> 24) & 0xff] ^ $this->Td1[($s1 >> 16) & 0xff] ^ $this->Td2[($s0 >> 8) & 0xff] ^ $this->Td3[$s3 & 0xff] ^ $key->rd_key[54];
- $t3 = $this->Td0[($s3 >> 24) & 0xff] ^ $this->Td1[($s2 >> 16) & 0xff] ^ $this->Td2[($s1 >> 8) & 0xff] ^ $this->Td3[$s0 & 0xff] ^ $key->rd_key[55];
- }
- }
-
- // This is correct
- $rk = $key->rounds << 2;
+ // map byte array block to cipher state
+ // and add initial round key:
+ $s0 = librijndael2::parseInt("0x" . substr($bin, 0 , 8)) ^ $key->rd_key[0];
+ $s1 = librijndael2::parseInt("0x" . substr($bin, 8 , 8)) ^ $key->rd_key[1];
+ $s2 = librijndael2::parseInt("0x" . substr($bin, 16, 8)) ^ $key->rd_key[2];
+ $s3 = librijndael2::parseInt("0x" . substr($bin, 24, 8)) ^ $key->rd_key[3];
+
+ // Using Full Unroll (Bigger more a bit faster :) )
+ $t0 = $this->Td0[($s0 >> 24) & 0xff] ^ $this->Td1[($s3 >> 16) & 0xff] ^ $this->Td2[($s2 >> 8) & 0xff] ^ $this->Td3[$s1 & 0xff] ^ $key->rd_key[4]; // ROUND 1
+ $t1 = $this->Td0[($s1 >> 24) & 0xff] ^ $this->Td1[($s0 >> 16) & 0xff] ^ $this->Td2[($s3 >> 8) & 0xff] ^ $this->Td3[$s2 & 0xff] ^ $key->rd_key[5];
+ $t2 = $this->Td0[($s2 >> 24) & 0xff] ^ $this->Td1[($s1 >> 16) & 0xff] ^ $this->Td2[($s0 >> 8) & 0xff] ^ $this->Td3[$s3 & 0xff] ^ $key->rd_key[6];
+ $t3 = $this->Td0[($s3 >> 24) & 0xff] ^ $this->Td1[($s2 >> 16) & 0xff] ^ $this->Td2[($s1 >> 8) & 0xff] ^ $this->Td3[$s0 & 0xff] ^ $key->rd_key[7];
+ $s0 = $this->Td0[($t0 >> 24) & 0xff] ^ $this->Td1[($t3 >> 16) & 0xff] ^ $this->Td2[($t2 >> 8) & 0xff] ^ $this->Td3[$t1 & 0xff] ^ $key->rd_key[8]; // ROUND 2
+ $s1 = $this->Td0[($t1 >> 24) & 0xff] ^ $this->Td1[($t0 >> 16) & 0xff] ^ $this->Td2[($t3 >> 8) & 0xff] ^ $this->Td3[$t2 & 0xff] ^ $key->rd_key[9];
+ $s2 = $this->Td0[($t2 >> 24) & 0xff] ^ $this->Td1[($t1 >> 16) & 0xff] ^ $this->Td2[($t0 >> 8) & 0xff] ^ $this->Td3[$t3 & 0xff] ^ $key->rd_key[10];
+ $s3 = $this->Td0[($t3 >> 24) & 0xff] ^ $this->Td1[($t2 >> 16) & 0xff] ^ $this->Td2[($t1 >> 8) & 0xff] ^ $this->Td3[$t0 & 0xff] ^ $key->rd_key[11];
+ $t0 = $this->Td0[($s0 >> 24) & 0xff] ^ $this->Td1[($s3 >> 16) & 0xff] ^ $this->Td2[($s2 >> 8) & 0xff] ^ $this->Td3[$s1 & 0xff] ^ $key->rd_key[12]; // ROUND 3
+ $t1 = $this->Td0[($s1 >> 24) & 0xff] ^ $this->Td1[($s0 >> 16) & 0xff] ^ $this->Td2[($s3 >> 8) & 0xff] ^ $this->Td3[$s2 & 0xff] ^ $key->rd_key[13];
+ $t2 = $this->Td0[($s2 >> 24) & 0xff] ^ $this->Td1[($s1 >> 16) & 0xff] ^ $this->Td2[($s0 >> 8) & 0xff] ^ $this->Td3[$s3 & 0xff] ^ $key->rd_key[14];
+ $t3 = $this->Td0[($s3 >> 24) & 0xff] ^ $this->Td1[($s2 >> 16) & 0xff] ^ $this->Td2[($s1 >> 8) & 0xff] ^ $this->Td3[$s0 & 0xff] ^ $key->rd_key[15];
+ $s0 = $this->Td0[($t0 >> 24) & 0xff] ^ $this->Td1[($t3 >> 16) & 0xff] ^ $this->Td2[($t2 >> 8) & 0xff] ^ $this->Td3[$t1 & 0xff] ^ $key->rd_key[16]; // ROUND 4
+ $s1 = $this->Td0[($t1 >> 24) & 0xff] ^ $this->Td1[($t0 >> 16) & 0xff] ^ $this->Td2[($t3 >> 8) & 0xff] ^ $this->Td3[$t2 & 0xff] ^ $key->rd_key[17];
+ $s2 = $this->Td0[($t2 >> 24) & 0xff] ^ $this->Td1[($t1 >> 16) & 0xff] ^ $this->Td2[($t0 >> 8) & 0xff] ^ $this->Td3[$t3 & 0xff] ^ $key->rd_key[18];
+ $s3 = $this->Td0[($t3 >> 24) & 0xff] ^ $this->Td1[($t2 >> 16) & 0xff] ^ $this->Td2[($t1 >> 8) & 0xff] ^ $this->Td3[$t0 & 0xff] ^ $key->rd_key[19];
+ $t0 = $this->Td0[($s0 >> 24) & 0xff] ^ $this->Td1[($s3 >> 16) & 0xff] ^ $this->Td2[($s2 >> 8) & 0xff] ^ $this->Td3[$s1 & 0xff] ^ $key->rd_key[20]; // ROUND 5
+ $t1 = $this->Td0[($s1 >> 24) & 0xff] ^ $this->Td1[($s0 >> 16) & 0xff] ^ $this->Td2[($s3 >> 8) & 0xff] ^ $this->Td3[$s2 & 0xff] ^ $key->rd_key[21];
+ $t2 = $this->Td0[($s2 >> 24) & 0xff] ^ $this->Td1[($s1 >> 16) & 0xff] ^ $this->Td2[($s0 >> 8) & 0xff] ^ $this->Td3[$s3 & 0xff] ^ $key->rd_key[22];
+ $t3 = $this->Td0[($s3 >> 24) & 0xff] ^ $this->Td1[($s2 >> 16) & 0xff] ^ $this->Td2[($s1 >> 8) & 0xff] ^ $this->Td3[$s0 & 0xff] ^ $key->rd_key[23];
+ $s0 = $this->Td0[($t0 >> 24) & 0xff] ^ $this->Td1[($t3 >> 16) & 0xff] ^ $this->Td2[($t2 >> 8) & 0xff] ^ $this->Td3[$t1 & 0xff] ^ $key->rd_key[24]; // ROUND 6
+ $s1 = $this->Td0[($t1 >> 24) & 0xff] ^ $this->Td1[($t0 >> 16) & 0xff] ^ $this->Td2[($t3 >> 8) & 0xff] ^ $this->Td3[$t2 & 0xff] ^ $key->rd_key[25];
+ $s2 = $this->Td0[($t2 >> 24) & 0xff] ^ $this->Td1[($t1 >> 16) & 0xff] ^ $this->Td2[($t0 >> 8) & 0xff] ^ $this->Td3[$t3 & 0xff] ^ $key->rd_key[26];
+ $s3 = $this->Td0[($t3 >> 24) & 0xff] ^ $this->Td1[($t2 >> 16) & 0xff] ^ $this->Td2[($t1 >> 8) & 0xff] ^ $this->Td3[$t0 & 0xff] ^ $key->rd_key[27];
+ $t0 = $this->Td0[($s0 >> 24) & 0xff] ^ $this->Td1[($s3 >> 16) & 0xff] ^ $this->Td2[($s2 >> 8) & 0xff] ^ $this->Td3[$s1 & 0xff] ^ $key->rd_key[28]; // ROUND 7
+ $t1 = $this->Td0[($s1 >> 24) & 0xff] ^ $this->Td1[($s0 >> 16) & 0xff] ^ $this->Td2[($s3 >> 8) & 0xff] ^ $this->Td3[$s2 & 0xff] ^ $key->rd_key[29];
+ $t2 = $this->Td0[($s2 >> 24) & 0xff] ^ $this->Td1[($s1 >> 16) & 0xff] ^ $this->Td2[($s0 >> 8) & 0xff] ^ $this->Td3[$s3 & 0xff] ^ $key->rd_key[30];
+ $t3 = $this->Td0[($s3 >> 24) & 0xff] ^ $this->Td1[($s2 >> 16) & 0xff] ^ $this->Td2[($s1 >> 8) & 0xff] ^ $this->Td3[$s0 & 0xff] ^ $key->rd_key[31];
+ $s0 = $this->Td0[($t0 >> 24) & 0xff] ^ $this->Td1[($t3 >> 16) & 0xff] ^ $this->Td2[($t2 >> 8) & 0xff] ^ $this->Td3[$t1 & 0xff] ^ $key->rd_key[32]; // ROUND 8
+ $s1 = $this->Td0[($t1 >> 24) & 0xff] ^ $this->Td1[($t0 >> 16) & 0xff] ^ $this->Td2[($t3 >> 8) & 0xff] ^ $this->Td3[$t2 & 0xff] ^ $key->rd_key[33];
+ $s2 = $this->Td0[($t2 >> 24) & 0xff] ^ $this->Td1[($t1 >> 16) & 0xff] ^ $this->Td2[($t0 >> 8) & 0xff] ^ $this->Td3[$t3 & 0xff] ^ $key->rd_key[34];
+ $s3 = $this->Td0[($t3 >> 24) & 0xff] ^ $this->Td1[($t2 >> 16) & 0xff] ^ $this->Td2[($t1 >> 8) & 0xff] ^ $this->Td3[$t0 & 0xff] ^ $key->rd_key[35];
+ $t0 = $this->Td0[($s0 >> 24) & 0xff] ^ $this->Td1[($s3 >> 16) & 0xff] ^ $this->Td2[($s2 >> 8) & 0xff] ^ $this->Td3[$s1 & 0xff] ^ $key->rd_key[36]; // ROUND 9
+ $t1 = $this->Td0[($s1 >> 24) & 0xff] ^ $this->Td1[($s0 >> 16) & 0xff] ^ $this->Td2[($s3 >> 8) & 0xff] ^ $this->Td3[$s2 & 0xff] ^ $key->rd_key[37];
+ $t2 = $this->Td0[($s2 >> 24) & 0xff] ^ $this->Td1[($s1 >> 16) & 0xff] ^ $this->Td2[($s0 >> 8) & 0xff] ^ $this->Td3[$s3 & 0xff] ^ $key->rd_key[38];
+ $t3 = $this->Td0[($s3 >> 24) & 0xff] ^ $this->Td1[($s2 >> 16) & 0xff] ^ $this->Td2[($s1 >> 8) & 0xff] ^ $this->Td3[$s0 & 0xff] ^ $key->rd_key[39];
+
+ // FIXME: BAD: need $key->rounds
+
+ if ($key->rounds > 10)
+ {
+ $s0 = $this->Td0[($t0 >> 24) & 0xff] ^ $this->Td1[($t3 >> 16) & 0xff] ^ $this->Td2[($t2 >> 8) & 0xff] ^ $this->Td3[$t1 & 0xff] ^ $key->rd_key[40]; // ROUND 10
+ $s1 = $this->Td0[($t1 >> 24) & 0xff] ^ $this->Td1[($t0 >> 16) & 0xff] ^ $this->Td2[($t3 >> 8) & 0xff] ^ $this->Td3[$t2 & 0xff] ^ $key->rd_key[41];
+ $s2 = $this->Td0[($t2 >> 24) & 0xff] ^ $this->Td1[($t1 >> 16) & 0xff] ^ $this->Td2[($t0 >> 8) & 0xff] ^ $this->Td3[$t3 & 0xff] ^ $key->rd_key[42];
+ $s3 = $this->Td0[($t3 >> 24) & 0xff] ^ $this->Td1[($t2 >> 16) & 0xff] ^ $this->Td2[($t1 >> 8) & 0xff] ^ $this->Td3[$t0 & 0xff] ^ $key->rd_key[43];
+ $t0 = $this->Td0[($s0 >> 24) & 0xff] ^ $this->Td1[($s3 >> 16) & 0xff] ^ $this->Td2[($s2 >> 8) & 0xff] ^ $this->Td3[$s1 & 0xff] ^ $key->rd_key[44]; // ROUND 11
+ $t1 = $this->Td0[($s1 >> 24) & 0xff] ^ $this->Td1[($s0 >> 16) & 0xff] ^ $this->Td2[($s3 >> 8) & 0xff] ^ $this->Td3[$s2 & 0xff] ^ $key->rd_key[45];
+ $t2 = $this->Td0[($s2 >> 24) & 0xff] ^ $this->Td1[($s1 >> 16) & 0xff] ^ $this->Td2[($s0 >> 8) & 0xff] ^ $this->Td3[$s3 & 0xff] ^ $key->rd_key[46];
+ $t3 = $this->Td0[($s3 >> 24) & 0xff] ^ $this->Td1[($s2 >> 16) & 0xff] ^ $this->Td2[($s1 >> 8) & 0xff] ^ $this->Td3[$s0 & 0xff] ^ $key->rd_key[47];
+
+ if ($key->rounds > 12)
+ {
+ $s0 = $this->Td0[($t0 >> 24) & 0xff] ^ $this->Td1[($t3 >> 16) & 0xff] ^ $this->Td2[($t2 >> 8) & 0xff] ^ $this->Td3[$t1 & 0xff] ^ $key->rd_key[48]; // ROUND 12
+ $s1 = $this->Td0[($t1 >> 24) & 0xff] ^ $this->Td1[($t0 >> 16) & 0xff] ^ $this->Td2[($t3 >> 8) & 0xff] ^ $this->Td3[$t2 & 0xff] ^ $key->rd_key[49];
+ $s2 = $this->Td0[($t2 >> 24) & 0xff] ^ $this->Td1[($t1 >> 16) & 0xff] ^ $this->Td2[($t0 >> 8) & 0xff] ^ $this->Td3[$t3 & 0xff] ^ $key->rd_key[50];
+ $s3 = $this->Td0[($t3 >> 24) & 0xff] ^ $this->Td1[($t2 >> 16) & 0xff] ^ $this->Td2[($t1 >> 8) & 0xff] ^ $this->Td3[$t0 & 0xff] ^ $key->rd_key[51];
+ $t0 = $this->Td0[($s0 >> 24) & 0xff] ^ $this->Td1[($s3 >> 16) & 0xff] ^ $this->Td2[($s2 >> 8) & 0xff] ^ $this->Td3[$s1 & 0xff] ^ $key->rd_key[52]; // ROUND 13
+ $t1 = $this->Td0[($s1 >> 24) & 0xff] ^ $this->Td1[($s0 >> 16) & 0xff] ^ $this->Td2[($s3 >> 8) & 0xff] ^ $this->Td3[$s2 & 0xff] ^ $key->rd_key[53];
+ $t2 = $this->Td0[($s2 >> 24) & 0xff] ^ $this->Td1[($s1 >> 16) & 0xff] ^ $this->Td2[($s0 >> 8) & 0xff] ^ $this->Td3[$s3 & 0xff] ^ $key->rd_key[54];
+ $t3 = $this->Td0[($s3 >> 24) & 0xff] ^ $this->Td1[($s2 >> 16) & 0xff] ^ $this->Td2[($s1 >> 8) & 0xff] ^ $this->Td3[$s0 & 0xff] ^ $key->rd_key[55];
+ }
+ }
+
+ // This is correct
+ $rk = $key->rounds << 2;
- /*
- // No Full Unroll
- */
-
- // Apply last round and
- // map cipher state to byte array block:
-
- $s0 = ($this->Td4[($t0 >> 24) & 0xff] & 0xff000000) ^
- ($this->Td4[($t3 >> 16) & 0xff] & 0x00ff0000) ^
- ($this->Td4[($t2 >> 8) & 0xff] & 0x0000ff00) ^
- ($this->Td4[($t1 ) & 0xff] & 0x000000ff) ^
- $key->rd_key[$rk];
-
- $out = librijndael2::ord2hex(($s0 >> 24) & 0xff);
- $out .= librijndael2::ord2hex(($s0 >> 16) & 0xff);
- $out .= librijndael2::ord2hex(($s0 >> 8) & 0xff);
- $out .= librijndael2::ord2hex($s0 & 0xff);
+ /*
+ // No Full Unroll
+ */
+
+ // Apply last round and
+ // map cipher state to byte array block:
+
+ $s0 = ($this->Td4[($t0 >> 24) & 0xff] & 0xff000000) ^
+ ($this->Td4[($t3 >> 16) & 0xff] & 0x00ff0000) ^
+ ($this->Td4[($t2 >> 8) & 0xff] & 0x0000ff00) ^
+ ($this->Td4[($t1 ) & 0xff] & 0x000000ff) ^
+ $key->rd_key[$rk];
+
+ $out = librijndael2::ord2hex(($s0 >> 24) & 0xff);
+ $out .= librijndael2::ord2hex(($s0 >> 16) & 0xff);
+ $out .= librijndael2::ord2hex(($s0 >> 8) & 0xff);
+ $out .= librijndael2::ord2hex($s0 & 0xff);
- $s1 = ($this->Td4[($t1 >> 24) & 0xff] & 0xff000000) ^
- ($this->Td4[($t0 >> 16) & 0xff] & 0x00ff0000) ^
- ($this->Td4[($t3 >> 8) & 0xff] & 0x0000ff00) ^
- ($this->Td4[($t2 ) & 0xff] & 0x000000ff) ^
- $key->rd_key[$rk+1];
-
- $out .= librijndael2::ord2hex(($s1 >> 24) & 0xff);
- $out .= librijndael2::ord2hex(($s1 >> 16) & 0xff);
- $out .= librijndael2::ord2hex(($s1 >> 8) & 0xff);
- $out .= librijndael2::ord2hex($s1 & 0xff);
-
- $s2 = ($this->Td4[($t2 >> 24) & 0xff] & 0xff000000) ^
- ($this->Td4[($t1 >> 16) & 0xff] & 0x00ff0000) ^
- ($this->Td4[($t0 >> 8) & 0xff] & 0x0000ff00) ^
- ($this->Td4[($t3 ) & 0xff] & 0x000000ff) ^
- $key->rd_key[$rk+2];
+ $s1 = ($this->Td4[($t1 >> 24) & 0xff] & 0xff000000) ^
+ ($this->Td4[($t0 >> 16) & 0xff] & 0x00ff0000) ^
+ ($this->Td4[($t3 >> 8) & 0xff] & 0x0000ff00) ^
+ ($this->Td4[($t2 ) & 0xff] & 0x000000ff) ^
+ $key->rd_key[$rk+1];
+
+ $out .= librijndael2::ord2hex(($s1 >> 24) & 0xff);
+ $out .= librijndael2::ord2hex(($s1 >> 16) & 0xff);
+ $out .= librijndael2::ord2hex(($s1 >> 8) & 0xff);
+ $out .= librijndael2::ord2hex($s1 & 0xff);
+
+ $s2 = ($this->Td4[($t2 >> 24) & 0xff] & 0xff000000) ^
+ ($this->Td4[($t1 >> 16) & 0xff] & 0x00ff0000) ^
+ ($this->Td4[($t0 >> 8) & 0xff] & 0x0000ff00) ^
+ ($this->Td4[($t3 ) & 0xff] & 0x000000ff) ^
+ $key->rd_key[$rk+2];
- $out .= librijndael2::ord2hex(($s2 >> 24) & 0xff);
- $out .= librijndael2::ord2hex(($s2 >> 16) & 0xff);
- $out .= librijndael2::ord2hex(($s2 >> 8) & 0xff);
- $out .= librijndael2::ord2hex($s2 & 0xff);
-
- $s3 = ($this->Td4[($t3 >> 24) & 0xff] & 0xff000000) ^
- ($this->Td4[($t2 >> 16) & 0xff] & 0x00ff0000) ^
- ($this->Td4[($t1 >> 8) & 0xff] & 0x0000ff00) ^
- ($this->Td4[($t0 ) & 0xff] & 0x000000ff) ^
- $key->rd_key[$rk+3];
-
- $out .= librijndael2::ord2hex(($s3 >> 24) & 0xff);
- $out .= librijndael2::ord2hex(($s3 >> 16) & 0xff);
- $out .= librijndael2::ord2hex(($s3 >> 8) & 0xff);
- $out .= librijndael2::ord2hex($s3 & 0xff);
-
- return $out;
- }
+ $out .= librijndael2::ord2hex(($s2 >> 24) & 0xff);
+ $out .= librijndael2::ord2hex(($s2 >> 16) & 0xff);
+ $out .= librijndael2::ord2hex(($s2 >> 8) & 0xff);
+ $out .= librijndael2::ord2hex($s2 & 0xff);
+
+ $s3 = ($this->Td4[($t3 >> 24) & 0xff] & 0xff000000) ^
+ ($this->Td4[($t2 >> 16) & 0xff] & 0x00ff0000) ^
+ ($this->Td4[($t1 >> 8) & 0xff] & 0x0000ff00) ^
+ ($this->Td4[($t0 ) & 0xff] & 0x000000ff) ^
+ $key->rd_key[$rk+3];
+
+ $out .= librijndael2::ord2hex(($s3 >> 24) & 0xff);
+ $out .= librijndael2::ord2hex(($s3 >> 16) & 0xff);
+ $out .= librijndael2::ord2hex(($s3 >> 8) & 0xff);
+ $out .= librijndael2::ord2hex($s3 & 0xff);
+
+ return $out;
+ }
- /////////////////////////////// MODES //////////////////////////////////
-
- /* ECB MODE (AES_ecb_encrypt)
- * bin: 128 bit block (32 hex digits)
- * key: AES_KEY object (use AES_set_encrypt_key or AES_set_decrypt_key)
- * enc: "AES_ENCRYPT" or "AES_DECRYPT"
- * Return value: 128 bit block (32 hex digits)
- */
+ /////////////////////////////// MODES //////////////////////////////////
+
+ /* ECB MODE (AES_ecb_encrypt)
+ * bin: 128 bit block (32 hex digits)
+ * key: AES_KEY object (use AES_set_encrypt_key or AES_set_decrypt_key)
+ * enc: "AES_ENCRYPT" or "AES_DECRYPT"
+ * Return value: 128 bit block (32 hex digits)
+ */
- function AES_ecb_encrypt($bin, $key, $enc)
- {
+ function AES_ecb_encrypt($bin, $key, $enc)
+ {
- if ($bin == '' || $key == '')
- {
- librijndael2::trace("AES_ecb_encrypt: bin/key undefined");
- return;
- }
-
- if ($enc !== "AES_ENCRYPT" && $enc !== "AES_DECRYPT")
- {
- librijndael2::trace("AES_ecb_encrypt: enc isn't AES_ENCRYPT/AES_DECRYPT");
- return;
- }
-
- if ($enc == "AES_ENCRYPT")
- $bout = $this->AES_encrypt($bin, $key);
- else
- $bout = $this->AES_decrypt($bin, $key);
-
- return $bout;
- }
+ if ($bin == '' || $key == '')
+ {
+ librijndael2::trace("AES_ecb_encrypt: bin/key undefined");
+ return;
+ }
+
+ if ($enc !== "AES_ENCRYPT" && $enc !== "AES_DECRYPT")
+ {
+ librijndael2::trace("AES_ecb_encrypt: enc isn't AES_ENCRYPT/AES_DECRYPT");
+ return;
+ }
+
+ if ($enc == "AES_ENCRYPT")
+ $bout = $this->AES_encrypt($bin, $key);
+ else
+ $bout = $this->AES_decrypt($bin, $key);
+
+ return $bout;
+ }
- /* CBC MODE (AES_cbc_encrypt)
- * bin: 128 bit block (32 hex digits)
- * key: AES_KEY object (use AES_set_encrypt_key or AES_set_decrypt_key)
- * ivec: Initialization Vector (32 hex digits)
- * enc: "AES_ENCRYPT" or "AES_DECRYPT"
- * Return value: 128 bit block (32 hex digits)
- */
+ /* CBC MODE (AES_cbc_encrypt)
+ * bin: 128 bit block (32 hex digits)
+ * key: AES_KEY object (use AES_set_encrypt_key or AES_set_decrypt_key)
+ * ivec: Initialization Vector (32 hex digits)
+ * enc: "AES_ENCRYPT" or "AES_DECRYPT"
+ * Return value: 128 bit block (32 hex digits)
+ */
- function AES_cbc_encrypt($bin, $key, $ivec, $enc)
- {
+ function AES_cbc_encrypt($bin, $key, $ivec, $enc)
+ {
- // if ($bin == '' || $key == '' || $ivec == '')
- // {
- // librijndael2::trace("AES_cbc_encrypt: bin/key/ivec undefined.");
- // return;
- // }
-
- $len = strlen($bin);
-
- if ($len % 32 != 0)
- {
- librijndael2::trace("AES_cbc_encrypt: data isn't multiple of 32 (32 hex = 128bits).");
- return;
- }
-
- if ($enc !== "AES_ENCRYPT" && $enc !== "AES_DECRYPT")
- {
- librijndael2::trace("AES_ecb_encrypt: enc isn't AES_ENCRYPT/AES_DECRYPT");
- return;
- }
+ // if ($bin == '' || $key == '' || $ivec == '')
+ // {
+ // librijndael2::trace("AES_cbc_encrypt: bin/key/ivec undefined.");
+ // return;
+ // }
+
+ $len = strlen($bin);
+
+ if ($len % 32 != 0)
+ {
+ librijndael2::trace("AES_cbc_encrypt: data isn't multiple of 32 (32 hex = 128bits).");
+ return;
+ }
+
+ if ($enc !== "AES_ENCRYPT" && $enc !== "AES_DECRYPT")
+ {
+ librijndael2::trace("AES_ecb_encrypt: enc isn't AES_ENCRYPT/AES_DECRYPT");
+ return;
+ }
- $tin = $bin;
- $tmp = '';
- $bout = '';
-
- if ($enc == "AES_ENCRYPT")
- while ($len > 0)
- {
- $tmp = "";
- for($n=0; $n < 32; $n += 2)
- {
- $aux = librijndael2::parseInt("0x" . substr($tin, $n , 2)) ^ librijndael2::parseInt("0x" . substr($ivec, $n, 2));
- $tmp .= librijndael2::ord2hex($aux);
- }
-
- $tout = $this->AES_encrypt($tmp, $key);
- $ivec = $tout;
- $len -= 32;
- $tin = substr($tin, 32);
- $bout .= $tout;
- }
- else
- while ($len > 0) {
- $tmp = $this->AES_decrypt($tin, $key);
- $tout = "";
- for($n=0; $n < 32; $n+=2)
- {
- $aux = librijndael2::parseInt("0x" . substr($tmp, $n , 2)) ^ librijndael2::parseInt("0x" . substr($ivec, $n, 2));
- $tout .= librijndael2::ord2hex($aux);
- }
-
- $ivec = $tin;
- $len -= 32;
- $tin = substr($tin, 32);
- $bout .= $tout;
- }
-
- return $bout;
- }
+ $tin = $bin;
+ $tmp = '';
+ $bout = '';
+
+ if ($enc == "AES_ENCRYPT")
+ while ($len > 0)
+ {
+ $tmp = "";
+ for($n=0; $n < 32; $n += 2)
+ {
+ $aux = librijndael2::parseInt("0x" . substr($tin, $n , 2)) ^ librijndael2::parseInt("0x" . substr($ivec, $n, 2));
+ $tmp .= librijndael2::ord2hex($aux);
+ }
+
+ $tout = $this->AES_encrypt($tmp, $key);
+ $ivec = $tout;
+ $len -= 32;
+ $tin = substr($tin, 32);
+ $bout .= $tout;
+ }
+ else
+ while ($len > 0) {
+ $tmp = $this->AES_decrypt($tin, $key);
+ $tout = "";
+ for($n=0; $n < 32; $n+=2)
+ {
+ $aux = librijndael2::parseInt("0x" . substr($tmp, $n , 2)) ^ librijndael2::parseInt("0x" . substr($ivec, $n, 2));
+ $tout .= librijndael2::ord2hex($aux);
+ }
+
+ $ivec = $tin;
+ $len -= 32;
+ $tin = substr($tin, 32);
+ $bout .= $tout;
+ }
+
+ return $bout;
+ }
}
class Crypt_Rijndael_Key extends Crypt_Rijndael
{
- var $rounds = 12;
- var $rd_key = array();
- var $key = '';
- var $bits = 0;
- var $key_state = 'none';
-
- function __construct($key)
- {
- $this->key = $key;
- $this->bits = ( strlen($key) * 4 );
- }
-
- // Expand the cipher key into the encryption key schedule.
- function set_encrypt()
- {
- $i = 0;
- $rk = 0;
-
- if ( $this->key_state === 'encrypt' )
- {
- return 0;
- }
-
- $this->key_state = 'encrypt';
-
- $userkey =& $this->key;
- $bits =& $this->bits;
-
- if ($bits != 128 && $bits != 192 && $bits != 256)
- {
- librijndael2::trace("AES_set_encrypt_key: key size isn't 128/192/256");
- return -2;
- }
+ var $rounds = 12;
+ var $rd_key = array();
+ var $key = '';
+ var $bits = 0;
+ var $key_state = 'none';
+
+ function __construct($key)
+ {
+ $this->key = $key;
+ $this->bits = ( strlen($key) * 4 );
+ }
+
+ // Expand the cipher key into the encryption key schedule.
+ function set_encrypt()
+ {
+ $i = 0;
+ $rk = 0;
+
+ if ( $this->key_state === 'encrypt' )
+ {
+ return 0;
+ }
+
+ $this->key_state = 'encrypt';
+
+ $userkey =& $this->key;
+ $bits =& $this->bits;
+
+ if ($bits != 128 && $bits != 192 && $bits != 256)
+ {
+ librijndael2::trace("AES_set_encrypt_key: key size isn't 128/192/256");
+ return -2;
+ }
- if ($bits==128)
- $this->rounds = 10;
- else if ($bits==192)
- $this->rounds = 12;
- else
- $this->rounds = 14;
-
-
- $this->rd_key = array();
- $this->rd_key[0] = librijndael2::parseInt("0x" . substr($userkey, 0 , 8));
- $this->rd_key[1] = librijndael2::parseInt("0x" . substr($userkey, 8 , 8));
- $this->rd_key[2] = librijndael2::parseInt("0x" . substr($userkey, 16, 8));
- $this->rd_key[3] = librijndael2::parseInt("0x" . substr($userkey, 24, 8));
-
- if ($bits == 128) {
- for (;;) {
- $temp = $this->rd_key[3+$rk];
- // (temp >> 24) & 0xff was difficult bug to tracking...
- $this->rd_key[4+$rk] = $this->rd_key[$rk] ^
- ($this->Te4[($temp >> 16) & 0xff] & 0xff000000) ^
- ($this->Te4[($temp >> 8) & 0xff] & 0x00ff0000) ^
- ($this->Te4[ $temp & 0xff] & 0x0000ff00) ^
- ($this->Te4[($temp >> 24) & 0xff] & 0x000000ff) ^
- $this->rcon[$i];
-
- $this->rd_key[5+$rk] = $this->rd_key[1+$rk] ^ $this->rd_key[4+$rk];
- $this->rd_key[6+$rk] = $this->rd_key[2+$rk] ^ $this->rd_key[5+$rk];
- $this->rd_key[7+$rk] = $this->rd_key[3+$rk] ^ $this->rd_key[6+$rk];
- if (++$i == 10) return 0;
- $rk += 4;
- }
- }
+ if ($bits==128)
+ $this->rounds = 10;
+ else if ($bits==192)
+ $this->rounds = 12;
+ else
+ $this->rounds = 14;
+
+
+ $this->rd_key = array();
+ $this->rd_key[0] = librijndael2::parseInt("0x" . substr($userkey, 0 , 8));
+ $this->rd_key[1] = librijndael2::parseInt("0x" . substr($userkey, 8 , 8));
+ $this->rd_key[2] = librijndael2::parseInt("0x" . substr($userkey, 16, 8));
+ $this->rd_key[3] = librijndael2::parseInt("0x" . substr($userkey, 24, 8));
+
+ if ($bits == 128) {
+ for (;;) {
+ $temp = $this->rd_key[3+$rk];
+ // (temp >> 24) & 0xff was difficult bug to tracking...
+ $this->rd_key[4+$rk] = $this->rd_key[$rk] ^
+ ($this->Te4[($temp >> 16) & 0xff] & 0xff000000) ^
+ ($this->Te4[($temp >> 8) & 0xff] & 0x00ff0000) ^
+ ($this->Te4[ $temp & 0xff] & 0x0000ff00) ^
+ ($this->Te4[($temp >> 24) & 0xff] & 0x000000ff) ^
+ $this->rcon[$i];
+
+ $this->rd_key[5+$rk] = $this->rd_key[1+$rk] ^ $this->rd_key[4+$rk];
+ $this->rd_key[6+$rk] = $this->rd_key[2+$rk] ^ $this->rd_key[5+$rk];
+ $this->rd_key[7+$rk] = $this->rd_key[3+$rk] ^ $this->rd_key[6+$rk];
+ if (++$i == 10) return 0;
+ $rk += 4;
+ }
+ }
- $this->rd_key[4] = librijndael2::parseInt("0x" . @substr($userkey, 32, 8));
- $this->rd_key[5] = librijndael2::parseInt("0x" . @substr($userkey, 40, 8));
-
- if ($bits == 192) {
- for (;;) {
- $temp = $this->rd_key[5+$rk];
- $this->rd_key[6+$rk] = $this->rd_key[$rk] ^
- ($this->Te4[($temp >> 16) & 0xff] & 0xff000000) ^
- ($this->Te4[($temp >> 8) & 0xff] & 0x00ff0000) ^
- ($this->Te4[($temp ) & 0xff] & 0x0000ff00) ^
- ($this->Te4[($temp >> 24) & 0xff] & 0x000000ff) ^
- $this->rcon[$i];
-
- $this->rd_key[7+$rk] = $this->rd_key[1+$rk] ^ $this->rd_key[6 + $rk];
- $this->rd_key[8+$rk] = $this->rd_key[2 + $rk] ^ $this->rd_key[7 + $rk];
- $this->rd_key[9+$rk] = $this->rd_key[3 + $rk] ^ $this->rd_key[8 + $rk];
- if (++$i == 8) {
- return 0;
- }
- $this->rd_key[10 + $rk] = $this->rd_key[4 + $rk] ^ $this->rd_key[9 + $rk];
- $this->rd_key[11 + $rk] = $this->rd_key[5 + $rk] ^ $this->rd_key[10 + $rk];
- $rk += 6;
- }
- }
-
- $this->rd_key[6] = librijndael2::parseInt("0x" . @substr($userkey, 48, 8));
- $this->rd_key[7] = librijndael2::parseInt("0x" . @substr($userkey, 56, 8));
-
- if ($bits == 256) {
- for (;;) {
- $temp = $this->rd_key[7+$rk];
- $this->rd_key[8+$rk] = $this->rd_key[$rk] ^
- ($this->Te4[($temp >> 16) & 0xff] & 0xff000000) ^
- ($this->Te4[($temp >> 8) & 0xff] & 0x00ff0000) ^
- ($this->Te4[($temp ) & 0xff] & 0x0000ff00) ^
- ($this->Te4[($temp >> 24) & 0xff] & 0x000000ff) ^
- $this->rcon[$i];
-
- $this->rd_key[9 + $rk] = $this->rd_key[1 + $rk] ^ $this->rd_key[8 + $rk];
- $this->rd_key[10 + $rk] = $this->rd_key[2 + $rk] ^ $this->rd_key[9 + $rk];
- $this->rd_key[11 + $rk] = $this->rd_key[3 + $rk] ^ $this->rd_key[10 + $rk];
- if (++$i == 7) {
- return 0;
- }
-
- $temp = $this->rd_key[11 + $rk];
- $this->rd_key[12 + $rk] = $this->rd_key[4 + $rk] ^
- ($this->Te4[($temp >> 24) & 0xff] & 0xff000000) ^
- ($this->Te4[($temp >> 16) & 0xff] & 0x00ff0000) ^
- ($this->Te4[($temp >> 8) & 0xff] & 0x0000ff00) ^
- ($this->Te4[($temp ) & 0xff] & 0x000000ff);
-
- $this->rd_key[13 + $rk] = $this->rd_key[5 + $rk] ^ $this->rd_key[12 + $rk];
- $this->rd_key[14 + $rk] = $this->rd_key[6 + $rk] ^ $this->rd_key[13 + $rk];
- $this->rd_key[15 + $rk] = $this->rd_key[7 + $rk] ^ $this->rd_key[14 + $rk];
- $rk += 8;
- }
- }
- return 0;
- }
+ $this->rd_key[4] = librijndael2::parseInt("0x" . @substr($userkey, 32, 8));
+ $this->rd_key[5] = librijndael2::parseInt("0x" . @substr($userkey, 40, 8));
+
+ if ($bits == 192) {
+ for (;;) {
+ $temp = $this->rd_key[5+$rk];
+ $this->rd_key[6+$rk] = $this->rd_key[$rk] ^
+ ($this->Te4[($temp >> 16) & 0xff] & 0xff000000) ^
+ ($this->Te4[($temp >> 8) & 0xff] & 0x00ff0000) ^
+ ($this->Te4[($temp ) & 0xff] & 0x0000ff00) ^
+ ($this->Te4[($temp >> 24) & 0xff] & 0x000000ff) ^
+ $this->rcon[$i];
+
+ $this->rd_key[7+$rk] = $this->rd_key[1+$rk] ^ $this->rd_key[6 + $rk];
+ $this->rd_key[8+$rk] = $this->rd_key[2 + $rk] ^ $this->rd_key[7 + $rk];
+ $this->rd_key[9+$rk] = $this->rd_key[3 + $rk] ^ $this->rd_key[8 + $rk];
+ if (++$i == 8) {
+ return 0;
+ }
+ $this->rd_key[10 + $rk] = $this->rd_key[4 + $rk] ^ $this->rd_key[9 + $rk];
+ $this->rd_key[11 + $rk] = $this->rd_key[5 + $rk] ^ $this->rd_key[10 + $rk];
+ $rk += 6;
+ }
+ }
+
+ $this->rd_key[6] = librijndael2::parseInt("0x" . @substr($userkey, 48, 8));
+ $this->rd_key[7] = librijndael2::parseInt("0x" . @substr($userkey, 56, 8));
+
+ if ($bits == 256) {
+ for (;;) {
+ $temp = $this->rd_key[7+$rk];
+ $this->rd_key[8+$rk] = $this->rd_key[$rk] ^
+ ($this->Te4[($temp >> 16) & 0xff] & 0xff000000) ^
+ ($this->Te4[($temp >> 8) & 0xff] & 0x00ff0000) ^
+ ($this->Te4[($temp ) & 0xff] & 0x0000ff00) ^
+ ($this->Te4[($temp >> 24) & 0xff] & 0x000000ff) ^
+ $this->rcon[$i];
+
+ $this->rd_key[9 + $rk] = $this->rd_key[1 + $rk] ^ $this->rd_key[8 + $rk];
+ $this->rd_key[10 + $rk] = $this->rd_key[2 + $rk] ^ $this->rd_key[9 + $rk];
+ $this->rd_key[11 + $rk] = $this->rd_key[3 + $rk] ^ $this->rd_key[10 + $rk];
+ if (++$i == 7) {
+ return 0;
+ }
+
+ $temp = $this->rd_key[11 + $rk];
+ $this->rd_key[12 + $rk] = $this->rd_key[4 + $rk] ^
+ ($this->Te4[($temp >> 24) & 0xff] & 0xff000000) ^
+ ($this->Te4[($temp >> 16) & 0xff] & 0x00ff0000) ^
+ ($this->Te4[($temp >> 8) & 0xff] & 0x0000ff00) ^
+ ($this->Te4[($temp ) & 0xff] & 0x000000ff);
+
+ $this->rd_key[13 + $rk] = $this->rd_key[5 + $rk] ^ $this->rd_key[12 + $rk];
+ $this->rd_key[14 + $rk] = $this->rd_key[6 + $rk] ^ $this->rd_key[13 + $rk];
+ $this->rd_key[15 + $rk] = $this->rd_key[7 + $rk] ^ $this->rd_key[14 + $rk];
+ $rk += 8;
+ }
+ }
+ return 0;
+ }
- // Expand the cipher key into the decryption key schedule.
- function set_decrypt()
- {
- $i = 0;
- $j = 0;
- $rk = 0;
- $bits =& $this->bits;
-
- if ( $this->key_state === 'decrypt' )
- {
- return 0;
- }
-
- $this->key_state = 'decrypt';
-
- // first, start with an encryption schedule
- $status = $this->set_encrypt();
-
- // set the state again because set_encrypt() will change it
- $this->key_state = 'decrypt';
-
- if ($status < 0) {
- librijndael2::trace("AES_set_decrypt_key: AES_set_encrypt_key error");
- return;
- }
-
- // invert the order of the round keys:
- for ($i = 0, $j = 4*($this->rounds); $i < $j; $i += 4, $j -= 4) {
- $temp = $this->rd_key[$i]; $this->rd_key[$i] = $this->rd_key[$j]; $this->rd_key[$j] = $temp;
- $temp = $this->rd_key[$i+1]; $this->rd_key[$i+1] = $this->rd_key[$j+1]; $this->rd_key[$j+1] = $temp;
- $temp = $this->rd_key[$i+2]; $this->rd_key[$i+2] = $this->rd_key[$j+2]; $this->rd_key[$j+2] = $temp;
- $temp = $this->rd_key[$i+3]; $this->rd_key[$i+3] = $this->rd_key[$j+3]; $this->rd_key[$j+3] = $temp;
- }
-
- // apply the inverse MixColumn transform to all round keys but the first and the last:
- for ($i = 1; $i < ($this->rounds); $i++) {
+ // Expand the cipher key into the decryption key schedule.
+ function set_decrypt()
+ {
+ $i = 0;
+ $j = 0;
+ $rk = 0;
+ $bits =& $this->bits;
+
+ if ( $this->key_state === 'decrypt' )
+ {
+ return 0;
+ }
+
+ $this->key_state = 'decrypt';
+
+ // first, start with an encryption schedule
+ $status = $this->set_encrypt();
+
+ // set the state again because set_encrypt() will change it
+ $this->key_state = 'decrypt';
+
+ if ($status < 0) {
+ librijndael2::trace("AES_set_decrypt_key: AES_set_encrypt_key error");
+ return;
+ }
+
+ // invert the order of the round keys:
+ for ($i = 0, $j = 4*($this->rounds); $i < $j; $i += 4, $j -= 4) {
+ $temp = $this->rd_key[$i]; $this->rd_key[$i] = $this->rd_key[$j]; $this->rd_key[$j] = $temp;
+ $temp = $this->rd_key[$i+1]; $this->rd_key[$i+1] = $this->rd_key[$j+1]; $this->rd_key[$j+1] = $temp;
+ $temp = $this->rd_key[$i+2]; $this->rd_key[$i+2] = $this->rd_key[$j+2]; $this->rd_key[$j+2] = $temp;
+ $temp = $this->rd_key[$i+3]; $this->rd_key[$i+3] = $this->rd_key[$j+3]; $this->rd_key[$j+3] = $temp;
+ }
+
+ // apply the inverse MixColumn transform to all round keys but the first and the last:
+ for ($i = 1; $i < ($this->rounds); $i++) {
- $rk += 4;
- $this->rd_key[$rk] =
- $this->Td0[$this->Te4[($this->rd_key[$rk] >> 24) & 0xff] & 0xff] ^
- $this->Td1[$this->Te4[($this->rd_key[$rk] >> 16) & 0xff] & 0xff] ^
- $this->Td2[$this->Te4[($this->rd_key[$rk] >> 8) & 0xff] & 0xff] ^
- $this->Td3[$this->Te4[($this->rd_key[$rk] ) & 0xff] & 0xff];
-
- $this->rd_key[1+$rk] =
- $this->Td0[$this->Te4[($this->rd_key[1+$rk] >> 24) & 0xff] & 0xff] ^
- $this->Td1[$this->Te4[($this->rd_key[1+$rk] >> 16) & 0xff] & 0xff] ^
- $this->Td2[$this->Te4[($this->rd_key[1+$rk] >> 8) & 0xff] & 0xff] ^
- $this->Td3[$this->Te4[($this->rd_key[1+$rk] ) & 0xff] & 0xff];
+ $rk += 4;
+ $this->rd_key[$rk] =
+ $this->Td0[$this->Te4[($this->rd_key[$rk] >> 24) & 0xff] & 0xff] ^
+ $this->Td1[$this->Te4[($this->rd_key[$rk] >> 16) & 0xff] & 0xff] ^
+ $this->Td2[$this->Te4[($this->rd_key[$rk] >> 8) & 0xff] & 0xff] ^
+ $this->Td3[$this->Te4[($this->rd_key[$rk] ) & 0xff] & 0xff];
+
+ $this->rd_key[1+$rk] =
+ $this->Td0[$this->Te4[($this->rd_key[1+$rk] >> 24) & 0xff] & 0xff] ^
+ $this->Td1[$this->Te4[($this->rd_key[1+$rk] >> 16) & 0xff] & 0xff] ^
+ $this->Td2[$this->Te4[($this->rd_key[1+$rk] >> 8) & 0xff] & 0xff] ^
+ $this->Td3[$this->Te4[($this->rd_key[1+$rk] ) & 0xff] & 0xff];
- $this->rd_key[2+$rk] =
- $this->Td0[$this->Te4[($this->rd_key[2+$rk] >> 24) & 0xff] & 0xff] ^
- $this->Td1[$this->Te4[($this->rd_key[2+$rk] >> 16) & 0xff] & 0xff] ^
- $this->Td2[$this->Te4[($this->rd_key[2+$rk] >> 8) & 0xff] & 0xff] ^
- $this->Td3[$this->Te4[($this->rd_key[2+$rk] ) & 0xff] & 0xff];
+ $this->rd_key[2+$rk] =
+ $this->Td0[$this->Te4[($this->rd_key[2+$rk] >> 24) & 0xff] & 0xff] ^
+ $this->Td1[$this->Te4[($this->rd_key[2+$rk] >> 16) & 0xff] & 0xff] ^
+ $this->Td2[$this->Te4[($this->rd_key[2+$rk] >> 8) & 0xff] & 0xff] ^
+ $this->Td3[$this->Te4[($this->rd_key[2+$rk] ) & 0xff] & 0xff];
- $this->rd_key[3+$rk] =
- $this->Td0[$this->Te4[($this->rd_key[3+$rk] >> 24) & 0xff] & 0xff] ^
- $this->Td1[$this->Te4[($this->rd_key[3+$rk] >> 16) & 0xff] & 0xff] ^
- $this->Td2[$this->Te4[($this->rd_key[3+$rk] >> 8) & 0xff] & 0xff] ^
- $this->Td3[$this->Te4[($this->rd_key[3+$rk] ) & 0xff] & 0xff];
- }
- return 0;
- }
+ $this->rd_key[3+$rk] =
+ $this->Td0[$this->Te4[($this->rd_key[3+$rk] >> 24) & 0xff] & 0xff] ^
+ $this->Td1[$this->Te4[($this->rd_key[3+$rk] >> 16) & 0xff] & 0xff] ^
+ $this->Td2[$this->Te4[($this->rd_key[3+$rk] >> 8) & 0xff] & 0xff] ^
+ $this->Td3[$this->Te4[($this->rd_key[3+$rk] ) & 0xff] & 0xff];
+ }
+ return 0;
+ }
}
/**
@@ -1410,381 +1410,381 @@
class AESCrypt
{
-
- /**
- * Fetches a Crypt_Rijndael_Key object for the given hex or binary key.
- * @param string Key, binary or hex format
- * @return object
- * @access protected
- */
-
- protected static function fetch_key($key)
- {
- static $objects = array();
-
- if ( !preg_match('/^[a-f0-9]+$/i', $key) )
- $key = librijndael2::string2hex($key);
-
- if ( isset($objects[$key]) )
- {
- return $objects[$key];
- }
- else
- {
- $objects[$key] = new Crypt_Rijndael_Key($key);
- $ret =& $objects[$key];
- return $ret;
- }
- }
-
- /**
- * Fetches a Crypt_Rijndael object.
- * @return object
- * @access protected
- */
-
- protected static function fetch_cr_singleton()
- {
- static $o = null;
-
- if ( is_object($o) )
- {
- return $o;
- }
- else
- {
- $o = new Crypt_Rijndael();
- $r =& $o;
- return $r;
- }
- }
-
- /**
- * Pads a string with nul bytes until it reaches a multiple of 16 bytes.
- * @param string
- * @return string
- */
-
- protected function pad_string($string)
- {
- while ( strlen($string) % 32 > 0 )
- {
- $string .= "00";
- }
- return $string;
- }
-
- /**
- * Constructor. Currently does not take parameters and ignores options from the old API.
- */
-
- public function __construct($key_size = 192, $block_size = 128, $debug = false)
- {
- }
-
- /**
- * Wrapper for encryption.
- * @param string Plain text to encrypt
- * @param string Binary or hex key
- * @param int Format to return result in - ENC_BINARY, ENC_HEX, or ENC_BASE64
- * @return string
- */
-
- public function encrypt($plaintext, $key, $return_format = ENC_HEX)
- {
- return $this->encrypt_cbc($plaintext, $key, '00000000000000000000000000000000', ENC_HEX);
- }
-
- /**
- * Wrapper for decryption.
- * @param string Encrypted text
- * @param string Binary or hex key
- * @param int Format that the encrypted text is in - ENC_BINARY, ENC_HEX, or ENC_BASE64
- * @param bool If true, avoids caching the decryption result.
- * @return string
- */
-
- public function decrypt($cryptext, $key, $input_format = ENC_HEX, $no_cache = false)
- {
- return $this->decrypt_cbc($cryptext, $key, '00000000000000000000000000000000', ENC_HEX, $no_cache);
- }
-
- /**
- * Wrapper for CBC encryption.
- * @param string Plain text to encrypt
- * @param string Binary or hex key
- * @param string 128-bit initialization vector, either hex or binary will do
- * @param int Format to return result in - ENC_BINARY, ENC_HEX, or ENC_BASE64
- */
-
- public function encrypt_cbc($plaintext, $key, $ivec, $return_format = ENC_HEX)
- {
- $okey = self::fetch_key($key);
- $okey->set_encrypt();
- $aes = self::fetch_cr_singleton();
- $plaintext = librijndael2::string2hex($plaintext);
-
- // init ivec
- if ( strlen($ivec) == '16' )
- {
- $ivec = librijndael2::string2hex($ivec);
- }
- else if ( preg_match('/^[a-f0-9]+$/i', $ivec) && strlen($ivec) == 32 )
- {
- // ivec is good
- }
- else
- {
- // invalid ivec
- return false;
- }
-
- $result = '';
- $plaintext = str_split($this->pad_string($plaintext), 32);
- foreach ( $plaintext as $block )
- {
- $block = $aes->AES_cbc_encrypt($block, $okey, $ivec, 'AES_ENCRYPT');
- $result .= $block;
- }
-
- switch ( $return_format )
- {
- case ENC_BINARY:
- return librijndael2::hex2string($result);
- case ENC_HEX:
- default:
- return $result;
- case ENC_BASE64:
- return base64_encode(librijndael2::hex2string($result));
- }
- }
-
- /**
- * Wrapper for CBC decryption.
- * @param string Encrypted text
- * @param string Binary or hex key
- * @param string 128-bit initialization vector, either hex or binary will do
- * @param int Format that the encrypted text is in - ENC_BINARY, ENC_HEX, or ENC_BASE64
- * @param bool If true, avoids caching the decryption result.
- * @return string
- */
-
- public function decrypt_cbc($cryptext, $key, $ivec, $input_format = ENC_HEX, $no_cache = false)
- {
- // AES_cbc_encrypt() expects hex
- switch ( $input_format )
- {
- case ENC_BINARY:
- $cryptext = librijndael2::string2hex($cryptext);
- break;
- case ENC_BASE64:
- $cryptext = librijndael2::string2hex(base64_decode($cryptext));
- break;
- }
-
- $hash = sha1("{$cryptext}::{$key}");
- if ( $cache_result = aes_decrypt_cache_fetch($hash) )
- return $cache_result;
-
- // load objects
- profiler_log("AES: Started decryption of string $hash");
- $okey = self::fetch_key($key);
- $okey->set_decrypt();
- $aes = self::fetch_cr_singleton();
-
- // init ivec
- if ( strlen($ivec) == '16' )
- {
- $ivec = librijndael2::string2hex($ivec);
- }
- else if ( preg_match('/^[a-f0-9]+$/i', $ivec) && strlen($ivec) == 32 )
- {
- // ivec is good
- }
- else
- {
- // invalid ivec
- return false;
- }
-
- // perform decryption
- $result = '';
- $cryptext_orig = $cryptext;
- $cryptext = enano_str_split($cryptext, 32);
- foreach ( $cryptext as $block )
- {
- $block = $aes->AES_cbc_encrypt($block, $okey, $ivec, 'AES_DECRYPT');
- $result .= $block;
- }
-
- // decode result and trim nul bytes
- $result = librijndael2::hex2string($result);
- $result = rtrim($result, "\000");
-
- if ( !$no_cache )
- aes_decrypt_cache_store($cryptext_orig, $result, $key);
-
- profiler_log("AES: Finished decryption of string $hash");
-
- // done! :)
- return $result;
- }
-
- /**
- * Factory.
- * @param int Key size in bits
- * @param int Block size in bits - ONLY 128-bit supported.
- * @return object Instance of AESCrypt
- */
-
- public static function singleton($key_size = AES_BITS, $block_size = 128)
- {
- static $instance = false;
- if ( !$instance )
- {
- $class = __CLASS__;
- $instance = new $class();
- }
- return $instance;
- }
-
- #
- # Utility functions
- #
-
- /**
- * Generates a random key suitable for encryption
- * @param int $len the length of the key, in bytes
- * @return string a BINARY key
- */
-
- static function randkey($len = 32)
- {
- if ( @file_exists('/dev/urandom') && @is_readable('/dev/urandom') )
- {
- // Let's use something a little more secure
- $ur = @fopen('/dev/urandom', 'r');
- if ( !$ur )
- return self::randkey_safe($len);
- $ukey = @fread($ur, $len);
- fclose($ur);
- if ( strlen($ukey) != $len )
- return self::randkey_safe($len);
- return $ukey;
- }
- return self::randkey_safe($len);
- }
-
- static function randkey_safe($len = 32)
- {
- $key = '';
- for($i=0;$i<$len;$i++)
- {
- $key .= chr(mt_rand(0, 255));
- }
- return $key;
- }
-
- function gen_readymade_key()
- {
- $key = librijndael2::string2hex($this->randkey(AES_BITS / 8));
- return $key;
- }
+
+ /**
+ * Fetches a Crypt_Rijndael_Key object for the given hex or binary key.
+ * @param string Key, binary or hex format
+ * @return object
+ * @access protected
+ */
+
+ protected static function fetch_key($key)
+ {
+ static $objects = array();
+
+ if ( !preg_match('/^[a-f0-9]+$/i', $key) )
+ $key = librijndael2::string2hex($key);
+
+ if ( isset($objects[$key]) )
+ {
+ return $objects[$key];
+ }
+ else
+ {
+ $objects[$key] = new Crypt_Rijndael_Key($key);
+ $ret =& $objects[$key];
+ return $ret;
+ }
+ }
+
+ /**
+ * Fetches a Crypt_Rijndael object.
+ * @return object
+ * @access protected
+ */
+
+ protected static function fetch_cr_singleton()
+ {
+ static $o = null;
+
+ if ( is_object($o) )
+ {
+ return $o;
+ }
+ else
+ {
+ $o = new Crypt_Rijndael();
+ $r =& $o;
+ return $r;
+ }
+ }
+
+ /**
+ * Pads a string with nul bytes until it reaches a multiple of 16 bytes.
+ * @param string
+ * @return string
+ */
+
+ protected function pad_string($string)
+ {
+ while ( strlen($string) % 32 > 0 )
+ {
+ $string .= "00";
+ }
+ return $string;
+ }
+
+ /**
+ * Constructor. Currently does not take parameters and ignores options from the old API.
+ */
+
+ public function __construct($key_size = 192, $block_size = 128, $debug = false)
+ {
+ }
+
+ /**
+ * Wrapper for encryption.
+ * @param string Plain text to encrypt
+ * @param string Binary or hex key
+ * @param int Format to return result in - ENC_BINARY, ENC_HEX, or ENC_BASE64
+ * @return string
+ */
+
+ public function encrypt($plaintext, $key, $return_format = ENC_HEX)
+ {
+ return $this->encrypt_cbc($plaintext, $key, '00000000000000000000000000000000', ENC_HEX);
+ }
+
+ /**
+ * Wrapper for decryption.
+ * @param string Encrypted text
+ * @param string Binary or hex key
+ * @param int Format that the encrypted text is in - ENC_BINARY, ENC_HEX, or ENC_BASE64
+ * @param bool If true, avoids caching the decryption result.
+ * @return string
+ */
+
+ public function decrypt($cryptext, $key, $input_format = ENC_HEX, $no_cache = false)
+ {
+ return $this->decrypt_cbc($cryptext, $key, '00000000000000000000000000000000', ENC_HEX, $no_cache);
+ }
+
+ /**
+ * Wrapper for CBC encryption.
+ * @param string Plain text to encrypt
+ * @param string Binary or hex key
+ * @param string 128-bit initialization vector, either hex or binary will do
+ * @param int Format to return result in - ENC_BINARY, ENC_HEX, or ENC_BASE64
+ */
+
+ public function encrypt_cbc($plaintext, $key, $ivec, $return_format = ENC_HEX)
+ {
+ $okey = self::fetch_key($key);
+ $okey->set_encrypt();
+ $aes = self::fetch_cr_singleton();
+ $plaintext = librijndael2::string2hex($plaintext);
+
+ // init ivec
+ if ( strlen($ivec) == '16' )
+ {
+ $ivec = librijndael2::string2hex($ivec);
+ }
+ else if ( preg_match('/^[a-f0-9]+$/i', $ivec) && strlen($ivec) == 32 )
+ {
+ // ivec is good
+ }
+ else
+ {
+ // invalid ivec
+ return false;
+ }
+
+ $result = '';
+ $plaintext = str_split($this->pad_string($plaintext), 32);
+ foreach ( $plaintext as $block )
+ {
+ $block = $aes->AES_cbc_encrypt($block, $okey, $ivec, 'AES_ENCRYPT');
+ $result .= $block;
+ }
+
+ switch ( $return_format )
+ {
+ case ENC_BINARY:
+ return librijndael2::hex2string($result);
+ case ENC_HEX:
+ default:
+ return $result;
+ case ENC_BASE64:
+ return base64_encode(librijndael2::hex2string($result));
+ }
+ }
+
+ /**
+ * Wrapper for CBC decryption.
+ * @param string Encrypted text
+ * @param string Binary or hex key
+ * @param string 128-bit initialization vector, either hex or binary will do
+ * @param int Format that the encrypted text is in - ENC_BINARY, ENC_HEX, or ENC_BASE64
+ * @param bool If true, avoids caching the decryption result.
+ * @return string
+ */
+
+ public function decrypt_cbc($cryptext, $key, $ivec, $input_format = ENC_HEX, $no_cache = false)
+ {
+ // AES_cbc_encrypt() expects hex
+ switch ( $input_format )
+ {
+ case ENC_BINARY:
+ $cryptext = librijndael2::string2hex($cryptext);
+ break;
+ case ENC_BASE64:
+ $cryptext = librijndael2::string2hex(base64_decode($cryptext));
+ break;
+ }
+
+ $hash = sha1("{$cryptext}::{$key}");
+ if ( $cache_result = aes_decrypt_cache_fetch($hash) )
+ return $cache_result;
+
+ // load objects
+ profiler_log("AES: Started decryption of string $hash");
+ $okey = self::fetch_key($key);
+ $okey->set_decrypt();
+ $aes = self::fetch_cr_singleton();
+
+ // init ivec
+ if ( strlen($ivec) == '16' )
+ {
+ $ivec = librijndael2::string2hex($ivec);
+ }
+ else if ( preg_match('/^[a-f0-9]+$/i', $ivec) && strlen($ivec) == 32 )
+ {
+ // ivec is good
+ }
+ else
+ {
+ // invalid ivec
+ return false;
+ }
+
+ // perform decryption
+ $result = '';
+ $cryptext_orig = $cryptext;
+ $cryptext = enano_str_split($cryptext, 32);
+ foreach ( $cryptext as $block )
+ {
+ $block = $aes->AES_cbc_encrypt($block, $okey, $ivec, 'AES_DECRYPT');
+ $result .= $block;
+ }
+
+ // decode result and trim nul bytes
+ $result = librijndael2::hex2string($result);
+ $result = rtrim($result, "\000");
+
+ if ( !$no_cache )
+ aes_decrypt_cache_store($cryptext_orig, $result, $key);
+
+ profiler_log("AES: Finished decryption of string $hash");
+
+ // done! :)
+ return $result;
+ }
+
+ /**
+ * Factory.
+ * @param int Key size in bits
+ * @param int Block size in bits - ONLY 128-bit supported.
+ * @return object Instance of AESCrypt
+ */
+
+ public static function singleton($key_size = AES_BITS, $block_size = 128)
+ {
+ static $instance = false;
+ if ( !$instance )
+ {
+ $class = __CLASS__;
+ $instance = new $class();
+ }
+ return $instance;
+ }
+
+ #
+ # Utility functions
+ #
+
+ /**
+ * Generates a random key suitable for encryption
+ * @param int $len the length of the key, in bytes
+ * @return string a BINARY key
+ */
+
+ static function randkey($len = 32)
+ {
+ if ( @file_exists('/dev/urandom') && @is_readable('/dev/urandom') )
+ {
+ // Let's use something a little more secure
+ $ur = @fopen('/dev/urandom', 'r');
+ if ( !$ur )
+ return self::randkey_safe($len);
+ $ukey = @fread($ur, $len);
+ fclose($ur);
+ if ( strlen($ukey) != $len )
+ return self::randkey_safe($len);
+ return $ukey;
+ }
+ return self::randkey_safe($len);
+ }
+
+ static function randkey_safe($len = 32)
+ {
+ $key = '';
+ for($i=0;$i<$len;$i++)
+ {
+ $key .= chr(mt_rand(0, 255));
+ }
+ return $key;
+ }
+
+ function gen_readymade_key()
+ {
+ $key = librijndael2::string2hex($this->randkey(AES_BITS / 8));
+ return $key;
+ }
}
function aes_decrypt_cache_store($encrypted, $decrypted, $key)
{
- if ( getConfig('cache_thumbs') != '1' )
- return false;
-
- $cache_file = ENANO_ROOT . '/cache/aes_decrypt.php';
- // only cache if $decrypted is long enough to actually warrant caching
- if ( strlen($decrypted) < 32 )
- {
- profiler_log("AES: Skipped caching a string (probably a password, we dunno) because it's too short");
- return false;
- }
- if ( file_exists($cache_file) )
- {
- require_once($cache_file);
- global $aes_decrypt_cache;
- $cachekey = sha1($encrypted . '::' . $key);
- $aes_decrypt_cache[$cachekey] = $decrypted;
-
- if ( count($aes_decrypt_cache) > 5000 )
- {
- // we've got a lot of strings in the cache, clear out a few
- $keys = array_keys($aes_decrypt_cache);
- for ( $i = 0; $i < 2500; $i++ )
- {
- unset($aes_decrypt_cache[$keys[$i]]);
- unset($aes_decrypt_cache[$keys[$i]]);
- }
- }
- }
- else
- {
- $aes_decrypt_cache = array(
- sha1($encrypted . '::' . $key) => $decrypted
- );
- }
- // call var_export and collect contents
- ob_start();
- var_export($aes_decrypt_cache);
- $dec_cache_string = ob_get_contents();
- ob_end_clean();
- $f = @fopen($cache_file, 'w');
- if ( !$f )
- return false;
- fwrite($f, " 5000 )
+ {
+ // we've got a lot of strings in the cache, clear out a few
+ $keys = array_keys($aes_decrypt_cache);
+ for ( $i = 0; $i < 2500; $i++ )
+ {
+ unset($aes_decrypt_cache[$keys[$i]]);
+ unset($aes_decrypt_cache[$keys[$i]]);
+ }
+ }
+ }
+ else
+ {
+ $aes_decrypt_cache = array(
+ sha1($encrypted . '::' . $key) => $decrypted
+ );
+ }
+ // call var_export and collect contents
+ ob_start();
+ var_export($aes_decrypt_cache);
+ $dec_cache_string = ob_get_contents();
+ ob_end_clean();
+ $f = @fopen($cache_file, 'w');
+ if ( !$f )
+ return false;
+ fwrite($f, "
diff -r de56132c008d -r bdac73ed481e includes/search.php
--- a/includes/search.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/search.php Sun Mar 28 23:10:46 2010 -0400
@@ -25,63 +25,63 @@
class Searcher
{
- var $results;
- var $index;
- var $warnings;
- var $match_case = false;
+ var $results;
+ var $index;
+ var $warnings;
+ var $match_case = false;
- function buildIndex($texts)
- {
- $this->index = Array();
- $stopwords = get_stopwords();
+ function buildIndex($texts)
+ {
+ $this->index = Array();
+ $stopwords = get_stopwords();
- foreach($texts as $i => $l)
- {
- $seed = md5(microtime(true) . mt_rand());
- $texts[$i] = str_replace("'", 'xxxApoS'.$seed.'xxx', $texts[$i]);
- $texts[$i] = preg_replace('#([\W_]+)#i', ' ', $texts[$i]);
- $texts[$i] = preg_replace('#([ ]+?)#', ' ', $texts[$i]);
- $texts[$i] = preg_replace('#([\']*){2,}#s', '', $texts[$i]);
- $texts[$i] = str_replace('xxxApoS'.$seed.'xxx', "'", $texts[$i]);
- $l = $texts[$i];
- $words = Array();
- $good_chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\' ';
- $good_chars = enano_str_split($good_chars, 1);
- $letters = enano_str_split($l, 1);
- foreach($letters as $x => $t)
- {
- if(!in_array($t, $good_chars))
- unset($letters[$x]);
- }
- $letters = implode('', $letters);
- $words = explode(' ', $letters);
- foreach($words as $c => $w)
- {
- if(strlen($w) < 2 || in_array($w, $stopwords) || strlen($w) > 63 || preg_match('/[\']{2,}/', $w))
- unset($words[$c]);
- else
- $words[$c] = $w;
- }
- $words = array_values($words);
- foreach($words as $c => $w)
- {
- if(isset($this->index[$w]))
- {
- if(!in_array($i, $this->index[$w]))
- $this->index[$w][] = $i;
- }
- else
- {
- $this->index[$w] = Array();
- $this->index[$w][] = $i;
- }
- }
- }
- foreach($this->index as $k => $v)
- {
- $this->index[$k] = implode(',', $this->index[$k]);
- }
- }
+ foreach($texts as $i => $l)
+ {
+ $seed = md5(microtime(true) . mt_rand());
+ $texts[$i] = str_replace("'", 'xxxApoS'.$seed.'xxx', $texts[$i]);
+ $texts[$i] = preg_replace('#([\W_]+)#i', ' ', $texts[$i]);
+ $texts[$i] = preg_replace('#([ ]+?)#', ' ', $texts[$i]);
+ $texts[$i] = preg_replace('#([\']*){2,}#s', '', $texts[$i]);
+ $texts[$i] = str_replace('xxxApoS'.$seed.'xxx', "'", $texts[$i]);
+ $l = $texts[$i];
+ $words = Array();
+ $good_chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\' ';
+ $good_chars = enano_str_split($good_chars, 1);
+ $letters = enano_str_split($l, 1);
+ foreach($letters as $x => $t)
+ {
+ if(!in_array($t, $good_chars))
+ unset($letters[$x]);
+ }
+ $letters = implode('', $letters);
+ $words = explode(' ', $letters);
+ foreach($words as $c => $w)
+ {
+ if(strlen($w) < 2 || in_array($w, $stopwords) || strlen($w) > 63 || preg_match('/[\']{2,}/', $w))
+ unset($words[$c]);
+ else
+ $words[$c] = $w;
+ }
+ $words = array_values($words);
+ foreach($words as $c => $w)
+ {
+ if(isset($this->index[$w]))
+ {
+ if(!in_array($i, $this->index[$w]))
+ $this->index[$w][] = $i;
+ }
+ else
+ {
+ $this->index[$w] = Array();
+ $this->index[$w][] = $i;
+ }
+ }
+ }
+ foreach($this->index as $k => $v)
+ {
+ $this->index[$k] = implode(',', $this->index[$k]);
+ }
+ }
}
/**
@@ -100,486 +100,486 @@
function perform_search($query, &$warnings, $case_sensitive = false, &$word_list)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- $warnings = array();
-
- //
- // STAGE 0: PARSE SEARCH QUERY
- // Identify all terms of the query. Separate between what is required and what is not, and what should be sent through the index as
- // opposed to straight-out LIKE-selected.
- //
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ $warnings = array();
+
+ //
+ // STAGE 0: PARSE SEARCH QUERY
+ // Identify all terms of the query. Separate between what is required and what is not, and what should be sent through the index as
+ // opposed to straight-out LIKE-selected.
+ //
- $query = parse_search_query($query, $warnings);
+ $query = parse_search_query($query, $warnings);
- // Segregate search terms containing spaces
- $query_phrase = array(
- 'any' => array(),
- 'req' => array()
- );
+ // Segregate search terms containing spaces
+ $query_phrase = array(
+ 'any' => array(),
+ 'req' => array()
+ );
- foreach ( $query['any'] as $i => $_ )
- {
- $term =& $query['any'][$i];
- $term = trim($term);
- // the indexer only indexes words a-z with apostrophes
- if ( preg_match('/[^A-Za-z\']/', $term) )
- {
- $query_phrase['any'][] = $term;
- unset($term, $query['any'][$i]);
- }
- }
- unset($term);
- $query['any'] = array_values($query['any']);
+ foreach ( $query['any'] as $i => $_ )
+ {
+ $term =& $query['any'][$i];
+ $term = trim($term);
+ // the indexer only indexes words a-z with apostrophes
+ if ( preg_match('/[^A-Za-z\']/', $term) )
+ {
+ $query_phrase['any'][] = $term;
+ unset($term, $query['any'][$i]);
+ }
+ }
+ unset($term);
+ $query['any'] = array_values($query['any']);
- foreach ( $query['req'] as $i => $_ )
- {
- $term =& $query['req'][$i];
- $term = trim($term);
- if ( preg_match('/[^A-Za-z\']/', $term) )
- {
- $query_phrase['req'][] = $term;
- unset($term, $query['req'][$i]);
- }
- }
- unset($term);
- $query['req'] = array_values($query['req']);
+ foreach ( $query['req'] as $i => $_ )
+ {
+ $term =& $query['req'][$i];
+ $term = trim($term);
+ if ( preg_match('/[^A-Za-z\']/', $term) )
+ {
+ $query_phrase['req'][] = $term;
+ unset($term, $query['req'][$i]);
+ }
+ }
+ unset($term);
+ $query['req'] = array_values($query['req']);
- $results = array();
- $scores = array();
- $ns_list = '(' . implode('|', array_keys($paths->nslist)) . ')';
+ $results = array();
+ $scores = array();
+ $ns_list = '(' . implode('|', array_keys($paths->nslist)) . ')';
- // FIXME: Update to use FULLTEXT algo when available.
+ // FIXME: Update to use FULLTEXT algo when available.
- // Build an SQL query to load from the index table
- if ( count($query['any']) < 1 && count($query['req']) < 1 && count($query_phrase['any']) < 1 && count($query_phrase['req']) < 1 )
- {
- // This is both because of technical restrictions and devastation that would occur on shared servers/large sites.
- $warnings[] = $lang->get('search_err_query_no_positive');
- return array();
- }
+ // Build an SQL query to load from the index table
+ if ( count($query['any']) < 1 && count($query['req']) < 1 && count($query_phrase['any']) < 1 && count($query_phrase['req']) < 1 )
+ {
+ // This is both because of technical restrictions and devastation that would occur on shared servers/large sites.
+ $warnings[] = $lang->get('search_err_query_no_positive');
+ return array();
+ }
- //
- // STAGE 1
- // Get all possible result pages from the search index. Tally which pages have the most words, and later sort them by boolean relevance
- //
+ //
+ // STAGE 1
+ // Get all possible result pages from the search index. Tally which pages have the most words, and later sort them by boolean relevance
+ //
- // Skip this if no indexable words are included
+ // Skip this if no indexable words are included
- if ( count($query['any']) > 0 || count($query['req']) > 0 )
- {
- $where_any = array();
- foreach ( $query['any'] as $term )
- {
- $term = escape_string_like($term);
- if ( !$case_sensitive )
- $term = strtolower($term);
- $where_any[] = $term;
- }
- foreach ( $query['req'] as $term )
- {
- $term = escape_string_like($term);
- if ( !$case_sensitive )
- $term = strtolower($term);
- $where_any[] = $term;
- }
+ if ( count($query['any']) > 0 || count($query['req']) > 0 )
+ {
+ $where_any = array();
+ foreach ( $query['any'] as $term )
+ {
+ $term = escape_string_like($term);
+ if ( !$case_sensitive )
+ $term = strtolower($term);
+ $where_any[] = $term;
+ }
+ foreach ( $query['req'] as $term )
+ {
+ $term = escape_string_like($term);
+ if ( !$case_sensitive )
+ $term = strtolower($term);
+ $where_any[] = $term;
+ }
- $col_word = ( $case_sensitive ) ? 'word' : 'word_lcase';
- $where_any_str = ( count($where_any) > 0 ) ? '( ' . $col_word . ' LIKE \'%' . implode('%\' OR ' . $col_word . ' LIKE \'%', $where_any) . '%\' )' : '';
+ $col_word = ( $case_sensitive ) ? 'word' : 'word_lcase';
+ $where_any_str = ( count($where_any) > 0 ) ? '( ' . $col_word . ' LIKE \'%' . implode('%\' OR ' . $col_word . ' LIKE \'%', $where_any) . '%\' )' : '';
- // generate query
- $sql = "SELECT word, page_names FROM " . table_prefix . "search_index WHERE {$where_any_str}";
- if ( !($q = $db->sql_query($sql)) )
- $db->_die('Error is in perform_search(), includes/search.php, query 1');
+ // generate query
+ $sql = "SELECT word, page_names FROM " . table_prefix . "search_index WHERE {$where_any_str}";
+ if ( !($q = $db->sql_query($sql)) )
+ $db->_die('Error is in perform_search(), includes/search.php, query 1');
- $word_tracking = array();
- if ( $row = $db->fetchrow($q) )
- {
- do
- {
- // get page list
- $pages =& $row['page_names'];
-
- // Find page IDs that contain commas
- // This should never happen because commas are escaped by sanitize_page_id(). Nevertheless for compatibility with older
- // databases, and to alleviate the concerns of hackers, we'll accommodate for page IDs with commas here by checking for
- // IDs that don't match the pattern for stringified page ID + namespace. If it doesn't match, that means it's a continuation
- // of the previous ID and should be concatenated to the previous entry.
- $matches = strpos($pages, ',') ? explode(',', $pages) : array($pages);
- $prev = false;
- foreach ( $matches as $i => $_ )
- {
- $match =& $matches[$i];
- if ( !preg_match("/^ns=$ns_list;pid=(.+)$/", $match) && $prev )
- {
- $matches[$prev] .= ',' . $match;
- unset($match, $matches[$i]);
- continue;
- }
- $prev = $i;
- }
- unset($match);
+ $word_tracking = array();
+ if ( $row = $db->fetchrow($q) )
+ {
+ do
+ {
+ // get page list
+ $pages =& $row['page_names'];
+
+ // Find page IDs that contain commas
+ // This should never happen because commas are escaped by sanitize_page_id(). Nevertheless for compatibility with older
+ // databases, and to alleviate the concerns of hackers, we'll accommodate for page IDs with commas here by checking for
+ // IDs that don't match the pattern for stringified page ID + namespace. If it doesn't match, that means it's a continuation
+ // of the previous ID and should be concatenated to the previous entry.
+ $matches = strpos($pages, ',') ? explode(',', $pages) : array($pages);
+ $prev = false;
+ foreach ( $matches as $i => $_ )
+ {
+ $match =& $matches[$i];
+ if ( !preg_match("/^ns=$ns_list;pid=(.+)$/", $match) && $prev )
+ {
+ $matches[$prev] .= ',' . $match;
+ unset($match, $matches[$i]);
+ continue;
+ }
+ $prev = $i;
+ }
+ unset($match);
- // Iterate through each of the results, assigning scores based on how many times the page has shown up.
- // This works because this phase of the search is strongly word-based not page-based. If a page shows up
- // multiple times while fetching the result rows from the search_index table, it simply means that page
- // contains more than one of the terms the user searched for.
+ // Iterate through each of the results, assigning scores based on how many times the page has shown up.
+ // This works because this phase of the search is strongly word-based not page-based. If a page shows up
+ // multiple times while fetching the result rows from the search_index table, it simply means that page
+ // contains more than one of the terms the user searched for.
- foreach ( $matches as $match )
- {
- $word_cs = (( $case_sensitive ) ? $row['word'] : strtolower($row['word']));
- if ( isset($word_tracking[$match]) && in_array($word_cs, $word_tracking[$match]) )
- {
- continue;
- }
- if ( isset($word_tracking[$match]) )
- {
- if ( isset($word_tracking[$match]) )
- {
- $word_tracking[$match][] = $word_cs;
- }
- }
- else
- {
- $word_tracking[$match] = array($word_cs);
- }
-
- // echo '' . print_r($word_tracking, true) . '
';
-
- $inc = 1;
+ foreach ( $matches as $match )
+ {
+ $word_cs = (( $case_sensitive ) ? $row['word'] : strtolower($row['word']));
+ if ( isset($word_tracking[$match]) && in_array($word_cs, $word_tracking[$match]) )
+ {
+ continue;
+ }
+ if ( isset($word_tracking[$match]) )
+ {
+ if ( isset($word_tracking[$match]) )
+ {
+ $word_tracking[$match][] = $word_cs;
+ }
+ }
+ else
+ {
+ $word_tracking[$match] = array($word_cs);
+ }
+
+ // echo '' . print_r($word_tracking, true) . '
';
+
+ $inc = 1;
- // Is this search term present in the page's title? If so, give extra points
- preg_match("/^ns=$ns_list;pid=(.+)$/", $match, $piecesparts);
- $title = get_page_title_ns($piecesparts[2], $piecesparts[1]);
-
- $test_func = ( $case_sensitive ) ? 'strstr' : 'stristr';
- if ( $test_func($title, $row['word']) || $test_func($piecesparts[2], $row['word']) )
- {
- $inc = 1.5;
- }
-
- // increase points if 2 or more words match a phrase in the title
- for ( $i = 0; $i < count($where_any) - 1; $i++ )
- {
- $phrase = "{$where_any[$i]} {$where_any[$i + 1]}";
- if ( $test_func($title, $phrase) )
- {
- $inc *= 1.25;
- }
- }
-
- // Deduct points if there are few similarities between the words
- $lev_array = array();
- foreach ( $where_any as $qword )
- {
- if ( strstr($word_cs, $qword) )
- $lev_array[ $qword ] = levenshtein($qword, $word_cs);
- }
- if ( min($lev_array) > 3 )
- {
- $inc /= array_sum($lev_array) / count($lev_array);
- }
-
- if ( isset($scores[$match]) )
- {
- $scores[$match] = $scores[$match] + $inc;
- }
- else
- {
- $scores[$match] = $inc;
- }
- }
- }
- while ( $row = $db->fetchrow($q) );
- }
- $db->free_result($q);
-
- //
- // STAGE 2: FIRST ELIMINATION ROUND
- // Iterate through the list of required terms. If a given page is not found to have the required term, eliminate it
- //
+ // Is this search term present in the page's title? If so, give extra points
+ preg_match("/^ns=$ns_list;pid=(.+)$/", $match, $piecesparts);
+ $title = get_page_title_ns($piecesparts[2], $piecesparts[1]);
+
+ $test_func = ( $case_sensitive ) ? 'strstr' : 'stristr';
+ if ( $test_func($title, $row['word']) || $test_func($piecesparts[2], $row['word']) )
+ {
+ $inc = 1.5;
+ }
+
+ // increase points if 2 or more words match a phrase in the title
+ for ( $i = 0; $i < count($where_any) - 1; $i++ )
+ {
+ $phrase = "{$where_any[$i]} {$where_any[$i + 1]}";
+ if ( $test_func($title, $phrase) )
+ {
+ $inc *= 1.25;
+ }
+ }
+
+ // Deduct points if there are few similarities between the words
+ $lev_array = array();
+ foreach ( $where_any as $qword )
+ {
+ if ( strstr($word_cs, $qword) )
+ $lev_array[ $qword ] = levenshtein($qword, $word_cs);
+ }
+ if ( min($lev_array) > 3 )
+ {
+ $inc /= array_sum($lev_array) / count($lev_array);
+ }
+
+ if ( isset($scores[$match]) )
+ {
+ $scores[$match] = $scores[$match] + $inc;
+ }
+ else
+ {
+ $scores[$match] = $inc;
+ }
+ }
+ }
+ while ( $row = $db->fetchrow($q) );
+ }
+ $db->free_result($q);
+
+ //
+ // STAGE 2: FIRST ELIMINATION ROUND
+ // Iterate through the list of required terms. If a given page is not found to have the required term, eliminate it
+ //
- foreach ( $query['req'] as $term )
- {
- foreach ( $word_tracking as $i => $page )
- {
- if ( !in_array($term, $page) )
- {
- unset($word_tracking[$i], $scores[$i]);
- }
- }
- }
- }
-
- //
- // STAGE 3: PHRASE SEARCHING
- // Use LIKE to find pages with specified phrases. We can do a super-picky single query without another elimination round because
- // at this stage we can search the full page_text column instead of relying on a word list.
- //
+ foreach ( $query['req'] as $term )
+ {
+ foreach ( $word_tracking as $i => $page )
+ {
+ if ( !in_array($term, $page) )
+ {
+ unset($word_tracking[$i], $scores[$i]);
+ }
+ }
+ }
+ }
+
+ //
+ // STAGE 3: PHRASE SEARCHING
+ // Use LIKE to find pages with specified phrases. We can do a super-picky single query without another elimination round because
+ // at this stage we can search the full page_text column instead of relying on a word list.
+ //
- // We can skip this stage if none of these special terms apply
+ // We can skip this stage if none of these special terms apply
- $text_col = ( $case_sensitive ) ? 'page_text' : ENANO_SQLFUNC_LOWERCASE . '(page_text)';
- $name_col = ( $case_sensitive ) ? 'name' : ENANO_SQLFUNC_LOWERCASE . '(name)';
- $text_col_join = ( $case_sensitive ) ? 't.page_text' : ENANO_SQLFUNC_LOWERCASE . '(t.page_text)';
- $name_col_join = ( $case_sensitive ) ? 'p.name' : ENANO_SQLFUNC_LOWERCASE . '(p.name)';
-
- $concat_column = ( ENANO_DBLAYER == 'MYSQL' ) ?
- 'CONCAT(\'ns=\',t.namespace,\';pid=\',t.page_id)' :
- "'ns=' || t.namespace || ';pid=' || t.page_id";
+ $text_col = ( $case_sensitive ) ? 'page_text' : ENANO_SQLFUNC_LOWERCASE . '(page_text)';
+ $name_col = ( $case_sensitive ) ? 'name' : ENANO_SQLFUNC_LOWERCASE . '(name)';
+ $text_col_join = ( $case_sensitive ) ? 't.page_text' : ENANO_SQLFUNC_LOWERCASE . '(t.page_text)';
+ $name_col_join = ( $case_sensitive ) ? 'p.name' : ENANO_SQLFUNC_LOWERCASE . '(p.name)';
+
+ $concat_column = ( ENANO_DBLAYER == 'MYSQL' ) ?
+ 'CONCAT(\'ns=\',t.namespace,\';pid=\',t.page_id)' :
+ "'ns=' || t.namespace || ';pid=' || t.page_id";
- if ( count($query_phrase['any']) > 0 || count($query_phrase['req']) > 0 )
- {
+ if ( count($query_phrase['any']) > 0 || count($query_phrase['req']) > 0 )
+ {
- $where_any = array();
- foreach ( $query_phrase['any'] as $term )
- {
- $term = escape_string_like($term);
- if ( !$case_sensitive )
- $term = strtolower($term);
- $where_any[] = "( $text_col LIKE '%$term%' OR $name_col LIKE '%$term%' )";
- }
+ $where_any = array();
+ foreach ( $query_phrase['any'] as $term )
+ {
+ $term = escape_string_like($term);
+ if ( !$case_sensitive )
+ $term = strtolower($term);
+ $where_any[] = "( $text_col LIKE '%$term%' OR $name_col LIKE '%$term%' )";
+ }
- $where_any = ( count($where_any) > 0 ) ? implode(" OR\n ", $where_any) : '';
+ $where_any = ( count($where_any) > 0 ) ? implode(" OR\n ", $where_any) : '';
- // Also do required terms, but use AND to ensure that all required terms are included
- $where_req = array();
- foreach ( $query_phrase['req'] as $term )
- {
- $term = escape_string_like($term);
- if ( !$case_sensitive )
- $term = strtolower($term);
- $where_req[] = "( $text_col LIKE '%$term%' OR $name_col LIKE '%$term%' )";
- }
- $and_clause = ( $where_any != '' ) ? 'AND ' : '';
- $where_req = ( count($where_req) > 0 ) ? "{$and_clause}" . implode(" AND\n ", $where_req) : '';
+ // Also do required terms, but use AND to ensure that all required terms are included
+ $where_req = array();
+ foreach ( $query_phrase['req'] as $term )
+ {
+ $term = escape_string_like($term);
+ if ( !$case_sensitive )
+ $term = strtolower($term);
+ $where_req[] = "( $text_col LIKE '%$term%' OR $name_col LIKE '%$term%' )";
+ }
+ $and_clause = ( $where_any != '' ) ? 'AND ' : '';
+ $where_req = ( count($where_req) > 0 ) ? "{$and_clause}" . implode(" AND\n ", $where_req) : '';
- $sql = 'SELECT ' . $concat_column . ' AS id, p.name, t.page_text FROM ' . table_prefix . "page_text AS t\n"
- . " LEFT JOIN " . table_prefix . "pages AS p\n"
- . " ON ( p.urlname = t.page_id AND p.namespace = t.namespace )\n"
- . " WHERE p.visible = 1 AND (\n $where_any\n $where_req\n );";
- if ( !($q = $db->sql_query($sql)) )
- $db->_die('Error is in perform_search(), includes/search.php, query 2. Parsed query dump follows:(indexable) ' . htmlspecialchars(print_r($query, true)) . '(non-indexable) ' . htmlspecialchars(print_r($query_phrase, true)) . '
');
+ $sql = 'SELECT ' . $concat_column . ' AS id, p.name, t.page_text FROM ' . table_prefix . "page_text AS t\n"
+ . " LEFT JOIN " . table_prefix . "pages AS p\n"
+ . " ON ( p.urlname = t.page_id AND p.namespace = t.namespace )\n"
+ . " WHERE p.visible = 1 AND (\n $where_any\n $where_req\n );";
+ if ( !($q = $db->sql_query($sql)) )
+ $db->_die('Error is in perform_search(), includes/search.php, query 2. Parsed query dump follows:(indexable) ' . htmlspecialchars(print_r($query, true)) . '(non-indexable) ' . htmlspecialchars(print_r($query_phrase, true)) . '
');
- if ( $row = $db->fetchrow() )
- {
- do
- {
- $id =& $row['id'];
- $inc = 0.0;
+ if ( $row = $db->fetchrow() )
+ {
+ do
+ {
+ $id =& $row['id'];
+ $inc = 0.0;
- $title = $row['name'];
- $test_func = ( $case_sensitive ) ? 'strstr' : 'stristr';
-
- // Is this search term present in the page's title? If so, give extra points
- $word_list = array_merge($query_phrase['any'], $query_phrase['req']);
- foreach ( $word_list as $word )
- {
- if ( $test_func($title, $word) )
- $inc += 1.5;
- else if ( $test_func($row['page_text'], $word) )
- $inc += 1.0;
- }
-
- // increase points if 2 or more words match a phrase in the title
- for ( $i = 0; $i < count($word_list) - 1; $i++ )
- {
- $phrase = "{$word_list[$i]} {$word_list[$i + 1]}";
- if ( $test_func($title, $phrase) )
- $inc *= 1.25;
- else if ( $test_func($row['page_text'], $phrase) )
- $inc *= 1.125;
- }
-
- if ( isset($scores[$id]) )
- {
- $scores[$id] = $scores[$id] + $inc;
- }
- else
- {
- $scores[$id] = $inc;
- }
- }
- while ( $row = $db->fetchrow() );
- }
- $db->free_result();
- }
+ $title = $row['name'];
+ $test_func = ( $case_sensitive ) ? 'strstr' : 'stristr';
+
+ // Is this search term present in the page's title? If so, give extra points
+ $word_list = array_merge($query_phrase['any'], $query_phrase['req']);
+ foreach ( $word_list as $word )
+ {
+ if ( $test_func($title, $word) )
+ $inc += 1.5;
+ else if ( $test_func($row['page_text'], $word) )
+ $inc += 1.0;
+ }
+
+ // increase points if 2 or more words match a phrase in the title
+ for ( $i = 0; $i < count($word_list) - 1; $i++ )
+ {
+ $phrase = "{$word_list[$i]} {$word_list[$i + 1]}";
+ if ( $test_func($title, $phrase) )
+ $inc *= 1.25;
+ else if ( $test_func($row['page_text'], $phrase) )
+ $inc *= 1.125;
+ }
+
+ if ( isset($scores[$id]) )
+ {
+ $scores[$id] = $scores[$id] + $inc;
+ }
+ else
+ {
+ $scores[$id] = $inc;
+ }
+ }
+ while ( $row = $db->fetchrow() );
+ }
+ $db->free_result();
+ }
- //
- // STAGE 4 - SELECT PAGE TEXT AND ELIMINATE NOTS
- // At this point, we have a complete list of all the possible pages. Now we want to obtain the page text, and within the same query
- // eliminate any terms that shouldn't be in there.
- //
+ //
+ // STAGE 4 - SELECT PAGE TEXT AND ELIMINATE NOTS
+ // At this point, we have a complete list of all the possible pages. Now we want to obtain the page text, and within the same query
+ // eliminate any terms that shouldn't be in there.
+ //
- // Generate master word list for the highlighter
- $word_list = array_values(array_merge($query['any'], $query['req'], $query_phrase['any'], $query_phrase['req']));
+ // Generate master word list for the highlighter
+ $word_list = array_values(array_merge($query['any'], $query['req'], $query_phrase['any'], $query_phrase['req']));
- $text_where = array();
- foreach ( $scores as $page_id => $_ )
- {
- $text_where[] = $db->escape($page_id);
- }
- $text_where = '( ' . $concat_column . ' = \'' . implode('\' OR ' . $concat_column . ' = \'', $text_where) . '\' )';
+ $text_where = array();
+ foreach ( $scores as $page_id => $_ )
+ {
+ $text_where[] = $db->escape($page_id);
+ }
+ $text_where = '( ' . $concat_column . ' = \'' . implode('\' OR ' . $concat_column . ' = \'', $text_where) . '\' )';
- if ( count($query['not']) > 0 )
- $text_where .= ' AND';
+ if ( count($query['not']) > 0 )
+ $text_where .= ' AND';
- $where_not = array();
- foreach ( $query['not'] as $term )
- {
- $term = escape_string_like($term);
- if ( !$case_sensitive )
- $term = strtolower($term);
- $where_not[] = $term;
- }
- $where_not = ( count($where_not) > 0 ) ? "$text_col NOT LIKE '%" . implode("%' AND $text_col NOT LIKE '%", $where_not) . "%'" : '';
+ $where_not = array();
+ foreach ( $query['not'] as $term )
+ {
+ $term = escape_string_like($term);
+ if ( !$case_sensitive )
+ $term = strtolower($term);
+ $where_not[] = $term;
+ }
+ $where_not = ( count($where_not) > 0 ) ? "$text_col NOT LIKE '%" . implode("%' AND $text_col NOT LIKE '%", $where_not) . "%'" : '';
- $sql = 'SELECT ' . $concat_column . ' AS id, t.page_id, t.namespace, CHAR_LENGTH(t.page_text) AS page_length, t.page_text, p.name AS page_name FROM ' . table_prefix . "page_text AS t
- LEFT JOIN " . table_prefix . "pages AS p
- ON ( p.urlname = t.page_id AND p.namespace = t.namespace )
- WHERE p.visible = 1 AND ( $text_where $where_not );";
- if ( !($q = $db->sql_unbuffered_query($sql)) )
- $db->_die('Error is in perform_search(), includes/search.php, query 3');
+ $sql = 'SELECT ' . $concat_column . ' AS id, t.page_id, t.namespace, CHAR_LENGTH(t.page_text) AS page_length, t.page_text, p.name AS page_name FROM ' . table_prefix . "page_text AS t
+ LEFT JOIN " . table_prefix . "pages AS p
+ ON ( p.urlname = t.page_id AND p.namespace = t.namespace )
+ WHERE p.visible = 1 AND ( $text_where $where_not );";
+ if ( !($q = $db->sql_unbuffered_query($sql)) )
+ $db->_die('Error is in perform_search(), includes/search.php, query 3');
- $page_data = array();
- if ( $row = $db->fetchrow() )
- {
- do
- {
- $row['page_text'] = htmlspecialchars($row['page_text']);
- $row['page_name'] = htmlspecialchars($row['page_name']);
+ $page_data = array();
+ if ( $row = $db->fetchrow() )
+ {
+ do
+ {
+ $row['page_text'] = htmlspecialchars($row['page_text']);
+ $row['page_name'] = htmlspecialchars($row['page_name']);
- // Highlight results (this is wonderfully automated)
- $row['page_text'] = highlight_and_clip_search_result($row['page_text'], $word_list, $case_sensitive);
- if ( strlen($row['page_text']) > 250 && !preg_match('/^\.\.\.(.+)\.\.\.$/', $row['page_text']) )
- {
- $row['page_text'] = substr($row['page_text'], 0, 150) . '...';
- }
- $row['page_name'] = highlight_search_result($row['page_name'], $word_list, $case_sensitive);
+ // Highlight results (this is wonderfully automated)
+ $row['page_text'] = highlight_and_clip_search_result($row['page_text'], $word_list, $case_sensitive);
+ if ( strlen($row['page_text']) > 250 && !preg_match('/^\.\.\.(.+)\.\.\.$/', $row['page_text']) )
+ {
+ $row['page_text'] = substr($row['page_text'], 0, 150) . '...';
+ }
+ $row['page_name'] = highlight_search_result($row['page_name'], $word_list, $case_sensitive);
- $page_data[$row['id']] = $row;
- }
- while ( $row = $db->fetchrow() );
- }
- $db->free_result();
-
- //
- // STAGE 5 - SPECIAL PAGE TITLE SEARCH
- // Iterate through $paths->pages and check the titles for search terms. Score accordingly.
- //
+ $page_data[$row['id']] = $row;
+ }
+ while ( $row = $db->fetchrow() );
+ }
+ $db->free_result();
+
+ //
+ // STAGE 5 - SPECIAL PAGE TITLE SEARCH
+ // Iterate through $paths->pages and check the titles for search terms. Score accordingly.
+ //
- foreach ( $paths->pages as $id => $page )
- {
- if ( $page['namespace'] != 'Special' || $page['visible'] == 0 )
- continue;
- $idstring = 'ns=' . $page['namespace'] . ';pid=' . $page['urlname_nons'];
- $any = array_values(array_unique(array_merge($query['any'], $query_phrase['any'])));
- foreach ( $any as $term )
- {
- if ( $case_sensitive )
- {
- if ( strstr($page['name'], $term) || strstr($page['urlname_nons'], $term) )
- {
- ( isset($scores[$idstring]) ) ? $scores[$idstring] = $scores[$idstring] + 1.5 : $scores[$idstring] = 1.5;
- }
- }
- else
- {
- if ( stristr($page['name'], $term) || stristr($page['urlname_nons'], $term) )
- {
- ( isset($scores[$idstring]) ) ? $scores[$idstring] = $scores[$idstring] + 1.5 : $scores[$idstring] = 1.5;
- }
- }
- }
- if ( isset($scores[$idstring]) )
- {
- $page_data[$idstring] = array(
- 'page_name' => highlight_search_result($page['name'], $word_list, $case_sensitive),
- 'page_text' => '',
- 'page_id' => $page['urlname_nons'],
- 'namespace' => $page['namespace'],
- 'score' => $scores[$idstring],
- 'page_length' => 1,
- 'page_note' => '[' . $lang->get('search_result_tag_special') . ']'
- );
- }
- }
-
- //
- // STAGE 6 - SECOND ELIMINATION ROUND
- // Iterate through the list of required terms. If a given page is not found to have the required term, eliminate it
- //
+ foreach ( $paths->pages as $id => $page )
+ {
+ if ( $page['namespace'] != 'Special' || $page['visible'] == 0 )
+ continue;
+ $idstring = 'ns=' . $page['namespace'] . ';pid=' . $page['urlname_nons'];
+ $any = array_values(array_unique(array_merge($query['any'], $query_phrase['any'])));
+ foreach ( $any as $term )
+ {
+ if ( $case_sensitive )
+ {
+ if ( strstr($page['name'], $term) || strstr($page['urlname_nons'], $term) )
+ {
+ ( isset($scores[$idstring]) ) ? $scores[$idstring] = $scores[$idstring] + 1.5 : $scores[$idstring] = 1.5;
+ }
+ }
+ else
+ {
+ if ( stristr($page['name'], $term) || stristr($page['urlname_nons'], $term) )
+ {
+ ( isset($scores[$idstring]) ) ? $scores[$idstring] = $scores[$idstring] + 1.5 : $scores[$idstring] = 1.5;
+ }
+ }
+ }
+ if ( isset($scores[$idstring]) )
+ {
+ $page_data[$idstring] = array(
+ 'page_name' => highlight_search_result($page['name'], $word_list, $case_sensitive),
+ 'page_text' => '',
+ 'page_id' => $page['urlname_nons'],
+ 'namespace' => $page['namespace'],
+ 'score' => $scores[$idstring],
+ 'page_length' => 1,
+ 'page_note' => '[' . $lang->get('search_result_tag_special') . ']'
+ );
+ }
+ }
+
+ //
+ // STAGE 6 - SECOND ELIMINATION ROUND
+ // Iterate through the list of required terms. If a given page is not found to have the required term, eliminate it
+ //
- $required = array_merge($query['req'], $query_phrase['req']);
- foreach ( $required as $term )
- {
- foreach ( $page_data as $id => $page )
- {
- if ( ( $page['namespace'] == 'Special' || ( $page['namespace'] != 'Special' && !strstr($page['page_text'], $term) ) ) && !strstr($page['page_id'], $term) && !strstr($page['page_name'], $term) )
- {
- unset($page_data[$id]);
- }
- }
- }
+ $required = array_merge($query['req'], $query_phrase['req']);
+ foreach ( $required as $term )
+ {
+ foreach ( $page_data as $id => $page )
+ {
+ if ( ( $page['namespace'] == 'Special' || ( $page['namespace'] != 'Special' && !strstr($page['page_text'], $term) ) ) && !strstr($page['page_id'], $term) && !strstr($page['page_name'], $term) )
+ {
+ unset($page_data[$id]);
+ }
+ }
+ }
- // At this point, all of our normal results are in. However, we can also allow plugins to hook into the system and score their own
- // pages and add text, etc. as necessary.
- // Plugins are COMPLETELY responsible for using the search terms and handling Boolean logic properly
+ // At this point, all of our normal results are in. However, we can also allow plugins to hook into the system and score their own
+ // pages and add text, etc. as necessary.
+ // Plugins are COMPLETELY responsible for using the search terms and handling Boolean logic properly
- inject_custom_search_results($query, $query_phrase, $scores, $page_data, $case_sensitive, $word_list);
-
- $code = $plugins->setHook('search_global_inner');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
+ inject_custom_search_results($query, $query_phrase, $scores, $page_data, $case_sensitive, $word_list);
+
+ $code = $plugins->setHook('search_global_inner');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
- // a marvelous debugging aid :-)
- // die('' . htmlspecialchars(print_r($page_data, true)) . '
');
+ // a marvelous debugging aid :-)
+ // die('' . htmlspecialchars(print_r($page_data, true)) . '
');
- //
- // STAGE 7 - HIGHLIGHT, TRIM, AND SCORE RESULTS
- // We now have the complete results of the search. We need to trim text down to show only portions of the page containing search
- // terms, highlight any search terms within the page, and sort the final results array in descending order of score.
- //
+ //
+ // STAGE 7 - HIGHLIGHT, TRIM, AND SCORE RESULTS
+ // We now have the complete results of the search. We need to trim text down to show only portions of the page containing search
+ // terms, highlight any search terms within the page, and sort the final results array in descending order of score.
+ //
- // Sort scores array
- arsort($scores);
+ // Sort scores array
+ arsort($scores);
- // Divisor for calculating relevance scores
- $divisor = ( count($query['any']) + count($query_phrase['any']) + count($query['req']) + count($query['not']) ) * 1.5;
- $divisor = max($divisor, max($scores));
-
- foreach ( $scores as $page_id => $score )
- {
- if ( !isset($page_data[$page_id]) )
- // It's possible that $scores contains a score for a page that was later eliminated because it contained a disallowed term
- continue;
+ // Divisor for calculating relevance scores
+ $divisor = ( count($query['any']) + count($query_phrase['any']) + count($query['req']) + count($query['not']) ) * 1.5;
+ $divisor = max($divisor, max($scores));
+
+ foreach ( $scores as $page_id => $score )
+ {
+ if ( !isset($page_data[$page_id]) )
+ // It's possible that $scores contains a score for a page that was later eliminated because it contained a disallowed term
+ continue;
- // Make a copy of the datum, then delete the original (it frees up a LOT of RAM)
- $datum = $page_data[$page_id];
- unset($page_data[$page_id]);
+ // Make a copy of the datum, then delete the original (it frees up a LOT of RAM)
+ $datum = $page_data[$page_id];
+ unset($page_data[$page_id]);
- // This is an internal value used for sorting - it's no longer needed.
- unset($datum['id']);
+ // This is an internal value used for sorting - it's no longer needed.
+ unset($datum['id']);
- // Calculate score
- // if ( $score > $divisor )
- // $score = $divisor;
- $datum['score'] = round($score / $divisor, 2) * 100;
-
- // Highlight the URL
- $datum['url_highlight'] = makeUrlComplete($datum['namespace'], $datum['page_id']);
- $datum['url_highlight'] = preg_replace('/\?.+$/', '', $datum['url_highlight']);
- $datum['url_highlight'] = highlight_search_result($datum['url_highlight'], $word_list, $case_sensitive);
+ // Calculate score
+ // if ( $score > $divisor )
+ // $score = $divisor;
+ $datum['score'] = round($score / $divisor, 2) * 100;
+
+ // Highlight the URL
+ $datum['url_highlight'] = makeUrlComplete($datum['namespace'], $datum['page_id']);
+ $datum['url_highlight'] = preg_replace('/\?.+$/', '', $datum['url_highlight']);
+ $datum['url_highlight'] = highlight_search_result($datum['url_highlight'], $word_list, $case_sensitive);
- // Store it in our until-now-unused results array
- $results[] = $datum;
- }
+ // Store it in our until-now-unused results array
+ $results[] = $datum;
+ }
- // Our work here is done. :-D
- return $results;
+ // Our work here is done. :-D
+ return $results;
}
/**
@@ -594,166 +594,166 @@
function parse_search_query($query, &$warnings)
{
- global $lang;
-
- $stopwords = get_stopwords();
- $ret = array(
- 'any' => array(),
- 'req' => array(),
- 'not' => array()
- );
- $warnings = array();
- $terms = array();
- $in_quote = false;
- $start_term = 0;
- $just_finished = false;
- for ( $i = 0; $i < strlen($query); $i++ )
- {
- $chr = $query{$i};
- $prev = ( $i > 0 ) ? $query{ $i - 1 } : '';
- $next = ( ( $i + 1 ) < strlen($query) ) ? $query{ $i + 1 } : '';
+ global $lang;
+
+ $stopwords = get_stopwords();
+ $ret = array(
+ 'any' => array(),
+ 'req' => array(),
+ 'not' => array()
+ );
+ $warnings = array();
+ $terms = array();
+ $in_quote = false;
+ $start_term = 0;
+ $just_finished = false;
+ for ( $i = 0; $i < strlen($query); $i++ )
+ {
+ $chr = $query{$i};
+ $prev = ( $i > 0 ) ? $query{ $i - 1 } : '';
+ $next = ( ( $i + 1 ) < strlen($query) ) ? $query{ $i + 1 } : '';
- if ( ( $chr == ' ' && !$in_quote ) || ( $i + 1 == strlen ( $query ) ) )
- {
- $len = ( $next == '' ) ? $i + 1 : $i - $start_term;
- $word = substr ( $query, $start_term, $len );
- $terms[] = $word;
- $start_term = $i + 1;
- }
+ if ( ( $chr == ' ' && !$in_quote ) || ( $i + 1 == strlen ( $query ) ) )
+ {
+ $len = ( $next == '' ) ? $i + 1 : $i - $start_term;
+ $word = substr ( $query, $start_term, $len );
+ $terms[] = $word;
+ $start_term = $i + 1;
+ }
- elseif ( $chr == '"' && $in_quote && $prev != '\\' )
- {
- $word = substr ( $query, $start_term, $i - $start_term + 1 );
- $start_pos = ( $next == ' ' ) ? $i + 2 : $i + 1;
- $in_quote = false;
- }
+ elseif ( $chr == '"' && $in_quote && $prev != '\\' )
+ {
+ $word = substr ( $query, $start_term, $i - $start_term + 1 );
+ $start_pos = ( $next == ' ' ) ? $i + 2 : $i + 1;
+ $in_quote = false;
+ }
- elseif ( $chr == '"' && !$in_quote )
- {
- $in_quote = true;
- $start_pos = $i;
- }
+ elseif ( $chr == '"' && !$in_quote )
+ {
+ $in_quote = true;
+ $start_pos = $i;
+ }
- }
+ }
- $ticker = 0;
+ $ticker = 0;
- foreach ( $terms as $element => $__unused )
- {
- $atom =& $terms[$element];
+ foreach ( $terms as $element => $__unused )
+ {
+ $atom =& $terms[$element];
- $ticker++;
+ $ticker++;
- if ( $ticker == 20 )
- {
- $warnings[] = $lang->get('search_err_query_too_many_terms');
- break;
- }
+ if ( $ticker == 20 )
+ {
+ $warnings[] = $lang->get('search_err_query_too_many_terms');
+ break;
+ }
- if ( substr ( $atom, 0, 2 ) == '+"' && substr ( $atom, ( strlen ( $atom ) - 1 ), 1 ) == '"' )
- {
- $word = substr ( $atom, 2, ( strlen( $atom ) - 3 ) );
- if ( strlen ( $word ) < 2 || in_array($word, $stopwords) )
- {
- $warnings[] = $lang->get('search_err_query_has_stopwords');
- $ticker--;
- continue;
- }
- if(in_array($word, $ret['req']))
- {
- $warnings[] = $lang->get('search_err_query_dup_terms');
- $ticker--;
- continue;
- }
- $ret['req'][] = $word;
- }
- elseif ( substr ( $atom, 0, 2 ) == '-"' && substr ( $atom, ( strlen ( $atom ) - 1 ), 1 ) == '"' )
- {
- $word = substr ( $atom, 2, ( strlen( $atom ) - 3 ) );
- if ( strlen ( $word ) < 4 )
- {
- $warnings[] = $lang->get('search_err_query_term_too_short');
- $ticker--;
- continue;
- }
- if(in_array($word, $ret['not']))
- {
- $warnings[] = $lang->get('search_err_query_dup_terms');
- $ticker--;
- continue;
- }
- $ret['not'][] = $word;
- }
- elseif ( substr ( $atom, 0, 1 ) == '+' )
- {
- $word = substr ( $atom, 1 );
- if ( strlen ( $word ) < 2 || in_array($word, $stopwords) )
- {
- $warnings[] = $lang->get('search_err_query_has_stopwords');
- $ticker--;
- continue;
- }
- if(in_array($word, $ret['req']))
- {
- $warnings[] = $lang->get('search_err_query_dup_terms');
- $ticker--;
- continue;
- }
- $ret['req'][] = $word;
- }
- elseif ( substr ( $atom, 0, 1 ) == '-' )
- {
- $word = substr ( $atom, 1 );
- if ( strlen ( $word ) < 2 || in_array($word, $stopwords) )
- {
- $warnings[] = $lang->get('search_err_query_has_stopwords');
- $ticker--;
- continue;
- }
- if(in_array($word, $ret['not']))
- {
- $warnings[] = $lang->get('search_err_query_dup_terms');
- $ticker--;
- continue;
- }
- $ret['not'][] = $word;
- }
- elseif ( substr ( $atom, 0, 1 ) == '"' && substr ( $atom, ( strlen($atom) - 1 ), 1 ) == '"' )
- {
- $word = substr ( $atom, 1, ( strlen ( $atom ) - 2 ) );
- if ( strlen ( $word ) < 2 || in_array($word, $stopwords) )
- {
- $warnings[] = $lang->get('search_err_query_has_stopwords');
- $ticker--;
- continue;
- }
- if(in_array($word, $ret['any']))
- {
- $warnings[] = $lang->get('search_err_query_dup_terms');
- $ticker--;
- continue;
- }
- $ret['any'][] = $word;
- }
- else
- {
- $word = $atom;
- if ( strlen ( $word ) < 2 || in_array($word, $stopwords) )
- {
- $warnings[] = $lang->get('search_err_query_has_stopwords');
- $ticker--;
- continue;
- }
- if(in_array($word, $ret['any']))
- {
- $warnings[] = $lang->get('search_err_query_dup_terms');
- $ticker--;
- continue;
- }
- $ret['any'][] = $word;
- }
- }
- return $ret;
+ if ( substr ( $atom, 0, 2 ) == '+"' && substr ( $atom, ( strlen ( $atom ) - 1 ), 1 ) == '"' )
+ {
+ $word = substr ( $atom, 2, ( strlen( $atom ) - 3 ) );
+ if ( strlen ( $word ) < 2 || in_array($word, $stopwords) )
+ {
+ $warnings[] = $lang->get('search_err_query_has_stopwords');
+ $ticker--;
+ continue;
+ }
+ if(in_array($word, $ret['req']))
+ {
+ $warnings[] = $lang->get('search_err_query_dup_terms');
+ $ticker--;
+ continue;
+ }
+ $ret['req'][] = $word;
+ }
+ elseif ( substr ( $atom, 0, 2 ) == '-"' && substr ( $atom, ( strlen ( $atom ) - 1 ), 1 ) == '"' )
+ {
+ $word = substr ( $atom, 2, ( strlen( $atom ) - 3 ) );
+ if ( strlen ( $word ) < 4 )
+ {
+ $warnings[] = $lang->get('search_err_query_term_too_short');
+ $ticker--;
+ continue;
+ }
+ if(in_array($word, $ret['not']))
+ {
+ $warnings[] = $lang->get('search_err_query_dup_terms');
+ $ticker--;
+ continue;
+ }
+ $ret['not'][] = $word;
+ }
+ elseif ( substr ( $atom, 0, 1 ) == '+' )
+ {
+ $word = substr ( $atom, 1 );
+ if ( strlen ( $word ) < 2 || in_array($word, $stopwords) )
+ {
+ $warnings[] = $lang->get('search_err_query_has_stopwords');
+ $ticker--;
+ continue;
+ }
+ if(in_array($word, $ret['req']))
+ {
+ $warnings[] = $lang->get('search_err_query_dup_terms');
+ $ticker--;
+ continue;
+ }
+ $ret['req'][] = $word;
+ }
+ elseif ( substr ( $atom, 0, 1 ) == '-' )
+ {
+ $word = substr ( $atom, 1 );
+ if ( strlen ( $word ) < 2 || in_array($word, $stopwords) )
+ {
+ $warnings[] = $lang->get('search_err_query_has_stopwords');
+ $ticker--;
+ continue;
+ }
+ if(in_array($word, $ret['not']))
+ {
+ $warnings[] = $lang->get('search_err_query_dup_terms');
+ $ticker--;
+ continue;
+ }
+ $ret['not'][] = $word;
+ }
+ elseif ( substr ( $atom, 0, 1 ) == '"' && substr ( $atom, ( strlen($atom) - 1 ), 1 ) == '"' )
+ {
+ $word = substr ( $atom, 1, ( strlen ( $atom ) - 2 ) );
+ if ( strlen ( $word ) < 2 || in_array($word, $stopwords) )
+ {
+ $warnings[] = $lang->get('search_err_query_has_stopwords');
+ $ticker--;
+ continue;
+ }
+ if(in_array($word, $ret['any']))
+ {
+ $warnings[] = $lang->get('search_err_query_dup_terms');
+ $ticker--;
+ continue;
+ }
+ $ret['any'][] = $word;
+ }
+ else
+ {
+ $word = $atom;
+ if ( strlen ( $word ) < 2 || in_array($word, $stopwords) )
+ {
+ $warnings[] = $lang->get('search_err_query_has_stopwords');
+ $ticker--;
+ continue;
+ }
+ if(in_array($word, $ret['any']))
+ {
+ $warnings[] = $lang->get('search_err_query_dup_terms');
+ $ticker--;
+ continue;
+ }
+ $ret['any'][] = $word;
+ }
+ }
+ return $ret;
}
/**
@@ -764,10 +764,10 @@
function escape_string_like($string)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
- $string = $db->escape($string);
- $string = str_replace(array('%', '_'), array('\%', '\_'), $string);
- return $string;
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $string = $db->escape($string);
+ $string = str_replace(array('%', '_'), array('\%', '\_'), $string);
+ return $string;
}
/**
@@ -780,18 +780,18 @@
function highlight_search_result($pt, $words, $case_sensitive = false)
{
- $words2 = array();
- for ( $i = 0; $i < sizeof($words); $i++)
- {
- if(!empty($words[$i]))
- $words2[] = preg_quote($words[$i]);
- }
+ $words2 = array();
+ for ( $i = 0; $i < sizeof($words); $i++)
+ {
+ if(!empty($words[$i]))
+ $words2[] = preg_quote($words[$i]);
+ }
- $flag = ( $case_sensitive ) ? '' : 'i';
- $regex = '/(' . implode('|', str_replace('/', '\\/', $words2)) . ')/' . $flag;
- $pt = preg_replace($regex, '\\1 ', $pt);
+ $flag = ( $case_sensitive ) ? '' : 'i';
+ $regex = '/(' . implode('|', str_replace('/', '\\/', $words2)) . ')/' . $flag;
+ $pt = preg_replace($regex, '\\1 ', $pt);
- return $pt;
+ return $pt;
}
/**
@@ -805,95 +805,95 @@
function highlight_and_clip_search_result($pt, $words, $case_sensitive = false)
{
- $cut_off = false;
+ $cut_off = false;
- $space_chars = Array("\t", "\n", "\r", " ");
+ $space_chars = Array("\t", "\n", "\r", " ");
- $pt = highlight_search_result($pt, $words, $case_sensitive);
+ $pt = highlight_search_result($pt, $words, $case_sensitive);
- foreach ( $words as $word )
- {
- // Boldface searched words
- $ptlen = strlen($pt);
- for ( $i = 0; $i < $ptlen; $i++ )
- {
- $len = strlen($word);
- if ( strtolower(substr($pt, $i, $len)) == strtolower($word) )
- {
- $chunk1 = substr($pt, 0, $i);
- $chunk2 = substr($pt, $i, $len);
- $chunk3 = substr($pt, ( $i + $len ));
- $pt = $chunk1 . $chunk2 . $chunk3;
- $ptlen = strlen($pt);
- // Cut off text to 150 chars or so
- if ( !$cut_off )
- {
- $cut_off = true;
- if ( $i - 75 > 0 )
- {
- // Navigate backwards until a space character is found
- $chunk = substr($pt, 0, ( $i - 75 ));
- $final_chunk = $chunk;
- for ( $j = strlen($chunk) - 1; $j > 0; $j = $j - 1 )
- {
- if ( in_array($chunk{$j}, $space_chars) )
- {
- $final_chunk = substr($chunk, $j + 1);
- break;
- }
- }
- $mid_chunk = substr($pt, ( $i - 75 ), 75);
+ foreach ( $words as $word )
+ {
+ // Boldface searched words
+ $ptlen = strlen($pt);
+ for ( $i = 0; $i < $ptlen; $i++ )
+ {
+ $len = strlen($word);
+ if ( strtolower(substr($pt, $i, $len)) == strtolower($word) )
+ {
+ $chunk1 = substr($pt, 0, $i);
+ $chunk2 = substr($pt, $i, $len);
+ $chunk3 = substr($pt, ( $i + $len ));
+ $pt = $chunk1 . $chunk2 . $chunk3;
+ $ptlen = strlen($pt);
+ // Cut off text to 150 chars or so
+ if ( !$cut_off )
+ {
+ $cut_off = true;
+ if ( $i - 75 > 0 )
+ {
+ // Navigate backwards until a space character is found
+ $chunk = substr($pt, 0, ( $i - 75 ));
+ $final_chunk = $chunk;
+ for ( $j = strlen($chunk) - 1; $j > 0; $j = $j - 1 )
+ {
+ if ( in_array($chunk{$j}, $space_chars) )
+ {
+ $final_chunk = substr($chunk, $j + 1);
+ break;
+ }
+ }
+ $mid_chunk = substr($pt, ( $i - 75 ), 75);
- $clipped = '...' . $final_chunk . $mid_chunk . $chunk2;
+ $clipped = '...' . $final_chunk . $mid_chunk . $chunk2;
- $chunk = substr($pt, ( $i + strlen($chunk2) + 75 ));
- $final_chunk = $chunk;
- for ( $j = 0; $j < strlen($chunk); $j++ )
- {
- if ( in_array($chunk{$j}, $space_chars) )
- {
- $final_chunk = substr($chunk, 0, $j);
- break;
- }
- }
+ $chunk = substr($pt, ( $i + strlen($chunk2) + 75 ));
+ $final_chunk = $chunk;
+ for ( $j = 0; $j < strlen($chunk); $j++ )
+ {
+ if ( in_array($chunk{$j}, $space_chars) )
+ {
+ $final_chunk = substr($chunk, 0, $j);
+ break;
+ }
+ }
- $end_chunk = substr($pt, ( $i + strlen($chunk2) ), 75 );
+ $end_chunk = substr($pt, ( $i + strlen($chunk2) ), 75 );
- $clipped .= $end_chunk . $final_chunk . '...';
+ $clipped .= $end_chunk . $final_chunk . '...';
- $pt = $clipped;
- }
- else if ( strlen($pt) > 200 )
- {
- $mid_chunk = substr($pt, ( $i - 75 ), 75);
+ $pt = $clipped;
+ }
+ else if ( strlen($pt) > 200 )
+ {
+ $mid_chunk = substr($pt, ( $i - 75 ), 75);
- $clipped = $chunk1 . $chunk2;
+ $clipped = $chunk1 . $chunk2;
- $chunk = substr($pt, ( $i + strlen($chunk2) + 75 ));
- $final_chunk = $chunk;
- for ( $j = 0; $j < strlen($chunk); $j++ )
- {
- if ( in_array($chunk{$j}, $space_chars) )
- {
- $final_chunk = substr($chunk, 0, $j);
- break;
- }
- }
+ $chunk = substr($pt, ( $i + strlen($chunk2) + 75 ));
+ $final_chunk = $chunk;
+ for ( $j = 0; $j < strlen($chunk); $j++ )
+ {
+ if ( in_array($chunk{$j}, $space_chars) )
+ {
+ $final_chunk = substr($chunk, 0, $j);
+ break;
+ }
+ }
- $end_chunk = substr($pt, ( $i + strlen($chunk2) ), 75 );
+ $end_chunk = substr($pt, ( $i + strlen($chunk2) ), 75 );
- $clipped .= $end_chunk . $final_chunk . '...';
+ $clipped .= $end_chunk . $final_chunk . '...';
- $pt = $clipped;
+ $pt = $clipped;
- }
- break 2;
- }
- }
- }
- $cut_off = false;
- }
- return $pt;
+ }
+ break 2;
+ }
+ }
+ }
+ $cut_off = false;
+ }
+ return $pt;
}
/**
@@ -903,15 +903,15 @@
function get_stopwords()
{
- static $stopwords;
- if ( is_array($stopwords) )
- return $stopwords;
+ static $stopwords;
+ if ( is_array($stopwords) )
+ return $stopwords;
- $stopwords = array('I', 'a', 'about', 'an', 'are', 'as', 'at', 'be', 'by', 'com', 'de', 'en', 'for', 'from', 'how', 'in', 'is', 'it',
- 'la', 'of', 'on', 'or', 'that', 'the', 'this', 'to', 'was', 'what', 'when', 'where', 'who', 'will', 'with', 'and',
- 'the');
-
- return $stopwords;
+ $stopwords = array('I', 'a', 'about', 'an', 'are', 'as', 'at', 'be', 'by', 'com', 'de', 'en', 'for', 'from', 'how', 'in', 'is', 'it',
+ 'la', 'of', 'on', 'or', 'that', 'the', 'this', 'to', 'was', 'what', 'when', 'where', 'who', 'will', 'with', 'and',
+ 'the');
+
+ return $stopwords;
}
/**
@@ -920,182 +920,182 @@
function inject_custom_search_results(&$query, &$query_phrase, &$scores, &$page_data, &$case_sensitive, &$word_list)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- global $search_handlers;
-
- // global functions
- $terms = array(
- 'any' => array_merge($query['any'], $query_phrase['any']),
- 'req' => array_merge($query['req'], $query_phrase['req']),
- 'not' => $query['not']
- );
-
- foreach ( $search_handlers as &$options )
- {
- $where = array('any' => array(), 'req' => array(), 'not' => array());
- $where_any =& $where['any'];
- $where_req =& $where['req'];
- $where_not =& $where['not'];
- $title_col = ( $case_sensitive ) ? $options['titlecolumn'] : ENANO_SQLFUNC_LOWERCASE . '(' . $options['titlecolumn'] . ')';
- if ( isset($options['datacolumn']) )
- $desc_col = ( $case_sensitive ) ? $options['datacolumn'] : ENANO_SQLFUNC_LOWERCASE . '(' . $options['datacolumn'] . ')';
- else
- $desc_col = "''";
- foreach ( $terms['any'] as $term )
- {
- $term = escape_string_like($term);
- if ( !$case_sensitive )
- $term = strtolower($term);
- $where_any[] = "( $title_col LIKE '%{$term}%' OR $desc_col LIKE '%{$term}%' )";
- }
- foreach ( $terms['req'] as $term )
- {
- $term = escape_string_like($term);
- if ( !$case_sensitive )
- $term = strtolower($term);
- $where_req[] = "( $title_col LIKE '%{$term}%' OR $desc_col LIKE '%{$term}%' )";
- }
- foreach ( $terms['not'] as $term )
- {
- $term = escape_string_like($term);
- if ( !$case_sensitive )
- $term = strtolower($term);
- $where_not[] = "$title_col NOT LIKE '%{$term}%' AND $desc_col NOT LIKE '%{$term}%'";
- }
- if ( empty($where_any) )
- unset($where_any, $where['any']);
- if ( empty($where_req) )
- unset($where_req, $where['req']);
- if ( empty($where_not) )
- unset($where_not, $where['not']);
-
- $where_any = '(' . implode(' OR ', $where_any) . '' . ( isset($where['req']) || isset($where['not']) ? ' OR 1 = 1' : '' ) . ')';
-
- if ( isset($where_req) )
- $where_req = implode(' AND ', $where_req);
- if ( isset($where_not) )
- $where_not = implode( 'AND ', $where_not);
-
- $where = implode(' AND ', $where);
-
- $columns = $options['titlecolumn'];
- if ( isset($options['datacolumn']) )
- $columns .= ", {$options['datacolumn']}";
- if ( isset($options['additionalcolumns']) )
- $columns .= ', ' . implode(', ', $options['additionalcolumns']);
-
- $additionalwhere = ( isset($options['additionalwhere']) ) ? $options['additionalwhere'] : '';
-
- $sql = "SELECT $columns FROM " . table_prefix . "{$options['table']} WHERE ( $where ) $additionalwhere;";
-
- if ( !($q = $db->sql_unbuffered_query($sql)) )
- {
- $db->_die('Automatically generated search query');
- }
-
- if ( $row = $db->fetchrow() )
- {
- do
- {
- $parser = $template->makeParserText($options['uniqueid']);
- $parser->assign_vars($row);
- $idstring = $parser->run();
-
- // Score this result
- foreach ( $word_list as $term )
- {
- if ( $case_sensitive )
- {
- if ( strstr($row[$options['titlecolumn']], $term) )
- {
- ( isset($scores[$idstring]) ) ? $scores[$idstring] += 1.5 : $scores[$idstring] = 1.5;
- }
- else if ( isset($options['datacolumn']) && strstr($row[$options['datacolumn']], $term) )
- {
- ( isset($scores[$idstring]) ) ? $scores[$idstring]++ : $scores[$idstring] = 1;
- }
- }
- else
- {
- if ( stristr($row[$options['titlecolumn']], $term) )
- {
- ( isset($scores[$idstring]) ) ? $scores[$idstring] += 1.5 : $scores[$idstring] = 1.5;
- }
- else if ( isset($options['datacolumn']) && stristr($row[$options['datacolumn']], $term) )
- {
- ( isset($scores[$idstring]) ) ? $scores[$idstring]++ : $scores[$idstring] = 1;
- }
- }
- }
- // Generate text...
- $text = '';
- if ( isset($options['datacolumn']) && !isset($options['formatcallback']) )
- {
- $text = highlight_and_clip_search_result(htmlspecialchars($row[$options['datacolumn']]), $word_list);
- }
- else if ( isset($options['formatcallback']) )
- {
- if ( is_callable($options['formatcallback']) )
- {
- $text = call_user_func($options['formatcallback'], $row, $word_list);
- }
- else
- {
- $parser = $template->makeParserText($options['formatcallback']);
- $parser->assign_vars($row);
- $text = $parser->run();
- }
- }
-
- // Inject result
-
- if ( isset($scores[$idstring]) )
- {
- $parser = $template->makeParserText($options['linkformat']['page_id']);
- $parser->assign_vars($row);
- $page_id = $parser->run();
-
- $parser = $template->makeParserText($options['linkformat']['namespace']);
- $parser->assign_vars($row);
- $namespace = $parser->run();
-
- $page_data[$idstring] = array(
- 'page_name' => highlight_search_result(htmlspecialchars($row[$options['titlecolumn']]), $word_list),
- 'page_text' => $text,
- 'score' => $scores[$idstring],
- 'page_id' => $page_id,
- 'namespace' => $namespace,
- );
-
- // Any additional flags that need to be added to the result?
- // The small usually-bracketed text to the left of the title
- if ( isset($options['resultnote']) )
- {
- $page_data[$idstring]['page_note'] = $options['resultnote'];
- }
- // Should we include the length?
- if ( isset($options['datacolumn']) )
- {
- $page_data[$idstring]['page_length'] = strlen($row[$options['datacolumn']]);
- }
- else
- {
- $page_data[$idstring]['page_length'] = 0;
- $page_data[$idstring]['zero_length'] = true;
- }
- // Anything to append to result links?
- if ( isset($options['linkformat']['append']) )
- {
- $page_data[$idstring]['url_append'] = $options['linkformat']['append'];
- }
- }
- }
- while ( $row = $db->fetchrow($q) );
- $db->free_result($q);
- }
- }
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ global $search_handlers;
+
+ // global functions
+ $terms = array(
+ 'any' => array_merge($query['any'], $query_phrase['any']),
+ 'req' => array_merge($query['req'], $query_phrase['req']),
+ 'not' => $query['not']
+ );
+
+ foreach ( $search_handlers as &$options )
+ {
+ $where = array('any' => array(), 'req' => array(), 'not' => array());
+ $where_any =& $where['any'];
+ $where_req =& $where['req'];
+ $where_not =& $where['not'];
+ $title_col = ( $case_sensitive ) ? $options['titlecolumn'] : ENANO_SQLFUNC_LOWERCASE . '(' . $options['titlecolumn'] . ')';
+ if ( isset($options['datacolumn']) )
+ $desc_col = ( $case_sensitive ) ? $options['datacolumn'] : ENANO_SQLFUNC_LOWERCASE . '(' . $options['datacolumn'] . ')';
+ else
+ $desc_col = "''";
+ foreach ( $terms['any'] as $term )
+ {
+ $term = escape_string_like($term);
+ if ( !$case_sensitive )
+ $term = strtolower($term);
+ $where_any[] = "( $title_col LIKE '%{$term}%' OR $desc_col LIKE '%{$term}%' )";
+ }
+ foreach ( $terms['req'] as $term )
+ {
+ $term = escape_string_like($term);
+ if ( !$case_sensitive )
+ $term = strtolower($term);
+ $where_req[] = "( $title_col LIKE '%{$term}%' OR $desc_col LIKE '%{$term}%' )";
+ }
+ foreach ( $terms['not'] as $term )
+ {
+ $term = escape_string_like($term);
+ if ( !$case_sensitive )
+ $term = strtolower($term);
+ $where_not[] = "$title_col NOT LIKE '%{$term}%' AND $desc_col NOT LIKE '%{$term}%'";
+ }
+ if ( empty($where_any) )
+ unset($where_any, $where['any']);
+ if ( empty($where_req) )
+ unset($where_req, $where['req']);
+ if ( empty($where_not) )
+ unset($where_not, $where['not']);
+
+ $where_any = '(' . implode(' OR ', $where_any) . '' . ( isset($where['req']) || isset($where['not']) ? ' OR 1 = 1' : '' ) . ')';
+
+ if ( isset($where_req) )
+ $where_req = implode(' AND ', $where_req);
+ if ( isset($where_not) )
+ $where_not = implode( 'AND ', $where_not);
+
+ $where = implode(' AND ', $where);
+
+ $columns = $options['titlecolumn'];
+ if ( isset($options['datacolumn']) )
+ $columns .= ", {$options['datacolumn']}";
+ if ( isset($options['additionalcolumns']) )
+ $columns .= ', ' . implode(', ', $options['additionalcolumns']);
+
+ $additionalwhere = ( isset($options['additionalwhere']) ) ? $options['additionalwhere'] : '';
+
+ $sql = "SELECT $columns FROM " . table_prefix . "{$options['table']} WHERE ( $where ) $additionalwhere;";
+
+ if ( !($q = $db->sql_unbuffered_query($sql)) )
+ {
+ $db->_die('Automatically generated search query');
+ }
+
+ if ( $row = $db->fetchrow() )
+ {
+ do
+ {
+ $parser = $template->makeParserText($options['uniqueid']);
+ $parser->assign_vars($row);
+ $idstring = $parser->run();
+
+ // Score this result
+ foreach ( $word_list as $term )
+ {
+ if ( $case_sensitive )
+ {
+ if ( strstr($row[$options['titlecolumn']], $term) )
+ {
+ ( isset($scores[$idstring]) ) ? $scores[$idstring] += 1.5 : $scores[$idstring] = 1.5;
+ }
+ else if ( isset($options['datacolumn']) && strstr($row[$options['datacolumn']], $term) )
+ {
+ ( isset($scores[$idstring]) ) ? $scores[$idstring]++ : $scores[$idstring] = 1;
+ }
+ }
+ else
+ {
+ if ( stristr($row[$options['titlecolumn']], $term) )
+ {
+ ( isset($scores[$idstring]) ) ? $scores[$idstring] += 1.5 : $scores[$idstring] = 1.5;
+ }
+ else if ( isset($options['datacolumn']) && stristr($row[$options['datacolumn']], $term) )
+ {
+ ( isset($scores[$idstring]) ) ? $scores[$idstring]++ : $scores[$idstring] = 1;
+ }
+ }
+ }
+ // Generate text...
+ $text = '';
+ if ( isset($options['datacolumn']) && !isset($options['formatcallback']) )
+ {
+ $text = highlight_and_clip_search_result(htmlspecialchars($row[$options['datacolumn']]), $word_list);
+ }
+ else if ( isset($options['formatcallback']) )
+ {
+ if ( is_callable($options['formatcallback']) )
+ {
+ $text = call_user_func($options['formatcallback'], $row, $word_list);
+ }
+ else
+ {
+ $parser = $template->makeParserText($options['formatcallback']);
+ $parser->assign_vars($row);
+ $text = $parser->run();
+ }
+ }
+
+ // Inject result
+
+ if ( isset($scores[$idstring]) )
+ {
+ $parser = $template->makeParserText($options['linkformat']['page_id']);
+ $parser->assign_vars($row);
+ $page_id = $parser->run();
+
+ $parser = $template->makeParserText($options['linkformat']['namespace']);
+ $parser->assign_vars($row);
+ $namespace = $parser->run();
+
+ $page_data[$idstring] = array(
+ 'page_name' => highlight_search_result(htmlspecialchars($row[$options['titlecolumn']]), $word_list),
+ 'page_text' => $text,
+ 'score' => $scores[$idstring],
+ 'page_id' => $page_id,
+ 'namespace' => $namespace,
+ );
+
+ // Any additional flags that need to be added to the result?
+ // The small usually-bracketed text to the left of the title
+ if ( isset($options['resultnote']) )
+ {
+ $page_data[$idstring]['page_note'] = $options['resultnote'];
+ }
+ // Should we include the length?
+ if ( isset($options['datacolumn']) )
+ {
+ $page_data[$idstring]['page_length'] = strlen($row[$options['datacolumn']]);
+ }
+ else
+ {
+ $page_data[$idstring]['page_length'] = 0;
+ $page_data[$idstring]['zero_length'] = true;
+ }
+ // Anything to append to result links?
+ if ( isset($options['linkformat']['append']) )
+ {
+ $page_data[$idstring]['url_append'] = $options['linkformat']['append'];
+ }
+ }
+ }
+ while ( $row = $db->fetchrow($q) );
+ $db->free_result($q);
+ }
+ }
}
?>
diff -r de56132c008d -r bdac73ed481e includes/sessions.php
--- a/includes/sessions.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/sessions.php Sun Mar 28 23:10:46 2010 -0400
@@ -21,4132 +21,4132 @@
*/
class sessionManager {
-
- # Variables
-
- /**
- * Whether we're logged in or not
- * @var bool
- */
-
- var $user_logged_in = false;
-
- /**
- * Our current low-privilege session key
- * @var string
- */
-
- var $sid;
-
- /**
- * Username of currently logged-in user, or IP address if not logged in
- * @var string
- */
-
- var $username;
-
- /**
- * User ID of currently logged-in user, or 1 if not logged in
- * @var int
- */
-
- var $user_id = 1;
-
- /**
- * Real name of currently logged-in user, or blank if not logged in
- * @var string
- */
-
- var $real_name;
-
- /**
- * E-mail address of currently logged-in user, or blank if not logged in
- * @var string
- */
-
- var $email;
-
- /**
- * List of "extra" user information fields (IM handles, etc.)
- * @var array (associative)
- */
-
- var $user_extra;
-
- /**
- * User level of current user
- * USER_LEVEL_GUEST: guest
- * USER_LEVEL_MEMBER: regular user
- * USER_LEVEL_CHPREF: default - pseudo-level that allows changing password and e-mail address (requires re-authentication)
- * USER_LEVEL_MOD: moderator
- * USER_LEVEL_ADMIN: administrator
- * @var int
- */
-
- var $user_level;
-
- /**
- * High-privilege session key
- * @var string or false if not running on high-level authentication
- */
-
- var $sid_super;
-
- /**
- * The user's theme preference, defaults to $template->default_theme
- * @var string
- */
-
- var $theme;
-
- /**
- * The user's style preference, or style auto-detected based on theme if not logged in
- * @var string
- */
-
- var $style;
-
- /**
- * Signature of current user - appended to comments, etc.
- * @var string
- */
-
- var $signature;
-
- /**
- * UNIX timestamp of when we were registered, or 0 if not logged in
- * @var int
- */
-
- var $reg_time;
-
- /**
- * The number of unread private messages this user has.
- * @var int
- */
-
- var $unread_pms = 0;
-
- /**
- * AES key used to encrypt passwords and session key info.
- * @var string
- * @access private
- */
-
- protected $private_key;
-
- /**
- * Regex that defines a valid username, minus the ^ and $, these are added later
- * @var string
- */
-
- var $valid_username = '([^<>&\?\'"%\n\r\t\a\/]+)';
-
- /**
- * The current user's user title. Defaults to NULL.
- * @var string
- */
-
- var $user_title = null;
-
- /**
- * What we're allowed to do as far as permissions go. This changes based on the value of the "auth" URI param.
- * @var string
- */
-
- var $auth_level = 1;
-
- /**
- * Preference for date formatting
- * @var string
- */
-
- var $date_format = DATE_4;
-
- /**
- * Preference for time formatting
- * @var string
- */
-
- var $time_format = TIME_24_NS;
-
- /**
- * State variable to track if a session timed out
- * @var bool
- */
-
- var $sw_timed_out = false;
-
- /**
- * Token appended to some important forms to prevent CSRF.
- * @var string
- */
-
- var $csrf_token = false;
-
- /**
- * Password change disabled, for auth plugins
- * @var bool
- */
-
- var $password_change_disabled = false;
-
- /**
- * Password change page URL + title, for auth plugins
- * @var array
- */
-
- var $password_change_dest = array('url' => '', 'title' => '');
-
- /**
- * Switch to track if we're started or not.
- * @access private
- * @var bool
- */
-
- var $started = false;
-
- /**
- * Switch to control compatibility mode (for older Enano websites being upgraded)
- * @access private
- * @var bool
- */
-
- var $compat = false;
-
- /**
- * Our list of permission types.
- * @access private
- * @var array
- */
-
- var $acl_types = Array();
-
- /**
- * The list of descriptions for the permission types
- * @var array
- */
-
- var $acl_descs = Array();
-
- /**
- * A list of dependencies for ACL types.
- * @var array
- */
-
- var $acl_deps = Array();
-
- /**
- * Our tell-all list of permissions. Do not even try to change this.
- * @access private
- * @var array
- */
-
- var $perms = Array();
-
- /**
- * A cache variable - saved after sitewide permissions are checked but before page-specific permissions.
- * @var array
- * @access private
- */
-
- var $acl_base_cache = Array();
-
- /**
- * Stores the scope information for ACL types.
- * @var array
- * @access private
- */
-
- var $acl_scope = Array();
-
- /**
- * Array to track which default permissions are being used
- * @var array
- * @access private
- */
-
- var $acl_defaults_used = Array();
-
- /**
- * Array to track group membership.
- * @var array
- */
-
- var $groups = Array();
-
- /**
- * Associative array to track group modship.
- * @var array
- */
-
- var $group_mod = Array();
-
- /**
- * A constant array of user-level-to-rank default associations.
- * @var array
- */
-
- var $level_rank_table = array(
- USER_LEVEL_ADMIN => RANK_ID_ADMIN,
- USER_LEVEL_MOD => RANK_ID_MOD,
- USER_LEVEL_MEMBER => RANK_ID_MEMBER,
- USER_LEVEL_CHPREF => RANK_ID_MEMBER,
- USER_LEVEL_GUEST => RANK_ID_GUEST
- );
-
- /**
- * A constant array that maps precedence constants to language strings
- * @var array
- */
-
- var $acl_inherit_lang_table = array(
- ACL_INHERIT_ENANO_DEFAULT => 'acl_inherit_enano_default',
- ACL_INHERIT_GLOBAL_EVERYONE => 'acl_inherit_global_everyone',
- ACL_INHERIT_GLOBAL_GROUP => 'acl_inherit_global_group',
- ACL_INHERIT_GLOBAL_USER => 'acl_inherit_global_user',
- ACL_INHERIT_PG_EVERYONE => 'acl_inherit_pg_everyone',
- ACL_INHERIT_PG_GROUP => 'acl_inherit_pg_group',
- ACL_INHERIT_PG_USER => 'acl_inherit_pg_user',
- ACL_INHERIT_LOCAL_EVERYONE => 'acl_inherit_local_everyone',
- ACL_INHERIT_LOCAL_GROUP => 'acl_inherit_local_group',
- ACL_INHERIT_LOCAL_USER => 'acl_inherit_local_user'
- );
-
- # Basic functions
-
- /**
- * Constructor.
- */
-
- function __construct()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( defined('IN_ENANO_INSTALL') && !defined('IN_ENANO_UPGRADE') )
- {
- @include(ENANO_ROOT.'/config.new.php');
- }
- else
- {
- @include(ENANO_ROOT.'/config.php');
- }
-
- unset($dbhost, $dbname, $dbuser, $dbpasswd);
- if(isset($crypto_key))
- {
- $this->private_key = $crypto_key;
- $this->private_key = hexdecode($this->private_key);
- }
- else
- {
- if(is_writable(ENANO_ROOT.'/config.php'))
- {
- // Generate and stash a private key
- // This should only happen during an automated silent gradual migration to the new encryption platform.
- $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
- $this->private_key = $aes->gen_readymade_key();
-
- $config = file_get_contents(ENANO_ROOT.'/config.php');
- if(!$config)
- {
- die('$session->__construct(): can\'t get the contents of config.php');
- }
-
- $config = str_replace("?>", "\$crypto_key = '{$this->private_key}';\n?>", $config);
- // And while we're at it...
- $config = str_replace('MIDGET_INSTALLED', 'ENANO_INSTALLED', $config);
- $fh = @fopen(ENANO_ROOT.'/config.php', 'w');
- if ( !$fh )
- {
- die('$session->__construct(): Couldn\'t open config file for writing to store the private key, I tried to avoid something like this...');
- }
-
- fwrite($fh, $config);
- fclose($fh);
- }
- else
- {
- die_semicritical('Crypto error', 'No private key was found in the config file, and we can\'t generate one because we don\'t have write access to the config file. Please CHMOD config.php to 666 or 777 and reload this page.
');
- }
- }
- // Check for compatibility mode
- if(defined('IN_ENANO_INSTALL'))
- {
- $q = $db->sql_query('SELECT old_encryption FROM '.table_prefix.'users LIMIT 1;');
- if(!$q)
- {
- $error = mysql_error();
- if(strstr($error, "Unknown column 'old_encryption'"))
- $this->compat = true;
- else
- $db->_die('This should never happen and is a bug - the only error that was supposed to happen here didn\'t happen. (sessions.php in constructor, during compat mode check)');
- }
- $db->free_result();
- }
- }
-
- /**
- * PHP 4 compatible constructor. Deprecated in 1.1.x.
- */
-
- /*
- function sessionManager()
- {
- $this->__construct();
- }
- */
-
- /**
- * Wrapper function to sanitize strings for MySQL and HTML
- * @param string $text The text to sanitize
- * @return string
- */
-
- function prepare_text($text)
- {
- global $db;
- return $db->escape(htmlspecialchars($text));
- }
-
- /**
- * Makes a SQL query and handles error checking
- * @param string $query The SQL query to make
- * @return resource
- */
-
- function sql($query)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $result = $db->sql_query($query);
- if(!$result)
- {
- $db->_die('The error seems to have occurred somewhere in the session management code.');
- }
- return $result;
- }
-
- /**
- * Returns true if we're currently on a page that shouldn't be blocked even if we have an inactive or banned account
- * @param bool strict - if true, whitelist of pages is even stricter (Login, Logout and CSS only). if false (default), admin access is allowed, assuming other factors allow it
- * @return bool
- */
-
- function on_critical_page($strict = false)
- {
- global $urlname;
- list($page_id, $namespace) = RenderMan::strToPageID($urlname);
- list($page_id) = explode('/', $page_id);
-
- if ( $strict )
- {
- return $namespace == 'Special' && in_array($page_id, array('CSS', 'Login', 'Logout', 'LangExportJSON', 'ActivateAccount'));
- }
- else
- {
- return $namespace == 'Admin' || ($namespace == 'Special' && in_array($page_id, array('CSS', 'Login', 'Logout', 'Administration', 'LangExportJSON', 'ActivateAccount')));
- }
- }
-
- # Session restoration and permissions
-
- /**
- * Initializes the basic state of things, including most user prefs, login data, cookie stuff
- */
-
- function start()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- global $timezone;
- if($this->started) return;
- $this->started = true;
- $user = false;
- if ( isset($_COOKIE['sid']) )
- {
- if ( $this->compat )
- {
- $userdata = $this->compat_validate_session($_COOKIE['sid']);
- }
- else
- {
- $userdata = $this->validate_session($_COOKIE['sid']);
- }
- if ( is_array($userdata) )
- {
- $this->sid = $_COOKIE['sid'];
- $this->user_logged_in = true;
- $this->user_id = intval($userdata['user_id']);
- $this->username = $userdata['username'];
- $this->user_level = intval($userdata['user_level']);
- $this->real_name = $userdata['real_name'];
- $this->email = $userdata['email'];
- $this->unread_pms = $userdata['num_pms'];
- $this->user_title = ( isset($userdata['user_title']) ) ? $userdata['user_title'] : null;
- if(!$this->compat)
- {
- $this->theme = $userdata['theme'];
- $this->style = $userdata['style'];
- $this->signature = $userdata['signature'];
- $this->reg_time = $userdata['reg_time'];
- }
- $this->auth_level = USER_LEVEL_MEMBER;
- // generate an anti-CSRF token
- $this->csrf_token = sha1($this->username . $this->sid . $this->user_id);
- if(!isset($template->named_theme_list[$this->theme]))
- {
- if($this->compat || !is_object($template))
- {
- $this->theme = 'oxygen';
- $this->style = 'bleu';
- }
- else
- {
- $this->theme = $template->default_theme;
- $this->style = $template->default_style;
- }
- }
- $user = true;
-
- // set timezone params
- $GLOBALS['timezone'] = $userdata['user_timezone'];
- $GLOBALS['dst_params'] = explode(';', $userdata['user_dst']);
- foreach ( $GLOBALS['dst_params'] as &$parm )
- {
- if ( substr($parm, -1) != 'd' )
- $parm = intval($parm);
- }
-
- // Set language
- if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
- {
- $lang_id = intval($userdata['user_lang']);
- $lang = new Language($lang_id);
- @setlocale(LC_ALL, $lang->lang_code);
- }
-
- if(isset($_REQUEST['auth']) && !$this->sid_super)
- {
- // Now he thinks he's a moderator. Or maybe even an administrator. Let's find out if he's telling the truth.
- if($this->compat)
- {
- $key = $_REQUEST['auth'];
- $super = $this->compat_validate_session($key);
- }
- else
- {
- $key = $_REQUEST['auth'];
- if ( !empty($key) && ( strlen($key) / 2 ) % 4 == 0 )
- {
- $super = $this->validate_session($key);
- }
- }
- if(is_array(@$super))
- {
- $this->auth_level = intval($super['auth_level']);
- $this->sid_super = $_REQUEST['auth'];
- }
- }
- }
- }
- if(!$user)
- {
- //exit;
- $this->register_guest_session();
- }
- if(!$this->compat)
- {
- // init groups
- $q = $this->sql('SELECT g.group_name,g.group_id,m.is_mod FROM '.table_prefix.'groups AS g' . "\n"
- . ' LEFT JOIN '.table_prefix.'group_members AS m' . "\n"
- . ' ON g.group_id=m.group_id' . "\n"
- . ' WHERE ( m.user_id='.$this->user_id.'' . "\n"
- . ' OR g.group_name=\'Everyone\')' . "\n"
- . ' ' . ( /* quick hack for upgrade compatibility reasons */ enano_version() == '1.0RC1' ? '' : 'AND ( m.pending != 1 OR m.pending IS NULL )' ) . '' . "\n"
- . ' ORDER BY group_id ASC;'); // The ORDER BY is to make sure "Everyone" comes first so the permissions can be overridden
- if($row = $db->fetchrow())
- {
- do {
- $this->groups[$row['group_id']] = $row['group_name'];
- $this->group_mod[$row['group_id']] = ( intval($row['is_mod']) == 1 );
- } while($row = $db->fetchrow());
- }
- else
- {
- die('No group info');
- }
- profiler_log('Fetched group memberships');
- }
-
- // make sure we aren't banned
- $this->check_banlist();
-
- // make sure the account is active
- if ( !$this->compat && $this->user_logged_in && $userdata['account_active'] < 1 && !$this->on_critical_page() )
- {
- $this->show_inactive_error($userdata);
- }
-
- // Printable page view? Probably the wrong place to control
- // it but $template is pretty dumb, it will just about always
- // do what you ask it to do, which isn't always what we want
- if ( isset ( $_GET['printable'] ) )
- {
- $this->theme = 'printable';
- $this->style = 'default';
- }
-
- // setup theme ACLs
- $template->process_theme_acls();
-
- profiler_log('Sessions started. Banlist and theme ACLs initialized');
- }
-
- # Logins
-
- /**
- * Attempts to perform a login using crypto functions
- * @param string $username The username
- * @param string $aes_data The encrypted password, hex-encoded
- * @param string $aes_key The MD5 hash of the encryption key, hex-encoded
- * @param string $challenge The 256-bit MD5 challenge string - first 128 bits should be the hash, the last 128 should be the challenge salt
- * @param int $level The privilege level we're authenticating for, defaults to 0
- * @param string $captcha_hash Optional. If we're locked out and the lockout policy is captcha, this should be the identifier for the code.
- * @param string $captcha_code Optional. If we're locked out and the lockout policy is captcha, this should be the code the user entered.
- * @param bool $remember Optional. If true, remembers the session for X days. Otherwise, assigns a short session. Defaults to false.
- * @param bool $lookup_key Optional. If true (default) this queries the database for the "real" encryption key. Else, uses what is given.
- * @return string 'success' on success, or error string on failure
- */
-
- function login_with_crypto($username, $aes_data, $aes_key_id, $challenge, $level = USER_LEVEL_MEMBER, $captcha_hash = false, $captcha_code = false, $remember = false, $lookup_key = true)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- // Instanciate the Rijndael encryption object
- $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
-
- // Fetch our decryption key
-
- if ( $lookup_key )
- {
- $aes_key = $this->fetch_public_key($aes_key_id);
- if ( !$aes_key )
- {
- // It could be that our key cache is full. If it seems larger than 65KB, clear it
- if ( strlen(getConfig('login_key_cache')) > 65000 )
- {
- setConfig('login_key_cache', '');
- return array(
- 'success' => false,
- 'error' => 'key_not_found_cleared',
- );
- }
- return array(
- 'success' => false,
- 'error' => 'key_not_found'
- );
- }
- }
- else
- {
- $aes_key =& $aes_key_id;
- }
-
- // Convert the key to a binary string
- $bin_key = hexdecode($aes_key);
-
- if(strlen($bin_key) != AES_BITS / 8)
- return array(
- 'success' => false,
- 'error' => 'key_wrong_length'
- );
-
- // Decrypt our password
- $password = $aes->decrypt($aes_data, $bin_key, ENC_HEX);
-
- // Let the LoginAPI do the rest.
- return $this->login_without_crypto($username, $password, false, $level, $captcha_hash, $captcha_code, $remember);
- }
-
- /**
- * Attempts to login without using crypto stuff, mainly for use when the other side doesn't like Javascript
- * This method of authentication is inherently insecure, there's really nothing we can do about it except hope and pray that everyone moves to Firefox
- * Technically it still uses crypto, but it only decrypts the password already stored, which is (obviously) required for authentication
- * @param string $username The username
- * @param string $password The password -OR- the MD5 hash of the password if $already_md5ed is true
- * @param bool $already_md5ed This should be set to true if $password is an MD5 hash, and should be false if it's plaintext. Defaults to false.
- * @param int $level The privilege level we're authenticating for, defaults to 0
- * @param bool $remember Optional. If true, remembers the session for X days. Otherwise, assigns a short session. Defaults to false.
- */
-
- function login_without_crypto($username, $password, $already_md5ed = false, $level = USER_LEVEL_MEMBER, $remember = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( $already_md5ed )
- {
- // No longer supported
- return array(
- 'mode' => 'error',
- 'error' => '$already_md5ed is no longer supported (set this parameter to false and make sure the password you send to $session->login_without_crypto() is not hashed)'
- );
- }
-
- // Replace underscores with spaces in username
- // (Added in 1.0.2)
- $username = str_replace('_', ' ', $username);
-
- // Perhaps we're upgrading Enano?
- if($this->compat)
- {
- return $this->login_compat($username, md5($password), $level);
- }
-
- // Instanciate the Rijndael encryption object
- $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
-
- // Initialize our success switch
- $success = false;
-
- // Retrieve the real password from the database
- $username_db = $db->escape(strtolower($username));
- $username_db_upper = $db->escape($username);
- if ( !$db->sql_query('SELECT password,password_salt,old_encryption,user_id,user_level,temp_password,temp_password_time FROM '.table_prefix."users\n"
- . " WHERE ( " . ENANO_SQLFUNC_LOWERCASE . "(username) = '$username_db' OR username = '$username_db_upper' );") )
- {
- $this->sql('SELECT password,\'\' AS password_salt,old_encryption,user_id,user_level,temp_password,temp_password_time FROM '.table_prefix."users\n"
- . " WHERE ( " . ENANO_SQLFUNC_LOWERCASE . "(username) = '$username_db' OR username = '$username_db_upper' );");
- }
- if ( $db->numrows() < 1 )
- {
- // This wasn't logged in <1.0.2, dunno how it slipped through
- if ( $level > USER_LEVEL_MEMBER )
- $this->sql('INSERT INTO ' . table_prefix . "logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES\n"
- . ' (\'security\', \'admin_auth_bad\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', '
- . '\''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
- else
- $this->sql('INSERT INTO ' . table_prefix . "logs(log_type,action,time_id,date_string,author,edit_summary) VALUES\n"
- . ' (\'security\', \'auth_bad\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', '
- . '\''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
-
- // Do we also need to increment the lockout countdown?
- if ( !defined('IN_ENANO_INSTALL') )
- $lockout_data = $this->get_lockout_info();
- else
- $lockout_data = array(
- 'lockout_policy' => 'disable'
- );
-
- if ( $lockout_data['policy'] != 'disable' && !defined('IN_ENANO_INSTALL') )
- {
- $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
- // increment fail count
- $this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action, username) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\', \'' . $db->escape($username) . '\');');
- $lockout_data['fails']++;
- return array(
- 'success' => false,
- 'error' => ( $lockout_data['fails'] >= $lockout_data['threshold'] ) ? 'locked_out' : 'invalid_credentials',
- 'lockout_threshold' => $lockout_data['threshold'],
- 'lockout_duration' => ( $lockout_data['duration'] ),
- 'lockout_fails' => $lockout_data['fails'],
- 'lockout_policy' => $lockout_data['policy']
- );
- }
-
- return array(
- 'success' => false,
- 'error' => 'invalid_credentials'
- );
- }
- $row = $db->fetchrow();
-
- // Check to see if we're logging in using a temporary password
-
- if((intval($row['temp_password_time']) + 3600*24) > time() )
- {
- $temp_pass = hmac_sha1($password, $row['password_salt']);
- if( $temp_pass === $row['temp_password'] )
- {
- $code = $plugins->setHook('login_password_reset');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- return array(
- 'success' => false,
- 'error' => 'valid_reset',
- 'redirect_url' => makeUrlComplete('Special', 'PasswordReset/stage2/' . $row['user_id'] . '/' . $this->pk_encrypt($password))
- );
- }
- }
-
- if ( $row['old_encryption'] == 1 )
- {
- // The user's password is stored using the obsolete and insecure MD5 algorithm - we'll update the field with the new password
- if(md5($password) === $row['password'])
- {
- if ( !defined('IN_ENANO_UPGRADE') )
- {
- $hmac_secret = hexencode(AESCrypt::randkey(20), '', '');
- $password_hmac = hmac_sha1($password, $hmac_secret);
- $this->sql('UPDATE '.table_prefix."users SET password = '$password_hmac', password_salt = '$hmac_secret', old_encryption = 0 WHERE user_id={$row['user_id']};");
- }
- $success = true;
- }
- }
- else if ( $row['old_encryption'] == 2 || ( defined('ENANO_UPGRADE_USE_AES_PASSWORDS') ) && strlen($row['password']) != 40 )
- {
- // Our password field uses the 1.0RC1-1.1.5 encryption format
- $real_pass = $aes->decrypt($row['password'], $this->private_key);
- if($password === $real_pass)
- {
- if ( !defined('IN_ENANO_UPGRADE') )
- {
- $hmac_secret = hexencode(AESCrypt::randkey(20), '', '');
- $password_hmac = hmac_sha1($password, $hmac_secret);
- $this->sql('UPDATE '.table_prefix."users SET password = '$password_hmac', password_salt = '$hmac_secret', old_encryption = 0 WHERE user_id={$row['user_id']};");
- }
- $success = true;
- }
- }
- else
- {
- // Password uses HMAC-SHA1
- $user_challenge = hmac_sha1($password, $row['password_salt']);
- $password_hmac =& $row['password'];
- if ( $user_challenge === $password_hmac )
- {
- $success = true;
- }
- }
- if($success)
- {
- if((int)$level > (int)$row['user_level'])
- return array(
- 'success' => false,
- 'error' => 'too_big_for_britches'
- );
-
- // grant session
- $sess = $this->register_session($row['user_id'], $username, ( isset($password_hmac) ? $password_hmac : $password ), $level, $remember);
-
- if($sess)
- {
- if($level > USER_LEVEL_MEMBER)
- $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,author_uid,edit_summary,page_text) VALUES(\'security\', \'admin_auth_good\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', ' . $row['user_id'] . ', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
- else
- $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,author_uid,edit_summary) VALUES(\'security\', \'auth_good\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', ' . $row['user_id'] . ', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
-
- $code = $plugins->setHook('login_success');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- return array(
- 'success' => true
- );
- }
- else
- return array(
- 'success' => false,
- 'error' => 'backend_fail'
- );
- }
- else
- {
- if($level > USER_LEVEL_MEMBER)
- $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES(\'security\', \'admin_auth_bad\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
- else
- $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
-
- // Do we also need to increment the lockout countdown?
- if ( !defined('IN_ENANO_INSTALL') && getConfig('lockout_policy', 'lockout') !== 'disable' )
- {
- $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
- // increment fail count
- $this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action, username) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\', \'' . $db->escape($username) . '\');');
- }
-
- return array(
- 'success' => false,
- 'error' => 'invalid_credentials'
- );
- }
- }
-
- /**
- * Attempts to log in using the old table structure and algorithm. This is for upgrades from old 1.0.x releases.
- * @param string $username
- * @param string $password This should be an MD5 hash
- * @return string 'success' if successful, or error message on failure
- */
-
- function login_compat($username, $password, $level = 0)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $pass_hashed =& $password;
- $this->sql('SELECT password,user_id,user_level FROM '.table_prefix.'users WHERE username=\''.$this->prepare_text($username).'\';');
- if($db->numrows() < 1)
- return 'The username and/or password is incorrect.';
- $row = $db->fetchrow();
- if($row['password'] == $password)
- {
- if((int)$level > (int)$row['user_level'])
- return 'You are not authorized for this level of access.';
- $sess = $this->register_session_compat(intval($row['user_id']), $username, $password, $level);
- if($sess)
- return 'success';
- else
- return 'Your login credentials were correct, but an internal error occured while registering the session key in the database.';
- }
- else
- {
- return 'The username and/or password is incorrect.';
- }
- }
-
- /**
- * Registers a session key in the database. This function *ASSUMES* that the username and password have already been validated!
- * Basically the session key is a hex-encoded cookie (encrypted with the site's private key) that says "u=[username];p=[sha1 of password];s=[unique key id]"
- * @param int $user_id
- * @param string $username
- * @param string $password_hmac The HMAC of the user's password, right from the database
- * @param int $level The level of access to grant, defaults to USER_LEVEL_MEMBER
- * @param bool $remember Whether the session should be long-term (true) or not (false). Defaults to short-term.
- * @return bool
- */
-
- function register_session($user_id, $username, $password_hmac, $level = USER_LEVEL_MEMBER, $remember = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- // Random key identifier
- $salt = '';
- for ( $i = 0; $i < 32; $i++ )
- {
- $salt .= chr(mt_rand(32, 126));
- }
-
- // Session key
- if ( defined('ENANO_UPGRADE_USE_AES_PASSWORDS') )
- {
- $session_key = $this->pk_encrypt("u=$username;p=" . sha1($password_hmac) . ";s=$salt");
- }
- else
- {
- $key_pieces = array($password_hmac);
- $sk_mode = 'generate';
- $code = $plugins->setHook('session_key_calc');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
- $key_pieces = implode("\xFF", $key_pieces);
-
- $session_key = hmac_sha1($key_pieces, $salt);
- }
-
- // Minimum level
- $level = max(array($level, USER_LEVEL_MEMBER));
-
- // Type of key
- $key_type = ( $level > USER_LEVEL_MEMBER ) ? SK_ELEV : ( $remember ? SK_LONG : SK_SHORT );
-
- // If we're registering an elevated-privilege key, it needs to be on GET
- if($level > USER_LEVEL_MEMBER)
- {
- $this->sid_super = $session_key;
- $_GET['auth'] = $session_key;
- }
- else
- {
- // Stash it in a cookie
- // For now, make the cookie last forever, we can change this in 1.1.x
- setcookie( 'sid', $session_key, time()+15552000, scriptPath.'/', null, $GLOBALS['is_https']);
- $_COOKIE['sid'] = $session_key;
- $this->sid = $session_key;
- }
- // $keyhash is stored in the database, this is for compatibility with the older DB structure
- $keyhash = md5($session_key);
- // Record the user's IP
- $ip = $_SERVER['REMOTE_ADDR'];
- if(!is_valid_ip($ip))
- die('$session->register_session: Remote-Addr was spoofed');
- // The time needs to be stashed to enforce the 15-minute limit on elevated session keys
- $time = time();
-
- // Sanity check
- if(!is_int($user_id))
- die('Somehow an SQL injection attempt crawled into our session registrar! (1)');
- if(!is_int($level))
- die(var_dump($level) . '
Somehow an SQL injection attempt crawled into our session registrar! (2)');
-
- // Update RAM
- $this->user_id = $user_id;
- $this->user_level = max(array($this->user_level, $level));
-
- // All done!
- $query = $db->sql_query('INSERT INTO '.table_prefix.'session_keys(session_key, salt, user_id, auth_level, source_ip, time, key_type) VALUES(\''.$keyhash.'\', \''.$db->escape($salt).'\', '.$user_id.', '.$level.', \''.$ip.'\', '.$time.', ' . $key_type . ');');
- if ( !$query && defined('IN_ENANO_UPGRADE') )
- // we're trying to upgrade so the key_type column is probably missing - try it again without specifying the key type
- $this->sql('INSERT INTO '.table_prefix.'session_keys(session_key, salt, user_id, auth_level, source_ip, time) VALUES(\''.$keyhash.'\', \''.$db->escape($salt).'\', '.$user_id.', '.$level.', \''.$ip.'\', '.$time.');');
-
- return true;
- }
-
- /**
- * Identical to register_session in nature, but uses the old login/table structure. DO NOT use this except in the upgrade script under very controlled circumstances.
- * @see sessionManager::register_session()
- * @access private
- */
-
- function register_session_compat($user_id, $username, $password, $level = 0)
- {
- $salt = md5(microtime() . mt_rand());
- $thekey = md5($password . $salt);
- if($level > 0)
- {
- $this->sid_super = $thekey;
- }
- else
- {
- setcookie( 'sid', $thekey, time()+315360000, scriptPath.'/' );
- $_COOKIE['sid'] = $thekey;
- }
- $ip = ip2hex($_SERVER['REMOTE_ADDR']);
- if(!$ip)
- die('$session->register_session: Remote-Addr was spoofed');
- $time = time();
- if(!is_int($user_id))
- die('Somehow an SQL injection attempt crawled into our session registrar! (1)');
- if(!is_int($level))
- die('Somehow an SQL injection attempt crawled into our session registrar! (2)');
- $query = $this->sql('INSERT INTO '.table_prefix.'session_keys(session_key, salt, user_id, auth_level, source_ip, time) VALUES(\''.$thekey.'\', \''.$salt.'\', '.$user_id.', '.$level.', \''.$ip.'\', '.$time.');');
- return true;
- }
-
- /**
- * Tells us if we're locked out from logging in or not.
- * @param reference will be filled with information regarding in-progress lockout
- * @return bool True if locked out, false otherwise
- */
-
- function get_lockout_info()
- {
- global $db;
-
- // this has to be initialized to hide warnings
- $lockdata = null;
-
- // Query database for lockout info
- $locked_out = false;
- $threshold = ( $_ = getConfig('lockout_threshold') ) ? intval($_) : 5;
- $duration = ( $_ = getConfig('lockout_duration') ) ? intval($_) : 15;
- // convert to seconds
- $duration = $duration * 60;
- // decide on policy
- $policy = ( $x = getConfig('lockout_policy') && in_array(getConfig('lockout_policy'), array('lockout', 'disable', 'captcha')) ) ? getConfig('lockout_policy') : 'lockout';
- if ( $policy != 'disable' )
- {
- // enabled; make decision
- $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
- $timestamp_cutoff = time() - $duration;
- $q = $this->sql('SELECT timestamp FROM ' . table_prefix . 'lockout WHERE timestamp > ' . $timestamp_cutoff . ' AND ipaddr = \'' . $ipaddr . '\' ORDER BY timestamp DESC;');
- $fails = $db->numrows($q);
- $row = $db->fetchrow($q);
- $locked_out = ( $fails >= $threshold );
- $lockdata = array(
- 'active' => $locked_out,
- 'threshold' => $threshold,
- 'duration' => ( $duration / 60 ),
- 'fails' => $fails,
- 'policy' => $policy,
- 'last_time' => $row['timestamp'],
- 'time_rem' => $locked_out ? ( $duration / 60 ) - round( ( time() - $row['timestamp'] ) / 60 ) : 0,
- 'captcha' => $policy == 'captcha' ? $this->make_captcha() : ''
- );
- $db->free_result();
- }
- else
- {
- // disabled; send back default dataset
- $lockdata = array(
- 'active' => false,
- 'threshold' => $threshold,
- 'duration' => ( $duration / 60 ),
- 'fails' => 0,
- 'policy' => $policy,
- 'last_time' => 0,
- 'time_rem' => 0,
- 'captcha' => ''
- );
- }
- return $lockdata;
- }
-
- /**
- * Creates/restores a guest session
- * @todo implement real session management for guests
- */
-
- function register_guest_session()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- $this->username = $_SERVER['REMOTE_ADDR'];
- $this->user_level = USER_LEVEL_GUEST;
- if($this->compat || defined('IN_ENANO_INSTALL'))
- {
- $this->theme = 'oxygen';
- $this->style = 'bleu';
- }
- else
- {
- $this->theme = ( isset($_GET['theme']) && isset($template->named_theme_list[$_GET['theme']])) ? $_GET['theme'] : $template->default_theme;
- $this->style = ( isset($_GET['style']) && file_exists(ENANO_ROOT.'/themes/'.$this->theme . '/css/'.$_GET['style'].'.css' )) ? $_GET['style'] : preg_replace('/\.css$/', '', $template->named_theme_list[$this->theme]['default_style']);
- }
- $this->user_id = 1;
- // This is a VERY special case we are allowing. It lets the installer create languages using the Enano API.
- if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
- {
- $language = ( isset($_GET['lang']) && preg_match('/^[a-z0-9-_]+$/', @$_GET['lang']) ) ? $_GET['lang'] : intval(getConfig('default_language'));
- $lang = new Language($language);
- @setlocale(LC_ALL, $lang->lang_code);
- }
- // make a CSRF token
- $this->csrf_token = hmac_sha1($_SERVER['REMOTE_ADDR'], sha1($this->private_key));
- }
-
- /**
- * Validates a session key, and returns the userdata associated with the key or false
- * @param string $key The session key to validate
- * @return array Keys are 'user_id', 'username', 'email', 'real_name', 'user_level', 'theme', 'style', 'signature', 'reg_time', 'account_active', 'activation_key', and 'auth_level' or bool false if validation failed. The key 'auth_level' is the maximum authorization level that this key provides.
- */
-
- function validate_session($key)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- profiler_log("SessionManager: checking session: " . sha1($key));
-
- if ( strlen($key) > 48 )
- {
- return $this->validate_aes_session($key);
- }
-
- profiler_log("SessionManager: checking session: " . $key);
-
- return $this->validate_session_shared($key, '');
- }
-
- /**
- * Validates an old-format AES session key. DO NOT USE THIS. Will return false if called outside of an upgrade.
- * @param string Session key
- * @return array
- */
-
- protected function validate_aes_session($key)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- // No valid use except during upgrades
- if ( !preg_match('/^upg-/', enano_version()) && !defined('IN_ENANO_UPGRADE') )
- return false;
-
- $decrypted_key = $this->pk_decrypt($key);
- if ( !$decrypted_key )
- {
- // die_semicritical('AES encryption error', 'Something went wrong during the AES decryption process.
'.print_r($decrypted_key, true).'
');
- return false;
- }
-
- $n = preg_match('/^u='.$this->valid_username.';p=([A-Fa-f0-9]+?);s=(.{32})$/', $decrypted_key, $keydata);
- if($n < 1)
- {
- echo '(debug) $session->validate_session: Key does not match regex
Decrypted key: '.$decrypted_key;
- return false;
- }
- $keyhash = md5($key);
- $salt = $db->escape($keydata[3]);
-
- return $this->validate_session_shared($keyhash, $salt, true);
- }
-
- /**
- * Shared portion of session validation. Do not try to call this.
- * @return array
- * @access private
- */
-
- protected function validate_session_shared($key, $salt, $loose_call = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- // using a normal call to $db->sql_query to avoid failing on errors here
- $columns_select = "u.user_id AS uid, u.username, u.password, u.password_salt, u.email, u.real_name, u.user_level, u.theme,\n"
- . " u.style,u.signature, u.reg_time, u.account_active, u.activation_key, u.user_lang, u.user_title, k.salt, k.source_ip,\n"
- . " k.time, k.auth_level, k.key_type, COUNT(p.message_id) AS num_pms, u.user_timezone, u.user_dst, x.*";
-
- $columns_groupby = "u.user_id, u.username, u.password, u.password_salt, u.email, u.real_name, u.user_level, u.theme, u.style, u.signature,\n"
- . " u.reg_time, u.account_active, u.activation_key, u.user_lang, u.user_timezone, u.user_title, u.user_dst,\n"
- . " k.salt, k.source_ip, k.time, k.auth_level, k.key_type, x.user_id, x.user_aim, x.user_yahoo, x.user_msn,\n"
- . " x.user_xmpp, x.user_homepage, x.user_location, x.user_job, x.user_hobbies, x.email_public,\n"
- . " x.disable_js_fx, x.date_format, x.time_format";
-
- $joins = " LEFT JOIN " . table_prefix . "users AS u\n"
- . " ON ( u.user_id=k.user_id )\n"
- . " LEFT JOIN " . table_prefix . "users_extra AS x\n"
- . " ON ( u.user_id=x.user_id OR x.user_id IS NULL )\n"
- . " LEFT JOIN " . table_prefix . "privmsgs AS p\n"
- . " ON ( p.message_to=u.username AND p.message_read=0 )\n";
- if ( !$loose_call )
- {
- $key_md5 = md5($key);
- $query = $db->sql_query("SELECT $columns_select\n"
- . "FROM " . table_prefix . "session_keys AS k\n"
- . $joins
- . " WHERE k.session_key='$key_md5'\n"
- . " GROUP BY $columns_groupby;");
- }
- else
- {
- $query = $db->sql_query("SELECT $columns_select\n"
- . "FROM " . table_prefix . "session_keys AS k\n"
- . $joins
- . " WHERE k.session_key='$key'\n"
- . " AND k.salt='$salt'\n"
- . " GROUP BY $columns_groupby;");
- }
-
- if ( !$query && ( defined('IN_ENANO_INSTALL') or defined('IN_ENANO_UPGRADE') ) )
- {
- $key_md5 = $loose_call ? $key : md5($key);
- $query = $this->sql('SELECT u.user_id AS uid,u.username,u.password,\'\' AS password_salt,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,u.reg_time,u.account_active,u.activation_key,k.source_ip,k.time,k.auth_level,COUNT(p.message_id) AS num_pms, 1440 AS user_timezone, \'0;0;0;0;60\' AS user_dst, ' . SK_SHORT . ' AS key_type, k.salt FROM '.table_prefix.'session_keys AS k
- LEFT JOIN '.table_prefix.'users AS u
- ON ( u.user_id=k.user_id )
- LEFT JOIN '.table_prefix.'privmsgs AS p
- ON ( p.message_to=u.username AND p.message_read=0 )
- WHERE k.session_key=\''.$key_md5.'\'
- GROUP BY u.user_id,u.username,u.password,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,u.reg_time,u.account_active,u.activation_key,k.source_ip,k.time,k.auth_level,k.salt;');
- }
- else if ( !$query )
- {
- $db->_die();
- }
- if($db->numrows() < 1)
- {
- // echo '(debug) $session->validate_session: Key was not found in database: ' . $key_md5 . '
';
- return false;
- }
- $row = $db->fetchrow();
- profiler_log("SessionManager: session check: selected and fetched results");
-
- $row['user_id'] =& $row['uid'];
- $ip = $_SERVER['REMOTE_ADDR'];
- if($row['auth_level'] > $row['user_level'])
- {
- // Failed authorization check
- // echo '(debug) $session->validate_session: access to this auth level denied
';
- return false;
- }
- if($ip != $row['source_ip'])
- {
- // Special exception for 1.1.x upgrade - the 1.1.3 upgrade changes the size of the column and this is what validate_session
- // expects, but if the column size hasn't changed yet just check the first 10 digits of the IP.
- $fail = true;
- if ( defined('IN_ENANO_UPGRADE') )
- {
- if ( substr($ip, 0, 10) == substr($row['source_ip'], 0, 10) )
- $fail = false;
- }
- // Failed IP address check
- // echo '(debug) $session->validate_session: IP address mismatch
';
- if ( $fail )
- return false;
- }
-
- // $loose_call is turned on only from validate_aes_session
- if ( !$loose_call )
- {
- $key_pieces = array($row['password']);
- $user_id =& $row['uid'];
- $sk_mode = 'validate';
- $code = $plugins->setHook('session_key_calc');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
- $key_pieces = implode("\xFF", $key_pieces);
- $correct_key = hexdecode(hmac_sha1($key_pieces, $row['salt']));
- $user_key = hexdecode($key);
- if ( $correct_key !== $user_key || !is_string($user_key) )
- {
- return false;
- }
- }
- else
- {
- // if this is a "loose call", this only works once (during the final upgrade stage). Destroy the contents of session_keys.
- if ( $row['auth_level'] == USER_LEVEL_ADMIN && preg_match('/^upg-/', enano_version()) )
- $this->sql('DELETE FROM ' . table_prefix . "session_keys;");
- }
-
- // timestamp check
- switch ( $row['key_type'] )
- {
- case SK_SHORT:
- $time_now = time();
- $time_key = $row['time'] + ( 60 * intval(getConfig('session_short', '720')) );
- if ( $time_now > $time_key )
- {
- // Session timed out
- return false;
- }
- break;
- case SK_LONG:
- if ( intval(getConfig('session_remember_time', '0')) === 0 )
- {
- // sessions last infinitely, timestamp validation is therefore successful
- break;
- }
- $time_now = time();
- $time_key = $row['time'] + ( 86400 * intval(getConfig('session_remember_time', '30')) );
- if ( $time_now > $time_key )
- {
- // Session timed out
- return false;
- }
- break;
- case SK_ELEV:
- $time_now = time();
- $time_key = $row['time'] + 900;
- if($time_now > $time_key && $row['auth_level'] > USER_LEVEL_MEMBER)
- {
- // Session timed out
- // echo '(debug) $session->validate_session: super session timed out
';
- $this->sw_timed_out = true;
- return false;
- }
- break;
- }
-
- // If this is an elevated-access or short-term session key, update the time
- if( $row['key_type'] == SK_ELEV || $row['key_type'] == SK_SHORT )
- {
- $this->sql('UPDATE '.table_prefix.'session_keys SET time='.time().' WHERE session_key=\''.md5($key).'\';');
- }
-
- $user_extra = array();
- foreach ( array('user_aim', 'user_yahoo', 'user_msn', 'user_xmpp', 'user_homepage', 'user_location', 'user_job', 'user_hobbies', 'email_public', 'disable_js_fx') as $column )
- {
- if ( isset($row[$column]) )
- $user_extra[$column] = $row[$column];
- else
- $user_extra[$column] = '';
- }
-
- if ( isset($row['date_format']) )
- $this->date_format = $row['date_format'];
- if ( isset($row['time_format']) )
- $this->time_format = $row['time_format'];
-
- $this->user_extra = $user_extra;
- // Leave the rest to PHP's automatic garbage collector ;-)
-
- $row['password'] = '';
- $row['user_timezone'] = intval($row['user_timezone']) - 1440;
-
- profiler_log("SessionManager: finished session check");
-
- return $row;
- }
-
- /**
- * Validates a session key, and returns the userdata associated with the key or false. Optimized for compatibility with the old MD5-based auth system.
- * @param string $key The session key to validate
- * @return array Keys are 'user_id', 'username', 'email', 'real_name', 'user_level', 'theme', 'style', 'signature', 'reg_time', 'account_active', 'activation_key', and 'auth_level' or bool false if validation failed. The key 'auth_level' is the maximum authorization level that this key provides.
- */
-
- function compat_validate_session($key)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $key = $db->escape($key);
-
- $query = $this->sql('SELECT u.user_id,u.username,u.password,u.email,u.real_name,u.user_level,k.source_ip,k.salt,k.time,k.auth_level,1440 AS user_timezone FROM '.table_prefix.'session_keys AS k
- LEFT JOIN '.table_prefix.'users AS u
- ON u.user_id=k.user_id
- WHERE k.session_key=\''.$key.'\';');
- if($db->numrows() < 1)
- {
- // echo '(debug) $session->validate_session: Key '.$key.' was not found in database
';
- return false;
- }
- $row = $db->fetchrow();
- $ip = ip2hex($_SERVER['REMOTE_ADDR']);
- if($row['auth_level'] > $row['user_level'])
- {
- // Failed authorization check
- // echo '(debug) $session->validate_session: user not authorized for this access level';
- return false;
- }
- if($ip != $row['source_ip'])
- {
- // Failed IP address check
- // echo '(debug) $session->validate_session: IP address mismatch; IP in table: '.$row['source_ip'].'; reported IP: '.$ip.'';
- return false;
- }
-
- // Do the password validation
- $real_key = md5($row['password'] . $row['salt']);
-
- //die(''.print_r($keydata, true).'
');
- if($real_key != $key)
- {
- // Failed password check
- // echo '(debug) $session->validate_session: supplied password is wrong
Real key: '.$real_key.'
User key: '.$key;
- return false;
- }
-
- $time_now = time();
- $time_key = $row['time'] + 900;
- if($time_now > $time_key && $row['auth_level'] >= 1)
- {
- $this->sw_timed_out = true;
- // Session timed out
- // echo '(debug) $session->validate_session: super session timed out
';
- return false;
- }
-
- $row['user_timezone'] = intval($row['user_timezone']) - 1440;
-
- return $row;
- }
-
- /**
- * Demotes us to one less than the specified auth level. AKA destroys elevated authentication and/or logs out the user, depending on $level
- * @param int $level How low we should go - USER_LEVEL_MEMBER means demote to USER_LEVEL_GUEST, and anything more powerful than USER_LEVEL_MEMBER means demote to USER_LEVEL_MEMBER
- * @return string 'success' if successful, or error on failure
- */
-
- function logout($level = USER_LEVEL_MEMBER)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $ou = $this->username;
- $oid = $this->user_id;
- if($level > USER_LEVEL_MEMBER)
- {
- $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
- if(!$this->user_logged_in || $this->auth_level < ( USER_LEVEL_MEMBER + 1))
- {
- return 'success';
- }
- // Destroy elevated privileges
- $keyhash = md5($this->sid_super);
- $this->sql('DELETE FROM '.table_prefix.'session_keys WHERE session_key=\''.$keyhash.'\' AND user_id=\'' . $this->user_id . '\';');
- $this->sid_super = false;
- $this->auth_level = USER_LEVEL_MEMBER;
- }
- else
- {
- if($this->user_logged_in)
- {
- $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
- // Completely destroy our session
- if($this->auth_level > USER_LEVEL_MEMBER)
- {
- $this->logout(USER_LEVEL_ADMIN);
- }
- $this->sql('DELETE FROM '.table_prefix.'session_keys WHERE session_key=\''.md5($this->sid).'\';');
- setcookie( 'sid', '', time()-(3600*24), scriptPath.'/' );
- }
- }
- $code = $plugins->setHook('logout_success'); // , Array('level'=>$level,'old_username'=>$ou,'old_user_id'=>$oid));
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
- return 'success';
- }
-
- # Miscellaneous stuff
-
- /**
- * Alerts the user that their account is inactive, and tells them appropriate steps to remedy the situation. Halts execution.
- * @param array Return from validate_session()
- */
-
- function show_inactive_error($userdata)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- global $title;
- $paths->init($title);
-
- $language = intval(getConfig('default_language'));
- $lang = new Language($language);
- @setlocale(LC_ALL, $lang->lang_code);
-
- $a = getConfig('account_activation');
- switch($a)
- {
- case 'none':
- default:
- $solution = $lang->get('user_login_noact_solution_none');
- break;
- case 'user':
- $solution = $lang->get('user_login_noact_solution_user');
- break;
- case 'admin':
- $solution = $lang->get('user_login_noact_solution_admin');
- break;
- }
-
- // admin activation request opportunity
- $q = $db->sql_query('SELECT 1 FROM '.table_prefix.'logs WHERE log_type=\'admin\' AND action=\'activ_req\' AND edit_summary=\'' . $db->escape($userdata['username']) . '\';');
- if ( !$q )
- $db->_die();
-
- $can_request = ( $db->numrows() < 1 );
- $db->free_result();
-
- if ( isset($_POST['logout']) )
- {
- $this->sid = $_COOKIE['sid'];
- $this->user_logged_in = true;
- $this->user_id = intval($userdata['user_id']);
- $this->username = $userdata['username'];
- $this->auth_level = USER_LEVEL_MEMBER;
- $this->user_level = USER_LEVEL_MEMBER;
- $this->logout();
- redirect(scriptPath . '/', $lang->get('user_login_noact_msg_logout_success_title'), $lang->get('user_login_noact_msg_logout_success_body'), 5);
- }
-
- if ( $can_request && !isset($_POST['activation_request']) )
- {
- $form = '' . $lang->get('user_login_noact_msg_ask_admins') . '
- ';
- }
- else
- {
- if ( $can_request && isset($_POST['activation_request']) )
- {
- $this->admin_activation_request($userdata['username']);
- $form = '' . $lang->get('user_login_noact_msg_admins_just_asked') . '
- ';
- }
- else
- {
- $form = '' . $lang->get('user_login_noact_msg_admins_asked') . '
- ';
- }
- }
-
- global $output;
- $output = new Output_HTML();
- $output->set_title($lang->get('user_login_noact_title'));
- die_friendly($lang->get('user_login_noact_title'), '' . $lang->get('user_login_noact_msg_intro') . ' '.$solution.'
' . $form);
- }
-
- /**
- * Appends the high-privilege session key to the URL if we are authorized to do high-privilege stuff
- * @param string $url The URL to add session data to
- * @return string
- */
-
- function append_sid($url)
- {
- $sep = ( strstr($url, '?') ) ? '&' : '?';
- if ( $this->sid_super )
- {
- $url = $url . $sep . 'auth=' . urlencode($this->sid_super);
- // echo($this->sid_super.'
');
- }
- return $url;
- }
-
- /**
- * Prevent the user from changing their password. Authentication plugins may call this to enforce single sign-on.
- * @param string URL to page where the user may change their password
- * @param string Title of the page where the user may change their password
- * @return null
- */
-
- function disable_password_change($change_url = false, $change_title = false)
- {
- if ( $this->password_change_disabled )
- {
- // don't allow calling twice. if we have two plugins doing this, somebody is bad at configuring websites.
- return false;
- }
-
- if ( is_string($change_url) && is_string($change_title) )
- {
- $this->password_change_dest = array(
- 'url' => $change_url,
- 'title' => $change_title
- );
- }
- else
- {
- $this->password_change_dest = array(
- 'url' => false,
- 'title' => false
- );
- }
-
- $this->password_change_disabled = true;
- }
-
- /**
- * Grabs the user's password MD5 - NOW DEPRECATED AND DISABLED.
- * @return bool false
- */
-
- function grab_password_hash()
- {
- return false;
- }
-
- /**
- * Destroys the user's password MD5 in memory
- */
-
- function disallow_password_grab()
- {
- $this->password_hash = false;
- return false;
- }
-
- /**
- * Generates an AES key and stashes it in the database
- * @return string Hex-encoded AES key
- */
-
- function rijndael_genkey()
- {
- $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
- $key = $aes->gen_readymade_key();
- $keys = getConfig('login_key_cache');
- if(is_string($keys))
- $keys .= $key;
- else
- $keys = $key;
- setConfig('login_key_cache', $keys);
- return $key;
- }
-
- /**
- * Generate a totally random 128-bit value for MD5 challenges
- * @return string
- */
-
- function dss_rand()
- {
- $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
- $random = $aes->randkey(128);
- unset($aes);
- return md5(microtime() . $random);
- }
-
- /**
- * Fetch a cached login public key using the MD5sum as an identifier. Each key can only be fetched once before it is destroyed.
- * @param string $md5 The MD5 sum of the key
- * @return string, or bool false on failure
- */
-
- function fetch_public_key($md5)
- {
- $keys = getConfig('login_key_cache');
- $keys = enano_str_split($keys, AES_BITS / 4);
-
- foreach($keys as $i => $k)
- {
- if(md5($k) == $md5)
- {
- unset($keys[$i]);
- if(count($keys) > 0)
- {
- if ( strlen(getConfig('login_key_cache') ) > 64000 )
- {
- // This should only need to be done once every month or so for an average-size site
- setConfig('login_key_cache', '');
- }
- else
- {
- $keys = implode('', array_values($keys));
- setConfig('login_key_cache', $keys);
- }
- }
- else
- {
- setConfig('login_key_cache', '');
- }
- return $k;
- }
- }
- // Couldn't find the key...
- return false;
- }
-
- /**
- * Adds a user to a group.
- * @param int User ID
- * @param int Group ID
- * @param bool Group moderator - defaults to false
- * @return bool True on success, false on failure
- */
-
- function add_user_to_group($user_id, $group_id, $is_mod = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- // Validation
- if ( !is_int($user_id) || !is_int($group_id) || !is_bool($is_mod) )
- return false;
- if ( $user_id < 1 || $group_id < 1 )
- return false;
-
- $mod_switch = ( $is_mod ) ? '1' : '0';
- $q = $this->sql('SELECT member_id,is_mod FROM '.table_prefix.'group_members WHERE user_id=' . $user_id . ' AND group_id=' . $group_id . ';');
- if ( !$q )
- $db->_die();
- if ( $db->numrows() < 1 )
- {
- // User is not in group
- $this->sql('INSERT INTO '.table_prefix.'group_members(user_id,group_id,is_mod) VALUES(' . $user_id . ', ' . $group_id . ', ' . $mod_switch . ');');
- return true;
- }
- else
- {
- $row = $db->fetchrow();
- // Update modship status
- if ( strval($row['is_mod']) == $mod_switch )
- {
- // Modship unchanged
- return true;
- }
- else
- {
- // Modship changed
- $this->sql('UPDATE '.table_prefix.'group_members SET is_mod=' . $mod_switch . ' WHERE member_id=' . $row['member_id'] . ';');
- return true;
- }
- }
- return false;
- }
-
- /**
- * Removes a user from a group.
- * @param int User ID
- * @param int Group ID
- * @return bool True on success, false on failure
- * @todo put a little more error checking in...
- */
-
- function remove_user_from_group($user_id, $group_id)
- {
- if ( !is_int($user_id) || !is_int($group_id) )
- return false;
- $this->sql('DELETE FROM '.table_prefix."group_members WHERE user_id=$user_id AND group_id=$group_id;");
- return true;
- }
-
- /**
- * Checks the banlist to ensure that we're an allowed user. Doesn't return anything because it dies if the user is banned.
- */
-
- function check_banlist()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- $col_reason = ( $this->compat ) ? '\'No reason available (session manager is in compatibility mode)\' AS reason' : 'reason';
- $remote_addr = ( strstr($_SERVER['REMOTE_ADDR'], ':') ) ? expand_ipv6_address($_SERVER['REMOTE_ADDR']) : $_SERVER['REMOTE_ADDR'];
-
- $banned = false;
- if ( $this->user_logged_in )
- {
- // check by IP, email, and username
- if ( ENANO_DBLAYER == 'MYSQL' )
- {
- $sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE \n"
- . " ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR \n"
- . " ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' REGEXP ban_value ) OR \n"
- . " ( ban_type = " . BAN_USER . " AND is_regex = 0 AND ban_value = '{$this->username}' ) OR \n"
- . " ( ban_type = " . BAN_USER . " AND is_regex = 1 AND '{$this->username}' REGEXP ban_value ) OR \n"
- . " ( ban_type = " . BAN_EMAIL . " AND is_regex = 0 AND ban_value = '{$this->email}' ) OR \n"
- . " ( ban_type = " . BAN_EMAIL . " AND is_regex = 1 AND '{$this->email}' REGEXP ban_value ) \n"
- . " ORDER BY ban_type ASC;";
- }
- else if ( ENANO_DBLAYER == 'PGSQL' )
- {
- $sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE \n"
- . " ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR \n"
- . " ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' ~ ban_value ) OR \n"
- . " ( ban_type = " . BAN_USER . " AND is_regex = 0 AND ban_value = '{$this->username}' ) OR \n"
- . " ( ban_type = " . BAN_USER . " AND is_regex = 1 AND '{$this->username}' ~ ban_value ) OR \n"
- . " ( ban_type = " . BAN_EMAIL . " AND is_regex = 0 AND ban_value = '{$this->email}' ) OR \n"
- . " ( ban_type = " . BAN_EMAIL . " AND is_regex = 1 AND '{$this->email}' ~ ban_value ) \n"
- . " ORDER BY ban_type ASC;";
- }
- $q = $this->sql($sql);
- if ( $db->numrows() > 0 )
- {
- while ( list($reason_temp, $ban_value, $ban_type, $is_regex) = $db->fetchrow_num() )
- {
- if ( $ban_type == BAN_IP && $is_regex != 1 )
- {
- // check range
- $regexp = parse_ip_range_regex($ban_value);
- if ( !$regexp )
- {
- continue;
- }
- if ( preg_match("/$regexp/", $remote_addr) )
- {
- $reason = $reason_temp;
- $banned = true;
- }
- }
- else
- {
- // User is banned
- $banned = true;
- $reason = $reason_temp;
- }
- }
- }
- $db->free_result();
- }
- else
- {
- // check by IP only
- if ( ENANO_DBLAYER == 'MYSQL' )
- {
- $sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE
- ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR
- ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' REGEXP ban_value )
- ORDER BY ban_type ASC;";
- }
- else if ( ENANO_DBLAYER == 'PGSQL' )
- {
- $sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE
- ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR
- ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' ~ ban_value )
- ORDER BY ban_type ASC;";
- }
- $q = $this->sql($sql);
- if ( $db->numrows() > 0 )
- {
- while ( list($reason_temp, $ban_value, $ban_type, $is_regex) = $db->fetchrow_num() )
- {
- if ( $ban_type == BAN_IP && $is_regex != 1 )
- {
- // check range
- $regexp = parse_ip_range_regex($ban_value);
- if ( !$regexp )
- {
- die("bad regexp for $ban_value");
- continue;
- }
- if ( preg_match("/$regexp/", $remote_addr) )
- {
- $reason = $reason_temp;
- $banned = true;
- }
- }
- else
- {
- // User is banned
- $reason = $reason_temp;
- $banned = true;
- }
- }
- }
- $db->free_result();
- }
- if ( $banned && !$this->on_critical_page(true) )
- {
- // This guy is banned - kill the session, kill the database connection, bail out, and be pretty about it
- die_semicritical($lang->get('user_ban_msg_title'), '' . $lang->get('user_ban_msg_body') . '
' . $lang->get('user_ban_lbl_reason') . '
' . $reason . '');
- exit;
- }
- }
-
- # Registration
-
- /**
- * Registers a user. This does not perform any type of login.
- * @param string New user's username
- * @param string This should be unencrypted.
- * @param string E-mail address.
- * @param string Optional, defaults to ''.
- * @param bool Optional. If true, the account is not activated initially and an admin activation request is sent. The caller is responsible for sending the address info and notice.
- */
-
- function create_user($username, $password, $email, $real_name = '', $coppa = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- // Initialize AES
- $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
-
- // Since we're recording IP addresses, make sure the user's IP is safe.
- $ip =& $_SERVER['REMOTE_ADDR'];
- if ( !is_valid_ip($ip) )
- return 'Invalid IP';
-
- if ( !preg_match('#^'.$this->valid_username.'$#', $username) )
- return $lang->get('user_reg_err_username_banned_chars');
-
- $username = str_replace('_', ' ', $username);
- $user_orig = $username;
- $username = $this->prepare_text($username);
- $email = $this->prepare_text($email);
- $real_name = $this->prepare_text($real_name);
-
- $nameclause = ( $real_name != '' ) ? ' OR real_name=\''.$real_name.'\'' : '';
- $q = $this->sql('SELECT * FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username)=\''.strtolower($username).'\' OR email=\''.$email.'\''.$nameclause.';');
- if($db->numrows() > 0)
- {
- $row = $db->fetchrow();
- $str = 'user_reg_err_dupe';
-
- if ( $row['username'] == $username )
- {
- $str .= '_username';
- }
- if ( $row['email'] == $email )
- {
- $str .= '_email';
- }
- if ( $row['real_name'] == $real_name && $real_name != '' )
- {
- $str .= '_realname';
- }
-
- return $lang->get($str);
- }
-
- // Is the password strong enough?
- if ( getConfig('pw_strength_enable') )
- {
- $min_score = intval( getConfig('pw_strength_minimum') );
- $pass_score = password_score($password);
- if ( $pass_score < $min_score )
- {
- return $lang->get('user_reg_err_password_too_weak');
- }
- }
-
- // Require the account to be activated?
- switch(getConfig('account_activation'))
- {
- case 'none':
- default:
- $active = '1';
- break;
- case 'user':
- $active = '0';
- break;
- case 'admin':
- $active = '0';
- break;
- }
- if ( $coppa )
- $active = '0';
-
- $coppa_col = ( $coppa ) ? '1' : '0';
-
- // Generate a totally random activation key
- $actkey = sha1 ( microtime() . mt_rand() );
+
+ # Variables
+
+ /**
+ * Whether we're logged in or not
+ * @var bool
+ */
+
+ var $user_logged_in = false;
+
+ /**
+ * Our current low-privilege session key
+ * @var string
+ */
+
+ var $sid;
+
+ /**
+ * Username of currently logged-in user, or IP address if not logged in
+ * @var string
+ */
+
+ var $username;
+
+ /**
+ * User ID of currently logged-in user, or 1 if not logged in
+ * @var int
+ */
+
+ var $user_id = 1;
+
+ /**
+ * Real name of currently logged-in user, or blank if not logged in
+ * @var string
+ */
+
+ var $real_name;
+
+ /**
+ * E-mail address of currently logged-in user, or blank if not logged in
+ * @var string
+ */
+
+ var $email;
+
+ /**
+ * List of "extra" user information fields (IM handles, etc.)
+ * @var array (associative)
+ */
+
+ var $user_extra;
+
+ /**
+ * User level of current user
+ * USER_LEVEL_GUEST: guest
+ * USER_LEVEL_MEMBER: regular user
+ * USER_LEVEL_CHPREF: default - pseudo-level that allows changing password and e-mail address (requires re-authentication)
+ * USER_LEVEL_MOD: moderator
+ * USER_LEVEL_ADMIN: administrator
+ * @var int
+ */
+
+ var $user_level;
+
+ /**
+ * High-privilege session key
+ * @var string or false if not running on high-level authentication
+ */
+
+ var $sid_super;
+
+ /**
+ * The user's theme preference, defaults to $template->default_theme
+ * @var string
+ */
+
+ var $theme;
+
+ /**
+ * The user's style preference, or style auto-detected based on theme if not logged in
+ * @var string
+ */
+
+ var $style;
+
+ /**
+ * Signature of current user - appended to comments, etc.
+ * @var string
+ */
+
+ var $signature;
+
+ /**
+ * UNIX timestamp of when we were registered, or 0 if not logged in
+ * @var int
+ */
+
+ var $reg_time;
+
+ /**
+ * The number of unread private messages this user has.
+ * @var int
+ */
+
+ var $unread_pms = 0;
+
+ /**
+ * AES key used to encrypt passwords and session key info.
+ * @var string
+ * @access private
+ */
+
+ protected $private_key;
+
+ /**
+ * Regex that defines a valid username, minus the ^ and $, these are added later
+ * @var string
+ */
+
+ var $valid_username = '([^<>&\?\'"%\n\r\t\a\/]+)';
+
+ /**
+ * The current user's user title. Defaults to NULL.
+ * @var string
+ */
+
+ var $user_title = null;
+
+ /**
+ * What we're allowed to do as far as permissions go. This changes based on the value of the "auth" URI param.
+ * @var string
+ */
+
+ var $auth_level = 1;
+
+ /**
+ * Preference for date formatting
+ * @var string
+ */
+
+ var $date_format = DATE_4;
+
+ /**
+ * Preference for time formatting
+ * @var string
+ */
+
+ var $time_format = TIME_24_NS;
+
+ /**
+ * State variable to track if a session timed out
+ * @var bool
+ */
+
+ var $sw_timed_out = false;
+
+ /**
+ * Token appended to some important forms to prevent CSRF.
+ * @var string
+ */
+
+ var $csrf_token = false;
+
+ /**
+ * Password change disabled, for auth plugins
+ * @var bool
+ */
+
+ var $password_change_disabled = false;
+
+ /**
+ * Password change page URL + title, for auth plugins
+ * @var array
+ */
+
+ var $password_change_dest = array('url' => '', 'title' => '');
+
+ /**
+ * Switch to track if we're started or not.
+ * @access private
+ * @var bool
+ */
+
+ var $started = false;
+
+ /**
+ * Switch to control compatibility mode (for older Enano websites being upgraded)
+ * @access private
+ * @var bool
+ */
+
+ var $compat = false;
+
+ /**
+ * Our list of permission types.
+ * @access private
+ * @var array
+ */
+
+ var $acl_types = Array();
+
+ /**
+ * The list of descriptions for the permission types
+ * @var array
+ */
+
+ var $acl_descs = Array();
+
+ /**
+ * A list of dependencies for ACL types.
+ * @var array
+ */
+
+ var $acl_deps = Array();
+
+ /**
+ * Our tell-all list of permissions. Do not even try to change this.
+ * @access private
+ * @var array
+ */
+
+ var $perms = Array();
+
+ /**
+ * A cache variable - saved after sitewide permissions are checked but before page-specific permissions.
+ * @var array
+ * @access private
+ */
+
+ var $acl_base_cache = Array();
+
+ /**
+ * Stores the scope information for ACL types.
+ * @var array
+ * @access private
+ */
+
+ var $acl_scope = Array();
+
+ /**
+ * Array to track which default permissions are being used
+ * @var array
+ * @access private
+ */
+
+ var $acl_defaults_used = Array();
+
+ /**
+ * Array to track group membership.
+ * @var array
+ */
+
+ var $groups = Array();
+
+ /**
+ * Associative array to track group modship.
+ * @var array
+ */
+
+ var $group_mod = Array();
+
+ /**
+ * A constant array of user-level-to-rank default associations.
+ * @var array
+ */
+
+ var $level_rank_table = array(
+ USER_LEVEL_ADMIN => RANK_ID_ADMIN,
+ USER_LEVEL_MOD => RANK_ID_MOD,
+ USER_LEVEL_MEMBER => RANK_ID_MEMBER,
+ USER_LEVEL_CHPREF => RANK_ID_MEMBER,
+ USER_LEVEL_GUEST => RANK_ID_GUEST
+ );
+
+ /**
+ * A constant array that maps precedence constants to language strings
+ * @var array
+ */
+
+ var $acl_inherit_lang_table = array(
+ ACL_INHERIT_ENANO_DEFAULT => 'acl_inherit_enano_default',
+ ACL_INHERIT_GLOBAL_EVERYONE => 'acl_inherit_global_everyone',
+ ACL_INHERIT_GLOBAL_GROUP => 'acl_inherit_global_group',
+ ACL_INHERIT_GLOBAL_USER => 'acl_inherit_global_user',
+ ACL_INHERIT_PG_EVERYONE => 'acl_inherit_pg_everyone',
+ ACL_INHERIT_PG_GROUP => 'acl_inherit_pg_group',
+ ACL_INHERIT_PG_USER => 'acl_inherit_pg_user',
+ ACL_INHERIT_LOCAL_EVERYONE => 'acl_inherit_local_everyone',
+ ACL_INHERIT_LOCAL_GROUP => 'acl_inherit_local_group',
+ ACL_INHERIT_LOCAL_USER => 'acl_inherit_local_user'
+ );
+
+ # Basic functions
+
+ /**
+ * Constructor.
+ */
+
+ function __construct()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( defined('IN_ENANO_INSTALL') && !defined('IN_ENANO_UPGRADE') )
+ {
+ @include(ENANO_ROOT.'/config.new.php');
+ }
+ else
+ {
+ @include(ENANO_ROOT.'/config.php');
+ }
+
+ unset($dbhost, $dbname, $dbuser, $dbpasswd);
+ if(isset($crypto_key))
+ {
+ $this->private_key = $crypto_key;
+ $this->private_key = hexdecode($this->private_key);
+ }
+ else
+ {
+ if(is_writable(ENANO_ROOT.'/config.php'))
+ {
+ // Generate and stash a private key
+ // This should only happen during an automated silent gradual migration to the new encryption platform.
+ $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
+ $this->private_key = $aes->gen_readymade_key();
+
+ $config = file_get_contents(ENANO_ROOT.'/config.php');
+ if(!$config)
+ {
+ die('$session->__construct(): can\'t get the contents of config.php');
+ }
+
+ $config = str_replace("?>", "\$crypto_key = '{$this->private_key}';\n?>", $config);
+ // And while we're at it...
+ $config = str_replace('MIDGET_INSTALLED', 'ENANO_INSTALLED', $config);
+ $fh = @fopen(ENANO_ROOT.'/config.php', 'w');
+ if ( !$fh )
+ {
+ die('$session->__construct(): Couldn\'t open config file for writing to store the private key, I tried to avoid something like this...');
+ }
+
+ fwrite($fh, $config);
+ fclose($fh);
+ }
+ else
+ {
+ die_semicritical('Crypto error', 'No private key was found in the config file, and we can\'t generate one because we don\'t have write access to the config file. Please CHMOD config.php to 666 or 777 and reload this page.
');
+ }
+ }
+ // Check for compatibility mode
+ if(defined('IN_ENANO_INSTALL'))
+ {
+ $q = $db->sql_query('SELECT old_encryption FROM '.table_prefix.'users LIMIT 1;');
+ if(!$q)
+ {
+ $error = mysql_error();
+ if(strstr($error, "Unknown column 'old_encryption'"))
+ $this->compat = true;
+ else
+ $db->_die('This should never happen and is a bug - the only error that was supposed to happen here didn\'t happen. (sessions.php in constructor, during compat mode check)');
+ }
+ $db->free_result();
+ }
+ }
+
+ /**
+ * PHP 4 compatible constructor. Deprecated in 1.1.x.
+ */
+
+ /*
+ function sessionManager()
+ {
+ $this->__construct();
+ }
+ */
+
+ /**
+ * Wrapper function to sanitize strings for MySQL and HTML
+ * @param string $text The text to sanitize
+ * @return string
+ */
+
+ function prepare_text($text)
+ {
+ global $db;
+ return $db->escape(htmlspecialchars($text));
+ }
+
+ /**
+ * Makes a SQL query and handles error checking
+ * @param string $query The SQL query to make
+ * @return resource
+ */
+
+ function sql($query)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $result = $db->sql_query($query);
+ if(!$result)
+ {
+ $db->_die('The error seems to have occurred somewhere in the session management code.');
+ }
+ return $result;
+ }
+
+ /**
+ * Returns true if we're currently on a page that shouldn't be blocked even if we have an inactive or banned account
+ * @param bool strict - if true, whitelist of pages is even stricter (Login, Logout and CSS only). if false (default), admin access is allowed, assuming other factors allow it
+ * @return bool
+ */
+
+ function on_critical_page($strict = false)
+ {
+ global $urlname;
+ list($page_id, $namespace) = RenderMan::strToPageID($urlname);
+ list($page_id) = explode('/', $page_id);
+
+ if ( $strict )
+ {
+ return $namespace == 'Special' && in_array($page_id, array('CSS', 'Login', 'Logout', 'LangExportJSON', 'ActivateAccount'));
+ }
+ else
+ {
+ return $namespace == 'Admin' || ($namespace == 'Special' && in_array($page_id, array('CSS', 'Login', 'Logout', 'Administration', 'LangExportJSON', 'ActivateAccount')));
+ }
+ }
+
+ # Session restoration and permissions
+
+ /**
+ * Initializes the basic state of things, including most user prefs, login data, cookie stuff
+ */
+
+ function start()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+ global $timezone;
+ if($this->started) return;
+ $this->started = true;
+ $user = false;
+ if ( isset($_COOKIE['sid']) )
+ {
+ if ( $this->compat )
+ {
+ $userdata = $this->compat_validate_session($_COOKIE['sid']);
+ }
+ else
+ {
+ $userdata = $this->validate_session($_COOKIE['sid']);
+ }
+ if ( is_array($userdata) )
+ {
+ $this->sid = $_COOKIE['sid'];
+ $this->user_logged_in = true;
+ $this->user_id = intval($userdata['user_id']);
+ $this->username = $userdata['username'];
+ $this->user_level = intval($userdata['user_level']);
+ $this->real_name = $userdata['real_name'];
+ $this->email = $userdata['email'];
+ $this->unread_pms = $userdata['num_pms'];
+ $this->user_title = ( isset($userdata['user_title']) ) ? $userdata['user_title'] : null;
+ if(!$this->compat)
+ {
+ $this->theme = $userdata['theme'];
+ $this->style = $userdata['style'];
+ $this->signature = $userdata['signature'];
+ $this->reg_time = $userdata['reg_time'];
+ }
+ $this->auth_level = USER_LEVEL_MEMBER;
+ // generate an anti-CSRF token
+ $this->csrf_token = sha1($this->username . $this->sid . $this->user_id);
+ if(!isset($template->named_theme_list[$this->theme]))
+ {
+ if($this->compat || !is_object($template))
+ {
+ $this->theme = 'oxygen';
+ $this->style = 'bleu';
+ }
+ else
+ {
+ $this->theme = $template->default_theme;
+ $this->style = $template->default_style;
+ }
+ }
+ $user = true;
+
+ // set timezone params
+ $GLOBALS['timezone'] = $userdata['user_timezone'];
+ $GLOBALS['dst_params'] = explode(';', $userdata['user_dst']);
+ foreach ( $GLOBALS['dst_params'] as &$parm )
+ {
+ if ( substr($parm, -1) != 'd' )
+ $parm = intval($parm);
+ }
+
+ // Set language
+ if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
+ {
+ $lang_id = intval($userdata['user_lang']);
+ $lang = new Language($lang_id);
+ @setlocale(LC_ALL, $lang->lang_code);
+ }
+
+ if(isset($_REQUEST['auth']) && !$this->sid_super)
+ {
+ // Now he thinks he's a moderator. Or maybe even an administrator. Let's find out if he's telling the truth.
+ if($this->compat)
+ {
+ $key = $_REQUEST['auth'];
+ $super = $this->compat_validate_session($key);
+ }
+ else
+ {
+ $key = $_REQUEST['auth'];
+ if ( !empty($key) && ( strlen($key) / 2 ) % 4 == 0 )
+ {
+ $super = $this->validate_session($key);
+ }
+ }
+ if(is_array(@$super))
+ {
+ $this->auth_level = intval($super['auth_level']);
+ $this->sid_super = $_REQUEST['auth'];
+ }
+ }
+ }
+ }
+ if(!$user)
+ {
+ //exit;
+ $this->register_guest_session();
+ }
+ if(!$this->compat)
+ {
+ // init groups
+ $q = $this->sql('SELECT g.group_name,g.group_id,m.is_mod FROM '.table_prefix.'groups AS g' . "\n"
+ . ' LEFT JOIN '.table_prefix.'group_members AS m' . "\n"
+ . ' ON g.group_id=m.group_id' . "\n"
+ . ' WHERE ( m.user_id='.$this->user_id.'' . "\n"
+ . ' OR g.group_name=\'Everyone\')' . "\n"
+ . ' ' . ( /* quick hack for upgrade compatibility reasons */ enano_version() == '1.0RC1' ? '' : 'AND ( m.pending != 1 OR m.pending IS NULL )' ) . '' . "\n"
+ . ' ORDER BY group_id ASC;'); // The ORDER BY is to make sure "Everyone" comes first so the permissions can be overridden
+ if($row = $db->fetchrow())
+ {
+ do {
+ $this->groups[$row['group_id']] = $row['group_name'];
+ $this->group_mod[$row['group_id']] = ( intval($row['is_mod']) == 1 );
+ } while($row = $db->fetchrow());
+ }
+ else
+ {
+ die('No group info');
+ }
+ profiler_log('Fetched group memberships');
+ }
+
+ // make sure we aren't banned
+ $this->check_banlist();
+
+ // make sure the account is active
+ if ( !$this->compat && $this->user_logged_in && $userdata['account_active'] < 1 && !$this->on_critical_page() )
+ {
+ $this->show_inactive_error($userdata);
+ }
+
+ // Printable page view? Probably the wrong place to control
+ // it but $template is pretty dumb, it will just about always
+ // do what you ask it to do, which isn't always what we want
+ if ( isset ( $_GET['printable'] ) )
+ {
+ $this->theme = 'printable';
+ $this->style = 'default';
+ }
+
+ // setup theme ACLs
+ $template->process_theme_acls();
+
+ profiler_log('Sessions started. Banlist and theme ACLs initialized');
+ }
+
+ # Logins
+
+ /**
+ * Attempts to perform a login using crypto functions
+ * @param string $username The username
+ * @param string $aes_data The encrypted password, hex-encoded
+ * @param string $aes_key The MD5 hash of the encryption key, hex-encoded
+ * @param string $challenge The 256-bit MD5 challenge string - first 128 bits should be the hash, the last 128 should be the challenge salt
+ * @param int $level The privilege level we're authenticating for, defaults to 0
+ * @param string $captcha_hash Optional. If we're locked out and the lockout policy is captcha, this should be the identifier for the code.
+ * @param string $captcha_code Optional. If we're locked out and the lockout policy is captcha, this should be the code the user entered.
+ * @param bool $remember Optional. If true, remembers the session for X days. Otherwise, assigns a short session. Defaults to false.
+ * @param bool $lookup_key Optional. If true (default) this queries the database for the "real" encryption key. Else, uses what is given.
+ * @return string 'success' on success, or error string on failure
+ */
+
+ function login_with_crypto($username, $aes_data, $aes_key_id, $challenge, $level = USER_LEVEL_MEMBER, $captcha_hash = false, $captcha_code = false, $remember = false, $lookup_key = true)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ // Instanciate the Rijndael encryption object
+ $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
+
+ // Fetch our decryption key
+
+ if ( $lookup_key )
+ {
+ $aes_key = $this->fetch_public_key($aes_key_id);
+ if ( !$aes_key )
+ {
+ // It could be that our key cache is full. If it seems larger than 65KB, clear it
+ if ( strlen(getConfig('login_key_cache')) > 65000 )
+ {
+ setConfig('login_key_cache', '');
+ return array(
+ 'success' => false,
+ 'error' => 'key_not_found_cleared',
+ );
+ }
+ return array(
+ 'success' => false,
+ 'error' => 'key_not_found'
+ );
+ }
+ }
+ else
+ {
+ $aes_key =& $aes_key_id;
+ }
+
+ // Convert the key to a binary string
+ $bin_key = hexdecode($aes_key);
+
+ if(strlen($bin_key) != AES_BITS / 8)
+ return array(
+ 'success' => false,
+ 'error' => 'key_wrong_length'
+ );
+
+ // Decrypt our password
+ $password = $aes->decrypt($aes_data, $bin_key, ENC_HEX);
+
+ // Let the LoginAPI do the rest.
+ return $this->login_without_crypto($username, $password, false, $level, $captcha_hash, $captcha_code, $remember);
+ }
+
+ /**
+ * Attempts to login without using crypto stuff, mainly for use when the other side doesn't like Javascript
+ * This method of authentication is inherently insecure, there's really nothing we can do about it except hope and pray that everyone moves to Firefox
+ * Technically it still uses crypto, but it only decrypts the password already stored, which is (obviously) required for authentication
+ * @param string $username The username
+ * @param string $password The password -OR- the MD5 hash of the password if $already_md5ed is true
+ * @param bool $already_md5ed This should be set to true if $password is an MD5 hash, and should be false if it's plaintext. Defaults to false.
+ * @param int $level The privilege level we're authenticating for, defaults to 0
+ * @param bool $remember Optional. If true, remembers the session for X days. Otherwise, assigns a short session. Defaults to false.
+ */
+
+ function login_without_crypto($username, $password, $already_md5ed = false, $level = USER_LEVEL_MEMBER, $remember = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( $already_md5ed )
+ {
+ // No longer supported
+ return array(
+ 'mode' => 'error',
+ 'error' => '$already_md5ed is no longer supported (set this parameter to false and make sure the password you send to $session->login_without_crypto() is not hashed)'
+ );
+ }
+
+ // Replace underscores with spaces in username
+ // (Added in 1.0.2)
+ $username = str_replace('_', ' ', $username);
+
+ // Perhaps we're upgrading Enano?
+ if($this->compat)
+ {
+ return $this->login_compat($username, md5($password), $level);
+ }
+
+ // Instanciate the Rijndael encryption object
+ $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
+
+ // Initialize our success switch
+ $success = false;
+
+ // Retrieve the real password from the database
+ $username_db = $db->escape(strtolower($username));
+ $username_db_upper = $db->escape($username);
+ if ( !$db->sql_query('SELECT password,password_salt,old_encryption,user_id,user_level,temp_password,temp_password_time FROM '.table_prefix."users\n"
+ . " WHERE ( " . ENANO_SQLFUNC_LOWERCASE . "(username) = '$username_db' OR username = '$username_db_upper' );") )
+ {
+ $this->sql('SELECT password,\'\' AS password_salt,old_encryption,user_id,user_level,temp_password,temp_password_time FROM '.table_prefix."users\n"
+ . " WHERE ( " . ENANO_SQLFUNC_LOWERCASE . "(username) = '$username_db' OR username = '$username_db_upper' );");
+ }
+ if ( $db->numrows() < 1 )
+ {
+ // This wasn't logged in <1.0.2, dunno how it slipped through
+ if ( $level > USER_LEVEL_MEMBER )
+ $this->sql('INSERT INTO ' . table_prefix . "logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES\n"
+ . ' (\'security\', \'admin_auth_bad\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', '
+ . '\''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
+ else
+ $this->sql('INSERT INTO ' . table_prefix . "logs(log_type,action,time_id,date_string,author,edit_summary) VALUES\n"
+ . ' (\'security\', \'auth_bad\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', '
+ . '\''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
+
+ // Do we also need to increment the lockout countdown?
+ if ( !defined('IN_ENANO_INSTALL') )
+ $lockout_data = $this->get_lockout_info();
+ else
+ $lockout_data = array(
+ 'lockout_policy' => 'disable'
+ );
+
+ if ( $lockout_data['policy'] != 'disable' && !defined('IN_ENANO_INSTALL') )
+ {
+ $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
+ // increment fail count
+ $this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action, username) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\', \'' . $db->escape($username) . '\');');
+ $lockout_data['fails']++;
+ return array(
+ 'success' => false,
+ 'error' => ( $lockout_data['fails'] >= $lockout_data['threshold'] ) ? 'locked_out' : 'invalid_credentials',
+ 'lockout_threshold' => $lockout_data['threshold'],
+ 'lockout_duration' => ( $lockout_data['duration'] ),
+ 'lockout_fails' => $lockout_data['fails'],
+ 'lockout_policy' => $lockout_data['policy']
+ );
+ }
+
+ return array(
+ 'success' => false,
+ 'error' => 'invalid_credentials'
+ );
+ }
+ $row = $db->fetchrow();
+
+ // Check to see if we're logging in using a temporary password
+
+ if((intval($row['temp_password_time']) + 3600*24) > time() )
+ {
+ $temp_pass = hmac_sha1($password, $row['password_salt']);
+ if( $temp_pass === $row['temp_password'] )
+ {
+ $code = $plugins->setHook('login_password_reset');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ return array(
+ 'success' => false,
+ 'error' => 'valid_reset',
+ 'redirect_url' => makeUrlComplete('Special', 'PasswordReset/stage2/' . $row['user_id'] . '/' . $this->pk_encrypt($password))
+ );
+ }
+ }
+
+ if ( $row['old_encryption'] == 1 )
+ {
+ // The user's password is stored using the obsolete and insecure MD5 algorithm - we'll update the field with the new password
+ if(md5($password) === $row['password'])
+ {
+ if ( !defined('IN_ENANO_UPGRADE') )
+ {
+ $hmac_secret = hexencode(AESCrypt::randkey(20), '', '');
+ $password_hmac = hmac_sha1($password, $hmac_secret);
+ $this->sql('UPDATE '.table_prefix."users SET password = '$password_hmac', password_salt = '$hmac_secret', old_encryption = 0 WHERE user_id={$row['user_id']};");
+ }
+ $success = true;
+ }
+ }
+ else if ( $row['old_encryption'] == 2 || ( defined('ENANO_UPGRADE_USE_AES_PASSWORDS') ) && strlen($row['password']) != 40 )
+ {
+ // Our password field uses the 1.0RC1-1.1.5 encryption format
+ $real_pass = $aes->decrypt($row['password'], $this->private_key);
+ if($password === $real_pass)
+ {
+ if ( !defined('IN_ENANO_UPGRADE') )
+ {
+ $hmac_secret = hexencode(AESCrypt::randkey(20), '', '');
+ $password_hmac = hmac_sha1($password, $hmac_secret);
+ $this->sql('UPDATE '.table_prefix."users SET password = '$password_hmac', password_salt = '$hmac_secret', old_encryption = 0 WHERE user_id={$row['user_id']};");
+ }
+ $success = true;
+ }
+ }
+ else
+ {
+ // Password uses HMAC-SHA1
+ $user_challenge = hmac_sha1($password, $row['password_salt']);
+ $password_hmac =& $row['password'];
+ if ( $user_challenge === $password_hmac )
+ {
+ $success = true;
+ }
+ }
+ if($success)
+ {
+ if((int)$level > (int)$row['user_level'])
+ return array(
+ 'success' => false,
+ 'error' => 'too_big_for_britches'
+ );
+
+ // grant session
+ $sess = $this->register_session($row['user_id'], $username, ( isset($password_hmac) ? $password_hmac : $password ), $level, $remember);
+
+ if($sess)
+ {
+ if($level > USER_LEVEL_MEMBER)
+ $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,author_uid,edit_summary,page_text) VALUES(\'security\', \'admin_auth_good\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', ' . $row['user_id'] . ', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
+ else
+ $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,author_uid,edit_summary) VALUES(\'security\', \'auth_good\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', ' . $row['user_id'] . ', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
+
+ $code = $plugins->setHook('login_success');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ return array(
+ 'success' => true
+ );
+ }
+ else
+ return array(
+ 'success' => false,
+ 'error' => 'backend_fail'
+ );
+ }
+ else
+ {
+ if($level > USER_LEVEL_MEMBER)
+ $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES(\'security\', \'admin_auth_bad\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
+ else
+ $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
+
+ // Do we also need to increment the lockout countdown?
+ if ( !defined('IN_ENANO_INSTALL') && getConfig('lockout_policy', 'lockout') !== 'disable' )
+ {
+ $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
+ // increment fail count
+ $this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action, username) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\', \'' . $db->escape($username) . '\');');
+ }
+
+ return array(
+ 'success' => false,
+ 'error' => 'invalid_credentials'
+ );
+ }
+ }
+
+ /**
+ * Attempts to log in using the old table structure and algorithm. This is for upgrades from old 1.0.x releases.
+ * @param string $username
+ * @param string $password This should be an MD5 hash
+ * @return string 'success' if successful, or error message on failure
+ */
+
+ function login_compat($username, $password, $level = 0)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $pass_hashed =& $password;
+ $this->sql('SELECT password,user_id,user_level FROM '.table_prefix.'users WHERE username=\''.$this->prepare_text($username).'\';');
+ if($db->numrows() < 1)
+ return 'The username and/or password is incorrect.';
+ $row = $db->fetchrow();
+ if($row['password'] == $password)
+ {
+ if((int)$level > (int)$row['user_level'])
+ return 'You are not authorized for this level of access.';
+ $sess = $this->register_session_compat(intval($row['user_id']), $username, $password, $level);
+ if($sess)
+ return 'success';
+ else
+ return 'Your login credentials were correct, but an internal error occured while registering the session key in the database.';
+ }
+ else
+ {
+ return 'The username and/or password is incorrect.';
+ }
+ }
+
+ /**
+ * Registers a session key in the database. This function *ASSUMES* that the username and password have already been validated!
+ * Basically the session key is a hex-encoded cookie (encrypted with the site's private key) that says "u=[username];p=[sha1 of password];s=[unique key id]"
+ * @param int $user_id
+ * @param string $username
+ * @param string $password_hmac The HMAC of the user's password, right from the database
+ * @param int $level The level of access to grant, defaults to USER_LEVEL_MEMBER
+ * @param bool $remember Whether the session should be long-term (true) or not (false). Defaults to short-term.
+ * @return bool
+ */
+
+ function register_session($user_id, $username, $password_hmac, $level = USER_LEVEL_MEMBER, $remember = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ // Random key identifier
+ $salt = '';
+ for ( $i = 0; $i < 32; $i++ )
+ {
+ $salt .= chr(mt_rand(32, 126));
+ }
+
+ // Session key
+ if ( defined('ENANO_UPGRADE_USE_AES_PASSWORDS') )
+ {
+ $session_key = $this->pk_encrypt("u=$username;p=" . sha1($password_hmac) . ";s=$salt");
+ }
+ else
+ {
+ $key_pieces = array($password_hmac);
+ $sk_mode = 'generate';
+ $code = $plugins->setHook('session_key_calc');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+ $key_pieces = implode("\xFF", $key_pieces);
+
+ $session_key = hmac_sha1($key_pieces, $salt);
+ }
+
+ // Minimum level
+ $level = max(array($level, USER_LEVEL_MEMBER));
+
+ // Type of key
+ $key_type = ( $level > USER_LEVEL_MEMBER ) ? SK_ELEV : ( $remember ? SK_LONG : SK_SHORT );
+
+ // If we're registering an elevated-privilege key, it needs to be on GET
+ if($level > USER_LEVEL_MEMBER)
+ {
+ $this->sid_super = $session_key;
+ $_GET['auth'] = $session_key;
+ }
+ else
+ {
+ // Stash it in a cookie
+ // For now, make the cookie last forever, we can change this in 1.1.x
+ setcookie( 'sid', $session_key, time()+15552000, scriptPath.'/', null, $GLOBALS['is_https']);
+ $_COOKIE['sid'] = $session_key;
+ $this->sid = $session_key;
+ }
+ // $keyhash is stored in the database, this is for compatibility with the older DB structure
+ $keyhash = md5($session_key);
+ // Record the user's IP
+ $ip = $_SERVER['REMOTE_ADDR'];
+ if(!is_valid_ip($ip))
+ die('$session->register_session: Remote-Addr was spoofed');
+ // The time needs to be stashed to enforce the 15-minute limit on elevated session keys
+ $time = time();
+
+ // Sanity check
+ if(!is_int($user_id))
+ die('Somehow an SQL injection attempt crawled into our session registrar! (1)');
+ if(!is_int($level))
+ die(var_dump($level) . '
Somehow an SQL injection attempt crawled into our session registrar! (2)');
+
+ // Update RAM
+ $this->user_id = $user_id;
+ $this->user_level = max(array($this->user_level, $level));
+
+ // All done!
+ $query = $db->sql_query('INSERT INTO '.table_prefix.'session_keys(session_key, salt, user_id, auth_level, source_ip, time, key_type) VALUES(\''.$keyhash.'\', \''.$db->escape($salt).'\', '.$user_id.', '.$level.', \''.$ip.'\', '.$time.', ' . $key_type . ');');
+ if ( !$query && defined('IN_ENANO_UPGRADE') )
+ // we're trying to upgrade so the key_type column is probably missing - try it again without specifying the key type
+ $this->sql('INSERT INTO '.table_prefix.'session_keys(session_key, salt, user_id, auth_level, source_ip, time) VALUES(\''.$keyhash.'\', \''.$db->escape($salt).'\', '.$user_id.', '.$level.', \''.$ip.'\', '.$time.');');
+
+ return true;
+ }
+
+ /**
+ * Identical to register_session in nature, but uses the old login/table structure. DO NOT use this except in the upgrade script under very controlled circumstances.
+ * @see sessionManager::register_session()
+ * @access private
+ */
+
+ function register_session_compat($user_id, $username, $password, $level = 0)
+ {
+ $salt = md5(microtime() . mt_rand());
+ $thekey = md5($password . $salt);
+ if($level > 0)
+ {
+ $this->sid_super = $thekey;
+ }
+ else
+ {
+ setcookie( 'sid', $thekey, time()+315360000, scriptPath.'/' );
+ $_COOKIE['sid'] = $thekey;
+ }
+ $ip = ip2hex($_SERVER['REMOTE_ADDR']);
+ if(!$ip)
+ die('$session->register_session: Remote-Addr was spoofed');
+ $time = time();
+ if(!is_int($user_id))
+ die('Somehow an SQL injection attempt crawled into our session registrar! (1)');
+ if(!is_int($level))
+ die('Somehow an SQL injection attempt crawled into our session registrar! (2)');
+ $query = $this->sql('INSERT INTO '.table_prefix.'session_keys(session_key, salt, user_id, auth_level, source_ip, time) VALUES(\''.$thekey.'\', \''.$salt.'\', '.$user_id.', '.$level.', \''.$ip.'\', '.$time.');');
+ return true;
+ }
+
+ /**
+ * Tells us if we're locked out from logging in or not.
+ * @param reference will be filled with information regarding in-progress lockout
+ * @return bool True if locked out, false otherwise
+ */
+
+ function get_lockout_info()
+ {
+ global $db;
+
+ // this has to be initialized to hide warnings
+ $lockdata = null;
+
+ // Query database for lockout info
+ $locked_out = false;
+ $threshold = ( $_ = getConfig('lockout_threshold') ) ? intval($_) : 5;
+ $duration = ( $_ = getConfig('lockout_duration') ) ? intval($_) : 15;
+ // convert to seconds
+ $duration = $duration * 60;
+ // decide on policy
+ $policy = ( $x = getConfig('lockout_policy') && in_array(getConfig('lockout_policy'), array('lockout', 'disable', 'captcha')) ) ? getConfig('lockout_policy') : 'lockout';
+ if ( $policy != 'disable' )
+ {
+ // enabled; make decision
+ $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
+ $timestamp_cutoff = time() - $duration;
+ $q = $this->sql('SELECT timestamp FROM ' . table_prefix . 'lockout WHERE timestamp > ' . $timestamp_cutoff . ' AND ipaddr = \'' . $ipaddr . '\' ORDER BY timestamp DESC;');
+ $fails = $db->numrows($q);
+ $row = $db->fetchrow($q);
+ $locked_out = ( $fails >= $threshold );
+ $lockdata = array(
+ 'active' => $locked_out,
+ 'threshold' => $threshold,
+ 'duration' => ( $duration / 60 ),
+ 'fails' => $fails,
+ 'policy' => $policy,
+ 'last_time' => $row['timestamp'],
+ 'time_rem' => $locked_out ? ( $duration / 60 ) - round( ( time() - $row['timestamp'] ) / 60 ) : 0,
+ 'captcha' => $policy == 'captcha' ? $this->make_captcha() : ''
+ );
+ $db->free_result();
+ }
+ else
+ {
+ // disabled; send back default dataset
+ $lockdata = array(
+ 'active' => false,
+ 'threshold' => $threshold,
+ 'duration' => ( $duration / 60 ),
+ 'fails' => 0,
+ 'policy' => $policy,
+ 'last_time' => 0,
+ 'time_rem' => 0,
+ 'captcha' => ''
+ );
+ }
+ return $lockdata;
+ }
+
+ /**
+ * Creates/restores a guest session
+ * @todo implement real session management for guests
+ */
+
+ function register_guest_session()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+ $this->username = $_SERVER['REMOTE_ADDR'];
+ $this->user_level = USER_LEVEL_GUEST;
+ if($this->compat || defined('IN_ENANO_INSTALL'))
+ {
+ $this->theme = 'oxygen';
+ $this->style = 'bleu';
+ }
+ else
+ {
+ $this->theme = ( isset($_GET['theme']) && isset($template->named_theme_list[$_GET['theme']])) ? $_GET['theme'] : $template->default_theme;
+ $this->style = ( isset($_GET['style']) && file_exists(ENANO_ROOT.'/themes/'.$this->theme . '/css/'.$_GET['style'].'.css' )) ? $_GET['style'] : preg_replace('/\.css$/', '', $template->named_theme_list[$this->theme]['default_style']);
+ }
+ $this->user_id = 1;
+ // This is a VERY special case we are allowing. It lets the installer create languages using the Enano API.
+ if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
+ {
+ $language = ( isset($_GET['lang']) && preg_match('/^[a-z0-9-_]+$/', @$_GET['lang']) ) ? $_GET['lang'] : intval(getConfig('default_language'));
+ $lang = new Language($language);
+ @setlocale(LC_ALL, $lang->lang_code);
+ }
+ // make a CSRF token
+ $this->csrf_token = hmac_sha1($_SERVER['REMOTE_ADDR'], sha1($this->private_key));
+ }
+
+ /**
+ * Validates a session key, and returns the userdata associated with the key or false
+ * @param string $key The session key to validate
+ * @return array Keys are 'user_id', 'username', 'email', 'real_name', 'user_level', 'theme', 'style', 'signature', 'reg_time', 'account_active', 'activation_key', and 'auth_level' or bool false if validation failed. The key 'auth_level' is the maximum authorization level that this key provides.
+ */
+
+ function validate_session($key)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ profiler_log("SessionManager: checking session: " . sha1($key));
+
+ if ( strlen($key) > 48 )
+ {
+ return $this->validate_aes_session($key);
+ }
+
+ profiler_log("SessionManager: checking session: " . $key);
+
+ return $this->validate_session_shared($key, '');
+ }
+
+ /**
+ * Validates an old-format AES session key. DO NOT USE THIS. Will return false if called outside of an upgrade.
+ * @param string Session key
+ * @return array
+ */
+
+ protected function validate_aes_session($key)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ // No valid use except during upgrades
+ if ( !preg_match('/^upg-/', enano_version()) && !defined('IN_ENANO_UPGRADE') )
+ return false;
+
+ $decrypted_key = $this->pk_decrypt($key);
+ if ( !$decrypted_key )
+ {
+ // die_semicritical('AES encryption error', 'Something went wrong during the AES decryption process.
'.print_r($decrypted_key, true).'
');
+ return false;
+ }
+
+ $n = preg_match('/^u='.$this->valid_username.';p=([A-Fa-f0-9]+?);s=(.{32})$/', $decrypted_key, $keydata);
+ if($n < 1)
+ {
+ echo '(debug) $session->validate_session: Key does not match regex
Decrypted key: '.$decrypted_key;
+ return false;
+ }
+ $keyhash = md5($key);
+ $salt = $db->escape($keydata[3]);
+
+ return $this->validate_session_shared($keyhash, $salt, true);
+ }
+
+ /**
+ * Shared portion of session validation. Do not try to call this.
+ * @return array
+ * @access private
+ */
+
+ protected function validate_session_shared($key, $salt, $loose_call = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ // using a normal call to $db->sql_query to avoid failing on errors here
+ $columns_select = "u.user_id AS uid, u.username, u.password, u.password_salt, u.email, u.real_name, u.user_level, u.theme,\n"
+ . " u.style,u.signature, u.reg_time, u.account_active, u.activation_key, u.user_lang, u.user_title, k.salt, k.source_ip,\n"
+ . " k.time, k.auth_level, k.key_type, COUNT(p.message_id) AS num_pms, u.user_timezone, u.user_dst, x.*";
+
+ $columns_groupby = "u.user_id, u.username, u.password, u.password_salt, u.email, u.real_name, u.user_level, u.theme, u.style, u.signature,\n"
+ . " u.reg_time, u.account_active, u.activation_key, u.user_lang, u.user_timezone, u.user_title, u.user_dst,\n"
+ . " k.salt, k.source_ip, k.time, k.auth_level, k.key_type, x.user_id, x.user_aim, x.user_yahoo, x.user_msn,\n"
+ . " x.user_xmpp, x.user_homepage, x.user_location, x.user_job, x.user_hobbies, x.email_public,\n"
+ . " x.disable_js_fx, x.date_format, x.time_format";
+
+ $joins = " LEFT JOIN " . table_prefix . "users AS u\n"
+ . " ON ( u.user_id=k.user_id )\n"
+ . " LEFT JOIN " . table_prefix . "users_extra AS x\n"
+ . " ON ( u.user_id=x.user_id OR x.user_id IS NULL )\n"
+ . " LEFT JOIN " . table_prefix . "privmsgs AS p\n"
+ . " ON ( p.message_to=u.username AND p.message_read=0 )\n";
+ if ( !$loose_call )
+ {
+ $key_md5 = md5($key);
+ $query = $db->sql_query("SELECT $columns_select\n"
+ . "FROM " . table_prefix . "session_keys AS k\n"
+ . $joins
+ . " WHERE k.session_key='$key_md5'\n"
+ . " GROUP BY $columns_groupby;");
+ }
+ else
+ {
+ $query = $db->sql_query("SELECT $columns_select\n"
+ . "FROM " . table_prefix . "session_keys AS k\n"
+ . $joins
+ . " WHERE k.session_key='$key'\n"
+ . " AND k.salt='$salt'\n"
+ . " GROUP BY $columns_groupby;");
+ }
+
+ if ( !$query && ( defined('IN_ENANO_INSTALL') or defined('IN_ENANO_UPGRADE') ) )
+ {
+ $key_md5 = $loose_call ? $key : md5($key);
+ $query = $this->sql('SELECT u.user_id AS uid,u.username,u.password,\'\' AS password_salt,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,u.reg_time,u.account_active,u.activation_key,k.source_ip,k.time,k.auth_level,COUNT(p.message_id) AS num_pms, 1440 AS user_timezone, \'0;0;0;0;60\' AS user_dst, ' . SK_SHORT . ' AS key_type, k.salt FROM '.table_prefix.'session_keys AS k
+ LEFT JOIN '.table_prefix.'users AS u
+ ON ( u.user_id=k.user_id )
+ LEFT JOIN '.table_prefix.'privmsgs AS p
+ ON ( p.message_to=u.username AND p.message_read=0 )
+ WHERE k.session_key=\''.$key_md5.'\'
+ GROUP BY u.user_id,u.username,u.password,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,u.reg_time,u.account_active,u.activation_key,k.source_ip,k.time,k.auth_level,k.salt;');
+ }
+ else if ( !$query )
+ {
+ $db->_die();
+ }
+ if($db->numrows() < 1)
+ {
+ // echo '(debug) $session->validate_session: Key was not found in database: ' . $key_md5 . '
';
+ return false;
+ }
+ $row = $db->fetchrow();
+ profiler_log("SessionManager: session check: selected and fetched results");
+
+ $row['user_id'] =& $row['uid'];
+ $ip = $_SERVER['REMOTE_ADDR'];
+ if($row['auth_level'] > $row['user_level'])
+ {
+ // Failed authorization check
+ // echo '(debug) $session->validate_session: access to this auth level denied
';
+ return false;
+ }
+ if($ip != $row['source_ip'])
+ {
+ // Special exception for 1.1.x upgrade - the 1.1.3 upgrade changes the size of the column and this is what validate_session
+ // expects, but if the column size hasn't changed yet just check the first 10 digits of the IP.
+ $fail = true;
+ if ( defined('IN_ENANO_UPGRADE') )
+ {
+ if ( substr($ip, 0, 10) == substr($row['source_ip'], 0, 10) )
+ $fail = false;
+ }
+ // Failed IP address check
+ // echo '(debug) $session->validate_session: IP address mismatch
';
+ if ( $fail )
+ return false;
+ }
+
+ // $loose_call is turned on only from validate_aes_session
+ if ( !$loose_call )
+ {
+ $key_pieces = array($row['password']);
+ $user_id =& $row['uid'];
+ $sk_mode = 'validate';
+ $code = $plugins->setHook('session_key_calc');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+ $key_pieces = implode("\xFF", $key_pieces);
+ $correct_key = hexdecode(hmac_sha1($key_pieces, $row['salt']));
+ $user_key = hexdecode($key);
+ if ( $correct_key !== $user_key || !is_string($user_key) )
+ {
+ return false;
+ }
+ }
+ else
+ {
+ // if this is a "loose call", this only works once (during the final upgrade stage). Destroy the contents of session_keys.
+ if ( $row['auth_level'] == USER_LEVEL_ADMIN && preg_match('/^upg-/', enano_version()) )
+ $this->sql('DELETE FROM ' . table_prefix . "session_keys;");
+ }
+
+ // timestamp check
+ switch ( $row['key_type'] )
+ {
+ case SK_SHORT:
+ $time_now = time();
+ $time_key = $row['time'] + ( 60 * intval(getConfig('session_short', '720')) );
+ if ( $time_now > $time_key )
+ {
+ // Session timed out
+ return false;
+ }
+ break;
+ case SK_LONG:
+ if ( intval(getConfig('session_remember_time', '0')) === 0 )
+ {
+ // sessions last infinitely, timestamp validation is therefore successful
+ break;
+ }
+ $time_now = time();
+ $time_key = $row['time'] + ( 86400 * intval(getConfig('session_remember_time', '30')) );
+ if ( $time_now > $time_key )
+ {
+ // Session timed out
+ return false;
+ }
+ break;
+ case SK_ELEV:
+ $time_now = time();
+ $time_key = $row['time'] + 900;
+ if($time_now > $time_key && $row['auth_level'] > USER_LEVEL_MEMBER)
+ {
+ // Session timed out
+ // echo '(debug) $session->validate_session: super session timed out
';
+ $this->sw_timed_out = true;
+ return false;
+ }
+ break;
+ }
+
+ // If this is an elevated-access or short-term session key, update the time
+ if( $row['key_type'] == SK_ELEV || $row['key_type'] == SK_SHORT )
+ {
+ $this->sql('UPDATE '.table_prefix.'session_keys SET time='.time().' WHERE session_key=\''.md5($key).'\';');
+ }
+
+ $user_extra = array();
+ foreach ( array('user_aim', 'user_yahoo', 'user_msn', 'user_xmpp', 'user_homepage', 'user_location', 'user_job', 'user_hobbies', 'email_public', 'disable_js_fx') as $column )
+ {
+ if ( isset($row[$column]) )
+ $user_extra[$column] = $row[$column];
+ else
+ $user_extra[$column] = '';
+ }
+
+ if ( isset($row['date_format']) )
+ $this->date_format = $row['date_format'];
+ if ( isset($row['time_format']) )
+ $this->time_format = $row['time_format'];
+
+ $this->user_extra = $user_extra;
+ // Leave the rest to PHP's automatic garbage collector ;-)
+
+ $row['password'] = '';
+ $row['user_timezone'] = intval($row['user_timezone']) - 1440;
+
+ profiler_log("SessionManager: finished session check");
+
+ return $row;
+ }
+
+ /**
+ * Validates a session key, and returns the userdata associated with the key or false. Optimized for compatibility with the old MD5-based auth system.
+ * @param string $key The session key to validate
+ * @return array Keys are 'user_id', 'username', 'email', 'real_name', 'user_level', 'theme', 'style', 'signature', 'reg_time', 'account_active', 'activation_key', and 'auth_level' or bool false if validation failed. The key 'auth_level' is the maximum authorization level that this key provides.
+ */
+
+ function compat_validate_session($key)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $key = $db->escape($key);
+
+ $query = $this->sql('SELECT u.user_id,u.username,u.password,u.email,u.real_name,u.user_level,k.source_ip,k.salt,k.time,k.auth_level,1440 AS user_timezone FROM '.table_prefix.'session_keys AS k
+ LEFT JOIN '.table_prefix.'users AS u
+ ON u.user_id=k.user_id
+ WHERE k.session_key=\''.$key.'\';');
+ if($db->numrows() < 1)
+ {
+ // echo '(debug) $session->validate_session: Key '.$key.' was not found in database
';
+ return false;
+ }
+ $row = $db->fetchrow();
+ $ip = ip2hex($_SERVER['REMOTE_ADDR']);
+ if($row['auth_level'] > $row['user_level'])
+ {
+ // Failed authorization check
+ // echo '(debug) $session->validate_session: user not authorized for this access level';
+ return false;
+ }
+ if($ip != $row['source_ip'])
+ {
+ // Failed IP address check
+ // echo '(debug) $session->validate_session: IP address mismatch; IP in table: '.$row['source_ip'].'; reported IP: '.$ip.'';
+ return false;
+ }
+
+ // Do the password validation
+ $real_key = md5($row['password'] . $row['salt']);
+
+ //die(''.print_r($keydata, true).'
');
+ if($real_key != $key)
+ {
+ // Failed password check
+ // echo '(debug) $session->validate_session: supplied password is wrong
Real key: '.$real_key.'
User key: '.$key;
+ return false;
+ }
+
+ $time_now = time();
+ $time_key = $row['time'] + 900;
+ if($time_now > $time_key && $row['auth_level'] >= 1)
+ {
+ $this->sw_timed_out = true;
+ // Session timed out
+ // echo '(debug) $session->validate_session: super session timed out
';
+ return false;
+ }
+
+ $row['user_timezone'] = intval($row['user_timezone']) - 1440;
+
+ return $row;
+ }
+
+ /**
+ * Demotes us to one less than the specified auth level. AKA destroys elevated authentication and/or logs out the user, depending on $level
+ * @param int $level How low we should go - USER_LEVEL_MEMBER means demote to USER_LEVEL_GUEST, and anything more powerful than USER_LEVEL_MEMBER means demote to USER_LEVEL_MEMBER
+ * @return string 'success' if successful, or error on failure
+ */
+
+ function logout($level = USER_LEVEL_MEMBER)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $ou = $this->username;
+ $oid = $this->user_id;
+ if($level > USER_LEVEL_MEMBER)
+ {
+ $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
+ if(!$this->user_logged_in || $this->auth_level < ( USER_LEVEL_MEMBER + 1))
+ {
+ return 'success';
+ }
+ // Destroy elevated privileges
+ $keyhash = md5($this->sid_super);
+ $this->sql('DELETE FROM '.table_prefix.'session_keys WHERE session_key=\''.$keyhash.'\' AND user_id=\'' . $this->user_id . '\';');
+ $this->sid_super = false;
+ $this->auth_level = USER_LEVEL_MEMBER;
+ }
+ else
+ {
+ if($this->user_logged_in)
+ {
+ $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
+ // Completely destroy our session
+ if($this->auth_level > USER_LEVEL_MEMBER)
+ {
+ $this->logout(USER_LEVEL_ADMIN);
+ }
+ $this->sql('DELETE FROM '.table_prefix.'session_keys WHERE session_key=\''.md5($this->sid).'\';');
+ setcookie( 'sid', '', time()-(3600*24), scriptPath.'/' );
+ }
+ }
+ $code = $plugins->setHook('logout_success'); // , Array('level'=>$level,'old_username'=>$ou,'old_user_id'=>$oid));
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+ return 'success';
+ }
+
+ # Miscellaneous stuff
+
+ /**
+ * Alerts the user that their account is inactive, and tells them appropriate steps to remedy the situation. Halts execution.
+ * @param array Return from validate_session()
+ */
+
+ function show_inactive_error($userdata)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ global $title;
+ $paths->init($title);
+
+ $language = intval(getConfig('default_language'));
+ $lang = new Language($language);
+ @setlocale(LC_ALL, $lang->lang_code);
+
+ $a = getConfig('account_activation');
+ switch($a)
+ {
+ case 'none':
+ default:
+ $solution = $lang->get('user_login_noact_solution_none');
+ break;
+ case 'user':
+ $solution = $lang->get('user_login_noact_solution_user');
+ break;
+ case 'admin':
+ $solution = $lang->get('user_login_noact_solution_admin');
+ break;
+ }
+
+ // admin activation request opportunity
+ $q = $db->sql_query('SELECT 1 FROM '.table_prefix.'logs WHERE log_type=\'admin\' AND action=\'activ_req\' AND edit_summary=\'' . $db->escape($userdata['username']) . '\';');
+ if ( !$q )
+ $db->_die();
+
+ $can_request = ( $db->numrows() < 1 );
+ $db->free_result();
+
+ if ( isset($_POST['logout']) )
+ {
+ $this->sid = $_COOKIE['sid'];
+ $this->user_logged_in = true;
+ $this->user_id = intval($userdata['user_id']);
+ $this->username = $userdata['username'];
+ $this->auth_level = USER_LEVEL_MEMBER;
+ $this->user_level = USER_LEVEL_MEMBER;
+ $this->logout();
+ redirect(scriptPath . '/', $lang->get('user_login_noact_msg_logout_success_title'), $lang->get('user_login_noact_msg_logout_success_body'), 5);
+ }
+
+ if ( $can_request && !isset($_POST['activation_request']) )
+ {
+ $form = '' . $lang->get('user_login_noact_msg_ask_admins') . '
+ ';
+ }
+ else
+ {
+ if ( $can_request && isset($_POST['activation_request']) )
+ {
+ $this->admin_activation_request($userdata['username']);
+ $form = '' . $lang->get('user_login_noact_msg_admins_just_asked') . '
+ ';
+ }
+ else
+ {
+ $form = '' . $lang->get('user_login_noact_msg_admins_asked') . '
+ ';
+ }
+ }
+
+ global $output;
+ $output = new Output_HTML();
+ $output->set_title($lang->get('user_login_noact_title'));
+ die_friendly($lang->get('user_login_noact_title'), '' . $lang->get('user_login_noact_msg_intro') . ' '.$solution.'
' . $form);
+ }
+
+ /**
+ * Appends the high-privilege session key to the URL if we are authorized to do high-privilege stuff
+ * @param string $url The URL to add session data to
+ * @return string
+ */
+
+ function append_sid($url)
+ {
+ $sep = ( strstr($url, '?') ) ? '&' : '?';
+ if ( $this->sid_super )
+ {
+ $url = $url . $sep . 'auth=' . urlencode($this->sid_super);
+ // echo($this->sid_super.'
');
+ }
+ return $url;
+ }
+
+ /**
+ * Prevent the user from changing their password. Authentication plugins may call this to enforce single sign-on.
+ * @param string URL to page where the user may change their password
+ * @param string Title of the page where the user may change their password
+ * @return null
+ */
+
+ function disable_password_change($change_url = false, $change_title = false)
+ {
+ if ( $this->password_change_disabled )
+ {
+ // don't allow calling twice. if we have two plugins doing this, somebody is bad at configuring websites.
+ return false;
+ }
+
+ if ( is_string($change_url) && is_string($change_title) )
+ {
+ $this->password_change_dest = array(
+ 'url' => $change_url,
+ 'title' => $change_title
+ );
+ }
+ else
+ {
+ $this->password_change_dest = array(
+ 'url' => false,
+ 'title' => false
+ );
+ }
+
+ $this->password_change_disabled = true;
+ }
+
+ /**
+ * Grabs the user's password MD5 - NOW DEPRECATED AND DISABLED.
+ * @return bool false
+ */
+
+ function grab_password_hash()
+ {
+ return false;
+ }
+
+ /**
+ * Destroys the user's password MD5 in memory
+ */
+
+ function disallow_password_grab()
+ {
+ $this->password_hash = false;
+ return false;
+ }
+
+ /**
+ * Generates an AES key and stashes it in the database
+ * @return string Hex-encoded AES key
+ */
+
+ function rijndael_genkey()
+ {
+ $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
+ $key = $aes->gen_readymade_key();
+ $keys = getConfig('login_key_cache');
+ if(is_string($keys))
+ $keys .= $key;
+ else
+ $keys = $key;
+ setConfig('login_key_cache', $keys);
+ return $key;
+ }
+
+ /**
+ * Generate a totally random 128-bit value for MD5 challenges
+ * @return string
+ */
+
+ function dss_rand()
+ {
+ $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
+ $random = $aes->randkey(128);
+ unset($aes);
+ return md5(microtime() . $random);
+ }
+
+ /**
+ * Fetch a cached login public key using the MD5sum as an identifier. Each key can only be fetched once before it is destroyed.
+ * @param string $md5 The MD5 sum of the key
+ * @return string, or bool false on failure
+ */
+
+ function fetch_public_key($md5)
+ {
+ $keys = getConfig('login_key_cache');
+ $keys = enano_str_split($keys, AES_BITS / 4);
+
+ foreach($keys as $i => $k)
+ {
+ if(md5($k) == $md5)
+ {
+ unset($keys[$i]);
+ if(count($keys) > 0)
+ {
+ if ( strlen(getConfig('login_key_cache') ) > 64000 )
+ {
+ // This should only need to be done once every month or so for an average-size site
+ setConfig('login_key_cache', '');
+ }
+ else
+ {
+ $keys = implode('', array_values($keys));
+ setConfig('login_key_cache', $keys);
+ }
+ }
+ else
+ {
+ setConfig('login_key_cache', '');
+ }
+ return $k;
+ }
+ }
+ // Couldn't find the key...
+ return false;
+ }
+
+ /**
+ * Adds a user to a group.
+ * @param int User ID
+ * @param int Group ID
+ * @param bool Group moderator - defaults to false
+ * @return bool True on success, false on failure
+ */
+
+ function add_user_to_group($user_id, $group_id, $is_mod = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ // Validation
+ if ( !is_int($user_id) || !is_int($group_id) || !is_bool($is_mod) )
+ return false;
+ if ( $user_id < 1 || $group_id < 1 )
+ return false;
+
+ $mod_switch = ( $is_mod ) ? '1' : '0';
+ $q = $this->sql('SELECT member_id,is_mod FROM '.table_prefix.'group_members WHERE user_id=' . $user_id . ' AND group_id=' . $group_id . ';');
+ if ( !$q )
+ $db->_die();
+ if ( $db->numrows() < 1 )
+ {
+ // User is not in group
+ $this->sql('INSERT INTO '.table_prefix.'group_members(user_id,group_id,is_mod) VALUES(' . $user_id . ', ' . $group_id . ', ' . $mod_switch . ');');
+ return true;
+ }
+ else
+ {
+ $row = $db->fetchrow();
+ // Update modship status
+ if ( strval($row['is_mod']) == $mod_switch )
+ {
+ // Modship unchanged
+ return true;
+ }
+ else
+ {
+ // Modship changed
+ $this->sql('UPDATE '.table_prefix.'group_members SET is_mod=' . $mod_switch . ' WHERE member_id=' . $row['member_id'] . ';');
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Removes a user from a group.
+ * @param int User ID
+ * @param int Group ID
+ * @return bool True on success, false on failure
+ * @todo put a little more error checking in...
+ */
+
+ function remove_user_from_group($user_id, $group_id)
+ {
+ if ( !is_int($user_id) || !is_int($group_id) )
+ return false;
+ $this->sql('DELETE FROM '.table_prefix."group_members WHERE user_id=$user_id AND group_id=$group_id;");
+ return true;
+ }
+
+ /**
+ * Checks the banlist to ensure that we're an allowed user. Doesn't return anything because it dies if the user is banned.
+ */
+
+ function check_banlist()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ $col_reason = ( $this->compat ) ? '\'No reason available (session manager is in compatibility mode)\' AS reason' : 'reason';
+ $remote_addr = ( strstr($_SERVER['REMOTE_ADDR'], ':') ) ? expand_ipv6_address($_SERVER['REMOTE_ADDR']) : $_SERVER['REMOTE_ADDR'];
+
+ $banned = false;
+ if ( $this->user_logged_in )
+ {
+ // check by IP, email, and username
+ if ( ENANO_DBLAYER == 'MYSQL' )
+ {
+ $sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE \n"
+ . " ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR \n"
+ . " ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' REGEXP ban_value ) OR \n"
+ . " ( ban_type = " . BAN_USER . " AND is_regex = 0 AND ban_value = '{$this->username}' ) OR \n"
+ . " ( ban_type = " . BAN_USER . " AND is_regex = 1 AND '{$this->username}' REGEXP ban_value ) OR \n"
+ . " ( ban_type = " . BAN_EMAIL . " AND is_regex = 0 AND ban_value = '{$this->email}' ) OR \n"
+ . " ( ban_type = " . BAN_EMAIL . " AND is_regex = 1 AND '{$this->email}' REGEXP ban_value ) \n"
+ . " ORDER BY ban_type ASC;";
+ }
+ else if ( ENANO_DBLAYER == 'PGSQL' )
+ {
+ $sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE \n"
+ . " ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR \n"
+ . " ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' ~ ban_value ) OR \n"
+ . " ( ban_type = " . BAN_USER . " AND is_regex = 0 AND ban_value = '{$this->username}' ) OR \n"
+ . " ( ban_type = " . BAN_USER . " AND is_regex = 1 AND '{$this->username}' ~ ban_value ) OR \n"
+ . " ( ban_type = " . BAN_EMAIL . " AND is_regex = 0 AND ban_value = '{$this->email}' ) OR \n"
+ . " ( ban_type = " . BAN_EMAIL . " AND is_regex = 1 AND '{$this->email}' ~ ban_value ) \n"
+ . " ORDER BY ban_type ASC;";
+ }
+ $q = $this->sql($sql);
+ if ( $db->numrows() > 0 )
+ {
+ while ( list($reason_temp, $ban_value, $ban_type, $is_regex) = $db->fetchrow_num() )
+ {
+ if ( $ban_type == BAN_IP && $is_regex != 1 )
+ {
+ // check range
+ $regexp = parse_ip_range_regex($ban_value);
+ if ( !$regexp )
+ {
+ continue;
+ }
+ if ( preg_match("/$regexp/", $remote_addr) )
+ {
+ $reason = $reason_temp;
+ $banned = true;
+ }
+ }
+ else
+ {
+ // User is banned
+ $banned = true;
+ $reason = $reason_temp;
+ }
+ }
+ }
+ $db->free_result();
+ }
+ else
+ {
+ // check by IP only
+ if ( ENANO_DBLAYER == 'MYSQL' )
+ {
+ $sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE
+ ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR
+ ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' REGEXP ban_value )
+ ORDER BY ban_type ASC;";
+ }
+ else if ( ENANO_DBLAYER == 'PGSQL' )
+ {
+ $sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE
+ ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR
+ ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' ~ ban_value )
+ ORDER BY ban_type ASC;";
+ }
+ $q = $this->sql($sql);
+ if ( $db->numrows() > 0 )
+ {
+ while ( list($reason_temp, $ban_value, $ban_type, $is_regex) = $db->fetchrow_num() )
+ {
+ if ( $ban_type == BAN_IP && $is_regex != 1 )
+ {
+ // check range
+ $regexp = parse_ip_range_regex($ban_value);
+ if ( !$regexp )
+ {
+ die("bad regexp for $ban_value");
+ continue;
+ }
+ if ( preg_match("/$regexp/", $remote_addr) )
+ {
+ $reason = $reason_temp;
+ $banned = true;
+ }
+ }
+ else
+ {
+ // User is banned
+ $reason = $reason_temp;
+ $banned = true;
+ }
+ }
+ }
+ $db->free_result();
+ }
+ if ( $banned && !$this->on_critical_page(true) )
+ {
+ // This guy is banned - kill the session, kill the database connection, bail out, and be pretty about it
+ die_semicritical($lang->get('user_ban_msg_title'), '' . $lang->get('user_ban_msg_body') . '
' . $lang->get('user_ban_lbl_reason') . '
' . $reason . '');
+ exit;
+ }
+ }
+
+ # Registration
+
+ /**
+ * Registers a user. This does not perform any type of login.
+ * @param string New user's username
+ * @param string This should be unencrypted.
+ * @param string E-mail address.
+ * @param string Optional, defaults to ''.
+ * @param bool Optional. If true, the account is not activated initially and an admin activation request is sent. The caller is responsible for sending the address info and notice.
+ */
+
+ function create_user($username, $password, $email, $real_name = '', $coppa = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ // Initialize AES
+ $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
+
+ // Since we're recording IP addresses, make sure the user's IP is safe.
+ $ip =& $_SERVER['REMOTE_ADDR'];
+ if ( !is_valid_ip($ip) )
+ return 'Invalid IP';
+
+ if ( !preg_match('#^'.$this->valid_username.'$#', $username) )
+ return $lang->get('user_reg_err_username_banned_chars');
+
+ $username = str_replace('_', ' ', $username);
+ $user_orig = $username;
+ $username = $this->prepare_text($username);
+ $email = $this->prepare_text($email);
+ $real_name = $this->prepare_text($real_name);
+
+ $nameclause = ( $real_name != '' ) ? ' OR real_name=\''.$real_name.'\'' : '';
+ $q = $this->sql('SELECT * FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username)=\''.strtolower($username).'\' OR email=\''.$email.'\''.$nameclause.';');
+ if($db->numrows() > 0)
+ {
+ $row = $db->fetchrow();
+ $str = 'user_reg_err_dupe';
+
+ if ( $row['username'] == $username )
+ {
+ $str .= '_username';
+ }
+ if ( $row['email'] == $email )
+ {
+ $str .= '_email';
+ }
+ if ( $row['real_name'] == $real_name && $real_name != '' )
+ {
+ $str .= '_realname';
+ }
+
+ return $lang->get($str);
+ }
+
+ // Is the password strong enough?
+ if ( getConfig('pw_strength_enable') )
+ {
+ $min_score = intval( getConfig('pw_strength_minimum') );
+ $pass_score = password_score($password);
+ if ( $pass_score < $min_score )
+ {
+ return $lang->get('user_reg_err_password_too_weak');
+ }
+ }
+
+ // Require the account to be activated?
+ switch(getConfig('account_activation'))
+ {
+ case 'none':
+ default:
+ $active = '1';
+ break;
+ case 'user':
+ $active = '0';
+ break;
+ case 'admin':
+ $active = '0';
+ break;
+ }
+ if ( $coppa )
+ $active = '0';
+
+ $coppa_col = ( $coppa ) ? '1' : '0';
+
+ // Generate a totally random activation key
+ $actkey = sha1 ( microtime() . mt_rand() );
- // We good, create the user
- $this->sql('INSERT INTO ' . table_prefix . "users ( username, email, real_name, theme, style, reg_time, account_active, activation_key, user_level, user_coppa,\n"
- . " user_registration_ip, user_lang, user_has_avatar, avatar_type ) VALUES\n"
- . " ( '$username', '$email', '$real_name', '$template->default_theme', '$template->default_style', " . time() . ", $active, '$actkey', \n"
- . " " . USER_LEVEL_CHPREF . ", $coppa_col, '$ip', $lang->lang_id, 0, 'png' );");
-
- // Get user ID and create users_extra entry
- $q = $this->sql('SELECT user_id FROM '.table_prefix."users WHERE username='$username';");
- if ( $db->numrows() > 0 )
- {
- list($user_id) = $db->fetchrow_num();
- $db->free_result();
-
- $this->sql('INSERT INTO '.table_prefix.'users_extra(user_id) VALUES(' . $user_id . ');');
- }
-
- // Set the password
- $this->set_password($user_id, $password);
-
- // Config option added, 1.1.5
- if ( getConfig('userpage_grant_acl', '1') == '1' )
- {
- // Grant edit and very limited mod access to the userpage
- $acl_data = array(
- 'read' => AUTH_ALLOW,
- 'view_source' => AUTH_ALLOW,
- 'edit_page' => AUTH_ALLOW,
- 'post_comments' => AUTH_ALLOW,
- 'edit_comments' => AUTH_ALLOW, // only allows editing own comments
- 'history_view' => AUTH_ALLOW,
- 'history_rollback' => AUTH_ALLOW,
- 'rename' => AUTH_ALLOW,
- 'delete_page' => AUTH_ALLOW,
- 'tag_create' => AUTH_ALLOW,
- 'tag_delete_own' => AUTH_ALLOW,
- 'tag_delete_other' => AUTH_ALLOW,
- 'edit_cat' => AUTH_ALLOW,
- 'create_page' => AUTH_ALLOW
- );
- $acl_data = $db->escape($this->perm_to_string($acl_data));
- $userpage = $db->escape(sanitize_page_id($user_orig));
- $cols = "target_type, target_id, page_id, namespace, rules";
- $vals = ACL_TYPE_USER . ", $user_id, '$userpage', 'User', '$acl_data'";
- $q = "INSERT INTO ".table_prefix."acl($cols) VALUES($vals);";
- $this->sql($q);
- }
-
- // Require the account to be activated?
- if ( $coppa )
- {
- $this->admin_activation_request($user_orig);
- $this->send_coppa_mail($user_orig, $email);
- }
- else
- {
- switch(getConfig('account_activation'))
- {
- case 'none':
- default:
- break;
- case 'user':
- $a = $this->send_activation_mail($user_orig);
- if(!$a)
- {
- $this->admin_activation_request($user_orig);
- return $lang->get('user_reg_err_actmail_failed') . ' ' . $a;
- }
- break;
- case 'admin':
- $this->admin_activation_request($user_orig);
- break;
- }
- }
-
- // Leave some data behind for the hook
- $code = $plugins->setHook('user_registered');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- return 'success';
- }
-
- /**
- * Attempts to send an e-mail to the specified user with activation instructions.
- * @param string $u The usernamd of the user requesting activation
- * @return bool true on success, false on failure
- */
-
- function send_activation_mail($u, $actkey = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- $q = $this->sql('SELECT username,activation_key,account_active,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($u).'\';');
- $r = $db->fetchrow();
- if ( empty($r['email']) )
- $db->_die('BUG: $session->send_activation_mail(): no e-mail address in row');
-
- $aklink = makeUrlComplete('Special', 'ActivateAccount/'.str_replace(' ', '_', $u).'/'. ( ( is_string($actkey) ) ? $actkey : $r['activation_key'] ) );
- $message = $lang->get('user_reg_activation_email', array(
- 'activation_link' => $aklink,
- 'username' => $u
- ));
-
- if ( getConfig('smtp_enabled') == '1' )
- {
- $result = smtp_send_email($r['email'], $lang->get('user_reg_activation_email_subject'), preg_replace("#(?get('user_reg_activation_email_subject'), preg_replace("#(?sql('SELECT username,email FROM '.table_prefix.'users WHERE user_id=2 OR user_level=' . USER_LEVEL_ADMIN . ' ORDER BY user_id ASC;');
- $un = $db->fetchrow();
- $admin_user = $un['username'];
-
- $q = $this->sql('SELECT username,activation_key,account_active,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($u).'\';');
- $r = $db->fetchrow();
- if ( empty($r['email']) )
- $db->_die('BUG: $session->send_activation_mail(): no e-mail address in row');
-
- if(isset($_SERVER['HTTPS'])) $prot = 'https';
- else $prot = 'http';
- if($_SERVER['SERVER_PORT'] == '80') $p = '';
- else $p = ':'.$_SERVER['SERVER_PORT'];
- $sidbak = false;
- if($this->sid_super)
- $sidbak = $this->sid_super;
- $this->sid_super = false;
- if($sidbak)
- $this->sid_super = $sidbak;
- unset($sidbak);
- $link = "$prot://".$_SERVER['HTTP_HOST'].scriptPath;
-
- $message = $lang->get(
- 'user_reg_activation_email_coppa',
- array(
- 'username' => $u,
- 'admin_user' => $admin_user,
- 'site_link' => $link
- )
- );
-
-
- if(getConfig('smtp_enabled') == '1')
- {
- $result = smtp_send_email($r['email'], getConfig('site_name').' website account activation', preg_replace("#(?sql('SELECT user_id,username,email FROM '.table_prefix.'users WHERE user_id='.$user.';'); // This is SAFE! This is only called if $user is an integer
- }
- elseif(is_string($user))
- {
- $q = $this->sql('SELECT user_id,username,email FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username)=' . ENANO_SQLFUNC_LOWERCASE . '(\''.$db->escape($user).'\');');
- }
- else
- {
- return false;
- }
-
- $row = $db->fetchrow();
- $temp_pass = $this->random_pass();
-
- $this->register_temp_password($row['user_id'], $temp_pass);
-
- $site_name = getConfig('site_name');
+ // We good, create the user
+ $this->sql('INSERT INTO ' . table_prefix . "users ( username, email, real_name, theme, style, reg_time, account_active, activation_key, user_level, user_coppa,\n"
+ . " user_registration_ip, user_lang, user_has_avatar, avatar_type ) VALUES\n"
+ . " ( '$username', '$email', '$real_name', '$template->default_theme', '$template->default_style', " . time() . ", $active, '$actkey', \n"
+ . " " . USER_LEVEL_CHPREF . ", $coppa_col, '$ip', $lang->lang_id, 0, 'png' );");
+
+ // Get user ID and create users_extra entry
+ $q = $this->sql('SELECT user_id FROM '.table_prefix."users WHERE username='$username';");
+ if ( $db->numrows() > 0 )
+ {
+ list($user_id) = $db->fetchrow_num();
+ $db->free_result();
+
+ $this->sql('INSERT INTO '.table_prefix.'users_extra(user_id) VALUES(' . $user_id . ');');
+ }
+
+ // Set the password
+ $this->set_password($user_id, $password);
+
+ // Config option added, 1.1.5
+ if ( getConfig('userpage_grant_acl', '1') == '1' )
+ {
+ // Grant edit and very limited mod access to the userpage
+ $acl_data = array(
+ 'read' => AUTH_ALLOW,
+ 'view_source' => AUTH_ALLOW,
+ 'edit_page' => AUTH_ALLOW,
+ 'post_comments' => AUTH_ALLOW,
+ 'edit_comments' => AUTH_ALLOW, // only allows editing own comments
+ 'history_view' => AUTH_ALLOW,
+ 'history_rollback' => AUTH_ALLOW,
+ 'rename' => AUTH_ALLOW,
+ 'delete_page' => AUTH_ALLOW,
+ 'tag_create' => AUTH_ALLOW,
+ 'tag_delete_own' => AUTH_ALLOW,
+ 'tag_delete_other' => AUTH_ALLOW,
+ 'edit_cat' => AUTH_ALLOW,
+ 'create_page' => AUTH_ALLOW
+ );
+ $acl_data = $db->escape($this->perm_to_string($acl_data));
+ $userpage = $db->escape(sanitize_page_id($user_orig));
+ $cols = "target_type, target_id, page_id, namespace, rules";
+ $vals = ACL_TYPE_USER . ", $user_id, '$userpage', 'User', '$acl_data'";
+ $q = "INSERT INTO ".table_prefix."acl($cols) VALUES($vals);";
+ $this->sql($q);
+ }
+
+ // Require the account to be activated?
+ if ( $coppa )
+ {
+ $this->admin_activation_request($user_orig);
+ $this->send_coppa_mail($user_orig, $email);
+ }
+ else
+ {
+ switch(getConfig('account_activation'))
+ {
+ case 'none':
+ default:
+ break;
+ case 'user':
+ $a = $this->send_activation_mail($user_orig);
+ if(!$a)
+ {
+ $this->admin_activation_request($user_orig);
+ return $lang->get('user_reg_err_actmail_failed') . ' ' . $a;
+ }
+ break;
+ case 'admin':
+ $this->admin_activation_request($user_orig);
+ break;
+ }
+ }
+
+ // Leave some data behind for the hook
+ $code = $plugins->setHook('user_registered');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
+ return 'success';
+ }
+
+ /**
+ * Attempts to send an e-mail to the specified user with activation instructions.
+ * @param string $u The usernamd of the user requesting activation
+ * @return bool true on success, false on failure
+ */
+
+ function send_activation_mail($u, $actkey = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+ $q = $this->sql('SELECT username,activation_key,account_active,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($u).'\';');
+ $r = $db->fetchrow();
+ if ( empty($r['email']) )
+ $db->_die('BUG: $session->send_activation_mail(): no e-mail address in row');
+
+ $aklink = makeUrlComplete('Special', 'ActivateAccount/'.str_replace(' ', '_', $u).'/'. ( ( is_string($actkey) ) ? $actkey : $r['activation_key'] ) );
+ $message = $lang->get('user_reg_activation_email', array(
+ 'activation_link' => $aklink,
+ 'username' => $u
+ ));
+
+ if ( getConfig('smtp_enabled') == '1' )
+ {
+ $result = smtp_send_email($r['email'], $lang->get('user_reg_activation_email_subject'), preg_replace("#(?get('user_reg_activation_email_subject'), preg_replace("#(?sql('SELECT username,email FROM '.table_prefix.'users WHERE user_id=2 OR user_level=' . USER_LEVEL_ADMIN . ' ORDER BY user_id ASC;');
+ $un = $db->fetchrow();
+ $admin_user = $un['username'];
+
+ $q = $this->sql('SELECT username,activation_key,account_active,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($u).'\';');
+ $r = $db->fetchrow();
+ if ( empty($r['email']) )
+ $db->_die('BUG: $session->send_activation_mail(): no e-mail address in row');
+
+ if(isset($_SERVER['HTTPS'])) $prot = 'https';
+ else $prot = 'http';
+ if($_SERVER['SERVER_PORT'] == '80') $p = '';
+ else $p = ':'.$_SERVER['SERVER_PORT'];
+ $sidbak = false;
+ if($this->sid_super)
+ $sidbak = $this->sid_super;
+ $this->sid_super = false;
+ if($sidbak)
+ $this->sid_super = $sidbak;
+ unset($sidbak);
+ $link = "$prot://".$_SERVER['HTTP_HOST'].scriptPath;
+
+ $message = $lang->get(
+ 'user_reg_activation_email_coppa',
+ array(
+ 'username' => $u,
+ 'admin_user' => $admin_user,
+ 'site_link' => $link
+ )
+ );
+
+
+ if(getConfig('smtp_enabled') == '1')
+ {
+ $result = smtp_send_email($r['email'], getConfig('site_name').' website account activation', preg_replace("#(?sql('SELECT user_id,username,email FROM '.table_prefix.'users WHERE user_id='.$user.';'); // This is SAFE! This is only called if $user is an integer
+ }
+ elseif(is_string($user))
+ {
+ $q = $this->sql('SELECT user_id,username,email FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username)=' . ENANO_SQLFUNC_LOWERCASE . '(\''.$db->escape($user).'\');');
+ }
+ else
+ {
+ return false;
+ }
+
+ $row = $db->fetchrow();
+ $temp_pass = $this->random_pass();
+
+ $this->register_temp_password($row['user_id'], $temp_pass);
+
+ $site_name = getConfig('site_name');
- $message = $lang->get('userfuncs_passreset_email', array(
- 'username' => $row['username'],
- 'site_name' => $site_name,
- 'remote_addr' => $_SERVER['REMOTE_ADDR'],
- 'temp_pass' => $temp_pass
- ));
-
- if(getConfig('smtp_enabled') == '1')
- {
- $result = smtp_send_email($row['email'], getConfig('site_name').' password reset', preg_replace("#(?'.$result.'
';
- $result = false;
- }
- } else {
- $result = mail($row['email'], getConfig('site_name').' password reset', preg_replace("#(?sql('SELECT password_salt FROM ' . table_prefix . "users WHERE user_id = $user_id;");
- if ( $db->numrows() < 1 )
- return false;
-
- list($salt) = $db->fetchrow_num();
- $db->free_result();
-
- $temp_pass = hmac_sha1($password, $salt);
- $this->sql('UPDATE '.table_prefix.'users SET temp_password=\'' . $temp_pass . '\',temp_password_time='.time().' WHERE user_id='.intval($user_id).';');
- }
-
- /**
- * Sends a request to the admin panel to have the username $u activated.
- * @param string $u The username of the user requesting activation
- */
-
- function admin_activation_request($u)
- {
- global $db;
- $this->sql('INSERT INTO '.table_prefix.'logs(log_type, action, time_id, date_string, author, edit_summary) VALUES(\'admin\', \'activ_req\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$this->username.'\', \''.$db->escape($u).'\');');
- }
-
- /**
- * Activates a user account. If the action fails, a report is sent to the admin.
- * @param string $user The username of the user requesting activation
- * @param string $key The activation key
- */
-
- function activate_account($user, $key)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $q = $this->sql('SELECT 1 FROM ' . table_prefix . 'users WHERE username = \''.$db->escape($user).'\' AND activation_key = \''.$db->escape($key).'\'');
- if ( $db->numrows() > 0 )
- {
- $new_key = md5(AESCrypt::randkey());
- $this->sql('UPDATE ' . table_prefix . 'users SET account_active = 1, activation_key = \'' . $new_key . '\' WHERE username=\''.$db->escape($user).'\' AND activation_key=\''.$db->escape($key).'\';');
- $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'activ_good\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($user).'\', \''.$_SERVER['REMOTE_ADDR'].'\')');
- return true;
- }
- else
- {
- $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'activ_bad\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($user).'\', \''.$_SERVER['REMOTE_ADDR'].'\')');
- return false;
- }
- }
-
- /**
- * For a given user level identifier (USER_LEVEL_*), returns a string describing that user level.
- * @param int User level
- * @param bool If true, returns a shorter string. Optional.
- * @return string
- */
-
- function userlevel_to_string($user_level, $short = false)
- {
- global $lang;
-
- static $levels = array(
- 'short' => array(
- USER_LEVEL_GUEST => 'Guest',
- USER_LEVEL_MEMBER => 'Member',
- USER_LEVEL_CHPREF => 'Sensitive preferences changeable',
- USER_LEVEL_MOD => 'Moderator',
- USER_LEVEL_ADMIN => 'Administrative'
- ),
- 'long' => array(
- USER_LEVEL_GUEST => 'Low - guest privileges',
- USER_LEVEL_MEMBER => 'Standard - normal member level',
- USER_LEVEL_CHPREF => 'Medium - user can change his/her own e-mail address and password',
- USER_LEVEL_MOD => 'High - moderator privileges',
- USER_LEVEL_ADMIN => 'Highest - administrative privileges'
- ),
- 'l10n' => false
- );
-
- if ( is_object($lang) && !$levels['l10n'] )
- {
- $levels = array(
- 'short' => array(
- USER_LEVEL_GUEST => $lang->get('user_level_short_guest'),
- USER_LEVEL_MEMBER => $lang->get('user_level_short_member'),
- USER_LEVEL_CHPREF => $lang->get('user_level_short_chpref'),
- USER_LEVEL_MOD => $lang->get('user_level_short_mod'),
- USER_LEVEL_ADMIN => $lang->get('user_level_short_admin')
- ),
- 'long' => array(
- USER_LEVEL_GUEST => $lang->get('user_level_long_guest'),
- USER_LEVEL_MEMBER => $lang->get('user_level_long_member'),
- USER_LEVEL_CHPREF => $lang->get('user_level_long_chpref'),
- USER_LEVEL_MOD => $lang->get('user_level_long_mod'),
- USER_LEVEL_ADMIN => $lang->get('user_level_long_admin')
- ),
- 'l10n' => true
- );
- }
-
- $key = ( $short ) ? 'short' : 'long';
- if ( isset($levels[$key][$user_level]) )
- {
- return $levels[$key][$user_level];
- }
- else
- {
- if ( $short )
- {
- return ( is_object($lang) ) ? $lang->get('user_level_short_unknown', array('user_level' => $user_level)) : "Unknown - $user_level";
- }
- else
- {
- return ( is_object($lang) ) ? $lang->get('user_level_long_unknown', array('user_level' => $user_level)) : "Unknown level ($user_level)";
- }
- }
-
- return 'Linux rocks!';
-
- }
-
- /**
- * Change a user's e-mail address.
- * @param int $user_id The user ID of the user to update - this cannot be changed
- * @param string $email The new e-mail address
- * @return string 'success' if successful, or array of error strings on failure
- */
-
- function change_email($user_id, $email)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- // Create some arrays
-
- $errors = array(); // Used to hold error strings
-
- // Scan the user ID for problems
- if ( intval($user_id) < 1 )
- $errors[] = 'SQL injection attempt';
-
- $user_id = intval($user_id);
-
- // Verify e-mail address
- if ( !check_email_address($email) )
- $errors[] = 'user_err_email_not_valid';
-
- if ( count($errors) > 0 )
- return $errors;
-
- // Make query
- $email = $db->escape($email);
- $q = $db->sql_query('UPDATE ' . table_prefix . "users SET email = '$email' WHERE user_id = $user_id;");
-
- // We also need to trigger re-activation.
- switch(getConfig('account_activation', 'none'))
- {
- case 'user':
- case 'admin':
-
- // Note: even with admin activation, activation e-mails are sent when an e-mail is changed.
-
- if ( $session->user_level >= USER_LEVEL_MOD && getConfig('account_activation') == 'admin' )
- // Trust admins and moderators
- break;
-
- // retrieve username
- if ( !$username )
- {
- $q = $this->sql('SELECT username FROM ' . table_prefix . "users WHERE user_id = $user_id;");
- if($db->numrows() < 1)
- {
- $errors[] = 'The username could not be selected.';
- }
- else
- {
- $row = $db->fetchrow();
- $username = $row['username'];
- }
- }
- if ( !$username )
- return $errors;
-
- // Generate an activation key
- $actkey = sha1 ( microtime() . mt_rand() );
- $a = $this->send_activation_mail($username, $actkey);
- if(!$a)
- {
- $this->admin_activation_request($username);
- }
- // Deactivate the account until e-mail is confirmed
- $q = $db->sql_query('UPDATE ' . table_prefix . "users SET account_active = 0, activation_key = '$actkey' WHERE user_id = $user_id;");
- break;
- }
-
- // Yay! We're done
- return 'success';
- }
-
- /**
- * Sets a user's password.
- * @param int|string User ID or username
- * @param string New password
- */
-
- function set_password($user, $password)
- {
- // Generate new password and salt
- $hmac_secret = hexencode(AESCrypt::randkey(20), '', '');
- $password_hmac = hmac_sha1($password, $hmac_secret);
-
- // Figure out how we want to specify the user
- $uidcol = is_int($user) ? "user_id = $user" : ENANO_SQLFUNC_LOWERCASE . "(username) = '" . strtolower($this->prepare_text($user)) . "'";
-
- // Perform update
- $this->sql('UPDATE ' . table_prefix . "users SET old_encryption = 0, password = '$password_hmac', password_salt = '$hmac_secret' WHERE $uidcol;");
-
- return true;
- }
-
- /**
- * Encrypts a string using the site's private key.
- * @param string
- * @param int Return type - one of ENC_BINARY, ENC_HEX, ENC_BASE64
- * @return string
- */
-
- function pk_encrypt($string, $return_type = ENC_HEX)
- {
- $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
- return $aes->encrypt($string, $this->private_key, $return_type);
- }
-
- /**
- * Encrypts a string using the site's private key.
- * @param string
- * @param int Input type - one of ENC_BINARY, ENC_HEX, ENC_BASE64
- * @return string
- */
-
- function pk_decrypt($string, $input_type = ENC_HEX)
- {
- $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
- return $aes->decrypt($string, $this->private_key, $input_type);
- }
-
- #
- # USER RANKS
- #
-
- /**
- * SYNOPSIS OF THE RANK SYSTEM
- * Enano's rank logic calculates a user's rank based on a precedence scale. The way things are checked is:
- * 1. Check to see if the user has a specific rank assigned. Use that if possible.
- * 2. Check the user's primary group to see if it specifies a rank. Use that if possible.
- * 3. Check the other groups a user is in. If one that has a custom rank is encountered, use that rank.
- * 4. See if the user's user level has a specific rank hard-coded to be associated with it. (Always overrideable as can be seen above)
- * 5. Use the "member" rank
- */
-
- /**
- * Generates a textual SQL query for fetching rank data to be sent to calculate_user_rank().
- * @param string Text to append, possibly a WHERE clause or so
- * @return string
- */
-
- function generate_rank_sql($append = '')
- {
- // Generate level-to-rank associations
- $assoc = array();
- foreach ( $this->level_rank_table as $level => $rank )
- {
- $assoc[] = " ( u.user_level = $level AND rl.rank_id = $rank )";
- }
- $assoc = implode(" OR\n", $assoc) . "\n";
-
- $gid_col = ( ENANO_DBLAYER == 'PGSQL' ) ?
- 'array_to_string(' . table_prefix . 'array_accum(m.group_id), \',\') AS group_list' :
- 'GROUP_CONCAT(m.group_id) AS group_list';
-
- // The actual query
- $sql = "SELECT u.user_id, u.username, u.user_level, u.user_group, u.user_rank, u.user_title, g.group_rank,\n"
- . " COALESCE(ru.rank_id, rg.rank_id, rl.rank_id, rd.rank_id ) AS rank_id,\n"
- . " COALESCE(ru.rank_title, rg.rank_title, rl.rank_title, rd.rank_title) AS rank_title,\n"
- . " COALESCE(ru.rank_style, rg.rank_style, rl.rank_style, rd.rank_style) AS rank_style,\n"
- . " rg.rank_id AS group_rank_id,\n"
- . " ( ru.rank_id IS NULL AND rg.rank_id IS NULL ) AS using_default,\n"
- . " ( ru.rank_id IS NULL AND rg.rank_id IS NOT NULL ) AS using_group,\n"
- . " ( ru.rank_id IS NOT NULL ) AS using_user,\n"
- . " u.user_rank_userset,\n"
- . " $gid_col\n"
- . " FROM " . table_prefix . "users AS u\n"
- . " LEFT JOIN " . table_prefix . "groups AS g\n"
- . " ON ( g.group_id = u.user_group )\n"
- . " LEFT JOIN " . table_prefix . "group_members AS m\n"
- . " ON ( u.user_id = m.user_id )\n"
- . " LEFT JOIN " . table_prefix . "ranks AS ru\n"
- . " ON ( u.user_rank = ru.rank_id )\n"
- . " LEFT JOIN " . table_prefix . "ranks AS rg\n"
- . " ON ( g.group_rank = rg.rank_id )\n"
- . " LEFT JOIN " . table_prefix . "ranks AS rl\n"
- . " ON (\n"
- . $assoc
- . " )\n"
- . " LEFT JOIN " . table_prefix . "ranks AS rd\n"
- . " ON ( rd.rank_id = 1 )$append\n"
- . " GROUP BY u.user_id, u.username, u.user_level, u.user_group, u.user_rank, u.user_title, u.user_rank_userset, g.group_rank,\n"
- . " ru.rank_id, ru.rank_title, ru.rank_style,rg.rank_id, rg.rank_title, rg.rank_style,\n"
- . " rl.rank_id, rl.rank_title, rl.rank_style,rd.rank_id, rd.rank_title, rd.rank_style;";
-
- return $sql;
- }
-
- /**
- * Returns an associative array with a user's rank information.
- * The array will contain the following values:
- * username: string The user's username
- * user_id: integer Numerical user ID
- * rank_id: integer Numerical rank ID
- * rank: string The user's current rank
- * title: string The user's custom user title if applicable; should be displayed one line below the rank
- * style: string CSS for the username
- * @param int|string Username *or* user ID
- * @return array or false on failure
- */
-
- function get_user_rank($id)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- global $user_ranks;
- // cache info in RAM if possible
- static $_cache = array();
-
- if ( is_int($id) && $id == 0 )
- $id = 1;
-
- if ( is_int($id) )
- $col = "u.user_id = $id";
- else if ( is_string($id) )
- $col = ENANO_SQLFUNC_LOWERCASE . "(username) = " . ENANO_SQLFUNC_LOWERCASE . "('" . $db->escape($id) . "')";
- else
- // invalid parameter
- return false;
-
- // check the RAM cache
- if ( isset($_cache[$id]) )
- return $_cache[$id];
-
- // check the disk cache
- if ( is_int($id) )
- {
- if ( isset($user_ranks[$id]) )
- {
- $_cache[$id] =& $user_ranks[$id];
- return $user_ranks[$id];
- }
- }
- else if ( is_string($id) )
- {
- foreach ( $user_ranks as $key => $valarray )
- {
- if ( is_string($key) && strtolower($key) == strtolower($id) )
- {
- $_cache[$id] = $valarray;
- return $valarray;
- }
- }
- }
-
- $sql = $this->generate_rank_sql("\n WHERE $col");
-
- $q = $this->sql($sql);
- // any results?
- if ( $db->numrows() < 1 )
- {
- // nuttin'.
- $db->free_result();
- $_cache[$id] = false;
- return false;
- }
-
- // Found something.
- $row = $db->fetchrow();
- $db->free_result();
-
- $row = $this->calculate_user_rank($row);
-
- $_cache[$id] = $row;
- return $row;
- }
-
- /**
- * Performs the actual rank calculation based on the contents of a row.
- * @param array
- * @return array
- */
-
- function calculate_user_rank($row)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- static $rank_cache = array();
- static $group_ranks = array();
-
- // try to cache that rank info
- if ( !isset($rank_cache[ intval($row['rank_id']) ]) && $row['rank_id'] )
- {
- $rank_cache[ intval($row['rank_id']) ] = array(
- 'rank_id' => intval($row['rank_id']),
- 'rank_title' => intval($row['rank_title']),
- 'rank_style' => intval($row['rank_style'])
- );
- }
- // cache group info (if appropriate)
- if ( $row['using_group'] && !isset($group_ranks[ intval($row['user_group']) ]) )
- {
- $group_ranks[ intval($row['user_group']) ] = intval($row['group_rank_id']);
- }
-
- // sanitize and process the as-of-yet rank data
- $row['rank_id'] = intval($row["rank_id"]);
- $row['rank_title'] = $row["rank_title"];
-
- // if we're falling back to some default, then see if we can use one of the user's other groups
- if ( $row['using_default'] && !empty($row['group_list']) )
- {
- $group_list = explode(',', $row['group_list']);
- if ( array_walk($group_list, 'intval') )
- {
- // go through the group list and see if any of them has a rank assigned
- foreach ( $group_list as $group_id )
- {
- // cached in RAM? Preferably use that.
- if ( !isset($group_ranks[$group_id]) )
- {
- // Not cached - grab it
- $q = $this->sql('SELECT group_rank FROM ' . table_prefix . "groups WHERE group_id = $group_id;");
- if ( $db->numrows() < 1 )
- {
- $db->free_result();
- continue;
- }
- list($result) = $db->fetchrow_num();
- $db->free_result();
-
- if ( $result === null || $result < 1 )
- {
- $group_ranks[$group_id] = false;
- }
- else
- {
- $group_ranks[$group_id] = intval($result);
- }
- }
- // we've got it now
- if ( $group_ranks[$group_id] )
- {
- // found a group with a rank assigned
- // so get the rank info
- $rank_id =& $group_ranks[$group_id];
- if ( !isset($rank_cache[$rank_id]) )
- {
- $q = $this->sql('SELECT rank_id, rank_title, rank_style FROM ' . table_prefix . "ranks WHERE rank_id = $rank_id;");
- if ( $db->numrows() < 1 )
- {
- $db->free_result();
- continue;
- }
- $rank_cache[$rank_id] = $db->fetchrow();
- $db->free_result();
- }
- // set the final rank parameters
- // die("found member-of-group exception with uid {$row['user_id']} gid $group_id rid $rank_id rt {$rank_cache[$rank_id]['rank_title']}");
- $row['rank_id'] = $rank_id;
- $row['rank_title'] = $rank_cache[$rank_id]['rank_title'];
- $row['rank_style'] = $rank_cache[$rank_id]['rank_style'];
- break;
- }
- }
- }
- }
-
- if ( $row['user_title'] === NULL )
- $row['user_title'] = false;
-
- $row['user_id'] = intval($row['user_id']);
- $row['user_level'] = intval($row['user_level']);
- $row['user_group'] = intval($row['user_group']);
-
- unset($row['user_rank'], $row['group_rank'], $row['group_list'], $row['using_default'], $row['using_group'], $row['user_level'], $row['user_group'], $row['username']);
- return $row;
- }
-
- /**
- * Get the list of ranks that a user is allowed to use. Returns false if they cannot change it.
- * @param string|int User ID or username
- * @return array Associative by rank ID
- */
-
- function get_user_possible_ranks($id)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- // cache info in RAM if possible
- static $_cache = array();
-
- if ( is_int($id) && $id == 0 )
- $id = 1;
-
- if ( is_int($id) )
- $col = "u.user_id = $id";
- else if ( is_string($id) )
- $col = ENANO_SQLFUNC_LOWERCASE . "(username) = " . ENANO_SQLFUNC_LOWERCASE . "('" . $db->escape($id) . "')";
- else
- // invalid parameter
- return false;
-
- // check the RAM cache
- if ( isset($_cache[$id]) )
- return $_cache[$id];
-
- $sql = $this->generate_rank_sql("\n WHERE $col");
-
- $q = $this->sql($sql);
- // any results?
- if ( $db->numrows() < 1 )
- {
- // nuttin'.
- $db->free_result();
- $_cache[$id] = false;
- return false;
- }
-
- // Found something.
- $row = $db->fetchrow();
- $db->free_result();
-
- if ( $row['using_user'] && !$row['user_rank_userset'] )
- {
- // The user's rank was set manually by an admin.
- $result = array(
- array(
- 'rank_id' => $row['rank_id'],
- 'rank_title' => $row['rank_title'],
- 'rank_style' => $row['rank_style'],
- 'rank_type' => 'user'
- )
- );
- $_cache[$id] = $result;
- return $result;
- }
-
- // copy the result to a more permanent array so we can reference this later
- $current_settings = $row;
- unset($row);
-
- $result = array();
-
- // first rank available to us will be the one set by the user's user level
- if ( isset($this->level_rank_table[$current_settings['user_level']]) )
- {
- $q = $this->sql('SELECT rank_id, rank_title, rank_style FROM ' . table_prefix . "ranks WHERE rank_id = {$this->level_rank_table[$this->user_level]};");
- if ( $db->numrows() > 0 )
- {
- $row = $db->fetchrow();
- $row['rank_type'] = 'ulevel';
-
- $result[] = $row;
- }
- $db->free_result();
- }
-
- // for each group the user is in, figure out if it has a rank associated with it
- $group_list = explode(',', $current_settings['group_list']);
- foreach ( $group_list as $group_id )
- {
- $group_id = intval($group_id);
- $q = $this->sql('SELECT r.rank_id, r.rank_title, r.rank_style FROM ' . table_prefix . "groups AS g\n"
- . " LEFT JOIN " . table_prefix . "ranks AS r\n"
- . " ON ( g.group_rank = r.rank_id )\n"
- . " WHERE g.group_id = $group_id\n"
- . " AND r.rank_id IS NOT NULL;");
- if ( $db->numrows() > 0 )
- {
- $row = $db->fetchrow();
- $row['rank_type'] = 'group';
-
- $result[] = $row;
- }
- $db->free_result();
- }
-
- $_cache[$id] = $result;
- return $result;
- }
-
- #
- # Access Control Lists
- #
-
- /**
- * Creates a new permission field in memory. If the permissions are set in the database, they are used. Otherwise, $default_perm is used.
- * @param string $acl_type An identifier for this field
- * @param int $default_perm Whether permission should be granted or not if it's not specified in the ACLs.
- * @param string $desc A human readable name for the permission type
- * @param array $deps The list of dependencies - this should be an array of ACL types
- * @param string $scope Which namespaces this field should apply to. This should be either a pipe-delimited list of namespace IDs or just "All".
- */
-
- function register_acl_type($acl_type, $default_perm = AUTH_DISALLOW, $desc = false, $deps = Array(), $scope = 'All')
- {
- if(isset($this->acl_types[$acl_type]))
- return false;
- else
- {
- if(!$desc)
- {
- $desc = capitalize_first_letter(str_replace('_', ' ', $acl_type));
- }
- $this->acl_types[$acl_type] = $default_perm;
- $this->acl_descs[$acl_type] = $desc;
- $this->acl_deps[$acl_type] = $deps;
- $this->acl_scope[$acl_type] = explode('|', $scope);
- }
- return true;
- }
-
- /**
- * Tells us whether permission $type is allowed or not based on the current rules.
- * @param string $type The permission identifier ($acl_type passed to sessionManager::register_acl_type())
- * @param bool $no_deps If true, disables dependency checking
- * @return bool True if allowed, false if denied or if an error occured
- */
-
- function get_permissions($type, $no_deps = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- if ( isset( $this->perms[$type] ) )
- {
- if ( $this->perms[$type] == AUTH_DENY )
- $ret = false;
- else if ( $this->perms[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
- $ret = true;
- else if ( $this->perms[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
- $ret = false;
- else if ( $this->perms[$type] == AUTH_ALLOW )
- $ret = true;
- else if ( $this->perms[$type] == AUTH_DISALLOW )
- $ret = false;
- }
- else if(isset($this->acl_types[$type]))
- {
- if ( $this->acl_types[$type] == AUTH_DENY )
- $ret = false;
- else if ( $this->acl_types[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
- $ret = true;
- else if ( $this->acl_types[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
- $ret = false;
- else if ( $this->acl_types[$type] == AUTH_ALLOW )
- $ret = true;
- else if ( $this->acl_types[$type] == AUTH_DISALLOW )
- $ret = false;
- }
- else
- {
- // ACL type is undefined
- trigger_error('Unknown access type "' . $type . '"', E_USER_WARNING);
- return false; // Be on the safe side and deny access
- }
- if ( !$no_deps )
- {
- if ( !$this->acl_check_deps($type) )
- return false;
- }
- return $ret;
- }
-
- /**
- * Fetch the permissions that apply to the current user for the page specified. The object you get will have the get_permissions method
- * and several other abilities.
- * @param string $page_id
- * @param string $namespace
- * @return object
- */
-
- function fetch_page_acl($page_id, $namespace)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( count ( $this->acl_base_cache ) < 1 )
- {
- // Permissions table not yet initialized
- return false;
- }
-
- // cache of permission objects (to save RAM and SQL queries)
- static $objcache = array();
-
- if ( count($objcache) == 0 )
- {
- foreach ( $paths->nslist as $key => $_ )
- {
- $objcache[$key] = array();
- }
- }
-
- if ( isset($objcache[$namespace][$page_id]) )
- {
- return $objcache[$namespace][$page_id];
- }
-
- $objcache[$namespace][$page_id] = new Session_ACLPageInfo( $page_id, $namespace, $this->acl_types, $this->acl_descs, $this->acl_deps, $this->acl_base_cache );
- $object =& $objcache[$namespace][$page_id];
-
- profiler_log("session: fetched ACLs for page {$namespace}:{$page_id}");
-
- return $object;
- }
-
- /**
- * Fetch the permissions that apply to an arbitrary user for the page specified. The object you get will have the get_permissions method
- * and several other abilities.
- * @param int|string $user_id_or_name; user ID *or* username of the user
- * @param string $page_id; if null, will be default effective permissions.
- * @param string $namespace; if null, will be default effective permissions.
- * @return object
- */
-
- function fetch_page_acl_user($user_id_or_name, $page_id, $namespace)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- // cache user info
- static $user_info_cache = null;
-
- if ( isset($user_info_cache[$user_id_or_name]) )
- {
- $user_id =& $user_info_cache[$user_id_or_name]['user_id'];
- $groups =& $user_info_cache[$user_id_or_name]['groups'];
- }
- else
- {
- $uid_column = ( is_int($user_id_or_name) ) ? "user_id = $user_id_or_name" : "username = '" . $db->escape($user_id_or_name) . "'";
- $q = $db->sql_query('SELECT u.user_id, m.group_id, g.group_name FROM ' . table_prefix . "users AS u\n"
- . " LEFT JOIN " . table_prefix . "group_members AS m\n"
- . " ON ( ( u.user_id = m.user_id AND m.pending = 0 ) OR m.member_id IS NULL )\n"
- . " LEFT JOIN " . table_prefix . "groups AS g\n"
- . " ON ( g.group_id = m.group_id )\n"
- . " WHERE $uid_column;");
- if ( !$q )
- $db->_die();
-
- // The l10n engine takes care of this later.
- $groups = array(1 => 'Everyone');
-
- if ( $row = $db->fetchrow() )
- {
- $user_id = intval($row['user_id']);
- if ( $row['group_id'] )
- {
- do
- {
- $groups[ intval($row['group_id'] ) ] = $row['group_name'];
- }
- while ( $row = $db->fetchrow() );
- }
- $db->free_result();
- }
- else
- {
- $db->free_result();
- throw new Exception('Unknown user ID or username');
- }
-
- $user_info_cache[$user_id_or_name] = array(
- 'user_id' => $user_id,
- 'groups' => $groups
- );
- }
-
- // cache base permissions
- static $base_cache = array();
- if ( !isset($base_cache[$user_id_or_name]) )
- {
- $base_cache[$user_id_or_name] = $this->acl_types;
- $current_perms =& $base_cache[$user_id_or_name];
- $current_perms['__resolve_table'] = array();
-
- $bs = 'SELECT rules, target_type, target_id, rule_id, page_id, namespace, g.group_name FROM '.table_prefix."acl AS a\n"
- . " LEFT JOIN " . table_prefix . "groups AS g\n"
- . " ON ( ( a.target_type = " . ACL_TYPE_GROUP . " AND a.target_id = g.group_id ) OR ( a.target_type != " . ACL_TYPE_GROUP . " ) )\n"
- . ' WHERE page_id IS NULL AND namespace IS NULL AND' . "\n"
- . ' ( ';
-
- $q = Array();
- $q[] = '( target_type='.ACL_TYPE_USER.' AND target_id= ' . $user_id . ' )';
- if(count($groups) > 0)
- {
- foreach($groups as $g_id => $g_name)
- {
- $q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
- }
- }
- $bs .= implode(" OR \n ", $q) . " ) \n ORDER BY target_type ASC, target_id ASC;";
- $q = $this->sql($bs);
- foreach ( $this->acl_types as $perm_type => $_ )
- {
- // init the resolver table with blanks
- $current_perms['__resolve_table'][$perm_type] = array(
- 'src' => ACL_INHERIT_ENANO_DEFAULT,
- 'rule_id' => -1
- );
- }
- if ( $row = $db->fetchrow() )
- {
- do {
- $rules = $this->string_to_perm($row['rules']);
- $is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
- // track where these rulings are coming from
- $src = ( $is_everyone ) ? ACL_INHERIT_GLOBAL_EVERYONE : ( $row['target_type'] == ACL_TYPE_GROUP ? ACL_INHERIT_GLOBAL_GROUP : ACL_INHERIT_GLOBAL_USER );
- foreach ( $rules as $perm_type => $_ )
- {
- $current_perms['__resolve_table'][$perm_type] = array(
- 'src' => $src,
- 'rule_id' => $row['rule_id']
- );
- if ( $row['group_name'] )
- {
- $current_perms['__resolve_table'][$perm_type]['group_name'] = $row['group_name'];
- }
- }
- // merge it in
- $current_perms = $this->acl_merge($current_perms, $rules, $is_everyone, $_defaults_used);
- } while ( $row = $db->fetchrow() );
- }
- }
-
- // cache of permission objects (to save RAM and SQL queries)
- static $objcache = array();
-
- if ( count($objcache) == 0 )
- {
- foreach ( $paths->nslist as $key => $_ )
- {
- $objcache[$key] = array();
- }
- }
-
- if ( !isset($objcache[$namespace][$page_id]) )
- {
- $objcache[$namespace][$page_id] = array();
- }
-
- if ( isset($objcache[$namespace][$page_id][$user_id_or_name]) )
- {
- return $objcache[$namespace][$page_id][$user_id_or_name];
- }
-
- //if ( !isset( $paths->pages[$paths->nslist[$namespace] . $page_id] ) )
- //{
- // // Page does not exist
- // return false;
- //}
-
- $objcache[$namespace][$page_id][$user_id_or_name] = new Session_ACLPageInfo(
- $page_id, // $page_id,
- $namespace, // $namespace,
- $this->acl_types, // $acl_types,
- $this->acl_descs, // $acl_descs,
- $this->acl_deps, // $acl_deps,
- $base_cache[$user_id_or_name], // $base,
- $user_info_cache[$user_id_or_name]['user_id'], // $user_id = null,
- $user_info_cache[$user_id_or_name]['groups'], // $groups = null,
- $base_cache[$user_id_or_name]['__resolve_table'] // $resolve_table = array()
- );
- $object =& $objcache[$namespace][$page_id][$user_id_or_name];
-
- return $object;
- }
-
- /**
- * Checks if the given ACL rule type applies to a namespace.
- * @param string ACL rule type
- * @param string Namespace
- * @return bool
- */
-
- function check_acl_scope($acl_rule, $namespace)
- {
- if ( !isset($this->acl_scope[$acl_rule]) )
- return false;
- if ( $this->acl_scope[$acl_rule] === array('All') )
- return true;
- return ( in_array($namespace, $this->acl_scope[$acl_rule]) ) ? true : false;
- }
-
- /**
- * Read all of our permissions from the database and process/apply them. This should be called after the page is determined.
- * @access private
- */
-
- function init_permissions()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- // Initialize the permissions list with some defaults
- $this->perms = $this->acl_types;
- $this->acl_defaults_used = $this->perms;
-
- // Fetch sitewide defaults from the permissions table
- $bs = 'SELECT rules, target_type, target_id FROM '.table_prefix.'acl' . "\n"
- . ' WHERE page_id IS NULL AND namespace IS NULL AND' . "\n"
- . ' ( ';
-
- $q = Array();
- $q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$this->user_id.' )';
- if(count($this->groups) > 0)
- {
- foreach($this->groups as $g_id => $g_name)
- {
- $q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
- }
- }
- $bs .= implode(" OR \n ", $q) . " ) \n ORDER BY target_type ASC, target_id ASC;";
- $q = $this->sql($bs);
- if ( $row = $db->fetchrow() )
- {
- do {
- $rules = $this->string_to_perm($row['rules']);
- $is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
- $this->acl_merge_with_current($rules, $is_everyone);
- } while ( $row = $db->fetchrow() );
- }
-
- // Cache the sitewide permissions for later use
- $this->acl_base_cache = $this->perms;
-
- profiler_log('session: base ACL set calculated');
-
- // Load and calculate permissions for the current page
- $page_acl = $this->fetch_page_acl($paths->page_id, $paths->namespace);
- $this->perms = $page_acl->perms;
- $this->acl_defaults_used = $page_acl->acl_defaults_used;
- }
-
- /**
- * Extends the scope of a permission type.
- * @param string The name of the permission type
- * @param string The namespace(s) that should be covered. This can be either one namespace ID or a pipe-delimited list.
- * @param object Optional - the current $paths object, in case we're doing this from the acl_rule_init hook
- */
-
- function acl_extend_scope($perm_type, $namespaces, &$p_in)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $p_obj = ( is_object($p_in) ) ? $p_in : $paths;
- $nslist = explode('|', $namespaces);
- foreach ( $nslist as $i => $ns )
- {
- if ( !isset($p_obj->nslist[$ns]) )
- {
- unset($nslist[$i]);
- }
- else
- {
- if ( $this->acl_scope[$perm_type] !== array('All') )
- $this->acl_scope[$perm_type][] = $ns;
- if ( isset($this->acl_types[$perm_type]) && !isset($this->perms[$perm_type]) )
- {
- $this->perms[$perm_type] = $this->acl_types[$perm_type];
- }
- }
- }
- }
-
- /**
- * Converts a permissions field into a string for database insertion. Similar in spirit to serialize().
- * @param array $perms An associative array with only integers as values
- * @return string
- */
-
- function perm_to_string($perms)
- {
- $s = '';
- foreach($perms as $perm => $ac)
- {
- if ( $ac == 'i' )
- continue;
- $s .= "$perm=$ac;";
- }
- return $s;
- }
-
- /**
- * Converts a permissions string back to an array.
- * @param string $perms The result from sessionManager::perm_to_string()
- * @return array
- */
-
- function string_to_perm($perms)
- {
- $ret = Array();
- preg_match_all('#([a-z0-9_-]+)=([0-9]+);#i', $perms, $matches);
- foreach($matches[1] as $i => $t)
- {
- $ret[$t] = intval($matches[2][$i]);
- }
- return $ret;
- }
-
- /**
- * Merges two ACL arrays. Both parameters should be permission list arrays. The second group takes precedence over the first, but AUTH_DENY always prevails.
- * @param array $perm1 The first set of permissions
- * @param array $perm2 The second set of permissions
- * @param bool $is_everyone If true, applies exceptions for "Everyone" group
- * @param array|reference $defaults_used Array that will be filled with default usage data
- * @return array
- */
-
- function acl_merge($perm1, $perm2, $is_everyone = false, &$defaults_used = array())
- {
- $ret = $perm1;
- if ( !is_array(@$defaults_used) )
- {
- $defaults_used = array();
- }
- foreach ( $perm1 as $i => $p )
- {
- if ( isset($perm2[$i]) )
- {
- if ( $is_everyone && isset($defaults_used[$i]) && $defaults_used[$i] === false )
- continue;
- // Decide precedence
- if ( isset($defaults_used[$i]) )
- {
- // echo "$i: default in use, overriding to: {$perm2[$i]}
";
- // Defaults are in use, override
-
- // CHANGED - 1.1.4:
- // For some time this has been intentionally relaxed so that the following
- // exception is available to Deny permissions:
- // If the rule applies to the group "Everyone" on the entire site,
- // Deny settings could be overriden.
- // This is documented at: http://docs.enanocms.org/Help:4.2
- if ( $perm1[$i] != AUTH_DENY )
- {
- $perm1[$i] = $perm2[$i];
- $defaults_used[$i] = ( $is_everyone );
- }
- }
- else
- {
- // echo "$i: default NOT in use";
- // Defaults are not in use, merge as normal
- if ( $perm1[$i] != AUTH_DENY )
- {
- // echo ", but overriding";
- $perm1[$i] = $perm2[$i];
- }
- // echo "
";
- }
- }
- }
- return $perm1;
- }
-
- /**
- * Merges two ACL arrays, but instead of calculating inheritance for missing permission types, just returns 'i' for that type. Useful
- * for explicitly requiring inheritance in ACL editing interfaces
- * @param array $perm1 The first set of permissions
- * @param array $perm2 The second, authoritative set of permissions
- */
-
- function acl_merge_inherit($perm1, $perm2)
- {
- foreach ( $perm1 as $type => $level )
- {
- $perm1[$type][$level] = 'i';
- }
- $ret = $perm1;
- foreach ( $perm2 as $type => $level )
- {
- if ( isset( $ret[$type] ) )
- {
- if ( $ret[$type] != AUTH_DENY )
- $ret[$type] = $level;
- }
- }
- return $ret;
- }
-
- /**
- * Merges the ACL array sent with the current permissions table, deciding precedence based on whether defaults are in effect or not.
- * @param array The array to merge into the master ACL list
- * @param bool If true, $perm is treated as the "new default"
- * @param int 1 if this is a site-wide ACL, 2 if page-specific. Defaults to 2.
- */
-
- function acl_merge_with_current($perm, $is_everyone = false, $scope = 2)
- {
- $this->perms = $this->acl_merge($this->perms, $perm, $is_everyone, $this->acl_defaults_used);
- }
-
- /**
- * Merges two ACL arrays. Both parameters should be permission list arrays. The second group takes precedence
- * over the first, without exceptions. This is used to merge the hardcoded defaults with admin-specified
- * defaults, which take precedence.
- * @param array $perm1 The first set of permissions
- * @param array $perm2 The second set of permissions
- * @return array
- */
-
- function acl_merge_complete($perm1, $perm2)
- {
- $ret = $perm1;
- foreach ( $perm2 as $type => $level )
- {
- $ret[$type] = $level;
- }
- return $ret;
- }
-
- /**
- * Tell us if the dependencies for a given permission are met.
- * @param string The ACL permission ID
- * @return bool
- */
-
- function acl_check_deps($type, $debug = false)
- {
- global $paths;
-
- // This will only happen if the permissions table is hacked or improperly accessed
- if(!isset($this->acl_deps[$type]))
- return true;
- // Permission has no dependencies?
- if(sizeof($this->acl_deps[$type]) < 1)
- return true;
- // go through them all and build a flat list of dependencies
- $deps = $this->acl_deps[$type];
- while(true)
- {
- $j = sizeof($deps);
- for ( $i = 0; $i < $j; $i++ )
- {
- $b = $deps;
- if ( !$this->check_acl_scope($deps[$i], $paths->namespace) )
- {
- // Action $type depends on action $deps[$i] which cannot be satisfied because $deps[$i] is out of scope.
- // echo '' . enano_debug_print_backtrace(true) . '
';
- trigger_error("acl_check_deps: $type depends on {$deps[$i]} which is not within scope of $paths->namespace; this indicats a bug in ACL rule specification", E_USER_WARNING);
- return false;
- }
- $deps = array_merge($deps, $this->acl_deps[$deps[$i]]);
- if( $b == $deps )
- {
- break 2;
- }
- $j = sizeof($deps);
- }
- }
- $debugdata = array();
- foreach($deps as $d)
- {
- // Our dependencies are fully resolved, so tell get_permissions() to not recursively call this function
- if ( !$this->get_permissions($d, true) )
- {
- if ( $debug )
- {
- $debugdata[] = $d;
- }
- else
- {
- return false;
- }
- }
- }
- return $debug ? $debugdata : true;
- }
-
- /**
- * Makes a CAPTCHA code and caches the code in the database
- * @param int $len The length of the code, in bytes
- * @param string Optional, the hash to reuse
- * @return string A unique identifier assigned to the code. This hash should be passed to sessionManager::getCaptcha() to retrieve the code.
- */
-
- function make_captcha($len = 7, $hash = '')
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $code = $this->generate_captcha_code($len);
- if ( !preg_match('/^[a-f0-9]{32}([a-z0-9]{8})?$/', $hash) )
- $hash = md5(microtime() . mt_rand());
- $session_data = $db->escape(serialize(array()));
-
- // sanity check
- if ( !is_valid_ip(@$_SERVER['REMOTE_ADDR']) || !is_int($this->user_id) )
- return false;
-
- $this->sql('DELETE FROM ' . table_prefix . "captcha WHERE session_id = '$hash';");
- $this->sql('INSERT INTO ' . table_prefix . 'captcha(session_id, code, session_data, source_ip, user_id)' . " VALUES('$hash', '$code', '$session_data', '{$_SERVER['REMOTE_ADDR']}', {$this->user_id});");
- return $hash;
- }
-
- /**
- * Generates a "pronouncable" or "human-friendly" word using various phonics rules
- * @param int Optional. The length of the word.
- * @return string
- */
-
- function generate_captcha_code($len = 7)
- {
- // don't use k and x, they get mixed up a lot
- $consonants = 'bcdfghmnpqrsvwyz';
- $vowels = 'aeiou';
- $prev = 'vowel';
- $prev_l = '';
- $word = '';
- $allow_next_vowel = true;
- for ( $i = 0; $i < $len; $i++ )
- {
- if ( $prev == 'vowel' )
- {
- $allow_next_vowel = false;
- if ( $prev_l == 'o' && mt_rand(0, 3) == 3 && $allow_next_vowel )
- $word .= 'i';
- else if ( $prev_l == 'q' && mt_rand(0, 3) != 1 && $allow_next_vowel )
- $word .= 'u';
- else if ( $prev_l == 'o' && mt_rand(0, 3) == 2 && $allow_next_vowel )
- $word .= 'u';
- else if ( $prev_l == 'a' && mt_rand(0, 3) == 3 && $allow_next_vowel )
- $word .= 'i';
- else if ( $prev_l == 'a' && mt_rand(0, 10) == 7 && $allow_next_vowel )
- $word .= 'o';
- else if ( $prev_l == 'a' && mt_rand(0, 7) == 2 && $allow_next_vowel )
- $word .= 'u';
- else
- {
- $allow_next_vowel = true;
- $word .= $consonants{mt_rand(0, (strlen($consonants)-1))};
- }
- }
- else if ( $prev == 'consonant' )
- {
- if ( $prev_l == 'p' && mt_rand(0, 7) == 4 )
- $word .= 't';
- else if ( $prev_l == 'p' && mt_rand(0, 5) == 1 )
- $word .= 'h';
- else
- $word .= $vowels{mt_rand(0, (strlen($vowels)-1))};
- }
- $prev_l = substr($word, -1);
- $l = ( mt_rand(0, 1) == 1 ) ? strtoupper($prev_l) : strtolower($prev_l);
- $word = substr($word, 0, -1) . $l;
- if ( strstr('aeiou', $prev_l) )
- $prev = 'vowel';
- else
- $prev = 'consonant';
- }
- return $word;
- }
-
- /**
- * For the given code ID, returns the correct CAPTCHA code, or false on failure
- * @param string $hash The unique ID assigned to the code
- * @param bool If true, the code is NOT deleted from the database. Use with caution!
- * @return string The correct confirmation code
- */
-
- function get_captcha($hash, $nodelete = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( !preg_match('/^[a-f0-9]{32}([a-z0-9]{8})?$/', $hash) )
- {
- die("session manager: bad captcha_hash $hash");
- return false;
- }
-
- // sanity check
- if ( !is_valid_ip(@$_SERVER['REMOTE_ADDR']) )
- {
- die("session manager insanity: bad REMOTE_ADDR or invalid UID");
- return false;
- }
-
- $q = $this->sql('SELECT code_id, code FROM ' . table_prefix . "captcha WHERE session_id = '$hash' AND source_ip = '{$_SERVER['REMOTE_ADDR']}';");
- if ( $db->numrows() < 1 )
- {
- return false;
- }
-
- list($code_id, $code) = $db->fetchrow_num();
-
- $db->free_result();
-
- // delete it
- if ( !$nodelete )
- $this->sql('DELETE FROM ' . table_prefix . "captcha WHERE code_id = $code_id;");
-
- return $code;
- }
-
- /**
- * (AS OF 1.0.2: Deprecated. Captcha codes are now killed on first fetch for security.) Deletes all CAPTCHA codes cached in the DB for this user.
- */
-
- function kill_captcha()
- {
- return true;
- }
-
- /**
- * Generates a random password.
- * @param int $length Optional - length of password
- * @return string
- */
-
- function random_pass($length = 10)
- {
- $valid_chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_+@#%&<>';
- $valid_chars = enano_str_split($valid_chars);
- $ret = '';
- for ( $i = 0; $i < $length; $i++ )
- {
- $ret .= $valid_chars[mt_rand(0, count($valid_chars)-1)];
- }
- return $ret;
- }
-
- /**
- * Generates some Javascript that calls the AES encryption library. Put this after your .
- * @param string The name of the form
- * @param string The name of the password field
- * @param string The name of the field that switches encryption on or off
- * @param string The name of the field that contains the encryption key
- * @param string The name of the field that will contain the encrypted password
- * @param string The name of the field that handles MD5 challenge data
- * @param string The name of the field that tells if the server supports DiffieHellman
- * @param string The name of the field with the DiffieHellman public key
- * @param string The name of the field that the client should populate with its public key
- * @return string
- */
-
- function aes_javascript($form_name, $pw_field, $use_crypt = 'use_crypt', $crypt_key = 'crypt_key', $crypt_data = 'crypt_data', $challenge = 'challenge_data', $dh_supported = 'dh_supported', $dh_pubkey = 'dh_public_key', $dh_client_pubkey = 'dh_client_public_key')
- {
- $code = '
-
- ';
- return $code;
- }
-
- /**
- * Generates the HTML form elements required for an encrypted logon experience.
- * @return string
- */
-
- function generate_aes_form()
- {
- $return = '';
- $return .= '';
- $return .= '';
- $return .= '';
-
- require_once(ENANO_ROOT . '/includes/math.php');
- require_once(ENANO_ROOT . '/includes/diffiehellman.php');
-
- global $dh_supported, $_math;
- if ( $dh_supported )
- {
- $dh_key_priv = dh_gen_private();
- $dh_key_pub = dh_gen_public($dh_key_priv);
- $dh_key_priv = $_math->str($dh_key_priv);
- $dh_key_pub = $_math->str($dh_key_pub);
- // store the keys in the DB
- $this->sql('INSERT INTO ' . table_prefix . "diffiehellman( public_key, private_key ) VALUES ( '$dh_key_pub', '$dh_key_priv' );");
-
- $return .= "
-
- ";
- }
- else
- {
- $return .= "";
- }
- return $return;
- }
-
- /**
- * If you used all the same form fields as the normal login interface, this will take care of DiffieHellman for you and return the key.
- * @param string Password field name (defaults to "password")
- * @return string
- */
-
- function get_aes_post($fieldname = 'password')
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
- if ( $_POST['use_crypt'] == 'yes' )
- {
- $crypt_key = $this->fetch_public_key($_POST['crypt_key']);
- if ( !$crypt_key )
- {
- throw new Exception($lang->get('user_err_key_not_found'));
- }
- $crypt_key = hexdecode($crypt_key);
- $data = $aes->decrypt($_POST['crypt_data'], $crypt_key, ENC_HEX);
- }
- else if ( $_POST['use_crypt'] == 'yes_dh' )
- {
- require_once(ENANO_ROOT . '/includes/math.php');
- require_once(ENANO_ROOT . '/includes/diffiehellman.php');
-
- global $dh_supported, $_math;
-
- if ( !$dh_supported )
- {
- throw new Exception('Server does not support DiffieHellman, denying request');
- }
-
- // Fetch private key
- $dh_public = $_POST['dh_public_key'];
- if ( !ctype_digit($dh_public) )
- {
- throw new Exception('ERR_DH_KEY_NOT_INTEGER');
- }
- $q = $db->sql_query('SELECT private_key, key_id FROM ' . table_prefix . "diffiehellman WHERE public_key = '$dh_public';");
- if ( !$q )
- $db->die_json();
-
- if ( $db->numrows() < 1 )
- {
- throw new Exception('ERR_DH_KEY_NOT_FOUND');
- }
-
- list($dh_private, $dh_key_id) = $db->fetchrow_num();
- $db->free_result();
-
- // We have the private key, now delete the key pair, we no longer need it
- $q = $db->sql_query('DELETE FROM ' . table_prefix . "diffiehellman WHERE key_id = $dh_key_id;");
- if ( !$q )
- $db->die_json();
-
- // Generate the shared secret
- $dh_secret = dh_gen_shared_secret($dh_private, $_POST['dh_client_public_key']);
- $dh_secret = $_math->str($dh_secret);
-
- // Did we get all our math right?
- $dh_secret_check = sha1($dh_secret);
- $dh_hash = $_POST['crypt_key'];
- if ( $dh_secret_check !== $dh_hash )
- {
- throw new Exception('ERR_DH_HASH_NO_MATCH');
- }
-
- // All good! Generate the AES key
- $aes_key = substr(sha256($dh_secret), 0, ( AES_BITS / 4 ));
-
- // decrypt user info
- $aes_key = hexdecode($aes_key);
- $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
- $data = $aes->decrypt($_POST['crypt_data'], $aes_key, ENC_HEX);
- }
- else
- {
- $data = $_POST[$fieldname];
- }
- return $data;
- }
-
- /**
- * Backend code for the JSON login interface. Basically a frontend to the session API that takes all parameters in one huge array.
- * @param array LoginAPI request
- * @return array LoginAPI response
- */
-
- function process_login_request($req, $_dbgtmp = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- // Setup EnanoMath and Diffie-Hellman
- global $dh_supported;
- if ( !function_exists('dh_gen_private') )
- {
- require_once(ENANO_ROOT.'/includes/math.php');
-
- $dh_supported = true;
- try
- {
- require_once(ENANO_ROOT . '/includes/diffiehellman.php');
- }
- catch ( Exception $e )
- {
- $dh_supported = false;
- }
- }
- global $_math;
-
- // Check for the mode
- if ( !isset($req['mode']) )
- {
- return $this->get_login_response('api_error', 'ERR_JSON_NO_MODE');
- }
-
- // Main processing switch
- switch ( $req['mode'] )
- {
- default:
- return $this->get_login_response('api_error', 'ERR_JSON_INVALID_MODE');
- break;
- case 'getkey':
-
- $this->start();
-
- return $this->get_login_response('initial');
- break;
- case 'login_dh':
- // User is requesting a login and has sent Diffie-Hellman data.
-
- //
- // KEY RECONSTRUCTION
- //
-
- $userinfo_crypt = $req['userinfo'];
- $dh_public = $req['dh_public_key'];
- $dh_hash = $req['dh_secret_hash'];
-
- // Check the key
- if ( !ctype_digit($dh_public) || !ctype_digit($req['dh_client_key']) )
- {
- return $this->get_login_response('api_error', 'ERR_DH_KEY_NOT_NUMERIC');
- }
-
- // Fetch private key
- $q = $db->sql_query('SELECT private_key, key_id FROM ' . table_prefix . "diffiehellman WHERE public_key = '$dh_public';");
- if ( !$q )
- $db->die_json();
-
- if ( $db->numrows() < 1 )
- {
- return $this->get_login_response('api_error', 'ERR_DH_KEY_NOT_FOUND');
- }
-
- list($dh_private, $dh_key_id) = $db->fetchrow_num();
- $db->free_result();
-
- // We have the private key, now delete the key pair, we no longer need it
- $q = $db->sql_query('DELETE FROM ' . table_prefix . "diffiehellman WHERE key_id = $dh_key_id;");
- if ( !$q )
- $db->die_json();
-
- // Generate the shared secret
- $dh_secret = dh_gen_shared_secret($dh_private, $req['dh_client_key']);
- $dh_secret = $_math->str($dh_secret);
-
- // Did we get all our math right?
- $dh_secret_check = sha1($dh_secret);
- if ( $dh_secret_check !== $dh_hash )
- {
- return $this->get_login_response('api_error', 'ERR_DH_HASH_NO_MATCH');
- }
-
- // All good! Generate the AES key
- $aes_key = substr(sha256($dh_secret), 0, ( AES_BITS / 4 ));
- case 'login_aes':
- if ( $req['mode'] == 'login_aes' )
- {
- // login_aes-specific code
- $aes_key = $this->fetch_public_key($req['key_aes']);
- if ( !$aes_key )
- {
- return $this->get_login_response('api_error', 'ERR_AES_LOOKUP_FAILED');
- }
- $userinfo_crypt = $req['userinfo'];
- }
- // shared between the two systems from here on out
-
- // decrypt user info
- $aes_key = hexdecode($aes_key);
- $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
- // using "true" here disables caching of the decrypted login info (which includes the password)
- $userinfo_json = $aes->decrypt($userinfo_crypt, $aes_key, ENC_HEX, true);
- if ( !$userinfo_json )
- {
- return $this->get_login_response('api_error', 'ERR_AES_DECRYPT_FAILED');
- }
- // de-JSON user info
- try
- {
- $userinfo = enano_json_decode($userinfo_json);
- }
- catch ( Exception $e )
- {
- return $this->get_login_response('api_error', 'ERR_USERINFO_DECODE_FAILED');
- }
-
- case 'login_pt':
- // plaintext login
- if ( $req['mode'] == 'login_pt' )
- {
- $userinfo = isset($req['userinfo']) ? $req['userinfo'] : array();
- }
-
- if ( !isset($userinfo['username']) || !isset($userinfo['password']) )
- {
- return $this->get_login_response('api_error', 'ERR_USERINFO_MISSING_VALUES');
- }
-
- $username =& $userinfo['username'];
- $password =& $userinfo['password'];
-
- // locked out? check captcha
- $lockout_data = $this->get_lockout_info();
- if ( $lockout_data['policy'] == 'captcha' && $lockout_data['active'] )
- {
- // policy is captcha -- check if it's correct, and if so, bypass lockout check
- $real_code = $this->get_captcha($req['captcha_hash']);
- if ( strtolower($real_code) !== strtolower($req['captcha_code']) )
- {
- // captcha is bad
- return $this->get_login_response('login_failure', 'lockout_bad_captcha');
- }
- }
- else if ( $lockout_data['policy'] == 'lockout' && $lockout_data['active'] )
- {
- // we're fully locked out
- return $this->get_login_response('login_failure', 'lockout_request_denied');
- }
-
- // At this point if any extra info was injected into the login data packet, we need to let plugins process it
- /**
- * Called upon processing an incoming login request. If you added anything to the userinfo object during the jshook
- * login_build_userinfo, that will be in the $userinfo array here. Expected return values are: true if your plugin has
- * not only succeeded but ALSO issued a session key (bypass the whole Enano builtin login process) and an associative array
- * with "mode" set to "error" and an error string in "error" to send an error back to the client. Any return value other
- * than these will be treated as a pass-through, and the user's password will be validated through Enano's standard process.
- * @hook login_process_userdata_json
- */
-
- $code = $plugins->setHook('login_process_userdata_json', true);
-
- foreach ( $code as $cmd )
- {
- $result = eval($cmd);
- if ( $result === true )
- {
- return $this->get_login_response('login_success', false, array(
- 'key' => $this->sid_super,
- 'user_id' => $this->user_id,
- 'user_level' => $this->user_level,
- 'reset' => false
- ));
- }
- else if ( is_array($result) )
- {
- if ( isset($result['mode']) && $result['mode'] === 'error' && isset($result['error']) )
- {
- // Pass back any additional information from the error response
- $append = $result;
- unset($append['mode'], $append['error']);
- $append['from_plugin'] = true;
-
- return $this->get_login_response('login_failure', $result['error'], $append);
- }
- }
- }
-
- // attempt the login
- $login_result = $this->login_without_crypto($username, $password, false, intval($req['level']), @$req['remember']);
-
- if ( $login_result['success'] )
- {
- return $this->get_login_response('login_success', false, array(
- 'key' => $this->sid_super,
- 'user_id' => $this->user_id,
- 'user_level' => $this->user_level,
- ));
- }
- else if ( !$login_result['success'] && $login_result['error'] === 'valid_reset' )
- {
- return $this->get_login_response('reset_pass_used', false, array(
- 'redirect_url' => $login_result['redirect_url']
- ));
- }
- else
- {
- return $this->get_login_response('login_failure', 'invalid_credentials');
- }
-
- break;
- case 'clean_key':
- // Clean out a key, since it won't be used.
- // This is called when the user clicks Cancel in the AJAX login interface.
- if ( !empty($req['key_aes']) )
- {
- $this->fetch_public_key($req['key_aes']);
- }
- if ( !empty($req['key_dh']) )
- {
- $pk = $db->escape($req['key_dh']);
- $q = $db->sql_query('DELETE FROM ' . table_prefix . "diffiehellman WHERE public_key = '$pk';");
- if ( !$q )
- $db->die_json();
- }
- return array(
- 'mode' => 'noop'
- );
- break;
- case 'respond_password_reset':
- die(enano_json_encode(array(
- 'mode' => 'login_success_reset',
- 'user_id' => $req['user_id'],
- 'temp_password' => $req['temp_password'],
- 'respawn_info' => $this->process_login_request(array('mode' => 'getkey'))
- )));
- break;
- case 'logout':
- if ( !$this->started )
- $this->start();
- if ( !isset($req['csrf_token']) )
- return array(
- 'mode' => 'error',
- 'error' => 'Invalid CSRF token'
- );
-
- if ( $req['csrf_token'] !== $this->csrf_token )
- return array(
- 'mode' => 'error',
- 'error' => 'Invalid CSRF token'
- );
- $level = isset($req['level']) && is_int($req['level']) ? $req['level'] : USER_LEVEL_MEMBER;
- if ( ($result = $this->logout($level)) === 'success' )
- {
- return array(
- 'mode' => 'logout_success'
- );
- }
- else
- {
- return array(
- 'mode' => 'error',
- 'error' => $result
- );
- }
- break;
- }
-
- }
-
- /**
- * Generate a packet to send to the client for logins.
- * @param string mode
- * @param array
- * @return array
- */
-
- function get_login_response($mode, $error = false, $base = array())
- {
- $this->start();
-
- // init
- $response = $base;
- // modules in the packet
- $response['mode'] = $mode;
- $response['error'] = $error;
- $response['crypto'] = $mode !== 'login_success' ? $this->get_login_crypto_packet() : false;
- $response['lockout'] = $mode !== 'login_success' ? $this->get_lockout_info() : false;
- $response['extended_time'] = intval(getConfig('session_remember_time', '30'));
- $response['username'] = $this->user_logged_in ? $this->username : false;
- return $response;
- }
-
- /**
- * Get a packet of crypto flags for login.
- * @return array
- */
-
- function get_login_crypto_packet()
- {
- global $dh_supported, $_math;
-
- $response = array();
-
- $response['dh_enable'] = $dh_supported;
- $response['aes_key'] = $this->rijndael_genkey();
-
- // Can we do Diffie-Hellman? If so, generate and stash a public/private key pair.
- if ( $dh_supported )
- {
- $dh_key_priv = dh_gen_private();
- $dh_key_pub = dh_gen_public($dh_key_priv);
- $dh_key_priv = $_math->str($dh_key_priv);
- $dh_key_pub = $_math->str($dh_key_pub);
- $response['dh_public_key'] = $dh_key_pub;
- // store the keys in the DB
- $this->sql('INSERT INTO ' . table_prefix . "diffiehellman( public_key, private_key ) VALUES ( '$dh_key_pub', '$dh_key_priv' );");
- }
-
- return $response;
- }
-
+ }
+ $code .= '
+
+ if ( frm[\'' . $dh_supported . '\'] )
+ {
+ frm[\'' . $dh_supported . '\'].value = ( use_diffiehellman ) ? "true" : "false";
+ }
+
+ if ( frm["' . $pw_field . '_confirm"] )
+ {
+ pass1 = frm.' . $pw_field . '.value;
+ pass2 = frm.' . $pw_field . '_confirm.value;
+ if ( pass1 != pass2 )
+ {
+ load_component("l10n");
+ alert($lang.get("userfuncs_passreset_err_no_match"));
+ return false;
+ }
+ if ( pass1.length < 6 )
+ {
+ load_component("l10n");
+ alert($lang.get("userfuncs_passreset_err_too_short"));
+ return false;
+ }
+ frm.' . $pw_field . '_confirm.value = "";
+ }
+
+ if ( testpassed && use_diffiehellman )
+ {
+ // try to blank out the table to prevent double submits and what have you
+ var el = frm.' . $pw_field . ';
+ while ( el.tagName != "BODY" && el.tagName != "TABLE" )
+ {
+ el = el.parentNode;
+ }
+ /*
+ if ( el.tagName == "TABLE" )
+ {
+ whiteOutElement(el);
+ }
+ */
+
+ frm.'.$use_crypt.'.value = \'yes_dh\';
+
+ // Perform Diffie Hellman stuff
+ // console.info("DiffieHellman: started keygen process");
+ var dh_priv = dh_gen_private();
+ var dh_pub = dh_gen_public(dh_priv);
+ var secret = dh_gen_shared_secret(dh_priv, frm.' . $dh_pubkey . '.value);
+ // console.info("DiffieHellman: finished keygen process");
+
+ // secret_hash is used to verify that the server guesses the correct secret
+ var secret_hash = hex_sha1(secret);
+
+ // give the server our values
+ frm.' . $crypt_key . '.value = secret_hash;
+ ' . ( $dh_supported ? 'frm.' . $dh_client_pubkey . '.value = dh_pub;' : '' ) . '
+
+ // console.info("DiffieHellman: set public values");
+
+ // crypt_key is the actual AES key
+ var crypt_key = (hex_sha256(secret)).substr(0, (keySizeInBits / 4));
+
+ // Perform encryption
+ crypt_key = hexToByteArray(crypt_key);
+ var pass = frm.'.$pw_field.'.value;
+ pass = stringToByteArray(pass);
+ var cryptstring = rijndaelEncrypt(pass, crypt_key, \'ECB\');
+ if(!cryptstring)
+ {
+ return false;
+ }
+ cryptstring = byteArrayToHex(cryptstring);
+ // console.info("DiffieHellman: finished AES");
+ frm.'.$crypt_data.'.value = cryptstring;
+ frm.'.$pw_field.'.value = \'\';
+ // console.info("DiffieHellman: ready to submit");
+ }
+ else if ( testpassed && !use_diffiehellman )
+ {
+ frm.'.$use_crypt.'.value = \'yes\';
+ var cryptkey = frm.'.$crypt_key.'.value;
+ frm.'.$crypt_key.'.value = hex_md5(cryptkey);
+ cryptkey = hexToByteArray(cryptkey);
+ if(!cryptkey || ( ( typeof cryptkey == \'string\' || typeof cryptkey == \'object\' ) ) && cryptkey.length != keySizeInBits / 8 )
+ {
+ if ( frm._login ) frm._login.disabled = true;
+ len = ( typeof cryptkey == \'string\' || typeof cryptkey == \'object\' ) ? \'\\nLen: \'+cryptkey.length : \'\';
+ alert(\'The key is messed up\\nType: \'+typeof(cryptkey)+len);
+ }
+ pass = frm.'.$pw_field.'.value;
+ chal = frm.'.$challenge.'.value;
+ challenge = hex_md5(pass + chal) + chal;
+ frm.'.$challenge.'.value = challenge;
+ pass = stringToByteArray(pass);
+ cryptstring = rijndaelEncrypt(pass, cryptkey, \'ECB\');
+ if(!cryptstring)
+ {
+ return false;
+ }
+ cryptstring = byteArrayToHex(cryptstring);
+ frm.'.$crypt_data.'.value = cryptstring;
+ frm.'.$pw_field.'.value = \'\';
+ }
+ }
+
+ ';
+ return $code;
+ }
+
+ /**
+ * Generates the HTML form elements required for an encrypted logon experience.
+ * @return string
+ */
+
+ function generate_aes_form()
+ {
+ $return = '';
+ $return .= '';
+ $return .= '';
+ $return .= '';
+
+ require_once(ENANO_ROOT . '/includes/math.php');
+ require_once(ENANO_ROOT . '/includes/diffiehellman.php');
+
+ global $dh_supported, $_math;
+ if ( $dh_supported )
+ {
+ $dh_key_priv = dh_gen_private();
+ $dh_key_pub = dh_gen_public($dh_key_priv);
+ $dh_key_priv = $_math->str($dh_key_priv);
+ $dh_key_pub = $_math->str($dh_key_pub);
+ // store the keys in the DB
+ $this->sql('INSERT INTO ' . table_prefix . "diffiehellman( public_key, private_key ) VALUES ( '$dh_key_pub', '$dh_key_priv' );");
+
+ $return .= "
+
+ ";
+ }
+ else
+ {
+ $return .= "";
+ }
+ return $return;
+ }
+
+ /**
+ * If you used all the same form fields as the normal login interface, this will take care of DiffieHellman for you and return the key.
+ * @param string Password field name (defaults to "password")
+ * @return string
+ */
+
+ function get_aes_post($fieldname = 'password')
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
+ if ( $_POST['use_crypt'] == 'yes' )
+ {
+ $crypt_key = $this->fetch_public_key($_POST['crypt_key']);
+ if ( !$crypt_key )
+ {
+ throw new Exception($lang->get('user_err_key_not_found'));
+ }
+ $crypt_key = hexdecode($crypt_key);
+ $data = $aes->decrypt($_POST['crypt_data'], $crypt_key, ENC_HEX);
+ }
+ else if ( $_POST['use_crypt'] == 'yes_dh' )
+ {
+ require_once(ENANO_ROOT . '/includes/math.php');
+ require_once(ENANO_ROOT . '/includes/diffiehellman.php');
+
+ global $dh_supported, $_math;
+
+ if ( !$dh_supported )
+ {
+ throw new Exception('Server does not support DiffieHellman, denying request');
+ }
+
+ // Fetch private key
+ $dh_public = $_POST['dh_public_key'];
+ if ( !ctype_digit($dh_public) )
+ {
+ throw new Exception('ERR_DH_KEY_NOT_INTEGER');
+ }
+ $q = $db->sql_query('SELECT private_key, key_id FROM ' . table_prefix . "diffiehellman WHERE public_key = '$dh_public';");
+ if ( !$q )
+ $db->die_json();
+
+ if ( $db->numrows() < 1 )
+ {
+ throw new Exception('ERR_DH_KEY_NOT_FOUND');
+ }
+
+ list($dh_private, $dh_key_id) = $db->fetchrow_num();
+ $db->free_result();
+
+ // We have the private key, now delete the key pair, we no longer need it
+ $q = $db->sql_query('DELETE FROM ' . table_prefix . "diffiehellman WHERE key_id = $dh_key_id;");
+ if ( !$q )
+ $db->die_json();
+
+ // Generate the shared secret
+ $dh_secret = dh_gen_shared_secret($dh_private, $_POST['dh_client_public_key']);
+ $dh_secret = $_math->str($dh_secret);
+
+ // Did we get all our math right?
+ $dh_secret_check = sha1($dh_secret);
+ $dh_hash = $_POST['crypt_key'];
+ if ( $dh_secret_check !== $dh_hash )
+ {
+ throw new Exception('ERR_DH_HASH_NO_MATCH');
+ }
+
+ // All good! Generate the AES key
+ $aes_key = substr(sha256($dh_secret), 0, ( AES_BITS / 4 ));
+
+ // decrypt user info
+ $aes_key = hexdecode($aes_key);
+ $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
+ $data = $aes->decrypt($_POST['crypt_data'], $aes_key, ENC_HEX);
+ }
+ else
+ {
+ $data = $_POST[$fieldname];
+ }
+ return $data;
+ }
+
+ /**
+ * Backend code for the JSON login interface. Basically a frontend to the session API that takes all parameters in one huge array.
+ * @param array LoginAPI request
+ * @return array LoginAPI response
+ */
+
+ function process_login_request($req, $_dbgtmp = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ // Setup EnanoMath and Diffie-Hellman
+ global $dh_supported;
+ if ( !function_exists('dh_gen_private') )
+ {
+ require_once(ENANO_ROOT.'/includes/math.php');
+
+ $dh_supported = true;
+ try
+ {
+ require_once(ENANO_ROOT . '/includes/diffiehellman.php');
+ }
+ catch ( Exception $e )
+ {
+ $dh_supported = false;
+ }
+ }
+ global $_math;
+
+ // Check for the mode
+ if ( !isset($req['mode']) )
+ {
+ return $this->get_login_response('api_error', 'ERR_JSON_NO_MODE');
+ }
+
+ // Main processing switch
+ switch ( $req['mode'] )
+ {
+ default:
+ return $this->get_login_response('api_error', 'ERR_JSON_INVALID_MODE');
+ break;
+ case 'getkey':
+
+ $this->start();
+
+ return $this->get_login_response('initial');
+ break;
+ case 'login_dh':
+ // User is requesting a login and has sent Diffie-Hellman data.
+
+ //
+ // KEY RECONSTRUCTION
+ //
+
+ $userinfo_crypt = $req['userinfo'];
+ $dh_public = $req['dh_public_key'];
+ $dh_hash = $req['dh_secret_hash'];
+
+ // Check the key
+ if ( !ctype_digit($dh_public) || !ctype_digit($req['dh_client_key']) )
+ {
+ return $this->get_login_response('api_error', 'ERR_DH_KEY_NOT_NUMERIC');
+ }
+
+ // Fetch private key
+ $q = $db->sql_query('SELECT private_key, key_id FROM ' . table_prefix . "diffiehellman WHERE public_key = '$dh_public';");
+ if ( !$q )
+ $db->die_json();
+
+ if ( $db->numrows() < 1 )
+ {
+ return $this->get_login_response('api_error', 'ERR_DH_KEY_NOT_FOUND');
+ }
+
+ list($dh_private, $dh_key_id) = $db->fetchrow_num();
+ $db->free_result();
+
+ // We have the private key, now delete the key pair, we no longer need it
+ $q = $db->sql_query('DELETE FROM ' . table_prefix . "diffiehellman WHERE key_id = $dh_key_id;");
+ if ( !$q )
+ $db->die_json();
+
+ // Generate the shared secret
+ $dh_secret = dh_gen_shared_secret($dh_private, $req['dh_client_key']);
+ $dh_secret = $_math->str($dh_secret);
+
+ // Did we get all our math right?
+ $dh_secret_check = sha1($dh_secret);
+ if ( $dh_secret_check !== $dh_hash )
+ {
+ return $this->get_login_response('api_error', 'ERR_DH_HASH_NO_MATCH');
+ }
+
+ // All good! Generate the AES key
+ $aes_key = substr(sha256($dh_secret), 0, ( AES_BITS / 4 ));
+ case 'login_aes':
+ if ( $req['mode'] == 'login_aes' )
+ {
+ // login_aes-specific code
+ $aes_key = $this->fetch_public_key($req['key_aes']);
+ if ( !$aes_key )
+ {
+ return $this->get_login_response('api_error', 'ERR_AES_LOOKUP_FAILED');
+ }
+ $userinfo_crypt = $req['userinfo'];
+ }
+ // shared between the two systems from here on out
+
+ // decrypt user info
+ $aes_key = hexdecode($aes_key);
+ $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
+ // using "true" here disables caching of the decrypted login info (which includes the password)
+ $userinfo_json = $aes->decrypt($userinfo_crypt, $aes_key, ENC_HEX, true);
+ if ( !$userinfo_json )
+ {
+ return $this->get_login_response('api_error', 'ERR_AES_DECRYPT_FAILED');
+ }
+ // de-JSON user info
+ try
+ {
+ $userinfo = enano_json_decode($userinfo_json);
+ }
+ catch ( Exception $e )
+ {
+ return $this->get_login_response('api_error', 'ERR_USERINFO_DECODE_FAILED');
+ }
+
+ case 'login_pt':
+ // plaintext login
+ if ( $req['mode'] == 'login_pt' )
+ {
+ $userinfo = isset($req['userinfo']) ? $req['userinfo'] : array();
+ }
+
+ if ( !isset($userinfo['username']) || !isset($userinfo['password']) )
+ {
+ return $this->get_login_response('api_error', 'ERR_USERINFO_MISSING_VALUES');
+ }
+
+ $username =& $userinfo['username'];
+ $password =& $userinfo['password'];
+
+ // locked out? check captcha
+ $lockout_data = $this->get_lockout_info();
+ if ( $lockout_data['policy'] == 'captcha' && $lockout_data['active'] )
+ {
+ // policy is captcha -- check if it's correct, and if so, bypass lockout check
+ $real_code = $this->get_captcha($req['captcha_hash']);
+ if ( strtolower($real_code) !== strtolower($req['captcha_code']) )
+ {
+ // captcha is bad
+ return $this->get_login_response('login_failure', 'lockout_bad_captcha');
+ }
+ }
+ else if ( $lockout_data['policy'] == 'lockout' && $lockout_data['active'] )
+ {
+ // we're fully locked out
+ return $this->get_login_response('login_failure', 'lockout_request_denied');
+ }
+
+ // At this point if any extra info was injected into the login data packet, we need to let plugins process it
+ /**
+ * Called upon processing an incoming login request. If you added anything to the userinfo object during the jshook
+ * login_build_userinfo, that will be in the $userinfo array here. Expected return values are: true if your plugin has
+ * not only succeeded but ALSO issued a session key (bypass the whole Enano builtin login process) and an associative array
+ * with "mode" set to "error" and an error string in "error" to send an error back to the client. Any return value other
+ * than these will be treated as a pass-through, and the user's password will be validated through Enano's standard process.
+ * @hook login_process_userdata_json
+ */
+
+ $code = $plugins->setHook('login_process_userdata_json', true);
+
+ foreach ( $code as $cmd )
+ {
+ $result = eval($cmd);
+ if ( $result === true )
+ {
+ return $this->get_login_response('login_success', false, array(
+ 'key' => $this->sid_super,
+ 'user_id' => $this->user_id,
+ 'user_level' => $this->user_level,
+ 'reset' => false
+ ));
+ }
+ else if ( is_array($result) )
+ {
+ if ( isset($result['mode']) && $result['mode'] === 'error' && isset($result['error']) )
+ {
+ // Pass back any additional information from the error response
+ $append = $result;
+ unset($append['mode'], $append['error']);
+ $append['from_plugin'] = true;
+
+ return $this->get_login_response('login_failure', $result['error'], $append);
+ }
+ }
+ }
+
+ // attempt the login
+ $login_result = $this->login_without_crypto($username, $password, false, intval($req['level']), @$req['remember']);
+
+ if ( $login_result['success'] )
+ {
+ return $this->get_login_response('login_success', false, array(
+ 'key' => $this->sid_super,
+ 'user_id' => $this->user_id,
+ 'user_level' => $this->user_level,
+ ));
+ }
+ else if ( !$login_result['success'] && $login_result['error'] === 'valid_reset' )
+ {
+ return $this->get_login_response('reset_pass_used', false, array(
+ 'redirect_url' => $login_result['redirect_url']
+ ));
+ }
+ else
+ {
+ return $this->get_login_response('login_failure', 'invalid_credentials');
+ }
+
+ break;
+ case 'clean_key':
+ // Clean out a key, since it won't be used.
+ // This is called when the user clicks Cancel in the AJAX login interface.
+ if ( !empty($req['key_aes']) )
+ {
+ $this->fetch_public_key($req['key_aes']);
+ }
+ if ( !empty($req['key_dh']) )
+ {
+ $pk = $db->escape($req['key_dh']);
+ $q = $db->sql_query('DELETE FROM ' . table_prefix . "diffiehellman WHERE public_key = '$pk';");
+ if ( !$q )
+ $db->die_json();
+ }
+ return array(
+ 'mode' => 'noop'
+ );
+ break;
+ case 'respond_password_reset':
+ die(enano_json_encode(array(
+ 'mode' => 'login_success_reset',
+ 'user_id' => $req['user_id'],
+ 'temp_password' => $req['temp_password'],
+ 'respawn_info' => $this->process_login_request(array('mode' => 'getkey'))
+ )));
+ break;
+ case 'logout':
+ if ( !$this->started )
+ $this->start();
+ if ( !isset($req['csrf_token']) )
+ return array(
+ 'mode' => 'error',
+ 'error' => 'Invalid CSRF token'
+ );
+
+ if ( $req['csrf_token'] !== $this->csrf_token )
+ return array(
+ 'mode' => 'error',
+ 'error' => 'Invalid CSRF token'
+ );
+ $level = isset($req['level']) && is_int($req['level']) ? $req['level'] : USER_LEVEL_MEMBER;
+ if ( ($result = $this->logout($level)) === 'success' )
+ {
+ return array(
+ 'mode' => 'logout_success'
+ );
+ }
+ else
+ {
+ return array(
+ 'mode' => 'error',
+ 'error' => $result
+ );
+ }
+ break;
+ }
+
+ }
+
+ /**
+ * Generate a packet to send to the client for logins.
+ * @param string mode
+ * @param array
+ * @return array
+ */
+
+ function get_login_response($mode, $error = false, $base = array())
+ {
+ $this->start();
+
+ // init
+ $response = $base;
+ // modules in the packet
+ $response['mode'] = $mode;
+ $response['error'] = $error;
+ $response['crypto'] = $mode !== 'login_success' ? $this->get_login_crypto_packet() : false;
+ $response['lockout'] = $mode !== 'login_success' ? $this->get_lockout_info() : false;
+ $response['extended_time'] = intval(getConfig('session_remember_time', '30'));
+ $response['username'] = $this->user_logged_in ? $this->username : false;
+ return $response;
+ }
+
+ /**
+ * Get a packet of crypto flags for login.
+ * @return array
+ */
+
+ function get_login_crypto_packet()
+ {
+ global $dh_supported, $_math;
+
+ $response = array();
+
+ $response['dh_enable'] = $dh_supported;
+ $response['aes_key'] = $this->rijndael_genkey();
+
+ // Can we do Diffie-Hellman? If so, generate and stash a public/private key pair.
+ if ( $dh_supported )
+ {
+ $dh_key_priv = dh_gen_private();
+ $dh_key_pub = dh_gen_public($dh_key_priv);
+ $dh_key_priv = $_math->str($dh_key_priv);
+ $dh_key_pub = $_math->str($dh_key_pub);
+ $response['dh_public_key'] = $dh_key_pub;
+ // store the keys in the DB
+ $this->sql('INSERT INTO ' . table_prefix . "diffiehellman( public_key, private_key ) VALUES ( '$dh_key_pub', '$dh_key_priv' );");
+ }
+
+ return $response;
+ }
+
}
/**
@@ -4158,457 +4158,457 @@
*/
class Session_ACLPageInfo {
-
- /**
- * The page ID of this ACL info package
- * @var string
- */
-
- var $page_id;
-
- /**
- * The namespace of the page being checked
- * @var string
- */
-
- var $namespace;
-
- /**
- * Our list of permission types.
- * @access private
- * @var array
- */
-
- var $acl_types = Array();
-
- /**
- * The list of descriptions for the permission types
- * @var array
- */
-
- var $acl_descs = Array();
-
- /**
- * A list of dependencies for ACL types.
- * @var array
- */
-
- var $acl_deps = Array();
-
- /**
- * Our tell-all list of permissions. Do not even try to change this.
- * @access private
- * @var array
- */
-
- var $perms = Array();
-
- /**
- * Array to track which default permissions are being used
- * @var array
- * @access private
- */
-
- var $acl_defaults_used = Array();
-
- /**
- * Tracks whether Wiki Mode is on for the page we're operating on.
- * @var bool
- */
-
- var $wiki_mode = false;
-
- /**
- * Tracks where permissions were calculated using the ACL_INHERIT_* constants. Layout:
- * array(
- * [permission_name] => array(
- * [src] => ACL_INHERIT_*
- * [rule_id] => integer
- * ),
- * ...
- * )
- *
- * @var array
- */
-
- var $perm_resolve_table = array();
-
- #
- # USER PARAMETERS
- #
-
- /**
- * User ID
- * @var int
- */
-
- var $user_id = 1;
-
- /**
- * Group membership associative array (group_id => group_name)
- * @var array
- */
-
- var $groups = array();
-
- /**
- * Constructor.
- * @param string $page_id The ID of the page to check
- * @param string $namespace The namespace of the page to check.
- * @param array $acl_types List of ACL types
- * @param array $acl_descs List of human-readable descriptions for permissions (associative)
- * @param array $acl_deps List of dependencies for permissions. For example, viewing history/diffs depends on the ability to read the page.
- * @param array $base What to start with - this is an attempt to reduce the number of SQL queries.
- * @param int|string $user_id_or_name Username or ID to search for, defaults to current user
- * @param array $resolve_table Debugging info for tracking where rules came from, defaults to a blank array.
- */
-
- function __construct($page_id, $namespace, $acl_types, $acl_descs, $acl_deps, $base, $user_id = null, $groups = null, $resolve_table = array())
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- // hack
- if ( isset($base['__resolve_table']) )
- {
- unset($base['__resolve_table']);
- }
-
- foreach ( $acl_types as $perm_type => $_ )
- {
- if ( !$session->check_acl_scope($perm_type, $namespace) )
- {
- unset($acl_types[$perm_type]);
- unset($acl_deps[$perm_type]);
- unset($acl_descs[$perm_type]);
- unset($base[$perm_type]);
- }
- }
-
- $this->acl_deps = $acl_deps;
- $this->acl_types = $acl_types;
- $this->acl_descs = $acl_descs;
-
- $this->perms = $acl_types;
- $this->perms = $session->acl_merge_complete($this->perms, $base);
-
- $this->perm_resolve_table = array();
- if ( is_array($resolve_table) )
- $this->perm_resolve_table = $resolve_table;
-
- if ( is_int($user_id) && is_array($groups) )
- {
- $this->user_id = $user_id;
- $this->groups = $groups;
- }
- else
- {
- $this->user_id = $session->user_id;
- $this->groups = $session->groups;
- }
-
- $this->page_id = $page_id;
- $this->namespace = $namespace;
-
- $this->__calculate();
- }
-
- /**
- * Performs the actual permission calculation.
- * @access private
- */
-
- private function __calculate()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $page_id =& $this->page_id;
- $namespace =& $this->namespace;
-
- // PAGE group info
- $pg_list = $paths->get_page_groups($page_id, $namespace);
- $pg_info = '';
- foreach ( $pg_list as $g_id )
- {
- $pg_info .= ' ( page_id=\'' . $g_id . '\' AND namespace=\'__PageGroup\' ) OR';
- }
-
- // Build a query to grab ACL info
- $bs = 'SELECT rules,target_type,target_id,page_id,namespace,rule_id,pg.pg_name,g.group_name FROM '.table_prefix."acl AS a\n"
- . " LEFT JOIN " . table_prefix . "page_groups AS pg\n"
- . " ON ( ( a.page_id = CAST(pg.pg_id AS char) AND a.namespace = '__PageGroup' ) OR ( a.namespace != '__PageGroup' ) )\n"
- . " LEFT JOIN " . table_prefix . "groups AS g\n"
- . " ON ( ( a.target_type = " . ACL_TYPE_GROUP . " AND a.target_id = g.group_id ) OR ( a.target_type != " . ACL_TYPE_GROUP . " ) )\n";
-
- $bs .= ' WHERE ' . "\n"
- . ' ( ';
- $q = Array();
- $q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$this->user_id.' )';
- if(count($this->groups) > 0)
- {
- foreach($this->groups as $g_id => $g_name)
- {
- $q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
- }
- }
- // The reason we're using an ORDER BY statement here is because ACL_TYPE_GROUP is less than ACL_TYPE_USER, causing the user's individual
- // permissions to override group permissions.
- $bs .= implode(" OR\n ", $q) . ' ) AND (' . $pg_info . ' ( page_id=\''.$db->escape($page_id).'\' AND namespace=\''.$db->escape($namespace).'\' ) )
- ORDER BY target_type ASC, page_id ASC, namespace ASC;';
-
- $q = $session->sql($bs);
- if ( $row = $db->fetchrow($q, true) )
- {
- do
- {
- $rules = $session->string_to_perm($row['rules']);
- $is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
- // log where this comes from
- if ( $row['namespace'] == '__PageGroup' )
- {
- $src = ( $is_everyone ) ? ACL_INHERIT_PG_EVERYONE : ( $row['target_type'] == ACL_TYPE_GROUP ? ACL_INHERIT_PG_GROUP : ACL_INHERIT_PG_USER );
- $pg_name = $row['pg_name'];
- }
- else
- {
- $src = ( $is_everyone ) ? ACL_INHERIT_LOCAL_EVERYONE : ( $row['target_type'] == ACL_TYPE_GROUP ? ACL_INHERIT_LOCAL_GROUP : ACL_INHERIT_LOCAL_USER );
- }
- if ( $row['group_name'] )
- {
- $group_name = $row['group_name'];
- }
- foreach ( $rules as $perm_type => $perm_value )
- {
- if ( !isset($this->perms[$perm_type]) )
- continue;
-
- if ( $this->perms[$perm_type] == AUTH_DENY )
- continue;
-
- if ( !$session->check_acl_scope($perm_type, $this->namespace) )
- continue;
-
- $this->perm_resolve_table[$perm_type] = array(
- 'src' => $src,
- 'rule_id' => $row['rule_id']
- );
- if ( isset($pg_name) )
- {
- $this->perm_resolve_table[$perm_type]['pg_name'] = $pg_name;
- }
- if ( isset($group_name) )
- {
- $this->perm_resolve_table[$perm_type]['group_name'] = $group_name;
- }
- }
- $this->acl_merge_with_current($rules, $is_everyone);
- } while ( $row = $db->fetchrow() );
- }
-
- $this->page_id = $page_id;
- $this->namespace = $namespace;
-
- $pathskey = $paths->nslist[$this->namespace].sanitize_page_id($this->page_id);
- $ns = namespace_factory($this->page_id, $this->namespace);
- $cdata = $ns->get_cdata();
- $ppwm = $cdata['wiki_mode'];
- unset($ns, $cdata);
-
- if ( $ppwm == 1 && ( $session->user_logged_in || getConfig('wiki_mode_require_login') != '1' ) )
- $this->wiki_mode = true;
- else if ( $ppwm == 1 && !$session->user_logged_in && getConfig('wiki_mode_require_login') == '1' )
- $this->wiki_mode = true;
- else if ( $ppwm == 0 )
- $this->wiki_mode = false;
- else if ( $ppwm == 2 )
- {
- if ( $this->user_id > 1 )
- {
- $this->wiki_mode = ( getConfig('wiki_mode') == '1' );
- }
- else
- {
- $this->wiki_mode = ( getConfig('wiki_mode') == '1' && getConfig('wiki_mode_require_login') != '1' );
- }
- }
- else
- {
- // Ech. Internal logic failure, this should never happen.
- return false;
- }
- }
-
- /**
- * Tells us whether permission $type is allowed or not based on the current rules.
- * @param string $type The permission identifier ($acl_type passed to sessionManager::register_acl_type())
- * @param bool $no_deps If true, disables dependency checking
- * @return bool True if allowed, false if denied or if an error occured
- */
-
- function get_permissions($type, $no_deps = false)
- {
- // echo '' . print_r($this->perms, true) . '
';
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( isset( $this->perms[$type] ) )
- {
- if ( $this->perms[$type] == AUTH_DENY )
- {
- $ret = false;
- }
- else if ( $this->perms[$type] == AUTH_WIKIMODE && $this->wiki_mode )
- {
- $ret = true;
- }
- else if ( $this->perms[$type] == AUTH_WIKIMODE && !$this->wiki_mode )
- {
- $ret = false;
- }
- else if ( $this->perms[$type] == AUTH_ALLOW )
- {
- $ret = true;
- }
- else if ( $this->perms[$type] == AUTH_DISALLOW )
- {
- $ret = false;
- }
- }
- else if(isset($this->acl_types[$type]))
- {
- if ( $this->acl_types[$type] == AUTH_DENY )
- $ret = false;
- else if ( $this->acl_types[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
- $ret = true;
- else if ( $this->acl_types[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
- $ret = false;
- else if ( $this->acl_types[$type] == AUTH_ALLOW )
- $ret = true;
- else if ( $this->acl_types[$type] == AUTH_DISALLOW )
- $ret = false;
- }
- else
- {
- // ACL type is undefined
- $caller = 'unknown';
- if ( function_exists('debug_backtrace') )
- {
- if ( $bt = @debug_backtrace() )
- {
- foreach ( $bt as $trace )
- {
- $file = basename($trace['file']);
- if ( $file != 'sessions.php' )
- {
- $caller = $file . ':' . $trace['line'];
- break;
- }
- }
- }
- }
- trigger_error('Unknown access type "' . $type . '", called from ' . $caller . '', E_USER_WARNING);
- return false; // Be on the safe side and deny access
- }
- if ( !$no_deps )
- {
- if ( !$this->acl_check_deps($type) )
- return false;
- }
- return $ret;
- }
-
- /**
- * Tell us if the dependencies for a given permission are met.
- * @param string The ACL permission ID
- * @param bool If true, does not return a boolean value, but instead returns array of dependencies that fail
- * @return bool
- */
-
- function acl_check_deps($type, $debug = false)
- {
- // This will only happen if the permissions table is hacked or improperly accessed
- if(!isset($this->acl_deps[$type]))
- return $debug ? array() : true;
- // Permission has no dependencies?
- if(sizeof($this->acl_deps[$type]) < 1)
- return $debug ? array() : true;
- // go through them all and build a flat list of dependencies
- $deps = $this->acl_deps[$type];
- while(true)
- {
- $j = sizeof($deps);
- for ( $i = 0; $i < $j; $i++ )
- {
- $b = $deps;
- if ( !isset($this->acl_deps[$deps[$i]]) )
- {
- // Action $type depends on action $deps[$i] which cannot be satisfied because $deps[$i] is out of scope.
- trigger_error("acl_check_deps: $type depends on {$deps[$i]} which is not within scope of $this->namespace; this indicats a bug in ACL rule specification", E_USER_WARNING);
- return false;
- }
- $deps = array_merge($deps, $this->acl_deps[$deps[$i]]);
- if( $b == $deps )
- {
- break 2;
- }
- $j = sizeof($deps);
- }
- }
- $debugdata = array();
- foreach($deps as $d)
- {
- // Our dependencies are fully resolved, so tell get_permissions() to not recursively call this function
- if ( !$this->get_permissions($d, true) )
- {
- if ( $debug )
- {
- $debugdata[] = $d;
- }
- else
- {
- return false;
- }
- }
- }
- return $debug ? $debugdata : true;
- }
-
- /**
- * Merges the ACL array sent with the current permissions table, deciding precedence based on whether defaults are in effect or not.
- * @param array The array to merge into the master ACL list
- * @param bool If true, $perm is treated as the "new default"
- * @param int 1 if this is a site-wide ACL, 2 if page-specific. Defaults to 2.
- */
-
- function acl_merge_with_current($perm, $is_everyone = false, $scope = 2)
- {
- foreach ( $this->perms as $i => $p )
- {
- if ( isset($perm[$i]) )
- {
- if ( $is_everyone && !@$this->acl_defaults_used[$i] )
- continue;
- // Decide precedence
- if ( isset($this->acl_defaults_used[$i]) )
- {
- //echo "$i: default in use, overriding to: {$perm[$i]}
";
- // Defaults are in use, override
- $this->perms[$i] = $perm[$i];
- $this->acl_defaults_used[$i] = ( $is_everyone );
- }
- else
- {
- //echo "$i: default NOT in use";
- // Defaults are not in use, merge as normal
- if ( $this->perms[$i] != AUTH_DENY )
- {
- //echo ", but overriding";
- $this->perms[$i] = $perm[$i];
- }
- //echo "
";
- }
- }
- }
- }
-
+
+ /**
+ * The page ID of this ACL info package
+ * @var string
+ */
+
+ var $page_id;
+
+ /**
+ * The namespace of the page being checked
+ * @var string
+ */
+
+ var $namespace;
+
+ /**
+ * Our list of permission types.
+ * @access private
+ * @var array
+ */
+
+ var $acl_types = Array();
+
+ /**
+ * The list of descriptions for the permission types
+ * @var array
+ */
+
+ var $acl_descs = Array();
+
+ /**
+ * A list of dependencies for ACL types.
+ * @var array
+ */
+
+ var $acl_deps = Array();
+
+ /**
+ * Our tell-all list of permissions. Do not even try to change this.
+ * @access private
+ * @var array
+ */
+
+ var $perms = Array();
+
+ /**
+ * Array to track which default permissions are being used
+ * @var array
+ * @access private
+ */
+
+ var $acl_defaults_used = Array();
+
+ /**
+ * Tracks whether Wiki Mode is on for the page we're operating on.
+ * @var bool
+ */
+
+ var $wiki_mode = false;
+
+ /**
+ * Tracks where permissions were calculated using the ACL_INHERIT_* constants. Layout:
+ * array(
+ * [permission_name] => array(
+ * [src] => ACL_INHERIT_*
+ * [rule_id] => integer
+ * ),
+ * ...
+ * )
+ *
+ * @var array
+ */
+
+ var $perm_resolve_table = array();
+
+ #
+ # USER PARAMETERS
+ #
+
+ /**
+ * User ID
+ * @var int
+ */
+
+ var $user_id = 1;
+
+ /**
+ * Group membership associative array (group_id => group_name)
+ * @var array
+ */
+
+ var $groups = array();
+
+ /**
+ * Constructor.
+ * @param string $page_id The ID of the page to check
+ * @param string $namespace The namespace of the page to check.
+ * @param array $acl_types List of ACL types
+ * @param array $acl_descs List of human-readable descriptions for permissions (associative)
+ * @param array $acl_deps List of dependencies for permissions. For example, viewing history/diffs depends on the ability to read the page.
+ * @param array $base What to start with - this is an attempt to reduce the number of SQL queries.
+ * @param int|string $user_id_or_name Username or ID to search for, defaults to current user
+ * @param array $resolve_table Debugging info for tracking where rules came from, defaults to a blank array.
+ */
+
+ function __construct($page_id, $namespace, $acl_types, $acl_descs, $acl_deps, $base, $user_id = null, $groups = null, $resolve_table = array())
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ // hack
+ if ( isset($base['__resolve_table']) )
+ {
+ unset($base['__resolve_table']);
+ }
+
+ foreach ( $acl_types as $perm_type => $_ )
+ {
+ if ( !$session->check_acl_scope($perm_type, $namespace) )
+ {
+ unset($acl_types[$perm_type]);
+ unset($acl_deps[$perm_type]);
+ unset($acl_descs[$perm_type]);
+ unset($base[$perm_type]);
+ }
+ }
+
+ $this->acl_deps = $acl_deps;
+ $this->acl_types = $acl_types;
+ $this->acl_descs = $acl_descs;
+
+ $this->perms = $acl_types;
+ $this->perms = $session->acl_merge_complete($this->perms, $base);
+
+ $this->perm_resolve_table = array();
+ if ( is_array($resolve_table) )
+ $this->perm_resolve_table = $resolve_table;
+
+ if ( is_int($user_id) && is_array($groups) )
+ {
+ $this->user_id = $user_id;
+ $this->groups = $groups;
+ }
+ else
+ {
+ $this->user_id = $session->user_id;
+ $this->groups = $session->groups;
+ }
+
+ $this->page_id = $page_id;
+ $this->namespace = $namespace;
+
+ $this->__calculate();
+ }
+
+ /**
+ * Performs the actual permission calculation.
+ * @access private
+ */
+
+ private function __calculate()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $page_id =& $this->page_id;
+ $namespace =& $this->namespace;
+
+ // PAGE group info
+ $pg_list = $paths->get_page_groups($page_id, $namespace);
+ $pg_info = '';
+ foreach ( $pg_list as $g_id )
+ {
+ $pg_info .= ' ( page_id=\'' . $g_id . '\' AND namespace=\'__PageGroup\' ) OR';
+ }
+
+ // Build a query to grab ACL info
+ $bs = 'SELECT rules,target_type,target_id,page_id,namespace,rule_id,pg.pg_name,g.group_name FROM '.table_prefix."acl AS a\n"
+ . " LEFT JOIN " . table_prefix . "page_groups AS pg\n"
+ . " ON ( ( a.page_id = CAST(pg.pg_id AS char) AND a.namespace = '__PageGroup' ) OR ( a.namespace != '__PageGroup' ) )\n"
+ . " LEFT JOIN " . table_prefix . "groups AS g\n"
+ . " ON ( ( a.target_type = " . ACL_TYPE_GROUP . " AND a.target_id = g.group_id ) OR ( a.target_type != " . ACL_TYPE_GROUP . " ) )\n";
+
+ $bs .= ' WHERE ' . "\n"
+ . ' ( ';
+ $q = Array();
+ $q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$this->user_id.' )';
+ if(count($this->groups) > 0)
+ {
+ foreach($this->groups as $g_id => $g_name)
+ {
+ $q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
+ }
+ }
+ // The reason we're using an ORDER BY statement here is because ACL_TYPE_GROUP is less than ACL_TYPE_USER, causing the user's individual
+ // permissions to override group permissions.
+ $bs .= implode(" OR\n ", $q) . ' ) AND (' . $pg_info . ' ( page_id=\''.$db->escape($page_id).'\' AND namespace=\''.$db->escape($namespace).'\' ) )
+ ORDER BY target_type ASC, page_id ASC, namespace ASC;';
+
+ $q = $session->sql($bs);
+ if ( $row = $db->fetchrow($q, true) )
+ {
+ do
+ {
+ $rules = $session->string_to_perm($row['rules']);
+ $is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
+ // log where this comes from
+ if ( $row['namespace'] == '__PageGroup' )
+ {
+ $src = ( $is_everyone ) ? ACL_INHERIT_PG_EVERYONE : ( $row['target_type'] == ACL_TYPE_GROUP ? ACL_INHERIT_PG_GROUP : ACL_INHERIT_PG_USER );
+ $pg_name = $row['pg_name'];
+ }
+ else
+ {
+ $src = ( $is_everyone ) ? ACL_INHERIT_LOCAL_EVERYONE : ( $row['target_type'] == ACL_TYPE_GROUP ? ACL_INHERIT_LOCAL_GROUP : ACL_INHERIT_LOCAL_USER );
+ }
+ if ( $row['group_name'] )
+ {
+ $group_name = $row['group_name'];
+ }
+ foreach ( $rules as $perm_type => $perm_value )
+ {
+ if ( !isset($this->perms[$perm_type]) )
+ continue;
+
+ if ( $this->perms[$perm_type] == AUTH_DENY )
+ continue;
+
+ if ( !$session->check_acl_scope($perm_type, $this->namespace) )
+ continue;
+
+ $this->perm_resolve_table[$perm_type] = array(
+ 'src' => $src,
+ 'rule_id' => $row['rule_id']
+ );
+ if ( isset($pg_name) )
+ {
+ $this->perm_resolve_table[$perm_type]['pg_name'] = $pg_name;
+ }
+ if ( isset($group_name) )
+ {
+ $this->perm_resolve_table[$perm_type]['group_name'] = $group_name;
+ }
+ }
+ $this->acl_merge_with_current($rules, $is_everyone);
+ } while ( $row = $db->fetchrow() );
+ }
+
+ $this->page_id = $page_id;
+ $this->namespace = $namespace;
+
+ $pathskey = $paths->nslist[$this->namespace].sanitize_page_id($this->page_id);
+ $ns = namespace_factory($this->page_id, $this->namespace);
+ $cdata = $ns->get_cdata();
+ $ppwm = $cdata['wiki_mode'];
+ unset($ns, $cdata);
+
+ if ( $ppwm == 1 && ( $session->user_logged_in || getConfig('wiki_mode_require_login') != '1' ) )
+ $this->wiki_mode = true;
+ else if ( $ppwm == 1 && !$session->user_logged_in && getConfig('wiki_mode_require_login') == '1' )
+ $this->wiki_mode = true;
+ else if ( $ppwm == 0 )
+ $this->wiki_mode = false;
+ else if ( $ppwm == 2 )
+ {
+ if ( $this->user_id > 1 )
+ {
+ $this->wiki_mode = ( getConfig('wiki_mode') == '1' );
+ }
+ else
+ {
+ $this->wiki_mode = ( getConfig('wiki_mode') == '1' && getConfig('wiki_mode_require_login') != '1' );
+ }
+ }
+ else
+ {
+ // Ech. Internal logic failure, this should never happen.
+ return false;
+ }
+ }
+
+ /**
+ * Tells us whether permission $type is allowed or not based on the current rules.
+ * @param string $type The permission identifier ($acl_type passed to sessionManager::register_acl_type())
+ * @param bool $no_deps If true, disables dependency checking
+ * @return bool True if allowed, false if denied or if an error occured
+ */
+
+ function get_permissions($type, $no_deps = false)
+ {
+ // echo '' . print_r($this->perms, true) . '
';
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( isset( $this->perms[$type] ) )
+ {
+ if ( $this->perms[$type] == AUTH_DENY )
+ {
+ $ret = false;
+ }
+ else if ( $this->perms[$type] == AUTH_WIKIMODE && $this->wiki_mode )
+ {
+ $ret = true;
+ }
+ else if ( $this->perms[$type] == AUTH_WIKIMODE && !$this->wiki_mode )
+ {
+ $ret = false;
+ }
+ else if ( $this->perms[$type] == AUTH_ALLOW )
+ {
+ $ret = true;
+ }
+ else if ( $this->perms[$type] == AUTH_DISALLOW )
+ {
+ $ret = false;
+ }
+ }
+ else if(isset($this->acl_types[$type]))
+ {
+ if ( $this->acl_types[$type] == AUTH_DENY )
+ $ret = false;
+ else if ( $this->acl_types[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
+ $ret = true;
+ else if ( $this->acl_types[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
+ $ret = false;
+ else if ( $this->acl_types[$type] == AUTH_ALLOW )
+ $ret = true;
+ else if ( $this->acl_types[$type] == AUTH_DISALLOW )
+ $ret = false;
+ }
+ else
+ {
+ // ACL type is undefined
+ $caller = 'unknown';
+ if ( function_exists('debug_backtrace') )
+ {
+ if ( $bt = @debug_backtrace() )
+ {
+ foreach ( $bt as $trace )
+ {
+ $file = basename($trace['file']);
+ if ( $file != 'sessions.php' )
+ {
+ $caller = $file . ':' . $trace['line'];
+ break;
+ }
+ }
+ }
+ }
+ trigger_error('Unknown access type "' . $type . '", called from ' . $caller . '', E_USER_WARNING);
+ return false; // Be on the safe side and deny access
+ }
+ if ( !$no_deps )
+ {
+ if ( !$this->acl_check_deps($type) )
+ return false;
+ }
+ return $ret;
+ }
+
+ /**
+ * Tell us if the dependencies for a given permission are met.
+ * @param string The ACL permission ID
+ * @param bool If true, does not return a boolean value, but instead returns array of dependencies that fail
+ * @return bool
+ */
+
+ function acl_check_deps($type, $debug = false)
+ {
+ // This will only happen if the permissions table is hacked or improperly accessed
+ if(!isset($this->acl_deps[$type]))
+ return $debug ? array() : true;
+ // Permission has no dependencies?
+ if(sizeof($this->acl_deps[$type]) < 1)
+ return $debug ? array() : true;
+ // go through them all and build a flat list of dependencies
+ $deps = $this->acl_deps[$type];
+ while(true)
+ {
+ $j = sizeof($deps);
+ for ( $i = 0; $i < $j; $i++ )
+ {
+ $b = $deps;
+ if ( !isset($this->acl_deps[$deps[$i]]) )
+ {
+ // Action $type depends on action $deps[$i] which cannot be satisfied because $deps[$i] is out of scope.
+ trigger_error("acl_check_deps: $type depends on {$deps[$i]} which is not within scope of $this->namespace; this indicats a bug in ACL rule specification", E_USER_WARNING);
+ return false;
+ }
+ $deps = array_merge($deps, $this->acl_deps[$deps[$i]]);
+ if( $b == $deps )
+ {
+ break 2;
+ }
+ $j = sizeof($deps);
+ }
+ }
+ $debugdata = array();
+ foreach($deps as $d)
+ {
+ // Our dependencies are fully resolved, so tell get_permissions() to not recursively call this function
+ if ( !$this->get_permissions($d, true) )
+ {
+ if ( $debug )
+ {
+ $debugdata[] = $d;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ }
+ return $debug ? $debugdata : true;
+ }
+
+ /**
+ * Merges the ACL array sent with the current permissions table, deciding precedence based on whether defaults are in effect or not.
+ * @param array The array to merge into the master ACL list
+ * @param bool If true, $perm is treated as the "new default"
+ * @param int 1 if this is a site-wide ACL, 2 if page-specific. Defaults to 2.
+ */
+
+ function acl_merge_with_current($perm, $is_everyone = false, $scope = 2)
+ {
+ foreach ( $this->perms as $i => $p )
+ {
+ if ( isset($perm[$i]) )
+ {
+ if ( $is_everyone && !@$this->acl_defaults_used[$i] )
+ continue;
+ // Decide precedence
+ if ( isset($this->acl_defaults_used[$i]) )
+ {
+ //echo "$i: default in use, overriding to: {$perm[$i]}
";
+ // Defaults are in use, override
+ $this->perms[$i] = $perm[$i];
+ $this->acl_defaults_used[$i] = ( $is_everyone );
+ }
+ else
+ {
+ //echo "$i: default NOT in use";
+ // Defaults are not in use, merge as normal
+ if ( $this->perms[$i] != AUTH_DENY )
+ {
+ //echo ", but overriding";
+ $this->perms[$i] = $perm[$i];
+ }
+ //echo "
";
+ }
+ }
+ }
+ }
+
}
/**
@@ -4617,12 +4617,12 @@
function cron_clean_login_cache()
{
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- if ( !$db->sql_query('DELETE FROM ' . table_prefix . 'diffiehellman;') )
- $db->_die();
-
- setConfig('login_key_cache', '');
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( !$db->sql_query('DELETE FROM ' . table_prefix . 'diffiehellman;') )
+ $db->_die();
+
+ setConfig('login_key_cache', '');
}
register_cron_task('cron_clean_login_cache', 72);
@@ -4633,12 +4633,12 @@
function cron_clean_old_admin_keys()
{
- global $db, $session, $paths, $template, $plugins; // Common objects
-
- $threshold = time() - ( 15 * 60 );
- $ul_member = USER_LEVEL_MEMBER;
- if ( !$db->sql_query('DELETE FROM ' . table_prefix . "session_keys WHERE time < $threshold AND auth_level > $ul_member;") )
- $db->_die();
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ $threshold = time() - ( 15 * 60 );
+ $ul_member = USER_LEVEL_MEMBER;
+ if ( !$db->sql_query('DELETE FROM ' . table_prefix . "session_keys WHERE time < $threshold AND auth_level > $ul_member;") )
+ $db->_die();
}
// Once a week
diff -r de56132c008d -r bdac73ed481e includes/sql_parse.php
--- a/includes/sql_parse.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/sql_parse.php Sun Mar 28 23:10:46 2010 -0400
@@ -22,134 +22,134 @@
class SQL_Parser
{
- /**
- * The SQL to be parsed.
- * @var string
- * @access private
- */
-
- private $sql_string;
-
- /**
- * Parsed SQL array
- * @var array
- * @access private
- */
-
- private $sql_array;
-
- /**
- * Template variables.
- * @var array
- * @access private
- */
-
- private $tpl_strings;
-
- /**
- * Constructor.
- * @param string If this contains newlines, it will be treated as the target SQL. If not, will be treated as a filename.
- * @param string If true, force as raw SQL, i.e. don't treat as a filename no matter what
- */
-
- public function __construct($sql, $force_file = false)
- {
- if ( strpos($sql, "\n") || $force_file )
- {
- $this->sql_string = $sql;
- }
- else
- {
- if ( file_exists($sql) )
- {
- $this->sql_string = @file_get_contents($sql);
- if ( empty($this->sql_string) )
- {
- throw new Exception('SQL file is blank or permissions are bad');
- }
- }
- else
- {
- throw new Exception('SQL file doesn\'t exist');
- }
-
- }
- $this->sql_array = false;
- $this->tpl_strings = array();
-
- // convert \r\n in the schema to \n, in case some FTP client or zip utility ran unix2dos for us
- // thanks to InvisGhost for reporting this error
- $this->sql_string = str_replace("\r\n", "\n", $this->sql_string);
- }
-
- /**
- * Sets template variables.
- * @param array Associative array of template variables to assign
- */
-
- public function assign_vars($vars)
- {
- if ( !is_array($vars) )
- return false;
- $this->tpl_strings = array_merge($this->tpl_strings, $vars);
- }
-
- /**
- * Internal function to parse the SQL.
- * @access private
- */
-
- private function parse_sql()
- {
- $this->sql_array = $this->sql_string;
- foreach ( $this->tpl_strings as $key => $value )
- {
- $this->sql_array = str_replace("{{{$key}}}", $value, $this->sql_array);
- }
-
- // Strip out comments
- $this->sql_array = explode("\n", $this->sql_array);
-
- foreach ( $this->sql_array as $i => $sql )
- {
- $query =& $this->sql_array[$i];
- $t = trim($query);
- if ( preg_match('/^(\#|--)/i', $t) )
- {
- unset($this->sql_array[$i]);
- unset($query);
- }
- }
- unset($query);
-
- $this->sql_array = array_values($this->sql_array);
- $this->sql_array = implode("\n", $this->sql_array);
- $this->sql_array = explode(";\n", trim($this->sql_array));
-
- foreach ( $this->sql_array as $i => $sql )
- {
- $query =& $this->sql_array[$i];
- $query = trim($query);
- if ( substr($query, ( strlen($query) - 1 ), 1 ) != ';' )
- {
- $query .= ';';
- }
- }
- unset($query);
- }
-
- /**
- * Returns the parsed array of SQL queries.
- * @param bool Optional. Defaults to false. If true, a parse is performed even if it already happened.
- * @return array
- */
-
- public function parse($force_reparse = false)
- {
- if ( !$this->sql_array || $force_reparse )
- $this->parse_sql();
- return $this->sql_array;
- }
+ /**
+ * The SQL to be parsed.
+ * @var string
+ * @access private
+ */
+
+ private $sql_string;
+
+ /**
+ * Parsed SQL array
+ * @var array
+ * @access private
+ */
+
+ private $sql_array;
+
+ /**
+ * Template variables.
+ * @var array
+ * @access private
+ */
+
+ private $tpl_strings;
+
+ /**
+ * Constructor.
+ * @param string If this contains newlines, it will be treated as the target SQL. If not, will be treated as a filename.
+ * @param string If true, force as raw SQL, i.e. don't treat as a filename no matter what
+ */
+
+ public function __construct($sql, $force_file = false)
+ {
+ if ( strpos($sql, "\n") || $force_file )
+ {
+ $this->sql_string = $sql;
+ }
+ else
+ {
+ if ( file_exists($sql) )
+ {
+ $this->sql_string = @file_get_contents($sql);
+ if ( empty($this->sql_string) )
+ {
+ throw new Exception('SQL file is blank or permissions are bad');
+ }
+ }
+ else
+ {
+ throw new Exception('SQL file doesn\'t exist');
+ }
+
+ }
+ $this->sql_array = false;
+ $this->tpl_strings = array();
+
+ // convert \r\n in the schema to \n, in case some FTP client or zip utility ran unix2dos for us
+ // thanks to InvisGhost for reporting this error
+ $this->sql_string = str_replace("\r\n", "\n", $this->sql_string);
+ }
+
+ /**
+ * Sets template variables.
+ * @param array Associative array of template variables to assign
+ */
+
+ public function assign_vars($vars)
+ {
+ if ( !is_array($vars) )
+ return false;
+ $this->tpl_strings = array_merge($this->tpl_strings, $vars);
+ }
+
+ /**
+ * Internal function to parse the SQL.
+ * @access private
+ */
+
+ private function parse_sql()
+ {
+ $this->sql_array = $this->sql_string;
+ foreach ( $this->tpl_strings as $key => $value )
+ {
+ $this->sql_array = str_replace("{{{$key}}}", $value, $this->sql_array);
+ }
+
+ // Strip out comments
+ $this->sql_array = explode("\n", $this->sql_array);
+
+ foreach ( $this->sql_array as $i => $sql )
+ {
+ $query =& $this->sql_array[$i];
+ $t = trim($query);
+ if ( preg_match('/^(\#|--)/i', $t) )
+ {
+ unset($this->sql_array[$i]);
+ unset($query);
+ }
+ }
+ unset($query);
+
+ $this->sql_array = array_values($this->sql_array);
+ $this->sql_array = implode("\n", $this->sql_array);
+ $this->sql_array = explode(";\n", trim($this->sql_array));
+
+ foreach ( $this->sql_array as $i => $sql )
+ {
+ $query =& $this->sql_array[$i];
+ $query = trim($query);
+ if ( substr($query, ( strlen($query) - 1 ), 1 ) != ';' )
+ {
+ $query .= ';';
+ }
+ }
+ unset($query);
+ }
+
+ /**
+ * Returns the parsed array of SQL queries.
+ * @param bool Optional. Defaults to false. If true, a parse is performed even if it already happened.
+ * @return array
+ */
+
+ public function parse($force_reparse = false)
+ {
+ if ( !$this->sql_array || $force_reparse )
+ $this->parse_sql();
+ return $this->sql_array;
+ }
}
?>
diff -r de56132c008d -r bdac73ed481e includes/stats.php
--- a/includes/stats.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/stats.php Sun Mar 28 23:10:46 2010 -0400
@@ -16,33 +16,33 @@
function doStats( $page_id = false, $namespace = false )
{
- global $db, $session, $paths, $template, $plugins; // Common objects
- if(getConfig('log_hits') == '1')
- {
- if(!$page_id || !$namespace)
- {
- $page_id = $paths->page_id;
- $namespace = $paths->namespace;
- }
- if($namespace == 'Special' || $namespace == 'Admin')
- {
- return false;
- }
- static $stats_done = false;
- static $stats_data = Array();
- if(!$stats_done)
- {
- $q = $db->sql_query('INSERT INTO '.table_prefix.'hits (username,time,page_id,namespace) VALUES(\''.$db->escape($session->username).'\', '.time().', \''.$db->escape($page_id).'\', \''.$db->escape($namespace).'\')');
- if(!$q)
- {
- echo $db->get_error();
- return false;
- }
- $db->free_result();
- $stats_done = true;
- return true;
- }
- }
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ if(getConfig('log_hits') == '1')
+ {
+ if(!$page_id || !$namespace)
+ {
+ $page_id = $paths->page_id;
+ $namespace = $paths->namespace;
+ }
+ if($namespace == 'Special' || $namespace == 'Admin')
+ {
+ return false;
+ }
+ static $stats_done = false;
+ static $stats_data = Array();
+ if(!$stats_done)
+ {
+ $q = $db->sql_query('INSERT INTO '.table_prefix.'hits (username,time,page_id,namespace) VALUES(\''.$db->escape($session->username).'\', '.time().', \''.$db->escape($page_id).'\', \''.$db->escape($namespace).'\')');
+ if(!$q)
+ {
+ echo $db->get_error();
+ return false;
+ }
+ $db->free_result();
+ $stats_done = true;
+ return true;
+ }
+ }
}
/**
@@ -53,26 +53,26 @@
function stats_top_pages($num = 5)
{
- global $db, $session, $paths, $template, $plugins; // Common objects
- if(!is_int($num))
- {
- return false;
- }
-
- $data = array();
- $q = $db->sql_query('SELECT COUNT(hit_id) AS num_hits, page_id, namespace FROM '.table_prefix.'hits GROUP BY page_id, namespace ORDER BY num_hits DESC LIMIT ' . $num . ';');
-
- while ( $row = $db->fetchrow($q) )
- {
- $title = get_page_title_ns($row['page_id'], $row['namespace']);
- $data[] = array(
- 'page_urlname' => $paths->get_pathskey($row['page_id'], $row['namespace']),
- 'page_title' => $title,
- 'num_hits' => $row['num_hits']
- );
- }
-
- return $data;
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ if(!is_int($num))
+ {
+ return false;
+ }
+
+ $data = array();
+ $q = $db->sql_query('SELECT COUNT(hit_id) AS num_hits, page_id, namespace FROM '.table_prefix.'hits GROUP BY page_id, namespace ORDER BY num_hits DESC LIMIT ' . $num . ';');
+
+ while ( $row = $db->fetchrow($q) )
+ {
+ $title = get_page_title_ns($row['page_id'], $row['namespace']);
+ $data[] = array(
+ 'page_urlname' => $paths->get_pathskey($row['page_id'], $row['namespace']),
+ 'page_title' => $title,
+ 'num_hits' => $row['num_hits']
+ );
+ }
+
+ return $data;
}
?>
diff -r de56132c008d -r bdac73ed481e includes/tagcloud.php
--- a/includes/tagcloud.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/tagcloud.php Sun Mar 28 23:10:46 2010 -0400
@@ -21,141 +21,141 @@
class TagCloud
{
-
- /**
- * The list of words in the cloud.
- * @var array
- */
-
- var $words = array();
-
- /**
- * Constructor.
- * @param array Optional. An initial list of words, just a plain old array.
- */
-
- function __construct($words = array())
- {
- if ( count($words) > 0 )
- {
- foreach ( $words as $word )
- $this->add_word($word);
- }
- }
-
- /**
- * Adds a word into the word list.
- * @param string The word to add
- */
-
- function add_word($word)
- {
- $word = sanitize_tag($word);
-
- if ( isset($this->words[$word]) )
- $this->words[$word] += 1;
- else
- $this->words[$word] = 1;
- }
-
- /**
- * Returns the total size of the cloud.
- * @return int
- */
-
- function get_cloud_size()
- {
- return array_sum($this->words);
- }
-
- /**
- * Shuffles the cloud.
- */
-
- function shuffle_cloud()
- {
- $keys = array_keys($this->words);
- if ( !$keys || empty($keys) || !is_array($keys) )
- return null;
-
- shuffle($keys);
- if ( !$keys || empty($keys) || !is_array($keys) )
- return null;
-
- $temp = $this->words;
- $this->words = array();
- foreach ( $keys as $word )
- {
- $this->words[$word] = $temp[$word];
- }
-
- unset($temp);
- }
-
- /**
- * Returns the popularity index (scale class) for a 1-100 number.
- * @param int
- * @return int
- */
-
- function get_scale_class($val)
- {
- $ret = 0;
- if ( $val >= 99 )
- $ret = 1;
- else if ( $val >= 70 )
- $ret = 2;
- else if ( $val >= 60 )
- $ret = 3;
- else if ( $val >= 50 )
- $ret = 4;
- else if ( $val >= 40 )
- $ret = 5;
- else if ( $val >= 30 )
- $ret = 6;
- else if ( $val >= 20 )
- $ret = 7;
- else if ( $val >= 10 )
- $ret = 8;
- else if ( $val >= 5 )
- $ret = 9;
- return $ret;
- }
-
- /**
- * Generates and returns HTML for the cloud.
- * @param string Optional. The CSS class applied to all tags. Can be "normal" or "small". Defaults to "normal".
- * @param string Optional. The alignment for the div. Defaults to "center".
- * @return string
- */
-
- function make_html($span_class = 'normal', $div_align = 'center')
- {
- global $lang;
- $html = array();
- $max = max($this->words);
- $size = $this->get_cloud_size();
- $inc = 0;
- if ( count($this->words) > 0 )
- {
- foreach ( $this->words as $word => $popularity )
- {
- $inc++;
- $word = htmlspecialchars($word);
- $percent = ( $popularity / $max ) * 100;
- $index = $this->get_scale_class($percent);
- $newline = ( $inc == 5 ) ? "
" : '';
- ( $inc == 5 ) ? $inc = 0 : null;
- $url = makeUrlNS('Special', 'TagCloud/' . htmlspecialchars($word));
- $popstring = ( $popularity == 1 ) ? $lang->get('pagetools_tagcloud_tip_popularity_one') : $lang->get('pagetools_tagcloud_tip_popularity_plural', array('popularity' => $popularity));
- $html[] = "$word"; // $newline";
- }
- }
- $html = '' . implode("\n", $html) . '';
- return $html;
- }
-
-
+
+ /**
+ * The list of words in the cloud.
+ * @var array
+ */
+
+ var $words = array();
+
+ /**
+ * Constructor.
+ * @param array Optional. An initial list of words, just a plain old array.
+ */
+
+ function __construct($words = array())
+ {
+ if ( count($words) > 0 )
+ {
+ foreach ( $words as $word )
+ $this->add_word($word);
+ }
+ }
+
+ /**
+ * Adds a word into the word list.
+ * @param string The word to add
+ */
+
+ function add_word($word)
+ {
+ $word = sanitize_tag($word);
+
+ if ( isset($this->words[$word]) )
+ $this->words[$word] += 1;
+ else
+ $this->words[$word] = 1;
+ }
+
+ /**
+ * Returns the total size of the cloud.
+ * @return int
+ */
+
+ function get_cloud_size()
+ {
+ return array_sum($this->words);
+ }
+
+ /**
+ * Shuffles the cloud.
+ */
+
+ function shuffle_cloud()
+ {
+ $keys = array_keys($this->words);
+ if ( !$keys || empty($keys) || !is_array($keys) )
+ return null;
+
+ shuffle($keys);
+ if ( !$keys || empty($keys) || !is_array($keys) )
+ return null;
+
+ $temp = $this->words;
+ $this->words = array();
+ foreach ( $keys as $word )
+ {
+ $this->words[$word] = $temp[$word];
+ }
+
+ unset($temp);
+ }
+
+ /**
+ * Returns the popularity index (scale class) for a 1-100 number.
+ * @param int
+ * @return int
+ */
+
+ function get_scale_class($val)
+ {
+ $ret = 0;
+ if ( $val >= 99 )
+ $ret = 1;
+ else if ( $val >= 70 )
+ $ret = 2;
+ else if ( $val >= 60 )
+ $ret = 3;
+ else if ( $val >= 50 )
+ $ret = 4;
+ else if ( $val >= 40 )
+ $ret = 5;
+ else if ( $val >= 30 )
+ $ret = 6;
+ else if ( $val >= 20 )
+ $ret = 7;
+ else if ( $val >= 10 )
+ $ret = 8;
+ else if ( $val >= 5 )
+ $ret = 9;
+ return $ret;
+ }
+
+ /**
+ * Generates and returns HTML for the cloud.
+ * @param string Optional. The CSS class applied to all tags. Can be "normal" or "small". Defaults to "normal".
+ * @param string Optional. The alignment for the div. Defaults to "center".
+ * @return string
+ */
+
+ function make_html($span_class = 'normal', $div_align = 'center')
+ {
+ global $lang;
+ $html = array();
+ $max = max($this->words);
+ $size = $this->get_cloud_size();
+ $inc = 0;
+ if ( count($this->words) > 0 )
+ {
+ foreach ( $this->words as $word => $popularity )
+ {
+ $inc++;
+ $word = htmlspecialchars($word);
+ $percent = ( $popularity / $max ) * 100;
+ $index = $this->get_scale_class($percent);
+ $newline = ( $inc == 5 ) ? "
" : '';
+ ( $inc == 5 ) ? $inc = 0 : null;
+ $url = makeUrlNS('Special', 'TagCloud/' . htmlspecialchars($word));
+ $popstring = ( $popularity == 1 ) ? $lang->get('pagetools_tagcloud_tip_popularity_one') : $lang->get('pagetools_tagcloud_tip_popularity_plural', array('popularity' => $popularity));
+ $html[] = "$word"; // $newline";
+ }
+ }
+ $html = '' . implode("\n", $html) . '';
+ return $html;
+ }
+
+
}
?>
diff -r de56132c008d -r bdac73ed481e includes/template.php
--- a/includes/template.php Sun Mar 28 21:49:26 2010 -0400
+++ b/includes/template.php Sun Mar 28 23:10:46 2010 -0400
@@ -13,1686 +13,1686 @@
class template
{
- var $tpl_strings, $tpl_bool, $vars_assign_history, $theme, $style, $no_headers, $additional_headers, $sidebar_extra, $sidebar_widgets, $toolbar_menu, $theme_list, $named_theme_list, $default_theme, $default_style, $plugin_blocks, $plugin_blocks_content, $namespace_string, $style_list, $theme_loaded;
-
- var $theme_initted = false;
- var $page_initted = false;
- var $elements = false;
- var $page_id = false;
- var $namespace = false;
- var $js_preload = array();
- var $js_append = '';
-
- /**
- * Page action conditions
- * @var array
- */
-
- var $conds = array();
-
- /**
- * The PageProcessor for the current page
- * @var object
- */
-
- var $page = false;
-
- /**
- * The list of themes that are critical for Enano operation. This doesn't include oxygen which
- * remains a user theme. By default this is admin and printable which have to be loaded on demand.
- * @var array
- */
-
- var $system_themes = array('admin', 'printable');
-
- /**
- * Set to true if the site is disabled and thus a message needs to be shown. This should ONLY be changed by common.php.
- * @var bool
- * @access private
- */
-
- var $site_disabled = false;
-
- /**
- * One of the absolute best parts of Enano :-P
- * @var string
- */
-
- var $fading_button = '';
-
- function __construct()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $cache;
-
- $this->tpl_bool = Array();
- $this->tpl_strings = Array();
- $this->sidebar_extra = '';
- $this->toolbar_menu = '';
- $this->additional_headers = '';
- $this->plugin_blocks = Array();
- $this->plugin_blocks_content = array();
- $this->theme_loaded = false;
-
- $this->theme_list = Array();
- $this->named_theme_list = Array();
-
- $this->vars_assign_history = array(
- 'strings' => array(),
- 'bool' => array()
- );
-
- if ( defined('IN_ENANO_UPGRADE') )
- {
- return $this->construct_compat();
- }
-
- if ( !$this->theme_list = $cache->fetch('themes') )
- {
- $q = $db->sql_query('SELECT theme_id, theme_name, enabled, default_style, group_policy, group_list FROM ' . table_prefix . 'themes;');
- if ( !$q )
- $db->_die('template.php selecting theme list');
-
- $i = 0;
- while ( $row = $db->fetchrow() )
- {
- $this->theme_list[$i] = $row;
- $i++;
- }
- unset($theme);
- $this->theme_list = array_values($this->theme_list);
- $cache->store('themes', $this->theme_list, -1);
- }
-
- // Create associative array of themes
- foreach ( $this->theme_list as $i => &$theme )
- $this->named_theme_list[ $theme['theme_id'] ] =& $this->theme_list[$i];
-
- unset($theme);
-
- $this->default_theme = ( $_ = getConfig('theme_default') ) ? $_ : $this->theme_list[0]['theme_id'];
- $this->named_theme_list[ $this->default_theme ]['css'] = $this->get_theme_css_files($this->default_theme);
- // Come up with the default style. If the CSS file specified in default_style exists, we're good, just
- // use that. Otherwise, use the first stylesheet that comes to mind.
- $df_data =& $this->named_theme_list[ $this->default_theme ];
- $this->default_style = ( in_array($df_data['default_style'], $df_data['css']) ) ? $df_data['default_style'] : $df_data['css'][0];
- }
-
- /**
- * Gets the list of available CSS files (styles) for the specified theme.
- * @param string Theme ID
- * @return array
- */
-
- function get_theme_css_files($theme_id)
- {
- $css = array();
- $dir = ENANO_ROOT . "/themes/{$theme_id}/css";
- if ( $dh = @opendir($dir) )
- {
- while ( ( $file = @readdir($dh) ) !== false )
- {
- if ( preg_match('/\.css$/', $file) )
- $css[] = preg_replace('/\.css$/', '', $file);
- }
- closedir($dh);
- }
- // No CSS files? If so, nuke it.
- if ( count($css) < 1 )
- {
- unset($this->theme_list[$theme_id]);
- }
- return $css;
- }
-
- /**
- * Failsafe constructor for upgrades.
- */
-
- function construct_compat()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $this->tpl_bool = Array();
- $this->tpl_strings = Array();
- $this->sidebar_extra = '';
- $this->toolbar_menu = '';
- $this->additional_headers = '';
- $this->plugin_blocks = Array();
- $this->theme_loaded = false;
-
- $this->fading_button = '
- 
- ';
-
- $this->theme_list = Array();
- $this->named_theme_list = Array();
-
- $q = $db->sql_query('SELECT theme_id, theme_name, enabled, default_style FROM ' . table_prefix . 'themes;');
- if ( !$q )
- $db->_die('template.php selecting theme list');
-
- $i = 0;
- while ( $row = $db->fetchrow() )
- {
- $this->theme_list[$i] = $row;
- $i++;
- }
- // List out all CSS files for this theme
- foreach ( $this->theme_list as $i => &$theme )
- {
- $theme['css'] = array();
- $dir = ENANO_ROOT . "/themes/{$theme['theme_id']}/css";
- if ( $dh = @opendir($dir) )
- {
- while ( ( $file = @readdir($dh) ) !== false )
- {
- if ( preg_match('/\.css$/', $file) )
- $theme['css'][] = preg_replace('/\.css$/', '', $file);
- }
- closedir($dh);
- }
- // No CSS files? If so, nuke it.
- if ( count($theme['css']) < 1 )
- {
- unset($this->theme_list[$i]);
- }
- }
- $this->theme_list = array_values($this->theme_list);
- // Create associative array of themes
- foreach ( $this->theme_list as $i => &$theme )
- $this->named_theme_list[ $theme['theme_id'] ] =& $this->theme_list[$i];
-
- $this->default_theme = ( $_ = getConfig('theme_default') ) ? $_ : $this->theme_list[0]['theme_id'];
- // Come up with the default style. If the CSS file specified in default_style exists, we're good, just
- // use that. Otherwise, use the first stylesheet that comes to mind.
- $df_data =& $this->named_theme_list[ $this->default_theme ];
- $this->default_style = ( in_array($df_data['default_style'], $df_data['css']) ) ? $df_data['default_style'] : $df_data['css'][0];
- }
-
- /**
- * Systematically deletes themes from available list if they're blocked by theme security settings. Called when session->start() finishes.
- */
-
- function process_theme_acls()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- // generate the fading button - needs to be done after sessions are started
- $admintitle = ( $session->user_level >= USER_LEVEL_ADMIN && is_object(@$lang) ) ? ' title="' . $lang->get('sidebar_btn_enanopowered_admin_tip') . '"' : '';
- $this->fading_button = '
- 
- ';
-
- // For each theme, check ACLs and delete from RAM if not authorized
- foreach ( $this->theme_list as $i => $theme )
- {
- if ( !@$theme['group_list'] )
- continue;
- if ( $theme['theme_id'] === getConfig('theme_default') )
- continue;
- switch ( $theme['group_policy'] )
- {
- case 'allow_all':
- // Unconditionally allowed
- continue;
- break;
- case 'whitelist':
- // If we're not on the list, off to the left please
- $list = enano_json_decode($theme['group_list']);
- $allowed = false;
- foreach ( $list as $acl )
- {
- if ( !preg_match('/^(u|g):([0-9]+)$/', $acl, $match) )
- // Invalid list entry, silently allow (maybe not a good idea but
- // really, these things are checked before they're inserted)
- continue 2;
- $mode = $match[1];
- $id = intval($match[2]);
- switch ( $mode )
- {
- case 'u':
- $allowed = ( $id == $session->user_id );
- if ( $allowed )
- break 2;
- break;
- case 'g':
- $allowed = ( isset($session->groups[$id]) );
- if ( $allowed )
- break 2;
- }
- }
- if ( !$allowed )
- {
- unset($this->theme_list[$i]);
- }
- break;
- case 'blacklist':
- // If we're ON the list, off to the left please
- $list = enano_json_decode($theme['group_list']);
- $allowed = true;
- foreach ( $list as $acl )
- {
- if ( !preg_match('/^(u|g):([0-9]+)$/', $acl, $match) )
- // Invalid list entry, silently allow (maybe not a good idea but
- // really, these things are checked before they're inserted)
- continue 2;
- $mode = $match[1];
- $id = intval($match[2]);
- switch ( $mode )
- {
- case 'u':
- $allowed = ( $id != $session->user_id );
- if ( !$allowed )
- break 2;
- break;
- case 'g':
- $allowed = ( !isset($session->groups[$id]) );
- if ( !$allowed )
- break 2;
- }
- }
- if ( !$allowed )
- {
- unset($this->theme_list[$i]);
- }
- break;
- }
- }
-
- $this->theme_list = array_values($this->theme_list);
-
- // Rebuild associative theme list
- $this->named_theme_list = array();
- foreach ( $this->theme_list as $i => &$theme )
- $this->named_theme_list[ $theme['theme_id'] ] =& $this->theme_list[$i];
- }
-
- /**
- * Register a new sidebar block.
- * @param string Block title
- * @param string Block HTML
- * @param bool If true, the class of the block will be the same as the one used for blocks that are a list of links instead of HTML content. This can do some wacky things like make all your s block level.
- */
-
- function sidebar_widget($t, $h, $use_normal_section = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- if ( !$this->theme_loaded )
- {
- $this->load_theme($session->theme, $session->style);
- }
- if(!$this->sidebar_widgets)
- $this->sidebar_widgets = '';
- $tplvars = $this->extract_vars('elements.tpl');
-
- if ( $use_normal_section )
- {
- $parser = $this->makeParserText($tplvars['sidebar_section']);
- }
- else
- {
- $parser = $this->makeParserText($tplvars['sidebar_section_raw']);
- }
-
- $parser->assign_vars(Array('TITLE' => '{TITLE}','CONTENT' => $h));
- $this->plugin_blocks[$t] = $parser->run();
- $this->plugin_blocks_content[$t] = $h;
- $this->sidebar_widgets .= $parser->run();
- }
- function add_header($html)
- {
- /* debug only **
- $bt = debug_backtrace();
- $bt = $bt[1];
- $this->additional_headers .= "\n \n " . $html;
- */
- $this->additional_headers .= "\n " . $html;
- }
- function get_css($s = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $this->init_vars();
-
- $path = ( $s ) ? 'css/'.$s : 'css/'.$this->style.'.css';
-
- if ( !file_exists(ENANO_ROOT . '/themes/' . $this->theme . '/' . $path) )
- {
- echo "/* WARNING: Falling back to default file because file $path does not exist */\n";
- $path = 'css/' . $this->style_list[0] . '.css';
- }
-
- return $this->process_template($path);
- }
- function load_theme($name = false, $css = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- $this->theme = ( $name ) ? $name : $session->theme;
- $this->style = ( $css ) ? $css : $session->style;
- if ( !$this->theme )
- {
- $this->theme = $this->theme_list[0]['theme_id'];
- $this->style = preg_replace('/\.css$/', '', $this->theme_list[0]['default_style']);
- }
- // Make sure we're allowed to use this theme.
- if ( (
- // If it was removed, it's probably blocked by an ACL, or it was uninstalled
- !isset($this->named_theme_list[$this->theme]) ||
- // Check if the theme is disabled
- ( isset($this->named_theme_list[$this->theme]) && isset($this->named_theme_list[$this->theme]['enabled']) && $this->named_theme_list[$this->theme]['enabled'] == 0 ) )
- // Above all, if it's a system theme, don't inhibit the loading process.
- && !in_array($this->theme, $this->system_themes)
- )
- {
- // No, something is preventing it - fall back to site default
- $this->theme = $this->default_theme;
-
- // Come up with the default style. If the CSS file specified in default_style exists, we're good, just
- // use that. Otherwise, use the first stylesheet that comes to mind.
- $df_data =& $this->named_theme_list[ $this->theme ];
- $this->style = ( in_array($df_data['default_style'], $df_data['css']) ) ? $df_data['default_style'] : $df_data['css'][0];
- }
- // The list of styles for the currently selected theme
- $this->style_list =& $this->named_theme_list[ $this->theme ]['css'];
- $this->theme_loaded = true;
- }
-
- /**
- * Change the theme we're supposed to display.
- * @param string Theme name
- * @param string Style name; optional
- */
-
- function set_theme($theme = false, $style = false)
- {
- $this->theme_initted = false;
- $this->load_theme($theme, $style);
- }
-
- /**
- * Change the page we're supposed to generate for
- * @param mixed Page ID *or* PageProcessor. If a PageProcessor, pulls permission info and such from that; if not, starts a PageProcessor. YOU SHOULD USE A PageProcessor WHENEVER POSSIBLE! It improves efficiency.
- * @param string Namespace; not required if including a PageProcessor.
- */
-
- function set_page($page_id_or_pp, $namespace = false)
- {
- if ( is_object($page_id_or_pp) && get_class($page_id_or_pp) === 'PageProcessor' )
- {
- $this->page_initted = false;
- $page =& $page_id_or_pp;
- $this->page = $page;
- $this->page_id = $page->page_id;
- $this->namespace = $page->namespace;
- }
- else if ( is_string($page_id_or_pp) )
- {
- if ( !is_string($namespace) )
- return false;
-
- if ( $page_id_or_pp === $this->page_id && $namespace === $this->namespace )
- return true;
-
- $this->page_initted = false;
- $this->page = false;
- $this->page_id = sanitize_page_id($page_id_or_pp);
- $this->namespace = $namespace;
- }
- else
- {
- return false;
- }
- return true;
- }
-
- /**
- * Queue a Javascript file to be loaded with the page instead of on demand.
- * @param mixed Javascript file string or array thereof, extensions are optional
- * @example
-
- $template->preload_js(array('jquery', 'jquery-ui'));
- $template->preload_js('admin-menu.js');
-
- * @return null
- */
-
- function preload_js($filemixed)
- {
- if ( is_string($filemixed) )
- $files = array($filemixed);
- else if ( is_array($filemixed) )
- $files = $filemixed;
- else
- // :-/
- return null;
-
- $this->js_preload = array_values(array_merge($this->js_preload, $files));
- }
-
- /**
- * Queue some HTML to be inserted after the Javascript runtime.
- * @param string HTML glob
- */
-
- function add_header_js($html)
- {
- $this->js_append .= "$html\n ";
- }
-
- /**
- * Global, only-called-once init. Goes to all themes.
- */
-
- function init_global_vars()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- global $email;
-
- $is_opera = (isset($_SERVER['HTTP_USER_AGENT']) && strstr($_SERVER['HTTP_USER_AGENT'], 'Opera')) ? true : false;
- $is_msie = (isset($_SERVER['HTTP_USER_AGENT']) && strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE')) ? true : false;
-
- $this->assign_bool(array(
- 'auth_admin' => $session->user_level >= USER_LEVEL_ADMIN ? true : false,
- 'user_logged_in' => $session->user_logged_in,
- 'opera' => $is_opera,
- 'msie' => $is_msie
- ));
-
- if ( $session->sid_super )
- {
- $ash = '&auth=' . $session->sid_super;
- $asq = "?auth=" . $session->sid_super;
- $asa = "&auth=" . $session->sid_super;
- $as2 = htmlspecialchars(urlSeparator) . 'auth='.$session->sid_super;
- }
- else
- {
- $asq = '';
- $asa = '';
- $as2 = '';
- $ash = '';
- }
-
- // Append the Enano version to URLs to break the cache on upgrades
- $enano_version = enano_version();
-
- // Set up javascript includes
- // these depend heavily on whether we have a CDN to work with or not
- if ( getConfig('cdn_path') )
- {
- // we're on a CDN, point to static includes
- // CLI javascript compression script: includes/clientside/jscompress.php
- $js_head = '';
-
- if ( !empty($this->js_preload) )
- {
- $loadlines = array();
-
- // make unique
- foreach ( $this->js_preload as &$script )
- {
- $script = preg_replace('/\.js$/', '', $script) . '.js';
- }
- unset($script);
- $this->js_preload = array_unique($this->js_preload);
-
- foreach ( $this->js_preload as $script )
- {
- $js_head .= "\n ";
- // special case for l10n: also load strings
- if ( $script == 'l10n.js' )
- {
- global $lang;
- $js_head .= "\n ";
- }
- $loadlines[] = "loaded_components['$script'] = true;";
- }
-
- // tell the system that this stuff is already loaded
- $loadlines = implode("\n ", $loadlines);
- $js_head .= "\n ";
- }
-
- $js_foot = <<
- // This initializes the Javascript runtime when the DOM is ready - not when the page is
- // done loading, because enano-lib-basic still has to load some 15 other script files
- // check for the init function - this is a KHTML fix
- // This doesn't seem to work properly in IE in 1.1.x - there are some problems with
- // tinyMCE and l10n.
- if ( typeof ( enano_init ) == 'function' && !IE )
- {
- enano_init();
- window.onload = function(e) { };
- }
-
- $this->js_append
+ var $tpl_strings, $tpl_bool, $vars_assign_history, $theme, $style, $no_headers, $additional_headers, $sidebar_extra, $sidebar_widgets, $toolbar_menu, $theme_list, $named_theme_list, $default_theme, $default_style, $plugin_blocks, $plugin_blocks_content, $namespace_string, $style_list, $theme_loaded;
+
+ var $theme_initted = false;
+ var $page_initted = false;
+ var $elements = false;
+ var $page_id = false;
+ var $namespace = false;
+ var $js_preload = array();
+ var $js_append = '';
+
+ /**
+ * Page action conditions
+ * @var array
+ */
+
+ var $conds = array();
+
+ /**
+ * The PageProcessor for the current page
+ * @var object
+ */
+
+ var $page = false;
+
+ /**
+ * The list of themes that are critical for Enano operation. This doesn't include oxygen which
+ * remains a user theme. By default this is admin and printable which have to be loaded on demand.
+ * @var array
+ */
+
+ var $system_themes = array('admin', 'printable');
+
+ /**
+ * Set to true if the site is disabled and thus a message needs to be shown. This should ONLY be changed by common.php.
+ * @var bool
+ * @access private
+ */
+
+ var $site_disabled = false;
+
+ /**
+ * One of the absolute best parts of Enano :-P
+ * @var string
+ */
+
+ var $fading_button = '';
+
+ function __construct()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $cache;
+
+ $this->tpl_bool = Array();
+ $this->tpl_strings = Array();
+ $this->sidebar_extra = '';
+ $this->toolbar_menu = '';
+ $this->additional_headers = '';
+ $this->plugin_blocks = Array();
+ $this->plugin_blocks_content = array();
+ $this->theme_loaded = false;
+
+ $this->theme_list = Array();
+ $this->named_theme_list = Array();
+
+ $this->vars_assign_history = array(
+ 'strings' => array(),
+ 'bool' => array()
+ );
+
+ if ( defined('IN_ENANO_UPGRADE') )
+ {
+ return $this->construct_compat();
+ }
+
+ if ( !$this->theme_list = $cache->fetch('themes') )
+ {
+ $q = $db->sql_query('SELECT theme_id, theme_name, enabled, default_style, group_policy, group_list FROM ' . table_prefix . 'themes;');
+ if ( !$q )
+ $db->_die('template.php selecting theme list');
+
+ $i = 0;
+ while ( $row = $db->fetchrow() )
+ {
+ $this->theme_list[$i] = $row;
+ $i++;
+ }
+ unset($theme);
+ $this->theme_list = array_values($this->theme_list);
+ $cache->store('themes', $this->theme_list, -1);
+ }
+
+ // Create associative array of themes
+ foreach ( $this->theme_list as $i => &$theme )
+ $this->named_theme_list[ $theme['theme_id'] ] =& $this->theme_list[$i];
+
+ unset($theme);
+
+ $this->default_theme = ( $_ = getConfig('theme_default') ) ? $_ : $this->theme_list[0]['theme_id'];
+ $this->named_theme_list[ $this->default_theme ]['css'] = $this->get_theme_css_files($this->default_theme);
+ // Come up with the default style. If the CSS file specified in default_style exists, we're good, just
+ // use that. Otherwise, use the first stylesheet that comes to mind.
+ $df_data =& $this->named_theme_list[ $this->default_theme ];
+ $this->default_style = ( in_array($df_data['default_style'], $df_data['css']) ) ? $df_data['default_style'] : $df_data['css'][0];
+ }
+
+ /**
+ * Gets the list of available CSS files (styles) for the specified theme.
+ * @param string Theme ID
+ * @return array
+ */
+
+ function get_theme_css_files($theme_id)
+ {
+ $css = array();
+ $dir = ENANO_ROOT . "/themes/{$theme_id}/css";
+ if ( $dh = @opendir($dir) )
+ {
+ while ( ( $file = @readdir($dh) ) !== false )
+ {
+ if ( preg_match('/\.css$/', $file) )
+ $css[] = preg_replace('/\.css$/', '', $file);
+ }
+ closedir($dh);
+ }
+ // No CSS files? If so, nuke it.
+ if ( count($css) < 1 )
+ {
+ unset($this->theme_list[$theme_id]);
+ }
+ return $css;
+ }
+
+ /**
+ * Failsafe constructor for upgrades.
+ */
+
+ function construct_compat()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $this->tpl_bool = Array();
+ $this->tpl_strings = Array();
+ $this->sidebar_extra = '';
+ $this->toolbar_menu = '';
+ $this->additional_headers = '';
+ $this->plugin_blocks = Array();
+ $this->theme_loaded = false;
+
+ $this->fading_button = '
+
+ ';
+
+ $this->theme_list = Array();
+ $this->named_theme_list = Array();
+
+ $q = $db->sql_query('SELECT theme_id, theme_name, enabled, default_style FROM ' . table_prefix . 'themes;');
+ if ( !$q )
+ $db->_die('template.php selecting theme list');
+
+ $i = 0;
+ while ( $row = $db->fetchrow() )
+ {
+ $this->theme_list[$i] = $row;
+ $i++;
+ }
+ // List out all CSS files for this theme
+ foreach ( $this->theme_list as $i => &$theme )
+ {
+ $theme['css'] = array();
+ $dir = ENANO_ROOT . "/themes/{$theme['theme_id']}/css";
+ if ( $dh = @opendir($dir) )
+ {
+ while ( ( $file = @readdir($dh) ) !== false )
+ {
+ if ( preg_match('/\.css$/', $file) )
+ $theme['css'][] = preg_replace('/\.css$/', '', $file);
+ }
+ closedir($dh);
+ }
+ // No CSS files? If so, nuke it.
+ if ( count($theme['css']) < 1 )
+ {
+ unset($this->theme_list[$i]);
+ }
+ }
+ $this->theme_list = array_values($this->theme_list);
+ // Create associative array of themes
+ foreach ( $this->theme_list as $i => &$theme )
+ $this->named_theme_list[ $theme['theme_id'] ] =& $this->theme_list[$i];
+
+ $this->default_theme = ( $_ = getConfig('theme_default') ) ? $_ : $this->theme_list[0]['theme_id'];
+ // Come up with the default style. If the CSS file specified in default_style exists, we're good, just
+ // use that. Otherwise, use the first stylesheet that comes to mind.
+ $df_data =& $this->named_theme_list[ $this->default_theme ];
+ $this->default_style = ( in_array($df_data['default_style'], $df_data['css']) ) ? $df_data['default_style'] : $df_data['css'][0];
+ }
+
+ /**
+ * Systematically deletes themes from available list if they're blocked by theme security settings. Called when session->start() finishes.
+ */
+
+ function process_theme_acls()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
+ // generate the fading button - needs to be done after sessions are started
+ $admintitle = ( $session->user_level >= USER_LEVEL_ADMIN && is_object(@$lang) ) ? ' title="' . $lang->get('sidebar_btn_enanopowered_admin_tip') . '"' : '';
+ $this->fading_button = '
+
+ ';
+
+ // For each theme, check ACLs and delete from RAM if not authorized
+ foreach ( $this->theme_list as $i => $theme )
+ {
+ if ( !@$theme['group_list'] )
+ continue;
+ if ( $theme['theme_id'] === getConfig('theme_default') )
+ continue;
+ switch ( $theme['group_policy'] )
+ {
+ case 'allow_all':
+ // Unconditionally allowed
+ continue;
+ break;
+ case 'whitelist':
+ // If we're not on the list, off to the left please
+ $list = enano_json_decode($theme['group_list']);
+ $allowed = false;
+ foreach ( $list as $acl )
+ {
+ if ( !preg_match('/^(u|g):([0-9]+)$/', $acl, $match) )
+ // Invalid list entry, silently allow (maybe not a good idea but
+ // really, these things are checked before they're inserted)
+ continue 2;
+ $mode = $match[1];
+ $id = intval($match[2]);
+ switch ( $mode )
+ {
+ case 'u':
+ $allowed = ( $id == $session->user_id );
+ if ( $allowed )
+ break 2;
+ break;
+ case 'g':
+ $allowed = ( isset($session->groups[$id]) );
+ if ( $allowed )
+ break 2;
+ }
+ }
+ if ( !$allowed )
+ {
+ unset($this->theme_list[$i]);
+ }
+ break;
+ case 'blacklist':
+ // If we're ON the list, off to the left please
+ $list = enano_json_decode($theme['group_list']);
+ $allowed = true;
+ foreach ( $list as $acl )
+ {
+ if ( !preg_match('/^(u|g):([0-9]+)$/', $acl, $match) )
+ // Invalid list entry, silently allow (maybe not a good idea but
+ // really, these things are checked before they're inserted)
+ continue 2;
+ $mode = $match[1];
+ $id = intval($match[2]);
+ switch ( $mode )
+ {
+ case 'u':
+ $allowed = ( $id != $session->user_id );
+ if ( !$allowed )
+ break 2;
+ break;
+ case 'g':
+ $allowed = ( !isset($session->groups[$id]) );
+ if ( !$allowed )
+ break 2;
+ }
+ }
+ if ( !$allowed )
+ {
+ unset($this->theme_list[$i]);
+ }
+ break;
+ }
+ }
+
+ $this->theme_list = array_values($this->theme_list);
+
+ // Rebuild associative theme list
+ $this->named_theme_list = array();
+ foreach ( $this->theme_list as $i => &$theme )
+ $this->named_theme_list[ $theme['theme_id'] ] =& $this->theme_list[$i];
+ }
+
+ /**
+ * Register a new sidebar block.
+ * @param string Block title
+ * @param string Block HTML
+ * @param bool If true, the class of the block will be the same as the one used for blocks that are a list of links instead of HTML content. This can do some wacky things like make all your s block level.
+ */
+
+ function sidebar_widget($t, $h, $use_normal_section = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ if ( !$this->theme_loaded )
+ {
+ $this->load_theme($session->theme, $session->style);
+ }
+ if(!$this->sidebar_widgets)
+ $this->sidebar_widgets = '';
+ $tplvars = $this->extract_vars('elements.tpl');
+
+ if ( $use_normal_section )
+ {
+ $parser = $this->makeParserText($tplvars['sidebar_section']);
+ }
+ else
+ {
+ $parser = $this->makeParserText($tplvars['sidebar_section_raw']);
+ }
+
+ $parser->assign_vars(Array('TITLE' => '{TITLE}','CONTENT' => $h));
+ $this->plugin_blocks[$t] = $parser->run();
+ $this->plugin_blocks_content[$t] = $h;
+ $this->sidebar_widgets .= $parser->run();
+ }
+ function add_header($html)
+ {
+ /* debug only **
+ $bt = debug_backtrace();
+ $bt = $bt[1];
+ $this->additional_headers .= "\n \n " . $html;
+ */
+ $this->additional_headers .= "\n " . $html;
+ }
+ function get_css($s = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $this->init_vars();
+
+ $path = ( $s ) ? 'css/'.$s : 'css/'.$this->style.'.css';
+
+ if ( !file_exists(ENANO_ROOT . '/themes/' . $this->theme . '/' . $path) )
+ {
+ echo "/* WARNING: Falling back to default file because file $path does not exist */\n";
+ $path = 'css/' . $this->style_list[0] . '.css';
+ }
+
+ return $this->process_template($path);
+ }
+ function load_theme($name = false, $css = false)
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ $this->theme = ( $name ) ? $name : $session->theme;
+ $this->style = ( $css ) ? $css : $session->style;
+ if ( !$this->theme )
+ {
+ $this->theme = $this->theme_list[0]['theme_id'];
+ $this->style = preg_replace('/\.css$/', '', $this->theme_list[0]['default_style']);
+ }
+ // Make sure we're allowed to use this theme.
+ if ( (
+ // If it was removed, it's probably blocked by an ACL, or it was uninstalled
+ !isset($this->named_theme_list[$this->theme]) ||
+ // Check if the theme is disabled
+ ( isset($this->named_theme_list[$this->theme]) && isset($this->named_theme_list[$this->theme]['enabled']) && $this->named_theme_list[$this->theme]['enabled'] == 0 ) )
+ // Above all, if it's a system theme, don't inhibit the loading process.
+ && !in_array($this->theme, $this->system_themes)
+ )
+ {
+ // No, something is preventing it - fall back to site default
+ $this->theme = $this->default_theme;
+
+ // Come up with the default style. If the CSS file specified in default_style exists, we're good, just
+ // use that. Otherwise, use the first stylesheet that comes to mind.
+ $df_data =& $this->named_theme_list[ $this->theme ];
+ $this->style = ( in_array($df_data['default_style'], $df_data['css']) ) ? $df_data['default_style'] : $df_data['css'][0];
+ }
+ // The list of styles for the currently selected theme
+ $this->style_list =& $this->named_theme_list[ $this->theme ]['css'];
+ $this->theme_loaded = true;
+ }
+
+ /**
+ * Change the theme we're supposed to display.
+ * @param string Theme name
+ * @param string Style name; optional
+ */
+
+ function set_theme($theme = false, $style = false)
+ {
+ $this->theme_initted = false;
+ $this->load_theme($theme, $style);
+ }
+
+ /**
+ * Change the page we're supposed to generate for
+ * @param mixed Page ID *or* PageProcessor. If a PageProcessor, pulls permission info and such from that; if not, starts a PageProcessor. YOU SHOULD USE A PageProcessor WHENEVER POSSIBLE! It improves efficiency.
+ * @param string Namespace; not required if including a PageProcessor.
+ */
+
+ function set_page($page_id_or_pp, $namespace = false)
+ {
+ if ( is_object($page_id_or_pp) && get_class($page_id_or_pp) === 'PageProcessor' )
+ {
+ $this->page_initted = false;
+ $page =& $page_id_or_pp;
+ $this->page = $page;
+ $this->page_id = $page->page_id;
+ $this->namespace = $page->namespace;
+ }
+ else if ( is_string($page_id_or_pp) )
+ {
+ if ( !is_string($namespace) )
+ return false;
+
+ if ( $page_id_or_pp === $this->page_id && $namespace === $this->namespace )
+ return true;
+
+ $this->page_initted = false;
+ $this->page = false;
+ $this->page_id = sanitize_page_id($page_id_or_pp);
+ $this->namespace = $namespace;
+ }
+ else
+ {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Queue a Javascript file to be loaded with the page instead of on demand.
+ * @param mixed Javascript file string or array thereof, extensions are optional
+ * @example
+
+ $template->preload_js(array('jquery', 'jquery-ui'));
+ $template->preload_js('admin-menu.js');
+
+ * @return null
+ */
+
+ function preload_js($filemixed)
+ {
+ if ( is_string($filemixed) )
+ $files = array($filemixed);
+ else if ( is_array($filemixed) )
+ $files = $filemixed;
+ else
+ // :-/
+ return null;
+
+ $this->js_preload = array_values(array_merge($this->js_preload, $files));
+ }
+
+ /**
+ * Queue some HTML to be inserted after the Javascript runtime.
+ * @param string HTML glob
+ */
+
+ function add_header_js($html)
+ {
+ $this->js_append .= "$html\n ";
+ }
+
+ /**
+ * Global, only-called-once init. Goes to all themes.
+ */
+
+ function init_global_vars()
+ {
+ global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+ global $email;
+
+ $is_opera = (isset($_SERVER['HTTP_USER_AGENT']) && strstr($_SERVER['HTTP_USER_AGENT'], 'Opera')) ? true : false;
+ $is_msie = (isset($_SERVER['HTTP_USER_AGENT']) && strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE')) ? true : false;
+
+ $this->assign_bool(array(
+ 'auth_admin' => $session->user_level >= USER_LEVEL_ADMIN ? true : false,
+ 'user_logged_in' => $session->user_logged_in,
+ 'opera' => $is_opera,
+ 'msie' => $is_msie
+ ));
+
+ if ( $session->sid_super )
+ {
+ $ash = '&auth=' . $session->sid_super;
+ $asq = "?auth=" . $session->sid_super;
+ $asa = "&auth=" . $session->sid_super;
+ $as2 = htmlspecialchars(urlSeparator) . 'auth='.$session->sid_super;
+ }
+ else
+ {
+ $asq = '';
+ $asa = '';
+ $as2 = '';
+ $ash = '';
+ }
+
+ // Append the Enano version to URLs to break the cache on upgrades
+ $enano_version = enano_version();
+
+ // Set up javascript includes
+ // these depend heavily on whether we have a CDN to work with or not
+ if ( getConfig('cdn_path') )
+ {
+ // we're on a CDN, point to static includes
+ // CLI javascript compression script: includes/clientside/jscompress.php
+ $js_head = '';
+
+ if ( !empty($this->js_preload) )
+ {
+ $loadlines = array();
+
+ // make unique
+ foreach ( $this->js_preload as &$script )
+ {
+ $script = preg_replace('/\.js$/', '', $script) . '.js';
+ }
+ unset($script);
+ $this->js_preload = array_unique($this->js_preload);
+
+ foreach ( $this->js_preload as $script )
+ {
+ $js_head .= "\n ";
+ // special case for l10n: also load strings
+ if ( $script == 'l10n.js' )
+ {
+ global $lang;
+ $js_head .= "\n ";
+ }
+ $loadlines[] = "loaded_components['$script'] = true;";
+ }
+
+ // tell the system that this stuff is already loaded
+ $loadlines = implode("\n ", $loadlines);
+ $js_head .= "\n ";
+ }
+
+ $js_foot = <<
+ // This initializes the Javascript runtime when the DOM is ready - not when the page is
+ // done loading, because enano-lib-basic still has to load some 15 other script files
+ // check for the init function - this is a KHTML fix
+ // This doesn't seem to work properly in IE in 1.1.x - there are some problems with
+ // tinyMCE and l10n.
+ if ( typeof ( enano_init ) == 'function' && !IE )
+ {
+ enano_init();
+ window.onload = function(e) { };
+ }
+
+ $this->js_append
JSEOF;
- }
- else
- {
- $cdnpath = cdnPath;
- $js_head = '';
-
- // point to jsres compressor
- $js_head .= <<
-
+ }
+ else
+ {
+ $cdnpath = cdnPath;
+ $js_head = '';
+
+ // point to jsres compressor
+ $js_head .= <<
+
JSEOF;
- $js_foot = '';
-
- if ( !empty($this->js_preload) )
- {
- foreach ( $this->js_preload as &$script )
- {
- $script = preg_replace('/\.js$/', '', $script) . '.js';
- }
- $this->js_preload = array_unique($this->js_preload);
- if ( in_array('l10n.js', $this->js_preload) )
- {
- // special case for l10n: also load strings
- global $lang;
- $js_foot .= "\n ";
- }
- $scripts = implode(',', $this->js_preload);
- $js_foot .= "\n ";
-
- }
-
- $js_foot .= <<
-
-
- $this->js_append
+ $js_foot = '';
+
+ if ( !empty($this->js_preload) )
+ {
+ foreach ( $this->js_preload as &$script )
+ {
+ $script = preg_replace('/\.js$/', '', $script) . '.js';
+ }
+ $this->js_preload = array_unique($this->js_preload);
+ if ( in_array('l10n.js', $this->js_preload) )
+ {
+ // special case for l10n: also load strings
+ global $lang;
+ $js_foot .= "\n ";
+ }
+ $scripts = implode(',', $this->js_preload);
+ $js_foot .= "\n ";
+
+ }
+
+ $js_foot .= <<
+
+
+ $this->js_append
JSEOF;
- }
-
-
- $this->assign_bool(array(
- 'fixed_menus' => false,
- 'export' => false,
- 'right_sidebar' => true,
- 'enable_uploads' => ( getConfig('enable_uploads') == '1' && $session->get_permissions('upload_files') ) ? true : false,
- 'stupid_mode' => false,
- ));
-
- // Add the e-mail address client code to the header
- $this->add_header($email->jscode());
-
- // Assign our main variables
- $this->assign_vars(array(
- 'SITE_NAME' => htmlspecialchars(getConfig('site_name')),
- 'USERNAME' => $session->username,
- 'SITE_DESC' => htmlspecialchars(getConfig('site_desc')),
- 'SCRIPTPATH' => scriptPath,
- 'CONTENTPATH' => contentPath,
- 'CDNPATH' => cdnPath,
- 'ADMIN_SID_QUES' => $asq,
- 'ADMIN_SID_AMP' => $asa,
- 'ADMIN_SID_AMP_HTML' => $ash,
- 'ADMIN_SID_AUTO' => $as2,
- 'ADMIN_SID_RAW' => ( is_string($session->sid_super) ? $session->sid_super : '' ),
- 'CSRF_TOKEN' => $session->csrf_token,
- 'COPYRIGHT' => RenderMan::parse_internal_links(getConfig('copyright_notice')),
- 'REQUEST_URI' => ( defined('ENANO_CLI') ? '' : $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'] ),
- 'SEARCH_ACTION' => makeUrlNS('Special', 'Search'),
- 'INPUT_TITLE' => ( urlSeparator == '&' ? '' : ''),
- 'INPUT_AUTH' => ( $session->sid_super ? '' : ''),
- 'MAIN_PAGE' => get_main_page(),
- 'UNREAD_PMS' => $session->unread_pms,
- 'JS_HEADER' => $js_head,
- 'JS_FOOTER' => $js_foot,
- 'URL_ABOUT_ENANO' => makeUrlNS('Special', 'About_Enano', '', true),
- 'ENANO_VERSION' => enano_version()
- ), true);
-
- $tpl_strings = array();
- foreach ( $paths->nslist as $ns_id => $ns_prefix )
- {
- $tpl_strings[ 'NS_' . strtoupper($ns_id) ] = $ns_prefix;
- }
-
- $this->assign_vars($tpl_strings, true);
- }
-
- /**
- * Init theme vars, like sidebar, global JS, that kind of stuff.
- */
-
- function init_theme_vars()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- // allows conditional testing of the theme ID (a bit crude, came from my NSIS days)
- $this->assign_bool(array(
- "theme_is_{$this->theme}" => true
- ));
-
- $this->elements = $this->extract_vars('elements.tpl');
-
- // Generate the code for the Administration and Edit Sidebar buttons
- // Once again, the new template parsing system can be used here
-
- $parser = $this->makeParserText($this->elements['sidebar_button']);
-
- $parser->assign_vars(Array(
- 'HREF'=>makeUrlNS('Special', 'Administration'),
- 'FLAGS'=>'onclick="if ( !KILL_SWITCH ) { void(ajaxStartAdminLogin()); return false; }"',
- 'TEXT'=>$lang->get('sidebar_btn_administration'),
- ));
-
- $admin_link = $parser->run();
-
- $parser->assign_vars(Array(
- 'HREF'=>makeUrlNS('Special', 'EditSidebar'),
- 'FLAGS'=>'onclick="if ( !KILL_SWITCH ) { void(ajaxLoginNavTo(\'Special\', \'EditSidebar\', ' . USER_LEVEL_ADMIN . ')); return false; }"',
- 'TEXT'=>$lang->get('sidebar_btn_editsidebar'),
- ));
-
- $sidebar_link = $parser->run();
-
- $this->assign_vars(array(
- 'ADMIN_LINK' => $admin_link,
- 'SIDEBAR_LINK' => $sidebar_link,
- 'THEME_ID' => $this->theme,
- 'STYLE_ID' => $this->style
- ));
-
- // Add the site description sidebar block
- $this->sidebar_widget($lang->get('sidebar_title_about'), '' . htmlspecialchars(getConfig('site_desc')) . '
');
-
- $this->theme_initted = true;
- }
-
- /**
- * Init page vars, like the toolbar, local JS, etc.
- */
-
- function init_page_vars()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- if ( !$this->page )
- {
- $this->page = new PageProcessor($this->page_id, $this->namespace);
- }
-
- $conds = $this->page->ns->get_conds();
-
- $this->assign_bool(array(
- 'in_admin' => ( ( $this->page_id == 'Administration' && $this->namespace == 'Special' ) || $this->namespace == 'Admin' ),
- 'auth_rename' => ( $conds['rename'] )
- ));
-
- // Get the "article" button text (depends on namespace)
- switch ( $this->namespace )
- {
- case "Article":
- default:
- $ns = $lang->get('onpage_lbl_page_article');
- break;
- case "Admin":
- $ns = $lang->get('onpage_lbl_page_admin');
- break;
- case "System":
- $ns = $lang->get('onpage_lbl_page_system');
- break;
- case "File":
- $ns = $lang->get('onpage_lbl_page_file');
- break;
- case "Help":
- $ns = $lang->get('onpage_lbl_page_help');
- break;
- case "User":
- $ns = $lang->get('onpage_lbl_page_user');
- break;
- case "Special":
- $ns = $lang->get('onpage_lbl_page_special');
- break;
- case "Template":
- $ns = $lang->get('onpage_lbl_page_template');
- break;
- case "Project":
- $ns = $lang->get('onpage_lbl_page_project');
- break;
- case "Category":
- $ns = $lang->get('onpage_lbl_page_category');
- break;
- case "API":
- $ns = $lang->get('onpage_lbl_page_external');
- break;
- }
- $this->namespace_string = $ns;
- unset($ns);
- // compatibility
- $local_namespace =& $this->namespace;
- $local_page_id =& $this->page_id;
- $code = $plugins->setHook('page_type_string_set');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
- $ns =& $this->namespace_string;
-
- //
- // PAGE TOOLBAR (on-page controls/actions)
- //
-
- $local_page = $paths->get_pathskey($this->page_id, $this->namespace);
- $local_cdata = $this->page->ns->get_cdata();
-
- // Initialize the toolbar
- $tb = '';
- $this->toolbar_menu = '';
-
- // Create "xx page" button
-
- $btn_selected = ( isset($this->elements['toolbar_button_selected'])) ? $this->elements['toolbar_button_selected'] : $this->elements['toolbar_button'];
- $parser = $this->makeParserText($btn_selected);
-
- if ( $conds['article'] )
- {
- $parser->assign_vars(array(
- 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxReset()); return false; }" title="' . $lang->get('onpage_tip_article') . '" accesskey="a"',
- 'PARENTFLAGS' => 'id="mdgToolbar_article"',
- 'HREF' => makeUrl($local_page, null, true),
- 'TEXT' => $this->namespace_string
- ));
-
- $tb .= $parser->run();
- }
-
- $button = $this->makeParserText($this->elements['toolbar_button']);
-
- // Page toolbar
- // Comments button
- if ( $conds['comments'] )
- {
- $cdata = $this->page->ns->get_cdata();
- if ( isset($cdata['comments_approved']) )
- {
- $approval_counts = array(
- COMMENT_APPROVED => $cdata['comments_approved'],
- COMMENT_UNAPPROVED => $cdata['comments_unapproved'],
- COMMENT_SPAM => $cdata['comments_spam']
- );
- $num_comments = $session->check_acl_scope('mod_comments', $this->namespace) && $this->page->perms->get_permissions('mod_comments')
- ? array_sum($approval_counts)
- : $approval_counts[COMMENT_APPROVED];
- }
- else
- {
- $e = $db->sql_query('SELECT approved FROM '.table_prefix.'comments WHERE page_id=\''.$this->page_id.'\' AND namespace=\''.$this->namespace.'\';');
- if ( !$e )
- {
- $db->_die();
- }
- $num_comments = $db->numrows();
- $approval_counts = array(COMMENT_UNAPPROVED => 0, COMMENT_APPROVED => 0, COMMENT_SPAM => 0);
-
- while ( $r = $db->fetchrow() )
- {
- $approval_counts[$r['approved']]++;
- }
- }
-
- $db->free_result();
- // $n = ( $session->check_acl_scope('mod_comments', $this->namespace) && $perms->get_permissions('mod_comments') ) ? (string)$num_comments : (string)$na;
- if ( $session->check_acl_scope('mod_comments', $this->namespace) && $this->page->perms->get_permissions('mod_comments') && ( $approval_counts[COMMENT_UNAPPROVED] + $approval_counts[COMMENT_SPAM] ) > 0 )
- {
- $subst = array(
- 'num_comments' => $num_comments,
- 'num_app' => $approval_counts[COMMENT_APPROVED],
- 'num_unapp' => $approval_counts[COMMENT_UNAPPROVED],
- 'num_spam' => $approval_counts[COMMENT_SPAM]
- );
- $btn_text = $lang->get('onpage_btn_discussion_unapp', $subst);
- }
- else
- {
- $subst = array(
- 'num_comments' => $num_comments
- );
- $btn_text = $lang->get('onpage_btn_discussion', $subst);
- }
-
- $button->assign_vars(array(
- 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxComments()); return false; }" title="' . $lang->get('onpage_tip_comments') . '" accesskey="c"',
- 'PARENTFLAGS' => 'id="mdgToolbar_discussion"',
- 'HREF' => makeUrl($local_page, 'do=comments', true),
- 'TEXT' => $btn_text,
- ));
-
- $tb .= $button->run();
- }
- // Edit button
- if( $conds['edit'] )
- {
- $button->assign_vars(array(
- 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxEditor()); return false; }" title="' . $lang->get('onpage_tip_edit') . '" accesskey="e"',
- 'PARENTFLAGS' => 'id="mdgToolbar_edit"',
- 'HREF' => makeUrl($local_page, 'do=edit', true),
- 'TEXT' => $lang->get('onpage_btn_edit')
- ));
- $tb .= $button->run();
- // View source button
- }
- else if ( $conds['viewsource'] )
- {
- $button->assign_vars(array(
- 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxEditor()); return false; }" title="' . $lang->get('onpage_tip_viewsource') . '" accesskey="e"',
- 'PARENTFLAGS' => 'id="mdgToolbar_edit"',
- 'HREF' => makeUrl($local_page, 'do=viewsource', true),
- 'TEXT' => $lang->get('onpage_btn_viewsource')
- ));
- $tb .= $button->run();
- }
- // History button
- if ( $conds['history'] )
- {
- $button->assign_vars(array(
- 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxHistory()); return false; }" title="' . $lang->get('onpage_tip_history') . '" accesskey="h"',
- 'PARENTFLAGS' => 'id="mdgToolbar_history"',
- 'HREF' => makeUrl($local_page, 'do=history', true),
- 'TEXT' => $lang->get('onpage_btn_history')
- ));
- $tb .= $button->run();
- }
-
- $menubtn = $this->makeParserText($this->elements['toolbar_menu_button']);
-
- // Additional actions menu
- // Rename button
- if ( $conds['rename'] )
- {
- $menubtn->assign_vars(array(
- 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxRename()); return false; }" title="' . $lang->get('onpage_tip_rename') . '" accesskey="r"',
- 'HREF' => makeUrl($local_page, 'do=rename', true),
- 'TEXT' => $lang->get('onpage_btn_rename'),
- ));
- $this->toolbar_menu .= $menubtn->run();
- }
-
- // Vote-to-delete button
- if ( $conds['delvote'] )
- {
- $menubtn->assign_vars(array(
- 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxDelVote()); return false; }" title="' . $lang->get('onpage_tip_delvote') . '" accesskey="d"',
- 'HREF' => makeUrl($local_page, 'do=delvote', true),
- 'TEXT' => $lang->get('onpage_btn_votedelete'),
- ));
- $this->toolbar_menu .= $menubtn->run();
- }
-
- // Clear-votes button
- if ( $conds['resetvotes'] )
- {
- $menubtn->assign_vars(array(
- 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxResetDelVotes()); return false; }" title="' . $lang->get('onpage_tip_resetvotes') . '" accesskey="y"',
- 'HREF' => makeUrl($local_page, 'do=resetvotes', true),
- 'TEXT' => $lang->get('onpage_btn_votedelete_reset'),
- ));
- $this->toolbar_menu .= $menubtn->run();
- }
-
- // Printable page button
- if ( $conds['printable'] )
- {
- $menubtn->assign_vars(array(
- 'FLAGS' => 'title="' . $lang->get('onpage_tip_printable') . '"',
- 'HREF' => makeUrl($local_page, 'printable=yes', true),
- 'TEXT' => $lang->get('onpage_btn_printable'),
- ));
- $this->toolbar_menu .= $menubtn->run();
- }
-
- // Protect button
- if ( $conds['protect'] )
- {
- switch($this->page->ns->cdata['protected'])
- {
- case PROTECT_FULL: $protect_status = $lang->get('onpage_btn_protect_on'); break;
- case PROTECT_SEMI: $protect_status = $lang->get('onpage_btn_protect_semi'); break;
- case PROTECT_NONE: $protect_status = $lang->get('onpage_btn_protect_off'); break;
- }
-
- $label = $this->makeParserText($this->elements['toolbar_label']);
- $label->assign_vars(array('TEXT' => $lang->get('onpage_lbl_protect') . ' ' . "$protect_status"));
- $t0 = $label->run();
-
- $menubtn->assign_vars(array(
- 'FLAGS' => 'accesskey="p" onclick="ajaxProtect(' . $this->page->ns->cdata['protected'] . '); return false;" id="tb_ajax_protect_btn" title="' . $lang->get('onpage_tip_protect') . '"',
- 'HREF' => makeUrl($local_page, 'do=protect', true),
- 'TEXT' => $lang->get('onpage_btn_protect_change')
- ));
- $t1 = $menubtn->run();
-
- $this->toolbar_menu .= '
-
- '.$t0.'
- '.$t1.'
-
-
';
- }
-
- // Wiki mode button
- if ( $conds['setwikimode'] )
- {
- // label at start
- $label = $this->makeParserText($this->elements['toolbar_label']);
- $label->assign_vars(array('TEXT' => $lang->get('onpage_lbl_wikimode')));
- $t0 = $label->run();
-
- // on button
- $ctmp = '';
- if ( $local_cdata['wiki_mode'] == 1 )
- {
- $ctmp = ' style="text-decoration: underline;"';
- }
- $menubtn->assign_vars(array(
- 'FLAGS' => $ctmp,
- 'HREF' => makeUrl($local_page, 'do=setwikimode&level=1', true),
- 'TEXT' => $lang->get('onpage_btn_wikimode_on')
- ));
- $t1 = $menubtn->run();
-
- // off button
- $ctmp = '';
- if ( $local_cdata['wiki_mode'] == 0 )
- {
- $ctmp=' style="text-decoration: underline;"';
- }
- $menubtn->assign_vars(array(
- 'FLAGS' => $ctmp,
- 'HREF' => makeUrl($local_page, 'do=setwikimode&level=0', true),
- 'TEXT' => $lang->get('onpage_btn_wikimode_off')
- ));
- $t2 = $menubtn->run();
-
- // global button
- $ctmp = '';
- if ( $local_cdata['wiki_mode'] == 2 )
- {
- $ctmp=' style="text-decoration: underline;"';
- }
- $menubtn->assign_vars(array(
- 'FLAGS' => $ctmp,
- 'HREF' => makeUrl($local_page, 'do=setwikimode&level=2', true),
- 'TEXT' => $lang->get('onpage_btn_wikimode_global')
- ));
- $t3 = $menubtn->run();
-
- // Tack it onto the list of buttons that are already there...
- $this->toolbar_menu .= '
-
- '.$t0.'
- '.$t1.'
- '.$t2.'
- '.$t3.'
-
-
';
- }
-
- // Clear logs button
- if ( $conds['clearlogs'] )
- {
- $menubtn->assign_vars(array(
- 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxClearLogs()); return false; }" title="' . $lang->get('onpage_tip_flushlogs') . '" accesskey="l"',
- 'HREF' => makeUrl($local_page, 'do=flushlogs', true),
- 'TEXT' => $lang->get('onpage_btn_clearlogs'),
- ));
- $this->toolbar_menu .= $menubtn->run();
- }
-
- // Delete page button
- if ( $conds['delete'] )
- {
- $s = $lang->get('onpage_btn_deletepage');
- if ( $this->page->ns->cdata['delvotes'] == 1 )
- {
- $subst = array(
- 'num_votes' => $this->page->ns->cdata['delvotes'],
- 'plural' => ''
- );
- $s .= $lang->get('onpage_btn_deletepage_votes', $subst);
- }
- else if ( $this->page->ns->cdata['delvotes'] > 1 )
- {
- $subst = array(
- 'num_votes' => $this->page->ns->cdata['delvotes'],
- 'plural' => $lang->get('meta_plural')
- );
- $s .= $lang->get('onpage_btn_deletepage_votes', $subst);
- }
-
- $menubtn->assign_vars(array(
- 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxDeletePage()); return false; }" title="' . $lang->get('onpage_tip_deletepage') . '" accesskey="k"',
- 'HREF' => makeUrl($local_page, 'do=deletepage', true),
- 'TEXT' => $s,
- ));
- $this->toolbar_menu .= $menubtn->run();
-
- }
-
- // Password-protect button
- if ( $conds['password'] )
- {
- // label at start
- $label = $this->makeParserText($this->elements['toolbar_label']);
- $label->assign_vars(array('TEXT' => $lang->get('onpage_lbl_password')));
- $t0 = $label->run();
-
- $menubtn->assign_vars(array(
- 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxSetPassword()); return false; }" title="' . $lang->get('onpage_tip_password') . '"',
- 'HREF' => '#',
- 'TEXT' => $lang->get('onpage_btn_password_set'),
- ));
- $t = $menubtn->run();
-
- $this->toolbar_menu .= ''.$t0.' '.$t.'
';
- }
-
- // Manage ACLs button
- if ( $conds['acledit'] )
- {
- $menubtn->assign_vars(array(
- 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { var s = ajaxOpenACLManager(); console.debug(s); return false; }" title="' . $lang->get('onpage_tip_aclmanager') . '" accesskey="m"',
- 'HREF' => makeUrl($local_page, 'do=aclmanager', true),
- 'TEXT' => $lang->get('onpage_btn_acl'),
- ));
- $this->toolbar_menu .= $menubtn->run();
- }
-
- // Administer page button
- if ( $conds['adminpage'] )
- {
- $menubtn->assign_vars(array(
- 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxAdminPage()); return false; }" title="' . $lang->get('onpage_tip_adminoptions') . '" accesskey="g"',
- 'HREF' => makeUrlNS('Special', 'Administration', 'module='.$paths->nslist['Admin'].'PageManager', true),
- 'TEXT' => $lang->get('onpage_btn_admin'),
- ));
- $this->toolbar_menu .= $menubtn->run();
- }
-
- if ( strlen($this->toolbar_menu) > 0 )
- {
- $button->assign_vars(array(
- 'FLAGS' => 'id="mdgToolbar_moreoptions" onclick="if ( !KILL_SWITCH ) { return false; }" title="' . $lang->get('onpage_tip_moreoptions') . '"',
- 'PARENTFLAGS' => '',
- 'HREF' => makeUrl($local_page, 'do=moreoptions', true),
- 'TEXT' => $lang->get('onpage_btn_moreoptions')
- ));
- $tb .= $button->run();
- }
-
- // Generate the code for the Log in, Log out, Change theme, Administration, and Edit Sidebar buttons
- // Once again, the new template parsing system can be used here
-
- $parser = $this->makeParserText($this->elements['sidebar_button']);
-
- $parser->assign_vars(Array(
- 'HREF'=>makeUrlNS('Special', "Logout/{$session->csrf_token}/{$local_page}"),
- 'FLAGS'=>'onclick="if ( !KILL_SWITCH ) { mb_logout(); return false; }"',
- 'TEXT'=>$lang->get('sidebar_btn_logout'),
- ));
-
- $logout_link = $parser->run();
-
- $parser->assign_vars(Array(
- 'HREF'=>makeUrlNS('Special', 'Login/' . $local_page),
- 'FLAGS'=>'onclick="if ( !KILL_SWITCH ) { ajaxStartLogin(); return false; }"' . ( $local_page_id == 'Login' && $local_namespace == 'Special' ? ' class="currentpage"' : '' ),
- 'TEXT'=>$lang->get('sidebar_btn_login'),
- ));
-
- $login_link = $parser->run();
-
- $parser->assign_vars(Array(
- 'HREF'=>makeUrlNS('Special', 'ChangeStyle/'.$local_page),
- 'FLAGS'=>'onclick="if ( !KILL_SWITCH ) { ajaxChangeStyle(); return false; }"' . ( $local_page_id == 'ChangeStyle' && $local_namespace == 'Special' ? ' class="currentpage"' : '' ),
- 'TEXT'=>$lang->get('sidebar_btn_changestyle'),
- ));
-
- $theme_link = $parser->run();
-
- // Run hooks
- $code = $plugins->setHook('tpl_compile_toolbar');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
-
- //
- // ASSIGN VARIABLES
- //
-
- $this->assign_vars(array(
- 'PAGE_NAME' => htmlspecialchars($this->page->ns->cdata['name']),
- 'PAGE_URLNAME' => $paths->nslist[$this->namespace] . sanitize_page_id($this->page_id),
- 'TOOLBAR' => $tb,
- 'TOOLBAR_EXTRAS' => $this->toolbar_menu,
- 'STYLE_LINK' => makeUrlNS('Special', 'CSS', null, true), //contentPath.$paths->nslist['Special'].'CSS' . $p,
- 'LOGIN_LINK' => $login_link,
- 'LOGOUT_LINK' => $logout_link,
- 'THEME_LINK' => $theme_link
- ), true);
- $this->page_initted = true;
- }
-
- /**
- * Generates and assigns the Javascript system variables
- */
-
- function generate_js_header()
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- $SID = ($session->sid_super) ? $session->sid_super : '';
-
- $local_page = $paths->get_pathskey($this->page_id, $this->namespace);
- $local_fullpage = $paths->get_pathskey($this->page_id, $this->namespace) . substr($paths->fullpage, strlen($paths->page));
-
- $urlname_clean = str_replace('\'', '\\\'', str_replace('\\', '\\\\', dirtify_page_id($local_fullpage)));
- $urlname_clean = strtr( $urlname_clean, array( '<' => '<', '>' => '>' ) );
-
- $urlname_jssafe = sanitize_page_id($local_fullpage);
- $physical_urlname_jssafe = sanitize_page_id($paths->fullpage);
-
- $protected = is_object($this->page) ? $this->page->ns->cdata['really_protected'] : false;
-
- // Generate the dynamic javascript vars
- // Sorry. I know. This block is a mess.
- $js_dynamic = ' ";
-
- $this->assign_vars(array(
- 'JS_DYNAMIC_VARS' => $js_dynamic,
- 'REPORT_URI' => makeUrl($local_fullpage, 'do=sql_report', true)
- ), true);
- }
-
- /**
- * Fetches, parses, and assigns the sidebar.
- */
-
- function assign_sidebar()
- {
- //
- // COMPILE THE SIDEBAR
- //
-
- // This is done after the big assign_vars() so that sidebar code has access to the newly assigned variables
-
- list($this->tpl_strings['SIDEBAR_LEFT'], $this->tpl_strings['SIDEBAR_RIGHT'], $min) = $this->fetch_sidebar();
- $this->tpl_bool['sidebar_left'] = ( $this->tpl_strings['SIDEBAR_LEFT'] != $min) ? true : false;
- $this->tpl_bool['sidebar_right'] = ( $this->tpl_strings['SIDEBAR_RIGHT'] != $min) ? true : false;
- $this->tpl_bool['right_sidebar'] = $this->tpl_bool['sidebar_right']; // backward compatibility
- }
-
- /**
- * Initializes all variables related to on-page content. This includes sidebars and what have you.
- * @param object Optional PageProcessor object to use for passing metadata and permissions on. If omitted, uses information from $paths and $session.
- * @param bool If true, re-inits even if already initted with this page_id and namespace
- */
-
- function init_vars($page = false, $force_init = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- $need_shared_init = ( !$this->theme_initted || !$this->page_initted );
-
- if ( $need_shared_init )
- {
- if ( !$this->theme || !$this->style )
- {
- $this->load_theme();
- }
- $code = $plugins->setHook('compile_template', true);
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
- }
-
- if ( !$this->theme_loaded )
- $this->load_theme();
-
- require(ENANO_ROOT . "/themes/{$this->theme}/theme.cfg");
-
- if ( !$this->page_id || !$this->namespace )
- {
- $this->page_id = $paths->page_id;
- $this->namespace = $paths->namespace;
- }
-
- profiler_log('template: prepped for var set (loaded theme, ran compile_template hook)');
-
- $this->init_global_vars();
- profiler_log('template: global vars set');
-
- if ( !$this->theme_initted )
- $this->init_theme_vars();
-
- profiler_log('template: theme vars set');
-
- if ( !$this->page_initted && !empty($this->namespace) )
- {
- profiler_log('template: page vars set');
- $this->init_page_vars();
- }
- else
- {
- profiler_message('template: skipped setting page vars');
- }
-
- // Perform shared init (combine javascript, etc.)
- if ( $need_shared_init )
- {
- $this->generate_js_header();
- $this->assign_sidebar();
- profiler_log('template: assigned sidebar and JS');
- }
-
- // and finally one string value that needs to be symlinked...
- if ( !isset($this->tpl_strings['ADDITIONAL_HEADERS']) )
- {
- $this->tpl_strings['ADDITIONAL_HEADERS'] =& $this->additional_headers;
- }
-
- // done!
- $code = $plugins->setHook('template_var_init_end');
- foreach ( $code as $cmd )
- {
- eval($cmd);
- }
- }
-
- function header($simple = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- define('ENANO_HEADERS_SENT', true);
-
- echo $this->getHeader($simple);
- }
-
- function footer($simple = false)
- {
- echo $this->getFooter($simple);
- }
-
- function getHeader($simple = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- if ( !$this->theme_loaded )
- {
- $this->load_theme($session->theme, $session->style);
- }
-
- if ( !$this->page_initted || !$this->theme_initted )
- $this->init_vars();
-
- // I feel awful doing this.
- if ( preg_match('/^W3C_Validator/', @$_SERVER['HTTP_USER_AGENT']) )
- {
- header('Content-type: application/xhtml+xml');
- }
-
- $header = '';
-
- if ( !$this->no_headers )
- {
- $header = ( $simple ) ?
- $this->process_template('simple-header.tpl') :
- $this->process_template('header.tpl');
- }
- if ( !$simple && $session->user_logged_in && $session->unread_pms > 0 )
- {
- $header .= $this->notify_unread_pms();
- }
- if ( !$simple && $session->sw_timed_out )
- {
- $login_link = makeUrlNS('Special', 'Login/' . $paths->fullpage, 'level=' . $session->user_level, true);
- $header .= '';
- }
- if ( $this->site_disabled && $session->user_level >= USER_LEVEL_ADMIN && ( $paths->page != $paths->nslist['Special'] . 'Administration' ) )
- {
- $admin_link = makeUrlNS('Special', 'Administration', 'module=' . $paths->nslist['Admin'] . 'GeneralConfig', true);
- $header .= '';
- }
-
- return $header;
- }
-
- function getFooter($simple = false)
- {
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
- if ( !$this->no_headers )
- {
-
- global $_starttime;
- if(isset($_GET['sqldbg']) && $session->get_permissions('mod_misc'))
- {
- echo '' . $lang->get('page_heading_sql_list') . '
';
- echo htmlspecialchars($db->sql_backtrace());
- echo '
';
- }
-
- $t = ( $simple ) ? $this->process_template('simple-footer.tpl') : $this->process_template('footer.tpl');
-
- $f = microtime_float();
- $f = $f - $_starttime;
- $f = round($f, 2);
-
- $t_loc = $lang->get('page_msg_stats_gentime_short', array('time' => $f));
- $t_loc_long = $lang->get('page_msg_stats_gentime_long', array('time' => $f));
- $q_loc = '' . $lang->get('page_msg_stats_sql', array('nq' => $db->num_queries)) . '';
- $dbg = $t_loc;
- $dbg_long = $t_loc_long;
- if ( $session->user_level >= USER_LEVEL_ADMIN || defined('ENANO_DEBUG') )
- {
- $dbg .= " | $q_loc";
- $dbg_long .= " | $q_loc";
- }
-
- $t = str_replace('[[Stats]]', $dbg, $t);
- $t = str_replace('[[StatsLong]]', $dbg_long, $t);
- $t = str_replace('[[NumQueries]]', (string)$db->num_queries, $t);
- $t = str_replace('[[GenTime]]', (string)$f, $t);
- $t = str_replace('[[NumQueriesLoc]]', $q_loc, $t);
- $t = str_replace('[[GenTimeLoc]]', $t_loc, $t);
- $t = str_replace('[[EnanoPoweredLink]]', $lang->get('page_enano_powered', array('about_uri' => $this->tpl_strings['URL_ABOUT_ENANO'])), $t);
- $t = str_replace('[[EnanoPoweredLinkLong]]', $lang->get('page_enano_powered_long', array('about_uri' => $this->tpl_strings['URL_ABOUT_ENANO'])), $t);
-
- if ( defined('ENANO_PROFILE') )
- {
- $t = str_replace('