phpslash-commit Mailing List for phpSlash (Page 60)
Brought to you by:
joestewart,
nhruby
This list is closed, nobody may subscribe to it.
2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
(59) |
Dec
(60) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2002 |
Jan
(52) |
Feb
(77) |
Mar
(118) |
Apr
(76) |
May
(106) |
Jun
(145) |
Jul
(9) |
Aug
(15) |
Sep
(78) |
Oct
(83) |
Nov
(105) |
Dec
(51) |
2003 |
Jan
(105) |
Feb
(100) |
Mar
(111) |
Apr
(149) |
May
(95) |
Jun
(56) |
Jul
(8) |
Aug
(2) |
Sep
|
Oct
(22) |
Nov
(117) |
Dec
(6) |
2004 |
Jan
(1) |
Feb
|
Mar
(3) |
Apr
(25) |
May
|
Jun
(11) |
Jul
(26) |
Aug
(85) |
Sep
(119) |
Oct
(312) |
Nov
(271) |
Dec
(5) |
2005 |
Jan
(6) |
Feb
|
Mar
|
Apr
(12) |
May
(7) |
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Joe S. <joe...@us...> - 2003-02-25 15:04:23
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv13468/phpslash-ft/class Modified Files: Author.class Log Message: change profile and lost password fixes Index: Author.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Author.class,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** Author.class 12 Feb 2003 22:33:44 -0000 1.40 --- Author.class 25 Feb 2003 15:04:13 -0000 1.41 *************** *** 844,848 **** function lostpw($ary = "") { ! global $REMOTE_ADDR; $this->author_templ->set_file(array( --- 844,848 ---- function lostpw($ary = "") { ! global $challenge; $this->author_templ->set_file(array( *************** *** 872,885 **** if ($this->db->next_record()) { $cookie_challenge = md5($this->auth->magic .":". $this->psl['basedir']); ! $md5_pw = $this->db->Record['password']; // this is the raw MD5ed user/pass combo ! $cookie_response = md5("$md5_pw:$cookie_challenge"); ! // replace the challenge with the date ! $cookie_challenge = date("Ymd"); ! $cookie_ary[] = $cookie_response; ! $cookie_ary[] = $this->db->Record['author_name']; ! $cookie_ary[] = $cookie_challenge; $confirm_hash=serialize($cookie_ary); $confirm_hash=base64_encode($confirm_hash); $confirm_hash=urlencode($confirm_hash); if(!is_valid_email($this->db->Record['email'])) { --- 872,904 ---- if ($this->db->next_record()) { + // This is a site unique challenge word $cookie_challenge = md5($this->auth->magic .":". $this->psl['basedir']); ! ! // this is the raw MD5ed user/pass combo ! $md5_pw = $this->db->Record['password']; ! ! // create the correct reponse ! $cookie_response = md5("$md5_pw:$cookie_challenge"); ! ! // create a unique challenge ! $cookie_challenge2 = md5(uniqid($this->psl['magic'])); ! ! // setup and save the confirmation check to the user's record ! $cookie_ary['response'] = $cookie_response; ! $cookie_ary['name'] = $this->db->Record['author_name']; ! $cookie_ary['challenge'] = $cookie_challenge2; $confirm_hash=serialize($cookie_ary); $confirm_hash=base64_encode($confirm_hash); + if(!$this->setConfirm($this->db->Record['author_name'],$confirm_hash)) { + $this->message .= "Username not found"; + return false; + } + + // setup and email the confirmation string + $cookie_ary = ''; + $cookie_ary['challenge'] = $cookie_challenge2; + $cookie_ary['name'] = $this->db->Record['author_name']; + $confirm_hash=serialize($cookie_ary); + $confirm_hash=base64_encode($confirm_hash); $confirm_hash=urlencode($confirm_hash); if(!is_valid_email($this->db->Record['email'])) { *************** *** 891,896 **** $mail_ary['mail_to_address'] = $this->db->Record['email']; $mail_ary['vars']['confirm'] = $confirm_hash; ! $mail_ary['vars']['remote_addr'] = $REMOTE_ADDR; ! if(emailNotify($mail_ary)) { $this->message .= "Email Confirmation sent"; --- 910,914 ---- $mail_ary['mail_to_address'] = $this->db->Record['email']; $mail_ary['vars']['confirm'] = $confirm_hash; ! $mail_ary['vars']['remote_addr'] = $_SERVER['REMOTE_ADDR']; if(emailNotify($mail_ary)) { $this->message .= "Email Confirmation sent"; *************** *** 906,909 **** --- 924,1031 ---- + /** + * setConfirm - set confirm string assigned to name + * + * when given a name, setConfirm sets the confirmation string + * + * @param string name + * @access public + * return true or false + */ + + function setConfirm($name, $confirm) { + // debug("setConfirm::name", $name); + // debug("setConfirm::confirm", $confirm); + if (!$name) { + // debug("setConfirm", "no name"); + $success = false; + } else { + $q = "UPDATE psl_author + SET perms = '$confirm' + WHERE author_name = '$name' "; + $this->db->query($q); + $success = true; + } + return $success; + } + + /** + * getConfirm - get confirm string assigned to name + * + * when given a name, getConfirm gets the confirmation string + * + * @param string name + * @access public + * return string + */ + + function getConfirm($name) { + // debug("getConfirm::name", $name); + if (!$name) { + // debug("getConfirm", "no name"); + $success = false; + } else { + $q = "SELECT perms + FROM psl_author + WHERE author_name = '$name' "; + $this->db->query($q); + $this->db->next_record(); + $success = $this->db->f("perms"); + } + return $success; + } + + + /** + * confirmAuthor - attempts to confirm a lost password confirmation string + * + * when given a confirm string, returns false if not confirmed + * and true upon success. + * + * If successful, HTTP_COOKIE_VARS are set with the correct variables for + * logging in automatically. + * + * @param string confirm + * @access public + * return boolean + */ + + function confirmAuthor($confirm) { + global $HTTP_COOKIE_VARS; + + if ( $confirm) { + // explode the confirmation string into an array + $confirm_hash = base64_decode($confirm); + $confirm_hash = unserialize($confirm_hash); + + // explode the saved array + $saved_confirm = $this->getConfirm($confirm_hash['name']); + $saved_confirm = base64_decode($saved_confirm); + $saved_confirm = unserialize($saved_confirm); + + // if the unique challenge word matches, continue. + if($confirm_hash['challenge'] == $saved_confirm['challenge']) { + + // reset the confirmation string - one time use only. + $this->setConfirm($saved_confirm['name'], ''); + + // setup the cookie variables + $confirm_hash = ''; + $confirm_hash[0] = $saved_confirm['response']; + $confirm_hash[1] = $saved_confirm['name']; + $confirm_hash[2] = md5($auth->magic .":". $this->psl['basedir']); + $HTTP_COOKIE_VARS['user_info'] = base64_encode(serialize($confirm_hash)); + // login should be successful + return true; + } else { + // confirmation challenge word did not match + return false; + } + } else { + // missing confirmation string + return false; + } + } + } /* end of Author.class */ ?> |
From: Matthew L. <sym...@us...> - 2003-02-25 13:00:44
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv20017/class Modified Files: MailingList.class Log Message: Fixed an SQL error in MailingList::build_body() caused by use of the obsolete 'date' column. Index: MailingList.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/MailingList.class,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** MailingList.class 23 Jan 2003 13:38:44 -0000 1.16 --- MailingList.class 25 Feb 2003 13:00:38 -0000 1.17 *************** *** 331,340 **** story.body_text, psl_author.author_name AS name ! FROM psl_story story, psl_author WHERE psl_author.author_id = story.user_id AND story.date_available >= $begtimestamp AND story.date_available <= $endtimestamp ! ORDER BY time"; $this->db->query($q); --- 331,340 ---- story.body_text, psl_author.author_name AS name ! FROM psl_story AS story, psl_author WHERE psl_author.author_id = story.user_id AND story.date_available >= $begtimestamp AND story.date_available <= $endtimestamp ! ORDER BY date_available"; $this->db->query($q); |
From: Joe S. <joe...@us...> - 2003-02-24 17:03:23
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv15967/phpslash-ft/public_html Modified Files: login.php3 Log Message: discard prefs when logging out Index: login.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** login.php3 21 Feb 2003 19:33:08 -0000 1.37 --- login.php3 24 Feb 2003 17:03:17 -0000 1.38 *************** *** 34,37 **** --- 34,39 ---- $username = $auth->auth['uname']; // $sess->delete(); // may be needed for phplib session4.inc + // discard prefs when logging out. + $auth->auth['preferences'] = ''; $auth->auth["error"] = sprintf(pslgetText("%s logged out."), $username); $auth->auth['uid'] = 'nobody'; |
From: Joe S. <joe...@us...> - 2003-02-24 17:03:21
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv15967/phpslash-ft Modified Files: CHANGES Log Message: discard prefs when logging out Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.704 retrieving revision 1.705 diff -C2 -d -r1.704 -r1.705 *** CHANGES 21 Feb 2003 22:22:57 -0000 1.704 --- CHANGES 24 Feb 2003 17:03:14 -0000 1.705 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2003-February-24 11:00AM CST Joe Stewart <joe...@us...> + [B] - login.php3 -discard prefs when logging out. + 2003-February-21 3:30PM CST Joe Stewart <joe...@us...> [B] - functions.inc - emailNotify should find the templates correctly. |
From: Joe S. <joe...@us...> - 2003-02-21 22:23:00
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv13441/phpslash-ft Modified Files: CHANGES Log Message: emailNotify template fix Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.703 retrieving revision 1.704 diff -C2 -d -r1.703 -r1.704 *** CHANGES 21 Feb 2003 22:22:00 -0000 1.703 --- CHANGES 21 Feb 2003 22:22:57 -0000 1.704 *************** *** 13,23 **** 9 - Removal of something (kill -9 :) - 2003-February-21 4:00PM CST Joe Stewart <joe...@us...> - [W] - profile.php3, Author.class - Lost password confirmation is now using a - session based challenge word. - 2003-February-21 3:30PM CST Joe Stewart <joe...@us...> [B] - functions.inc - emailNotify should find the templates correctly. - slashAuthCR.class - reject login without a challenge word. 2003-February-21 1:30PM CST Joe Stewart <joe...@us...> --- 13,18 ---- |
From: Joe S. <joe...@us...> - 2003-02-21 22:22:06
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv13038/phpslash-ft/class Modified Files: slashAuthCR.class Log Message: emailNotify template fix Index: slashAuthCR.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** slashAuthCR.class 21 Feb 2003 21:47:04 -0000 1.41 --- slashAuthCR.class 21 Feb 2003 22:22:00 -0000 1.42 *************** *** 245,252 **** $lostpw = $HTTP_POST_VARS['lostpw']; } ! if(empty($HTTP_POST_VARS['challenge'])) { return false; } if($challenge != $HTTP_POST_VARS['challenge']) { --- 245,254 ---- $lostpw = $HTTP_POST_VARS['lostpw']; } ! ! /* if(empty($HTTP_POST_VARS['challenge'])) { return false; } + */ if($challenge != $HTTP_POST_VARS['challenge']) { |
From: Joe S. <joe...@us...> - 2003-02-21 22:22:03
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv13038/phpslash-ft Modified Files: CHANGES Log Message: emailNotify template fix Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.702 retrieving revision 1.703 diff -C2 -d -r1.702 -r1.703 *** CHANGES 21 Feb 2003 21:47:03 -0000 1.702 --- CHANGES 21 Feb 2003 22:22:00 -0000 1.703 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2003-February-21 4:00PM CST Joe Stewart <joe...@us...> + [W] - profile.php3, Author.class - Lost password confirmation is now using a + session based challenge word. + 2003-February-21 3:30PM CST Joe Stewart <joe...@us...> [B] - functions.inc - emailNotify should find the templates correctly. |
From: Joe S. <joe...@us...> - 2003-02-21 21:47:11
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv30993/phpslash-ft Modified Files: CHANGES Log Message: emailNotify template fix Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.701 retrieving revision 1.702 diff -C2 -d -r1.701 -r1.702 *** CHANGES 21 Feb 2003 19:33:01 -0000 1.701 --- CHANGES 21 Feb 2003 21:47:03 -0000 1.702 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2003-February-21 3:30PM CST Joe Stewart <joe...@us...> + [B] - functions.inc - emailNotify should find the templates correctly. + slashAuthCR.class - reject login without a challenge word. + 2003-February-21 1:30PM CST Joe Stewart <joe...@us...> [B] - login.php3 - restored logging back in immediately after logging out. |
From: Joe S. <joe...@us...> - 2003-02-21 21:47:09
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv30993/phpslash-ft/class Modified Files: functions.inc slashAuthCR.class Log Message: emailNotify template fix Index: functions.inc =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v retrieving revision 1.133 retrieving revision 1.134 diff -C2 -d -r1.133 -r1.134 *** functions.inc 20 Feb 2003 21:55:38 -0000 1.133 --- functions.inc 21 Feb 2003 21:47:04 -0000 1.134 *************** *** 1464,1479 **** } ! if( file_exists($_PSL['templatedir'] . "/" . basename($ary['tpl']) . ".tpl") ) { ! $tpl = basename($ary['tpl']) . ".tpl"; ! } else { ! debug ( "emailNotify: Template file doesn't exist", $_PSL['templatedir'] . "/" . basename($ary['tpl']) . ".tpl"); return false; } - $template = pslNew("slashTemplate",$_PSL['templatedir'], "remove");; - $template->set_file("emailnotify",$tpl); - $template->set_var(array( ! 'REMOTE_ADDR' => $REMOTE_ADDR, 'ROOTURL' => $_PSL['rooturl'], 'MAILTONAME' => $ary['mail_to'], --- 1464,1474 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir'], "remove");; ! if ( !$template->set_file('emailnotify' , basename($ary['tpl']) . ".tpl" )) { return false; } $template->set_var(array( ! 'REMOTE_ADDR' => $_SERVER['REMOTE_ADDR'], 'ROOTURL' => $_PSL['rooturl'], 'MAILTONAME' => $ary['mail_to'], Index: slashAuthCR.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** slashAuthCR.class 21 Feb 2003 19:33:09 -0000 1.40 --- slashAuthCR.class 21 Feb 2003 21:47:04 -0000 1.41 *************** *** 246,249 **** --- 246,253 ---- } + if(empty($HTTP_POST_VARS['challenge'])) { + return false; + } + if($challenge != $HTTP_POST_VARS['challenge']) { return false; |
From: Joe S. <joe...@us...> - 2003-02-21 19:33:48
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv5770/phpslash-ft/public_html Modified Files: login.php3 Log Message: log back in immediately after logging out Index: login.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** login.php3 18 Feb 2003 15:33:11 -0000 1.36 --- login.php3 21 Feb 2003 19:33:08 -0000 1.37 *************** *** 18,22 **** } ! if (isset($HTTP_GET_VARS['logout'])) { if(isset($HTTP_COOKIE_VARS['user_info'])) { $user_info = unserialize(base64_decode($HTTP_COOKIE_VARS['user_info'])); --- 18,23 ---- } ! if ((!empty($HTTP_GET_VARS['logout'])) && ($perm->have_perm('user'))) { ! // if (isset($HTTP_GET_VARS['logout'])) { if(isset($HTTP_COOKIE_VARS['user_info'])) { $user_info = unserialize(base64_decode($HTTP_COOKIE_VARS['user_info'])); *************** *** 32,39 **** $username = $auth->auth['uname']; ! $sess->delete(); // may be needed for phplib session4.inc $auth->auth["error"] = sprintf(pslgetText("%s logged out."), $username); $auth->auth['uid'] = 'nobody'; $auth->auth['perm'] = ""; } /* --- 33,42 ---- $username = $auth->auth['uname']; ! // $sess->delete(); // may be needed for phplib session4.inc $auth->auth["error"] = sprintf(pslgetText("%s logged out."), $username); $auth->auth['uid'] = 'nobody'; $auth->auth['perm'] = ""; + + $HTTP_GET_VARS['logout'] = ''; } /* |
From: Joe S. <joe...@us...> - 2003-02-21 19:33:19
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv5770/phpslash-ft/class Modified Files: slashAuthCR.class Log Message: log back in immediately after logging out Index: slashAuthCR.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** slashAuthCR.class 19 Feb 2003 16:27:54 -0000 1.39 --- slashAuthCR.class 21 Feb 2003 19:33:09 -0000 1.40 *************** *** 351,354 **** --- 351,356 ---- $HTTP_POST_VARS = $saved_post; + $saved_get = ''; + $saved_post = ''; $challenge = ''; |
From: Joe S. <joe...@us...> - 2003-02-21 19:33:14
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv5770/phpslash-ft Modified Files: CHANGES Log Message: log back in immediately after logging out Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.700 retrieving revision 1.701 diff -C2 -d -r1.700 -r1.701 *** CHANGES 20 Feb 2003 21:55:25 -0000 1.700 --- CHANGES 21 Feb 2003 19:33:01 -0000 1.701 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2003-February-21 1:30PM CST Joe Stewart <joe...@us...> + [B] - login.php3 - restored logging back in immediately after logging out. + slashAuthCR.class - reset saved_get and saved_post after logging in. + 2003-February-20 3:30PM CST Joe Stewart <joe...@us...> [B] - functions.inc - setLang sets the current language in _PSL['lang']; |
From: Matthew L. <sym...@us...> - 2003-02-21 15:58:06
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv15204 Modified Files: config-dist.php3 Log Message: Fixed the accidental commenting-out of large blocks of the config script. Index: config-dist.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.php3,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** config-dist.php3 20 Feb 2003 21:14:13 -0000 1.36 --- config-dist.php3 21 Feb 2003 15:58:01 -0000 1.37 *************** *** 1,3 **** --- 1,4 ---- <?php + /* * config.php3 - Configuration File for PHPSlash *************** *** 7,10 **** --- 8,17 ---- */ + // Specify full path to ini file + $psl_inifile = "config.ini.php3"; + + // end of required configuration. config.ini.php3 contains the phpSlash + // configuration variables. + // This is a comment, it spans one line *************** *** 14,39 **** like this, but you need to be sure to close it like so: */ - /** - * Programs which parse code for documentation blocks (e.g., phpDoc) - * look for comments that begin with a slash and two asterisks, and - * have subsequent lines beginning with an asterisk, like this. - **/ - - /** - * All configuration/settings/preference information should go in the - * $_PSL array. - **/ - if (!is_array($_PSL)) { - $_PSL = array(); - } - - // Specify full path to ini file - if (empty($_PSL['config.ini_file'])) { - $_PSL['config.ini_file'] = "config.ini.php3"; - } - - // end of required configuration. config.ini.php3 contains the phpSlash - // configuration variables. - /* After phpSlash is configured, the jpcache-config.php file and the varkey below can be configured to further optimize the cache system. --- 21,24 ---- *************** *** 41,102 **** */ ! // require_once "/home/leingang/src/phpslash-ft/class/jpcache/jpcache.php"; ! // if(array_key_exists('JPCACHE_TYPE', $GLOBALS)) { ! // $varkey = ''; ! // if (!empty($HTTP_COOKIE_VARS['slashSess'])) { ! // $scriptkey = "-slashSess-". $HTTP_COOKIE_VARS['slashSess']; ! // } elseif (!empty($HTTP_COOKIE_VARS['user_info']) ) { ! // $varkey = md5("POST=" . serialize($HTTP_POST_VARS) . " GET=" . serialize($HTTP_GET_VARS) . " COOKIE=" . serialize($HTTP_COOKIE_VARS)); ! // } else { ! ! // // $scriptkey = "-uid-nobody"; ! // $scriptkey = ''; ! // if(!empty($HTTP_COOKIE_VARS['skin'])) { ! // $scriptkey .= "-skin-". $HTTP_COOKIE_VARS['skin']; ! // } ! // } ! // $lang_ary = split( "[,;]", $HTTP_ACCEPT_LANGUAGE); ! // if(!empty($lang_ary[0])) { ! // $scriptkey .= "-lang-". $lang_ary[0]; ! // // } else { ! // // $scriptkey .= "-lang-blank"; ! // } ! // if( !empty($HTTP_COOKIE_VARS['TZ'])) { ! // $scriptkey .= "-TZ-". $HTTP_COOKIE_VARS['TZ']; ! // // } else { ! // // $scriptkey .= "-TZ-America-Chicago"; ! // } ! // foreach( $HTTP_GET_VARS as $key => $value) { ! // $scriptkey .= "-". $key ."-". $value; ! // } ! // if ((empty($HTTP_GET_VARS['section'])) AND ! // (empty($HTTP_GET_VARS['section_id']))){ ! // $scriptkey .= "-section_id-3"; ! // } ! // $scriptkey = preg_replace("'/|:|\\|\*|<|>|\|'","-", $HTTP_SERVER_VARS['PHP_SELF'].$scriptkey); ! // if($GLOBALS['JPCACHE_IGNORE_DOMAIN'] == 0) { ! // $scriptkey = str_replace(".","-", $HTTP_SERVER_VARS['HTTP_HOST'] .$scriptkey); ! // } ! // jpcache_start('',$scriptkey, $varkey); ! // } // parse the ini configuration file into the $_PSL array // Specify full path to ini file ! $_PSL = parse_ini_file($_PSL['config.ini_file'], TRUE); ! $_PSL['version'] = '0.7RC3'; ! /**** START DEBUGGING - Comment or delete this for production! ****/ //ini_set('error_reporting', 'E_ALL'); //ini_set('error_reporting', 'E_ALL~E_NOTICE'); /**** END DEBUGGING ****/ ! ////////////////////////////////////////////////////////////////////////// // SECTION 1 - REQUIRED FILES -------------------------------------------- ////////////////////////////////////////////////////////////////////////// ! // 1.1 Uncomment this only if you can't use a local php.ini or .htaccess ! if( !empty($_PSL['phplibdir'])) { $_PHPLIB['libdir'] = $_PSL['phplibdir']; --- 26,90 ---- */ ! // require "/path/to/jpcache.php"; ! ! if(array_key_exists('JPCACHE_TYPE', $GLOBALS)) { ! $varkey = ''; ! if (!empty($HTTP_COOKIE_VARS['slashSess'])) { ! $scriptkey = "-slashSess-". $HTTP_COOKIE_VARS['slashSess']; ! } elseif (!empty($HTTP_COOKIE_VARS['user_info']) ) { ! $varkey = md5("POST=" . serialize($HTTP_POST_VARS) . " GET=" . serialize($HTTP_GET_VARS) . " COOKIE=" . serialize($HTTP_COOKIE_VARS)); ! } else { ! ! // $scriptkey = "-uid-nobody"; ! $scriptkey = ''; ! if(!empty($HTTP_COOKIE_VARS['skin'])) { ! $scriptkey .= "-skin-". $HTTP_COOKIE_VARS['skin']; ! } ! } ! $lang_ary = split( "[,;]", $HTTP_ACCEPT_LANGUAGE); ! if(!empty($lang_ary[0])) { ! $scriptkey .= "-lang-". $lang_ary[0]; ! // } else { ! // $scriptkey .= "-lang-blank"; ! } ! if( !empty($HTTP_COOKIE_VARS['TZ'])) { ! $scriptkey .= "-TZ-". $HTTP_COOKIE_VARS['TZ']; ! // } else { ! // $scriptkey .= "-TZ-America-Chicago"; ! } ! foreach( $HTTP_GET_VARS as $key => $value) { ! $scriptkey .= "-". $key ."-". $value; ! } ! if ((empty($HTTP_GET_VARS['section'])) AND ! (empty($HTTP_GET_VARS['section_id']))){ ! $scriptkey .= "-section_id-3"; ! } ! $scriptkey = preg_replace("'/|:|\\|\*|<|>|\|'","-", $HTTP_SERVER_VARS['PHP_SELF'].$scriptkey); ! if($GLOBALS['JPCACHE_IGNORE_DOMAIN'] == 0) { ! $scriptkey = str_replace(".","-", $HTTP_SERVER_VARS['HTTP_HOST'] .$scriptkey); ! } ! jpcache_start('',$scriptkey, $varkey); ! } ! ! $_PSL = array(); // parse the ini configuration file into the $_PSL array // Specify full path to ini file ! $_PSL = parse_ini_file($psl_inifile, TRUE); ! $_PSL['version'] = '0.7RC3'; ! /**** START DEBUGGING - Comment or delete this for production! ****/ //ini_set('error_reporting', 'E_ALL'); //ini_set('error_reporting', 'E_ALL~E_NOTICE'); /**** END DEBUGGING ****/ ! ////////////////////////////////////////////////////////////////////////// // SECTION 1 - REQUIRED FILES -------------------------------------------- ////////////////////////////////////////////////////////////////////////// ! // 1.1 Uncomment this only if you can't use a local php.ini or .htaccess ! if( !empty($_PSL['phplibdir'])) { $_PHPLIB['libdir'] = $_PSL['phplibdir']; *************** *** 151,155 **** require_once($_PSL['classdir'] . '/functions.inc'); require_once($_PSL['classdir'] . '/lib.resources.php'); ! /* now that the functions are in, we can define the arg_separator */ --- 139,143 ---- require_once($_PSL['classdir'] . '/functions.inc'); require_once($_PSL['classdir'] . '/lib.resources.php'); ! /* now that the functions are in, we can define the arg_separator */ *************** *** 161,165 **** // comment to enable setting lang in url $lang = false; ! $_PSL['languagefile'] = $_PSL['localedir'] . "/" . $_PSL['language'] . ".php3"; --- 149,153 ---- // comment to enable setting lang in url $lang = false; ! $_PSL['languagefile'] = $_PSL['localedir'] . "/" . $_PSL['language'] . ".php3"; *************** *** 173,184 **** if (!empty($HTTP_GET_VARS['skin'])) { if (empty($HTTP_GET_VARS['nocookie'])) { ! $_PSL['templatedir'] = setSkinTpl($HTTP_GET_VARS['skin'], "cookie"); } else { ! $_PSL['templatedir'] = setSkinTpl($HTTP_GET_VARS['skin'], ""); } } else { $_PSL['templatedir'] = setSkinTpl("", ""); } ! /** --- 161,172 ---- if (!empty($HTTP_GET_VARS['skin'])) { if (empty($HTTP_GET_VARS['nocookie'])) { ! $_PSL['templatedir'] = setSkinTpl($HTTP_GET_VARS['skin'], "cookie"); } else { ! $_PSL['templatedir'] = setSkinTpl($HTTP_GET_VARS['skin'], ""); } } else { $_PSL['templatedir'] = setSkinTpl("", ""); } ! /** *************** *** 214,223 **** /** ! * These classes are PHPSlash's extensions to the PHPLIB base classes. ! * We only configure the ones which are required to get the page open ! * and restore session data. ! * ! * Note: author IS needed now because slashAuth uses it to fill in perms ! **/ addClassRequirement("slash_sql","ct_sql"); addClassRequirement("slash_sql",$_PSL['classdir'] . "/slash_sql.class"); --- 202,211 ---- /** ! * These classes are PHPSlash's extensions to the PHPLIB base classes. ! * We only configure the ones which are required to get the page open ! * and restore session data. ! * ! * Note: author IS needed now because slashAuth uses it to fill in perms ! **/ addClassRequirement("slash_sql","ct_sql"); addClassRequirement("slash_sql",$_PSL['classdir'] . "/slash_sql.class"); *************** *** 257,367 **** */ ! ! // // begin built-in jpcache ! // if(empty($GLOBALS['JPCACHE_TYPE'])) { ! // ! // // jpcachedir -> the full directory path to the jpcache scripts. ! // if(empty($_PSL['jpcachedir'])) { ! // $_PSL['jpcachedir'] = $_PSL['classdir'] . "/jpcache"; ! // } ! // ! // // $JPCACHE_TYPE = "file"; ! // // $JPCACHE_TYPE = "mysql"; ! // // $JPCACHE_TYPE = "dbm"; ! // $JPCACHE_TYPE = "phplib"; ! // ! // /** ! // * General jpcache configuration options. ! // */ ! // $JPCACHE_TIME = 900; // Default number of seconds to cache a page ! // $JPCACHE_DEBUG = 0; // Turn debugging on/off ! // $JPCACHE_IGNORE_DOMAIN= 1; // Ignore domain name in request(single site) ! // $JPCACHE_ON = 1; // Turn caching on/off ! // $JPCACHE_USE_GZIP = 0; // Whether or not to use GZIP ! // $JPCACHE_POST = 1; // Should POST's be cached ! // $JPCACHE_GC = 1; // Probability % of garbage collection ! // $JPCACHE_GZIP_LEVEL = 9; // GZIPcompressionlevel to use (1=low,9=high) ! // $JPCACHE_DELAY_START = 1; // Immediate or manual call to jpcache_start() ! // $JPCACHE_HASHSCRIPTKEY = 0; // Hash SCRIPT-KEY or not ! // ! // /** ! // * File based caching setting. ! // */ ! // $JPCACHE_DIR = "/tmp/jpcache"; // Directory where jpcache must store ! // // generated files. Please use a dedicated ! // // directory, and make it writable ! // $JPCACHE_FILEPREFIX = "jpc-";// Prefix used in the filename. This enables ! // // us to (more accuratly) recognize jpcache- ! // // files. ! // ! // /** ! // * DB based caching settings. ! // */ ! // $JPCACHE_DB_HOST = $_PSL['DB_Host']; // Database Server ! // $JPCACHE_DB_DATABASE = $_PSL['DB_Database']; // Database-name to use ! // $JPCACHE_DB_USERNAME = $_PSL['DB_User']; // Username ! // $JPCACHE_DB_PASSWORD = $_PSL['DB_Password']; // Password ! // $JPCACHE_DB_TABLE = "CACHEDATA"; // Table that holds the data ! // $JPCACHE_OPTIMIZE = 0; // If 'OPTIMIZE TABLE' after garbage ! // // collection is executed. Please check ! // // first if this works on your mySQL! ! // ! // // Standard jpcache functions ! // // require $_PSL['jpcachedir']. "/jpcache-main.php"; ! // addLibraryRequirement("jpcache",$_PSL['jpcachedir'] . "/jpcache-main.php"); ! // // Type specific jpcache implementations ! // if ('phplib' == $JPCACHE_TYPE) { ! // addClassRequirement("jpcacheDB","db_sql"); ! // addClassRequirement("jpcacheDB",$_PSL['jpcachedir'] ."/type/phplib.php"); ! // } ! // addLibraryRequirement("jpcache",$_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php"); ! // loadLibrary("jpcache"); ! // // require $_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php"; ! // ! // // end of jpcache configuration ! // ! // // cache invocation ! // $varkey = ''; ! // if (!empty($HTTP_COOKIE_VARS['slashSess'])) { ! // $scriptkey = "-slashSess-". $HTTP_COOKIE_VARS['slashSess']; ! // } elseif (!empty($HTTP_COOKIE_VARS['user_info']) ) { ! // $varkey = md5("POST=" . serialize($HTTP_POST_VARS) . " GET=" . serialize($HTTP_GET_VARS) . " COOKIE=" . serialize($HTTP_COOKIE_VARS)); ! // } else { ! // ! // // $scriptkey = "-uid-nobody"; ! // $scriptkey = ''; ! // if(!empty($HTTP_COOKIE_VARS['skin'])) { ! // $scriptkey .= "-skin-". $_PSL['skin']; ! // } ! // } ! // $lang_ary = split( "[,;]", $HTTP_ACCEPT_LANGUAGE); ! // if(!empty($lang_ary[0])) { ! // $scriptkey .= "-lang-". $lang_ary[0]; ! // // } else { ! // // $scriptkey .= "-lang-blank"; ! // } ! // if( !empty($HTTP_COOKIE_VARS['TZ'])) { ! // $scriptkey .= "-TZ-". $HTTP_COOKIE_VARS['TZ']; ! // } else { ! // $scriptkey .= "-TZ-". $_PSL['timezone']['name']; ! // } ! // foreach( $HTTP_GET_VARS as $key => $value) { ! // $scriptkey .= "-". $key ."-". $value; ! // } ! // if ((empty($HTTP_GET_VARS['section'])) AND ! // (empty($HTTP_GET_VARS['section_id']))){ ! // $scriptkey .= "-section_id-". $_PSL['home_section_id']; ! // } ! // // not too goofy key names ! // $scriptkey = preg_replace("'/|:|\\|\*|<|>|\|'","-", $_PSL['phpself'].$scriptkey); ! // if($GLOBALS['JPCACHE_IGNORE_DOMAIN'] == 0) { ! // $scriptkey = str_replace(".","-", $HTTP_SERVER_VARS['HTTP_HOST'] .$scriptkey); ! // } ! // jpcache_start('',$scriptkey, $varkey); ! // ! // // end of jpcache invocation ! // ! // } // end of built-in jpcache portion ! // // 1.11.4) Other Variables... --- 245,354 ---- */ ! // begin built-in jpcache ! if(empty($GLOBALS['JPCACHE_TYPE'])) { ! ! // jpcachedir -> the full directory path to the jpcache scripts. ! if(empty($_PSL['jpcachedir'])) { ! $_PSL['jpcachedir'] = $_PSL['classdir'] . "/jpcache"; ! } ! ! // $JPCACHE_TYPE = "file"; ! // $JPCACHE_TYPE = "mysql"; ! // $JPCACHE_TYPE = "dbm"; ! $JPCACHE_TYPE = "phplib"; ! ! /** ! * General jpcache configuration options. ! */ ! $JPCACHE_TIME = 900; // Default number of seconds to cache a page ! $JPCACHE_DEBUG = 0; // Turn debugging on/off ! $JPCACHE_IGNORE_DOMAIN= 1; // Ignore domain name in request(single site) ! $JPCACHE_ON = 1; // Turn caching on/off ! $JPCACHE_USE_GZIP = 0; // Whether or not to use GZIP ! $JPCACHE_POST = 1; // Should POST's be cached ! $JPCACHE_GC = 1; // Probability % of garbage collection ! $JPCACHE_GZIP_LEVEL = 9; // GZIPcompressionlevel to use (1=low,9=high) ! $JPCACHE_DELAY_START = 1; // Immediate or manual call to jpcache_start() ! $JPCACHE_HASHSCRIPTKEY = 0; // Hash SCRIPT-KEY or not ! ! /** ! * File based caching setting. ! */ ! $JPCACHE_DIR = "/tmp/jpcache"; // Directory where jpcache must store ! // generated files. Please use a dedicated ! // directory, and make it writable ! $JPCACHE_FILEPREFIX = "jpc-";// Prefix used in the filename. This enables ! // us to (more accuratly) recognize jpcache- ! // files. ! ! /** ! * DB based caching settings. ! */ ! $JPCACHE_DB_HOST = $_PSL['DB_Host']; // Database Server ! $JPCACHE_DB_DATABASE = $_PSL['DB_Database']; // Database-name to use ! $JPCACHE_DB_USERNAME = $_PSL['DB_User']; // Username ! $JPCACHE_DB_PASSWORD = $_PSL['DB_Password']; // Password ! $JPCACHE_DB_TABLE = "CACHEDATA"; // Table that holds the data ! $JPCACHE_OPTIMIZE = 0; // If 'OPTIMIZE TABLE' after garbage ! // collection is executed. Please check ! // first if this works on your mySQL! ! ! // Standard jpcache functions ! // require $_PSL['jpcachedir']. "/jpcache-main.php"; ! addLibraryRequirement("jpcache",$_PSL['jpcachedir'] . "/jpcache-main.php"); ! // Type specific jpcache implementations ! if ('phplib' == $JPCACHE_TYPE) { ! addClassRequirement("jpcacheDB","db_sql"); ! addClassRequirement("jpcacheDB",$_PSL['jpcachedir'] ."/type/phplib.php"); ! } ! addLibraryRequirement("jpcache",$_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php"); ! loadLibrary("jpcache"); ! // require $_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php"; ! ! // end of jpcache configuration ! ! // cache invocation ! $varkey = ''; ! if (!empty($HTTP_COOKIE_VARS['slashSess'])) { ! $scriptkey = "-slashSess-". $HTTP_COOKIE_VARS['slashSess']; ! } elseif (!empty($HTTP_COOKIE_VARS['user_info']) ) { ! $varkey = md5("POST=" . serialize($HTTP_POST_VARS) . " GET=" . serialize($HTTP_GET_VARS) . " COOKIE=" . serialize($HTTP_COOKIE_VARS)); ! } else { ! ! // $scriptkey = "-uid-nobody"; ! $scriptkey = ''; ! if(!empty($HTTP_COOKIE_VARS['skin'])) { ! $scriptkey .= "-skin-". $_PSL['skin']; ! } ! } ! $lang_ary = split( "[,;]", $HTTP_ACCEPT_LANGUAGE); ! if(!empty($lang_ary[0])) { ! $scriptkey .= "-lang-". $lang_ary[0]; ! // } else { ! // $scriptkey .= "-lang-blank"; ! } ! if( !empty($HTTP_COOKIE_VARS['TZ'])) { ! $scriptkey .= "-TZ-". $HTTP_COOKIE_VARS['TZ']; ! } else { ! $scriptkey .= "-TZ-". $_PSL['timezone']['name']; ! } ! foreach( $HTTP_GET_VARS as $key => $value) { ! $scriptkey .= "-". $key ."-". $value; ! } ! if ((empty($HTTP_GET_VARS['section'])) AND ! (empty($HTTP_GET_VARS['section_id']))){ ! $scriptkey .= "-section_id-". $_PSL['home_section_id']; ! } ! // not too goofy key names ! $scriptkey = preg_replace("'/|:|\\|\*|<|>|\|'","-", $_PSL['phpself'].$scriptkey); ! if($GLOBALS['JPCACHE_IGNORE_DOMAIN'] == 0) { ! $scriptkey = str_replace(".","-", $HTTP_SERVER_VARS['HTTP_HOST'] .$scriptkey); ! } ! jpcache_start('',$scriptkey, $varkey); ! ! // end of jpcache invocation ! ! } // end of built-in jpcache portion ! // 1.11.4) Other Variables... *************** *** 376,477 **** /** ! * $ary is used by story::getStory and block_i::getBlocks ! * this block just merges in the default section ! */ $ary = array(); if(!empty($HTTP_GET_VARS)) { ! $ary = clean($HTTP_GET_VARS); } if ((empty($ary['section'])) AND (empty($ary['section_id']))){ ! $section_id = $_PSL['home_section_id']; ! if(!$section_id) { ! $section_id = "3"; ! } ! $ary['section_id'] = $section_id; } $_PSL['amp'] = arg_separator("1"); ! // NavBar Menu Definitions $menuitem = array(); /* ! * menuitem array legend: ! * ! * name - The text displayed in the NavBar menu. This text is checked in the ! * languagefile. To customize, change the text in the appropriate ! * languagefile to avoid translation problems. ! * link - url for menu item link. ! * perm - permission require to view this menu item. "nobody" for all clients. ! * module - module require for viewing this menu item. "" (blank) for all. ! * ! * To add navbar menu items, add a complete entry below. Translation will be ! * attempted automatically. ! */ $menuitem[] = array( ! 'name' => "Login", ! 'link' => $_PSL['rooturl'] . "/login.php3", ! 'perm' => "", ! 'module' => "" ! ); $menuitem[] = array( ! 'name' => "Logout", ! 'link' => $_PSL['rooturl'] . "/login.php3?logout=yes", ! 'perm' => "user", ! 'module' => "" ! ); $menuitem[] = array( ! 'name' => "Home", ! 'link' => $_PSL['rooturl'] . "/" . $_PSL['mainpage'], ! 'perm' => "nobody", ! 'module' => "" ! ); $menuitem[] = array( ! 'name' => "Add Story", ! 'link' => $_PSL['rooturl'] . "/submission.php3", ! 'perm' => "nobody", ! 'module' => "Submission" ); $menuitem[] = array( ! 'name' => "Glossary", ! 'link' => $_PSL['rooturl'] . "/glossary.php3", ! 'perm' => "nobody", ! 'module' => "Glossary" ); $menuitem[] = array( ! 'name' => "Archives", ! 'link' => $_PSL['rooturl'] . "/search.php3", ! 'perm' => "nobody", ! 'module' => "" ); $menuitem[] = array( ! 'name' => "Polls", ! 'link' => $_PSL['rooturl'] . "/poll.php3", ! 'perm' => "nobody", ! 'module' => "Poll" ); $menuitem[] = array( ! 'name' => "Mailing List", ! 'link' => $_PSL['rooturl'] . "/mailinglist.php3", ! 'perm' => "nobody", ! 'module' => "MailingList" ); $menuitem[] = array( ! 'name' => "About", ! 'link' => $_PSL['rooturl'] . "/about.php3", ! 'perm' => "nobody", ! 'module' => "" ); $menuitem[] = array( ! 'name' => "Admin", ! 'link' => $_PSL['rooturl'] . "/login.php3", ! 'perm' => "user", ! 'module' => "" ! ); --- 363,463 ---- /** ! * $ary is used by story::getStory and block_i::getBlocks ! * this block just merges in the default section ! */ $ary = array(); if(!empty($HTTP_GET_VARS)) { ! $ary = clean($HTTP_GET_VARS); } if ((empty($ary['section'])) AND (empty($ary['section_id']))){ ! $section_id = $_PSL['home_section_id']; ! if(!$section_id) { ! $section_id = "3"; ! } ! $ary['section_id'] = $section_id; } $_PSL['amp'] = arg_separator("1"); ! // NavBar Menu Definitions $menuitem = array(); /* ! * menuitem array legend: ! * ! * name - The text displayed in the NavBar menu. This text is checked in the ! * languagefile. To customize, change the text in the appropriate * languagefile to avoid translation problems. ! * link - url for menu item link. ! * perm - permission require to view this menu item. "nobody" for all clients. ! * module - module require for viewing this menu item. "" (blank) for all. ! * ! * To add navbar menu items, add a complete entry below. Translation will be ! * attempted automatically. ! */ $menuitem[] = array( ! 'name' => "Login", ! 'link' => $_PSL['rooturl'] . "/login.php3", ! 'perm' => "", ! 'module' => "" ! ); $menuitem[] = array( ! 'name' => "Logout", ! 'link' => $_PSL['rooturl'] . "/login.php3?logout=yes", ! 'perm' => "user", ! 'module' => "" ! ); $menuitem[] = array( ! 'name' => "Home", ! 'link' => $_PSL['rooturl'] . "/" . $_PSL['mainpage'], ! 'perm' => "nobody", ! 'module' => "" ! ); $menuitem[] = array( ! 'name' => "Add Story", ! 'link' => $_PSL['rooturl'] . "/submission.php3", ! 'perm' => "nobody", ! 'module' => "Submission" ); $menuitem[] = array( ! 'name' => "Glossary", ! 'link' => $_PSL['rooturl'] . "/glossary.php3", ! 'perm' => "nobody", ! 'module' => "Glossary" ); $menuitem[] = array( ! 'name' => "Archives", ! 'link' => $_PSL['rooturl'] . "/search.php3", ! 'perm' => "nobody", ! 'module' => "" ); $menuitem[] = array( ! 'name' => "Polls", ! 'link' => $_PSL['rooturl'] . "/poll.php3", ! 'perm' => "nobody", ! 'module' => "Poll" ); $menuitem[] = array( ! 'name' => "Mailing List", ! 'link' => $_PSL['rooturl'] . "/mailinglist.php3", ! 'perm' => "nobody", ! 'module' => "MailingList" ); $menuitem[] = array( ! 'name' => "About", ! 'link' => $_PSL['rooturl'] . "/about.php3", ! 'perm' => "nobody", ! 'module' => "" ); $menuitem[] = array( ! 'name' => "Admin", ! 'link' => $_PSL['rooturl'] . "/login.php3", ! 'perm' => "user", ! 'module' => "" ! ); *************** *** 482,562 **** $menuitem[] = array( ! 'name' => "User Profile", ! 'link' => $_PSL['rooturl'] . "/profile.php3", ! 'perm' => "user", ! 'module' => "" ! ); $menuitem[] = array( ! 'name' => "Topic", ! 'link' => $_PSL['adminurl'] . "/topicAdmin.php3", ! 'perm' => "topic", ! 'module' => "" ); $menuitem[] = array( ! 'name' => "Story", ! 'link' => $_PSL['adminurl'] . "/storyAdmin.php3", ! 'perm' => "story", ! 'module' => "Story" ); $menuitem[] = array( ! 'name' => "Submission", ! 'link' => $_PSL['adminurl'] . "/submissionAdmin.php3", ! 'perm' => "submission", ! 'module' => "Submission" ); $menuitem[] = array( ! 'name' => "Section", ! 'link' => $_PSL['adminurl'] . "/sectionAdmin.php3", ! 'perm' => "section", ! 'module' => "Section" ); $menuitem[] = array( ! 'name' => "Block", ! 'link' => $_PSL['adminurl'] . "/blockAdmin.php3", ! 'perm' => "block", ! 'module' => "Block" ); $menuitem[] = array( ! 'name' => "Poll", ! 'link' => $_PSL['adminurl'] . "/pollAdmin.php3", ! 'perm' => "poll", ! 'module' => "Poll" ); $menuitem[] = array( ! 'name' => "Mailing List", ! 'link' => $_PSL['adminurl'] . "/mailinglistAdmin.php3", ! 'perm' => "mailinglist", ! 'module' => "MailingList" ); $menuitem[] = array( ! 'name' => "Author", ! 'link' => $_PSL['adminurl'] . "/authorAdmin.php3", ! 'perm' => "author", ! 'module' => "Author" ); $menuitem[] = array( ! 'name' => "Glossary", ! 'link' => $_PSL['adminurl'] . "/glossaryAdmin.php3", ! 'perm' => "glossary", ! 'module' => "Glossary" ); $menuitem[] = array( ! 'name' => "Variable", ! 'link' => $_PSL['adminurl'] . "/variableAdmin.php3", ! 'perm' => "variable", ! 'module' => "Variable" ); $menuitem[] = array( ! 'name' => "Logging", ! 'link' => $_PSL['adminurl'] . "/infologAdmin.php3", ! 'perm' => "logging", ! 'module' => "Infolog" ); $menuitem[] = array( ! 'name' => "Group", ! 'link' => $_PSL['adminurl'] . "/groupAdmin.php3", ! 'perm' => "groupAdmin", ! 'module' => "Group" ); --- 468,548 ---- $menuitem[] = array( ! 'name' => "User Profile", ! 'link' => $_PSL['rooturl'] . "/profile.php3", ! 'perm' => "user", ! 'module' => "" ! ); $menuitem[] = array( ! 'name' => "Topic", ! 'link' => $_PSL['adminurl'] . "/topicAdmin.php3", ! 'perm' => "topic", ! 'module' => "" ); $menuitem[] = array( ! 'name' => "Story", ! 'link' => $_PSL['adminurl'] . "/storyAdmin.php3", ! 'perm' => "story", ! 'module' => "Story" ); $menuitem[] = array( ! 'name' => "Submission", ! 'link' => $_PSL['adminurl'] . "/submissionAdmin.php3", ! 'perm' => "submission", ! 'module' => "Submission" ); $menuitem[] = array( ! 'name' => "Section", ! 'link' => $_PSL['adminurl'] . "/sectionAdmin.php3", ! 'perm' => "section", ! 'module' => "Section" ); $menuitem[] = array( ! 'name' => "Block", ! 'link' => $_PSL['adminurl'] . "/blockAdmin.php3", ! 'perm' => "block", ! 'module' => "Block" ); $menuitem[] = array( ! 'name' => "Poll", ! 'link' => $_PSL['adminurl'] . "/pollAdmin.php3", ! 'perm' => "poll", ! 'module' => "Poll" ); $menuitem[] = array( ! 'name' => "Mailing List", ! 'link' => $_PSL['adminurl'] . "/mailinglistAdmin.php3", ! 'perm' => "mailinglist", ! 'module' => "MailingList" ); $menuitem[] = array( ! 'name' => "Author", ! 'link' => $_PSL['adminurl'] . "/authorAdmin.php3", ! 'perm' => "author", ! 'module' => "Author" ); $menuitem[] = array( ! 'name' => "Glossary", ! 'link' => $_PSL['adminurl'] . "/glossaryAdmin.php3", ! 'perm' => "glossary", ! 'module' => "Glossary" ); $menuitem[] = array( ! 'name' => "Variable", ! 'link' => $_PSL['adminurl'] . "/variableAdmin.php3", ! 'perm' => "variable", ! 'module' => "Variable" ); $menuitem[] = array( ! 'name' => "Logging", ! 'link' => $_PSL['adminurl'] . "/infologAdmin.php3", ! 'perm' => "logging", ! 'module' => "Infolog" ); $menuitem[] = array( ! 'name' => "Group", ! 'link' => $_PSL['adminurl'] . "/groupAdmin.php3", ! 'perm' => "groupAdmin", ! 'module' => "Group" ); *************** *** 573,585 **** if (empty($_PSL['page_features'])) { foreach(array("sess"=>"slashSess", ! "auth"=>"slashAuth", ! "perm"=>"slashPerm") ! as $name => $class) { ! $class = pslGetClass($class); ! loadClass($class); ! $_PSL['page_features'][$name] = $class; } } ! page_open($_PSL['page_features']); /** --- 559,571 ---- if (empty($_PSL['page_features'])) { foreach(array("sess"=>"slashSess", ! "auth"=>"slashAuth", ! "perm"=>"slashPerm") ! as $name => $class) { ! $class = pslGetClass($class); ! loadClass($class); ! $_PSL['page_features'][$name] = $class; } } ! page_open($_PSL['page_features']); /** *************** *** 690,692 **** // ---------------------------------------------------------- ! ?> \ No newline at end of file --- 676,678 ---- // ---------------------------------------------------------- ! ?> |
From: Joe S. <joe...@us...> - 2003-02-20 21:55:52
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv17187/phpslash-ft/class Modified Files: functions.inc Log Message: setLang sets the current language in _PSL['lang'] Index: functions.inc =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v retrieving revision 1.132 retrieving revision 1.133 diff -C2 -d -r1.132 -r1.133 *** functions.inc 20 Feb 2003 21:17:10 -0000 1.132 --- functions.inc 20 Feb 2003 21:55:38 -0000 1.133 *************** *** 1102,1111 **** // start with default $lang = $_PSL['languagefile']; ! if( $new_lang) { // directly set language if (file_exists( $_PSL['localedir'] . "/" . basename($new_lang))) { $lang = $_PSL['localedir'] . "/" . basename($new_lang); } elseif (file_exists( $_PSL['localedir'] . "/" . basename($new_lang) . ".php3")) { $lang = $_PSL['localedir'] . "/" . basename($new_lang) . ".php3"; } } elseif( $HTTP_ACCEPT_LANGUAGE) { // else try to get from browser --- 1102,1116 ---- // start with default $lang = $_PSL['languagefile']; ! ! // current lang is default language unless changed below. ! $_PSL['lang'] = $_PSL['language']; ! if( $new_lang) { // directly set language if (file_exists( $_PSL['localedir'] . "/" . basename($new_lang))) { $lang = $_PSL['localedir'] . "/" . basename($new_lang); + $_PSL['lang'] = str_replace('.php3', '', basename($new_lang)); } elseif (file_exists( $_PSL['localedir'] . "/" . basename($new_lang) . ".php3")) { $lang = $_PSL['localedir'] . "/" . basename($new_lang) . ".php3"; + $_PSL['lang'] = basename($new_lang); } } elseif( $HTTP_ACCEPT_LANGUAGE) { // else try to get from browser *************** *** 1113,1128 **** $i = 0; $done = false; ! while( ( $i < count($lang_ary)) AND ( !$done) ) { $base_lang = split( "[_-]", trim($lang_ary[$i])); if (file_exists( $_PSL['localedir'] . "/" . trim($lang_ary[$i]) . ".php3")) { $lang = $_PSL['localedir'] . "/" . trim($lang_ary[$i]) . ".php3"; $done = true; } elseif (file_exists( $_PSL['localedir'] . "/" . $base_lang[0]. ".php3")) { // no dialect match - so try base language ( "en" for "en-US") $lang = $_PSL['localedir'] . "/" . $base_lang[0] . ".php3"; $done = true; } $i++; } } --- 1118,1137 ---- $i = 0; $done = false; ! $count = count($lang_ary); ! while( ( $i < $count) AND ( !$done) ) { $base_lang = split( "[_-]", trim($lang_ary[$i])); if (file_exists( $_PSL['localedir'] . "/" . trim($lang_ary[$i]) . ".php3")) { $lang = $_PSL['localedir'] . "/" . trim($lang_ary[$i]) . ".php3"; + $_PSL['lang'] = trim($lang_ary[$i]); $done = true; } elseif (file_exists( $_PSL['localedir'] . "/" . $base_lang[0]. ".php3")) { // no dialect match - so try base language ( "en" for "en-US") $lang = $_PSL['localedir'] . "/" . $base_lang[0] . ".php3"; + $_PSL['lang'] = $base_lang[0]; $done = true; } $i++; } + } |
From: Joe S. <joe...@us...> - 2003-02-20 21:55:43
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv17187/phpslash-ft Modified Files: CHANGES Log Message: setLang sets the current language in _PSL['lang'] Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.699 retrieving revision 1.700 diff -C2 -d -r1.699 -r1.700 *** CHANGES 20 Feb 2003 16:38:27 -0000 1.699 --- CHANGES 20 Feb 2003 21:55:25 -0000 1.700 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2003-February-20 3:30PM CST Joe Stewart <joe...@us...> + [B] - functions.inc - setLang sets the current language in _PSL['lang']; + 2003-February-20 10:00AM CST Joe Stewart <joe...@us...> [W] - no.php3 - Lars Kvanum updated the Norwegian translation. |
From: Matthew L. <sym...@us...> - 2003-02-20 21:17:16
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv32230/class Modified Files: functions.inc Log Message: psl_getLocalInfo now defaults to its input if no localized information exists, just like pslGetText. Index: functions.inc =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v retrieving revision 1.131 retrieving revision 1.132 diff -C2 -d -r1.131 -r1.132 *** functions.inc 12 Feb 2003 20:45:51 -0000 1.131 --- functions.inc 20 Feb 2003 21:17:10 -0000 1.132 *************** *** 984,1029 **** */ function psl_getLocalinfo($category,$keyword,$locale=false) { ! GLOBAL $_PSL; ! static $localinfo; ! static $catcodes; ! $ans = ''; ! if (!$catcodes) { ! foreach(array('LC_CTYPE','LC_COLLATE','LC_MONETARY','LC_NUMERIC','LC_TIME') as $cat) ! $catcodes[constant($cat)] = $cat; ! } ! if (is_int($category)) { ! $catcode = $category; ! $category = $catcodes[$catcode]; ! } ! else { ! $catcode = constant($category); ! } ! $locale || $locale = $_PSL['locale'][$category]; ! if (!is_array($localinfo[$locale][$category])) { ! $filename = sprintf('%s/%s.%s.php3',$_PSL['localedir'],$locale,$category); ! if (!is_readable($filename)) { ! pslError("psl_getLocalinfo: file either nonexistent or not readable: $filename"); ! } ! else { ! include($filename); // sets a variable $pslstrings ! $localinfo[$locale][$category] = $pslstrings; ! } ! } if(!empty($localinfo[$locale][$category][$keyword])) { ! $ans = $localinfo[$locale][$category][$keyword]; } ! if (!isset($ans)) { ! /* Hm. it's not in the localinfo array. We'll try first looking ! in the localinfo for the en_US locale (sorry for the hegemony), ! and then just give up if that fails. */ ! if ($locale != 'en_US') ! $ans = psl_getLocalinfo($category,$keyword,'en_US'); ! else ! $ans = $keyword; ! } ! return $ans; } --- 984,1035 ---- */ function psl_getLocalinfo($category,$keyword,$locale=false) { ! GLOBAL $_PSL; ! static $localinfo; ! static $catcodes; ! $fc = sprintf("psl_getLocalinfo(%s,%s,%s)",$category,$keyword,($locale ? $locale : 'FALSE')); ! // debug($fc,'begin'); ! $ans = NULL; ! if (!$catcodes) { ! foreach(array('LC_CTYPE','LC_COLLATE','LC_MONETARY','LC_NUMERIC','LC_TIME') as $cat) ! $catcodes[constant($cat)] = $cat; ! } ! if (is_int($category)) { ! $catcode = $category; ! $category = $catcodes[$catcode]; ! } ! else { ! $catcode = constant($category); ! } ! ! $locale || $locale = $_PSL['locale'][$category]; ! if (!is_array($localinfo[$locale][$category])) { ! $filename = sprintf('%s/%s.%s.php3',$_PSL['localedir'],$locale,$category); ! if (!is_readable($filename)) { ! pslError("psl_getLocalinfo: file either nonexistent or not readable: $filename"); ! } ! else { ! include($filename); // sets a variable $pslstrings ! $localinfo[$locale][$category] = $pslstrings; ! } ! } ! debug('localinfo',$localinfo); if(!empty($localinfo[$locale][$category][$keyword])) { ! $ans = $localinfo[$locale][$category][$keyword]; } ! if (!isset($ans)) { ! // debug($fc,"$keyword not set in locale[$category]"); ! /* Hm. it's not in the localinfo array. We'll try first looking ! in the localinfo for the en_US locale (sorry for the hegemony), ! and then just give up if that fails. */ ! if ($locale != 'en_US') ! $ans = psl_getLocalinfo($category,$keyword,'en_US'); ! else ! $ans = $keyword; ! } ! // debug("$fc: answer",$ans); ! return $ans; } |
From: Matthew L. <sym...@us...> - 2003-02-20 21:15:39
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv31612/class Modified Files: tz.class Log Message: The config directives zone_file and country_file are recognized and used as member variables. Index: tz.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/tz.class,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tz.class 22 Jan 2003 19:12:33 -0000 1.4 --- tz.class 20 Feb 2003 21:15:34 -0000 1.5 *************** *** 65,68 **** --- 65,74 ---- } $this->set_member($ary); + if (!$this->zone_file) { + $this->zone_file = $this->tzdir . '/zone.tab'; + } + if (!$this->country_file) { + $this->country_file = $this->tzdir . '/iso3166.tab'; + } $this->valid = $this->validate(); *************** *** 235,240 **** $tpl->set_block('form','each_region_option','EACH_REGION_OPTION'); $tpl->debug=false; ! $tz_file_lines = file($this->tzdir . '/zone.tab'); ! $country_file_lines = file($this->tzdir . '/iso3166.tab'); $continents = array('Africa'=>array(), --- 241,246 ---- $tpl->set_block('form','each_region_option','EACH_REGION_OPTION'); $tpl->debug=false; ! $tz_file_lines = file($this->zone_file); ! $country_file_lines = file($this->country_file); $continents = array('Africa'=>array(), |
From: Matthew L. <sym...@us...> - 2003-02-20 21:14:18
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv31175/public_html Modified Files: config-dist.ini.php3 config-dist.php3 Log Message: Added commented-out directives "zone_file" and "country_file" to the timezone block. Mac users who need to use the PHPSlash-distributed zone.tab and iso3166.tab can use these directives. Index: config-dist.ini.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.ini.php3,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** config-dist.ini.php3 11 Feb 2003 20:07:23 -0000 1.14 --- config-dist.ini.php3 20 Feb 2003 21:14:12 -0000 1.15 *************** *** 107,111 **** classdir = "/path/to/class" ;; ! ;; The base URL for the PHPSlash site rooturl = "http://localhost/phpslash/public_html" ;; --- 107,111 ---- classdir = "/path/to/class" ;; ! ;; The base URL for the PHPSlash site. rooturl = "http://localhost/phpslash/public_html" ;; *************** *** 409,418 **** ;; to do even if you are using native time zones): dir = "/usr/share/zoneinfo" ;; ;; If you can't do that either, you are stuck specifying time zones as ! ;; POSIX-compatible strings. In any case, you need to specify the ! ;; server's default time zone. If you are using native timezones and ! ;; want the default to be the actual server's setting, enter it this ! ;; way (find the right path): ; default = ":/etc/localtime"; ;; --- 409,423 ---- ;; to do even if you are using native time zones): dir = "/usr/share/zoneinfo" + ;; For MacOSX Users: some files are missing in the time zone database + ;; installation. Uncomment these lines (and correct the directory) to use + ;; the PHPSlash-distributed copies. + ; zone_file = "/home/username/phpslash-0.7/contrib/zone.tab" + ; country_file = "/home/username/phpslash-0.7/contrib/iso3166.tab" ;; ;; If you can't do that either, you are stuck specifying time zones as ! ;; POSIX-compatible strings; see below. In any case, you need to ! ;; specify the server's default time zone. If you are using native ! ;; timezones and want the default to be the actual server's setting, ! ;; enter it this way (find the right path): ; default = ":/etc/localtime"; ;; *************** *** 422,426 **** name = "America/Chicago"; ;; ! ;; Finally, if all you are able to do is specify a string, do it like this: ; name = "GMT+0BST,M4.1.0/1,M10.5.0/2"; ;; end of timezone definitions --- 427,432 ---- name = "America/Chicago"; ;; ! ;; Finally, if all you are able to do is specify a POSIX string, do it ! ;; like this: ; name = "GMT+0BST,M4.1.0/1,M10.5.0/2"; ;; end of timezone definitions Index: config-dist.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.php3,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** config-dist.php3 13 Feb 2003 18:24:12 -0000 1.35 --- config-dist.php3 20 Feb 2003 21:14:13 -0000 1.36 *************** *** 1,4 **** <?php - /* * config.php3 - Configuration File for PHPSlash --- 1,3 ---- *************** *** 8,17 **** */ - // Specify full path to ini file - $psl_inifile = "config.ini.php3"; - - // end of required configuration. config.ini.php3 contains the phpSlash - // configuration variables. - // This is a comment, it spans one line --- 7,10 ---- *************** *** 21,24 **** --- 14,39 ---- like this, but you need to be sure to close it like so: */ + /** + * Programs which parse code for documentation blocks (e.g., phpDoc) + * look for comments that begin with a slash and two asterisks, and + * have subsequent lines beginning with an asterisk, like this. + **/ + + /** + * All configuration/settings/preference information should go in the + * $_PSL array. + **/ + if (!is_array($_PSL)) { + $_PSL = array(); + } + + // Specify full path to ini file + if (empty($_PSL['config.ini_file'])) { + $_PSL['config.ini_file'] = "config.ini.php3"; + } + + // end of required configuration. config.ini.php3 contains the phpSlash + // configuration variables. + /* After phpSlash is configured, the jpcache-config.php file and the varkey below can be configured to further optimize the cache system. *************** *** 26,90 **** */ ! // require "/path/to/jpcache.php"; ! ! if(array_key_exists('JPCACHE_TYPE', $GLOBALS)) { ! $varkey = ''; ! if (!empty($HTTP_COOKIE_VARS['slashSess'])) { ! $scriptkey = "-slashSess-". $HTTP_COOKIE_VARS['slashSess']; ! } elseif (!empty($HTTP_COOKIE_VARS['user_info']) ) { ! $varkey = md5("POST=" . serialize($HTTP_POST_VARS) . " GET=" . serialize($HTTP_GET_VARS) . " COOKIE=" . serialize($HTTP_COOKIE_VARS)); ! } else { ! ! // $scriptkey = "-uid-nobody"; ! $scriptkey = ''; ! if(!empty($HTTP_COOKIE_VARS['skin'])) { ! $scriptkey .= "-skin-". $HTTP_COOKIE_VARS['skin']; ! } ! } ! $lang_ary = split( "[,;]", $HTTP_ACCEPT_LANGUAGE); ! if(!empty($lang_ary[0])) { ! $scriptkey .= "-lang-". $lang_ary[0]; ! // } else { ! // $scriptkey .= "-lang-blank"; ! } ! if( !empty($HTTP_COOKIE_VARS['TZ'])) { ! $scriptkey .= "-TZ-". $HTTP_COOKIE_VARS['TZ']; ! // } else { ! // $scriptkey .= "-TZ-America-Chicago"; ! } ! foreach( $HTTP_GET_VARS as $key => $value) { ! $scriptkey .= "-". $key ."-". $value; ! } ! if ((empty($HTTP_GET_VARS['section'])) AND ! (empty($HTTP_GET_VARS['section_id']))){ ! $scriptkey .= "-section_id-3"; ! } ! $scriptkey = preg_replace("'/|:|\\|\*|<|>|\|'","-", $HTTP_SERVER_VARS['PHP_SELF'].$scriptkey); ! if($GLOBALS['JPCACHE_IGNORE_DOMAIN'] == 0) { ! $scriptkey = str_replace(".","-", $HTTP_SERVER_VARS['HTTP_HOST'] .$scriptkey); ! } ! jpcache_start('',$scriptkey, $varkey); ! } ! ! $_PSL = array(); // parse the ini configuration file into the $_PSL array // Specify full path to ini file ! $_PSL = parse_ini_file($psl_inifile, TRUE); ! $_PSL['version'] = '0.7RC3'; ! /**** START DEBUGGING - Comment or delete this for production! ****/ //ini_set('error_reporting', 'E_ALL'); //ini_set('error_reporting', 'E_ALL~E_NOTICE'); /**** END DEBUGGING ****/ ! ////////////////////////////////////////////////////////////////////////// // SECTION 1 - REQUIRED FILES -------------------------------------------- ////////////////////////////////////////////////////////////////////////// ! // 1.1 Uncomment this only if you can't use a local php.ini or .htaccess ! if( !empty($_PSL['phplibdir'])) { $_PHPLIB['libdir'] = $_PSL['phplibdir']; --- 41,102 ---- */ ! // require_once "/home/leingang/src/phpslash-ft/class/jpcache/jpcache.php"; ! // if(array_key_exists('JPCACHE_TYPE', $GLOBALS)) { ! // $varkey = ''; ! // if (!empty($HTTP_COOKIE_VARS['slashSess'])) { ! // $scriptkey = "-slashSess-". $HTTP_COOKIE_VARS['slashSess']; ! // } elseif (!empty($HTTP_COOKIE_VARS['user_info']) ) { ! // $varkey = md5("POST=" . serialize($HTTP_POST_VARS) . " GET=" . serialize($HTTP_GET_VARS) . " COOKIE=" . serialize($HTTP_COOKIE_VARS)); ! // } else { ! ! // // $scriptkey = "-uid-nobody"; ! // $scriptkey = ''; ! // if(!empty($HTTP_COOKIE_VARS['skin'])) { ! // $scriptkey .= "-skin-". $HTTP_COOKIE_VARS['skin']; ! // } ! // } ! // $lang_ary = split( "[,;]", $HTTP_ACCEPT_LANGUAGE); ! // if(!empty($lang_ary[0])) { ! // $scriptkey .= "-lang-". $lang_ary[0]; ! // // } else { ! // // $scriptkey .= "-lang-blank"; ! // } ! // if( !empty($HTTP_COOKIE_VARS['TZ'])) { ! // $scriptkey .= "-TZ-". $HTTP_COOKIE_VARS['TZ']; ! // // } else { ! // // $scriptkey .= "-TZ-America-Chicago"; ! // } ! // foreach( $HTTP_GET_VARS as $key => $value) { ! // $scriptkey .= "-". $key ."-". $value; ! // } ! // if ((empty($HTTP_GET_VARS['section'])) AND ! // (empty($HTTP_GET_VARS['section_id']))){ ! // $scriptkey .= "-section_id-3"; ! // } ! // $scriptkey = preg_replace("'/|:|\\|\*|<|>|\|'","-", $HTTP_SERVER_VARS['PHP_SELF'].$scriptkey); ! // if($GLOBALS['JPCACHE_IGNORE_DOMAIN'] == 0) { ! // $scriptkey = str_replace(".","-", $HTTP_SERVER_VARS['HTTP_HOST'] .$scriptkey); ! // } ! // jpcache_start('',$scriptkey, $varkey); ! // } // parse the ini configuration file into the $_PSL array // Specify full path to ini file ! $_PSL = parse_ini_file($_PSL['config.ini_file'], TRUE); ! $_PSL['version'] = '0.7RC3'; ! /**** START DEBUGGING - Comment or delete this for production! ****/ //ini_set('error_reporting', 'E_ALL'); //ini_set('error_reporting', 'E_ALL~E_NOTICE'); /**** END DEBUGGING ****/ ! ////////////////////////////////////////////////////////////////////////// // SECTION 1 - REQUIRED FILES -------------------------------------------- ////////////////////////////////////////////////////////////////////////// ! // 1.1 Uncomment this only if you can't use a local php.ini or .htaccess ! if( !empty($_PSL['phplibdir'])) { $_PHPLIB['libdir'] = $_PSL['phplibdir']; *************** *** 139,143 **** require_once($_PSL['classdir'] . '/functions.inc'); require_once($_PSL['classdir'] . '/lib.resources.php'); ! /* now that the functions are in, we can define the arg_separator */ --- 151,155 ---- require_once($_PSL['classdir'] . '/functions.inc'); require_once($_PSL['classdir'] . '/lib.resources.php'); ! /* now that the functions are in, we can define the arg_separator */ *************** *** 149,153 **** // comment to enable setting lang in url $lang = false; ! $_PSL['languagefile'] = $_PSL['localedir'] . "/" . $_PSL['language'] . ".php3"; --- 161,165 ---- // comment to enable setting lang in url $lang = false; ! $_PSL['languagefile'] = $_PSL['localedir'] . "/" . $_PSL['language'] . ".php3"; *************** *** 161,172 **** if (!empty($HTTP_GET_VARS['skin'])) { if (empty($HTTP_GET_VARS['nocookie'])) { ! $_PSL['templatedir'] = setSkinTpl($HTTP_GET_VARS['skin'], "cookie"); } else { ! $_PSL['templatedir'] = setSkinTpl($HTTP_GET_VARS['skin'], ""); } } else { $_PSL['templatedir'] = setSkinTpl("", ""); } ! /** --- 173,184 ---- if (!empty($HTTP_GET_VARS['skin'])) { if (empty($HTTP_GET_VARS['nocookie'])) { ! $_PSL['templatedir'] = setSkinTpl($HTTP_GET_VARS['skin'], "cookie"); } else { ! $_PSL['templatedir'] = setSkinTpl($HTTP_GET_VARS['skin'], ""); } } else { $_PSL['templatedir'] = setSkinTpl("", ""); } ! /** *************** *** 202,211 **** /** ! * These classes are PHPSlash's extensions to the PHPLIB base classes. ! * We only configure the ones which are required to get the page open ! * and restore session data. ! * ! * Note: author IS needed now because slashAuth uses it to fill in perms ! **/ addClassRequirement("slash_sql","ct_sql"); addClassRequirement("slash_sql",$_PSL['classdir'] . "/slash_sql.class"); --- 214,223 ---- /** ! * These classes are PHPSlash's extensions to the PHPLIB base classes. ! * We only configure the ones which are required to get the page open ! * and restore session data. ! * ! * Note: author IS needed now because slashAuth uses it to fill in perms ! **/ addClassRequirement("slash_sql","ct_sql"); addClassRequirement("slash_sql",$_PSL['classdir'] . "/slash_sql.class"); *************** *** 245,354 **** */ ! // begin built-in jpcache ! if(empty($GLOBALS['JPCACHE_TYPE'])) { ! ! // jpcachedir -> the full directory path to the jpcache scripts. ! if(empty($_PSL['jpcachedir'])) { ! $_PSL['jpcachedir'] = $_PSL['classdir'] . "/jpcache"; ! } ! ! // $JPCACHE_TYPE = "file"; ! // $JPCACHE_TYPE = "mysql"; ! // $JPCACHE_TYPE = "dbm"; ! $JPCACHE_TYPE = "phplib"; ! ! /** ! * General jpcache configuration options. ! */ ! $JPCACHE_TIME = 900; // Default number of seconds to cache a page ! $JPCACHE_DEBUG = 0; // Turn debugging on/off ! $JPCACHE_IGNORE_DOMAIN= 1; // Ignore domain name in request(single site) ! $JPCACHE_ON = 1; // Turn caching on/off ! $JPCACHE_USE_GZIP = 0; // Whether or not to use GZIP ! $JPCACHE_POST = 1; // Should POST's be cached ! $JPCACHE_GC = 1; // Probability % of garbage collection ! $JPCACHE_GZIP_LEVEL = 9; // GZIPcompressionlevel to use (1=low,9=high) ! $JPCACHE_DELAY_START = 1; // Immediate or manual call to jpcache_start() ! $JPCACHE_HASHSCRIPTKEY = 0; // Hash SCRIPT-KEY or not ! ! /** ! * File based caching setting. ! */ ! $JPCACHE_DIR = "/tmp/jpcache"; // Directory where jpcache must store ! // generated files. Please use a dedicated ! // directory, and make it writable ! $JPCACHE_FILEPREFIX = "jpc-";// Prefix used in the filename. This enables ! // us to (more accuratly) recognize jpcache- ! // files. ! ! /** ! * DB based caching settings. ! */ ! $JPCACHE_DB_HOST = $_PSL['DB_Host']; // Database Server ! $JPCACHE_DB_DATABASE = $_PSL['DB_Database']; // Database-name to use ! $JPCACHE_DB_USERNAME = $_PSL['DB_User']; // Username ! $JPCACHE_DB_PASSWORD = $_PSL['DB_Password']; // Password ! $JPCACHE_DB_TABLE = "CACHEDATA"; // Table that holds the data ! $JPCACHE_OPTIMIZE = 0; // If 'OPTIMIZE TABLE' after garbage ! // collection is executed. Please check ! // first if this works on your mySQL! ! ! // Standard jpcache functions ! // require $_PSL['jpcachedir']. "/jpcache-main.php"; ! addLibraryRequirement("jpcache",$_PSL['jpcachedir'] . "/jpcache-main.php"); ! // Type specific jpcache implementations ! if ('phplib' == $JPCACHE_TYPE) { ! addClassRequirement("jpcacheDB","db_sql"); ! addClassRequirement("jpcacheDB",$_PSL['jpcachedir'] ."/type/phplib.php"); ! } ! addLibraryRequirement("jpcache",$_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php"); ! loadLibrary("jpcache"); ! // require $_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php"; ! ! // end of jpcache configuration ! ! // cache invocation ! $varkey = ''; ! if (!empty($HTTP_COOKIE_VARS['slashSess'])) { ! $scriptkey = "-slashSess-". $HTTP_COOKIE_VARS['slashSess']; ! } elseif (!empty($HTTP_COOKIE_VARS['user_info']) ) { ! $varkey = md5("POST=" . serialize($HTTP_POST_VARS) . " GET=" . serialize($HTTP_GET_VARS) . " COOKIE=" . serialize($HTTP_COOKIE_VARS)); ! } else { ! ! // $scriptkey = "-uid-nobody"; ! $scriptkey = ''; ! if(!empty($HTTP_COOKIE_VARS['skin'])) { ! $scriptkey .= "-skin-". $_PSL['skin']; ! } ! } ! $lang_ary = split( "[,;]", $HTTP_ACCEPT_LANGUAGE); ! if(!empty($lang_ary[0])) { ! $scriptkey .= "-lang-". $lang_ary[0]; ! // } else { ! // $scriptkey .= "-lang-blank"; ! } ! if( !empty($HTTP_COOKIE_VARS['TZ'])) { ! $scriptkey .= "-TZ-". $HTTP_COOKIE_VARS['TZ']; ! } else { ! $scriptkey .= "-TZ-". $_PSL['timezone']['name']; ! } ! foreach( $HTTP_GET_VARS as $key => $value) { ! $scriptkey .= "-". $key ."-". $value; ! } ! if ((empty($HTTP_GET_VARS['section'])) AND ! (empty($HTTP_GET_VARS['section_id']))){ ! $scriptkey .= "-section_id-". $_PSL['home_section_id']; ! } ! // not too goofy key names ! $scriptkey = preg_replace("'/|:|\\|\*|<|>|\|'","-", $_PSL['phpself'].$scriptkey); ! if($GLOBALS['JPCACHE_IGNORE_DOMAIN'] == 0) { ! $scriptkey = str_replace(".","-", $HTTP_SERVER_VARS['HTTP_HOST'] .$scriptkey); ! } ! jpcache_start('',$scriptkey, $varkey); ! ! // end of jpcache invocation ! ! } // end of built-in jpcache portion ! // 1.11.4) Other Variables... --- 257,367 ---- */ ! ! // // begin built-in jpcache ! // if(empty($GLOBALS['JPCACHE_TYPE'])) { ! // ! // // jpcachedir -> the full directory path to the jpcache scripts. ! // if(empty($_PSL['jpcachedir'])) { ! // $_PSL['jpcachedir'] = $_PSL['classdir'] . "/jpcache"; ! // } ! // ! // // $JPCACHE_TYPE = "file"; ! // // $JPCACHE_TYPE = "mysql"; ! // // $JPCACHE_TYPE = "dbm"; ! // $JPCACHE_TYPE = "phplib"; ! // ! // /** ! // * General jpcache configuration options. ! // */ ! // $JPCACHE_TIME = 900; // Default number of seconds to cache a page ! // $JPCACHE_DEBUG = 0; // Turn debugging on/off ! // $JPCACHE_IGNORE_DOMAIN= 1; // Ignore domain name in request(single site) ! // $JPCACHE_ON = 1; // Turn caching on/off ! // $JPCACHE_USE_GZIP = 0; // Whether or not to use GZIP ! // $JPCACHE_POST = 1; // Should POST's be cached ! // $JPCACHE_GC = 1; // Probability % of garbage collection ! // $JPCACHE_GZIP_LEVEL = 9; // GZIPcompressionlevel to use (1=low,9=high) ! // $JPCACHE_DELAY_START = 1; // Immediate or manual call to jpcache_start() ! // $JPCACHE_HASHSCRIPTKEY = 0; // Hash SCRIPT-KEY or not ! // ! // /** ! // * File based caching setting. ! // */ ! // $JPCACHE_DIR = "/tmp/jpcache"; // Directory where jpcache must store ! // // generated files. Please use a dedicated ! // // directory, and make it writable ! // $JPCACHE_FILEPREFIX = "jpc-";// Prefix used in the filename. This enables ! // // us to (more accuratly) recognize jpcache- ! // // files. ! // ! // /** ! // * DB based caching settings. ! // */ ! // $JPCACHE_DB_HOST = $_PSL['DB_Host']; // Database Server ! // $JPCACHE_DB_DATABASE = $_PSL['DB_Database']; // Database-name to use ! // $JPCACHE_DB_USERNAME = $_PSL['DB_User']; // Username ! // $JPCACHE_DB_PASSWORD = $_PSL['DB_Password']; // Password ! // $JPCACHE_DB_TABLE = "CACHEDATA"; // Table that holds the data ! // $JPCACHE_OPTIMIZE = 0; // If 'OPTIMIZE TABLE' after garbage ! // // collection is executed. Please check ! // // first if this works on your mySQL! ! // ! // // Standard jpcache functions ! // // require $_PSL['jpcachedir']. "/jpcache-main.php"; ! // addLibraryRequirement("jpcache",$_PSL['jpcachedir'] . "/jpcache-main.php"); ! // // Type specific jpcache implementations ! // if ('phplib' == $JPCACHE_TYPE) { ! // addClassRequirement("jpcacheDB","db_sql"); ! // addClassRequirement("jpcacheDB",$_PSL['jpcachedir'] ."/type/phplib.php"); ! // } ! // addLibraryRequirement("jpcache",$_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php"); ! // loadLibrary("jpcache"); ! // // require $_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php"; ! // ! // // end of jpcache configuration ! // ! // // cache invocation ! // $varkey = ''; ! // if (!empty($HTTP_COOKIE_VARS['slashSess'])) { ! // $scriptkey = "-slashSess-". $HTTP_COOKIE_VARS['slashSess']; ! // } elseif (!empty($HTTP_COOKIE_VARS['user_info']) ) { ! // $varkey = md5("POST=" . serialize($HTTP_POST_VARS) . " GET=" . serialize($HTTP_GET_VARS) . " COOKIE=" . serialize($HTTP_COOKIE_VARS)); ! // } else { ! // ! // // $scriptkey = "-uid-nobody"; ! // $scriptkey = ''; ! // if(!empty($HTTP_COOKIE_VARS['skin'])) { ! // $scriptkey .= "-skin-". $_PSL['skin']; ! // } ! // } ! // $lang_ary = split( "[,;]", $HTTP_ACCEPT_LANGUAGE); ! // if(!empty($lang_ary[0])) { ! // $scriptkey .= "-lang-". $lang_ary[0]; ! // // } else { ! // // $scriptkey .= "-lang-blank"; ! // } ! // if( !empty($HTTP_COOKIE_VARS['TZ'])) { ! // $scriptkey .= "-TZ-". $HTTP_COOKIE_VARS['TZ']; ! // } else { ! // $scriptkey .= "-TZ-". $_PSL['timezone']['name']; ! // } ! // foreach( $HTTP_GET_VARS as $key => $value) { ! // $scriptkey .= "-". $key ."-". $value; ! // } ! // if ((empty($HTTP_GET_VARS['section'])) AND ! // (empty($HTTP_GET_VARS['section_id']))){ ! // $scriptkey .= "-section_id-". $_PSL['home_section_id']; ! // } ! // // not too goofy key names ! // $scriptkey = preg_replace("'/|:|\\|\*|<|>|\|'","-", $_PSL['phpself'].$scriptkey); ! // if($GLOBALS['JPCACHE_IGNORE_DOMAIN'] == 0) { ! // $scriptkey = str_replace(".","-", $HTTP_SERVER_VARS['HTTP_HOST'] .$scriptkey); ! // } ! // jpcache_start('',$scriptkey, $varkey); ! // ! // // end of jpcache invocation ! // ! // } // end of built-in jpcache portion ! // // 1.11.4) Other Variables... *************** *** 363,463 **** /** ! * $ary is used by story::getStory and block_i::getBlocks ! * this block just merges in the default section ! */ $ary = array(); if(!empty($HTTP_GET_VARS)) { ! $ary = clean($HTTP_GET_VARS); } if ((empty($ary['section'])) AND (empty($ary['section_id']))){ ! $section_id = $_PSL['home_section_id']; ! if(!$section_id) { ! $section_id = "3"; ! } ! $ary['section_id'] = $section_id; } $_PSL['amp'] = arg_separator("1"); ! // NavBar Menu Definitions $menuitem = array(); /* ! * menuitem array legend: ! * ! * name - The text displayed in the NavBar menu. This text is checked in the ! * languagefile. To customize, change the text in the appropriate * languagefile to avoid translation problems. ! * link - url for menu item link. ! * perm - permission require to view this menu item. "nobody" for all clients. ! * module - module require for viewing this menu item. "" (blank) for all. ! * ! * To add navbar menu items, add a complete entry below. Translation will be ! * attempted automatically. ! */ $menuitem[] = array( ! 'name' => "Login", ! 'link' => $_PSL['rooturl'] . "/login.php3", ! 'perm' => "", ! 'module' => "" ! ); $menuitem[] = array( ! 'name' => "Logout", ! 'link' => $_PSL['rooturl'] . "/login.php3?logout=yes", ! 'perm' => "user", ! 'module' => "" ! ); $menuitem[] = array( ! 'name' => "Home", ! 'link' => $_PSL['rooturl'] . "/" . $_PSL['mainpage'], ! 'perm' => "nobody", ! 'module' => "" ! ); $menuitem[] = array( ! 'name' => "Add Story", ! 'link' => $_PSL['rooturl'] . "/submission.php3", ! 'perm' => "nobody", ! 'module' => "Submission" ); $menuitem[] = array( ! 'name' => "Glossary", ! 'link' => $_PSL['rooturl'] . "/glossary.php3", ! 'perm' => "nobody", ! 'module' => "Glossary" ); $menuitem[] = array( ! 'name' => "Archives", ! 'link' => $_PSL['rooturl'] . "/search.php3", ! 'perm' => "nobody", ! 'module' => "" ); $menuitem[] = array( ! 'name' => "Polls", ! 'link' => $_PSL['rooturl'] . "/poll.php3", ! 'perm' => "nobody", ! 'module' => "Poll" ); $menuitem[] = array( ! 'name' => "Mailing List", ! 'link' => $_PSL['rooturl'] . "/mailinglist.php3", ! 'perm' => "nobody", ! 'module' => "MailingList" ); $menuitem[] = array( ! 'name' => "About", ! 'link' => $_PSL['rooturl'] . "/about.php3", ! 'perm' => "nobody", ! 'module' => "" ); $menuitem[] = array( ! 'name' => "Admin", ! 'link' => $_PSL['rooturl'] . "/login.php3", ! 'perm' => "user", ! 'module' => "" ! ); --- 376,477 ---- /** ! * $ary is used by story::getStory and block_i::getBlocks ! * this block just merges in the default section ! */ $ary = array(); if(!empty($HTTP_GET_VARS)) { ! $ary = clean($HTTP_GET_VARS); } if ((empty($ary['section'])) AND (empty($ary['section_id']))){ ! $section_id = $_PSL['home_section_id']; ! if(!$section_id) { ! $section_id = "3"; ! } ! $ary['section_id'] = $section_id; } $_PSL['amp'] = arg_separator("1"); ! // NavBar Menu Definitions $menuitem = array(); /* ! * menuitem array legend: ! * ! * name - The text displayed in the NavBar menu. This text is checked in the ! * languagefile. To customize, change the text in the appropriate ! * languagefile to avoid translation problems. ! * link - url for menu item link. ! * perm - permission require to view this menu item. "nobody" for all clients. ! * module - module require for viewing this menu item. "" (blank) for all. ! * ! * To add navbar menu items, add a complete entry below. Translation will be ! * attempted automatically. ! */ $menuitem[] = array( ! 'name' => "Login", ! 'link' => $_PSL['rooturl'] . "/login.php3", ! 'perm' => "", ! 'module' => "" ! ); $menuitem[] = array( ! 'name' => "Logout", ! 'link' => $_PSL['rooturl'] . "/login.php3?logout=yes", ! 'perm' => "user", ! 'module' => "" ! ); $menuitem[] = array( ! 'name' => "Home", ! 'link' => $_PSL['rooturl'] . "/" . $_PSL['mainpage'], ! 'perm' => "nobody", ! 'module' => "" ! ); $menuitem[] = array( ! 'name' => "Add Story", ! 'link' => $_PSL['rooturl'] . "/submission.php3", ! 'perm' => "nobody", ! 'module' => "Submission" ); $menuitem[] = array( ! 'name' => "Glossary", ! 'link' => $_PSL['rooturl'] . "/glossary.php3", ! 'perm' => "nobody", ! 'module' => "Glossary" ); $menuitem[] = array( ! 'name' => "Archives", ! 'link' => $_PSL['rooturl'] . "/search.php3", ! 'perm' => "nobody", ! 'module' => "" ); $menuitem[] = array( ! 'name' => "Polls", ! 'link' => $_PSL['rooturl'] . "/poll.php3", ! 'perm' => "nobody", ! 'module' => "Poll" ); $menuitem[] = array( ! 'name' => "Mailing List", ! 'link' => $_PSL['rooturl'] . "/mailinglist.php3", ! 'perm' => "nobody", ! 'module' => "MailingList" ); $menuitem[] = array( ! 'name' => "About", ! 'link' => $_PSL['rooturl'] . "/about.php3", ! 'perm' => "nobody", ! 'module' => "" ); $menuitem[] = array( ! 'name' => "Admin", ! 'link' => $_PSL['rooturl'] . "/login.php3", ! 'perm' => "user", ! 'module' => "" ! ); *************** *** 468,548 **** $menuitem[] = array( ! 'name' => "User Profile", ! 'link' => $_PSL['rooturl'] . "/profile.php3", ! 'perm' => "user", ! 'module' => "" ! ); $menuitem[] = array( ! 'name' => "Topic", ! 'link' => $_PSL['adminurl'] . "/topicAdmin.php3", ! 'perm' => "topic", ! 'module' => "" ); $menuitem[] = array( ! 'name' => "Story", ! 'link' => $_PSL['adminurl'] . "/storyAdmin.php3", ! 'perm' => "story", ! 'module' => "Story" ); $menuitem[] = array( ! 'name' => "Submission", ! 'link' => $_PSL['adminurl'] . "/submissionAdmin.php3", ! 'perm' => "submission", ! 'module' => "Submission" ); $menuitem[] = array( ! 'name' => "Section", ! 'link' => $_PSL['adminurl'] . "/sectionAdmin.php3", ! 'perm' => "section", ! 'module' => "Section" ); $menuitem[] = array( ! 'name' => "Block", ! 'link' => $_PSL['adminurl'] . "/blockAdmin.php3", ! 'perm' => "block", ! 'module' => "Block" ); $menuitem[] = array( ! 'name' => "Poll", ! 'link' => $_PSL['adminurl'] . "/pollAdmin.php3", ! 'perm' => "poll", ! 'module' => "Poll" ); $menuitem[] = array( ! 'name' => "Mailing List", ! 'link' => $_PSL['adminurl'] . "/mailinglistAdmin.php3", ! 'perm' => "mailinglist", ! 'module' => "MailingList" ); $menuitem[] = array( ! 'name' => "Author", ! 'link' => $_PSL['adminurl'] . "/authorAdmin.php3", ! 'perm' => "author", ! 'module' => "Author" ); $menuitem[] = array( ! 'name' => "Glossary", ! 'link' => $_PSL['adminurl'] . "/glossaryAdmin.php3", ! 'perm' => "glossary", ! 'module' => "Glossary" ); $menuitem[] = array( ! 'name' => "Variable", ! 'link' => $_PSL['adminurl'] . "/variableAdmin.php3", ! 'perm' => "variable", ! 'module' => "Variable" ); $menuitem[] = array( ! 'name' => "Logging", ! 'link' => $_PSL['adminurl'] . "/infologAdmin.php3", ! 'perm' => "logging", ! 'module' => "Infolog" ); $menuitem[] = array( ! 'name' => "Group", ! 'link' => $_PSL['adminurl'] . "/groupAdmin.php3", ! 'perm' => "groupAdmin", ! 'module' => "Group" ); --- 482,562 ---- $menuitem[] = array( ! 'name' => "User Profile", ! 'link' => $_PSL['rooturl'] . "/profile.php3", ! 'perm' => "user", ! 'module' => "" ! ); $menuitem[] = array( ! 'name' => "Topic", ! 'link' => $_PSL['adminurl'] . "/topicAdmin.php3", ! 'perm' => "topic", ! 'module' => "" ); $menuitem[] = array( ! 'name' => "Story", ! 'link' => $_PSL['adminurl'] . "/storyAdmin.php3", ! 'perm' => "story", ! 'module' => "Story" ); $menuitem[] = array( ! 'name' => "Submission", ! 'link' => $_PSL['adminurl'] . "/submissionAdmin.php3", ! 'perm' => "submission", ! 'module' => "Submission" ); $menuitem[] = array( ! 'name' => "Section", ! 'link' => $_PSL['adminurl'] . "/sectionAdmin.php3", ! 'perm' => "section", ! 'module' => "Section" ); $menuitem[] = array( ! 'name' => "Block", ! 'link' => $_PSL['adminurl'] . "/blockAdmin.php3", ! 'perm' => "block", ! 'module' => "Block" ); $menuitem[] = array( ! 'name' => "Poll", ! 'link' => $_PSL['adminurl'] . "/pollAdmin.php3", ! 'perm' => "poll", ! 'module' => "Poll" ); $menuitem[] = array( ! 'name' => "Mailing List", ! 'link' => $_PSL['adminurl'] . "/mailinglistAdmin.php3", ! 'perm' => "mailinglist", ! 'module' => "MailingList" ); $menuitem[] = array( ! 'name' => "Author", ! 'link' => $_PSL['adminurl'] . "/authorAdmin.php3", ! 'perm' => "author", ! 'module' => "Author" ); $menuitem[] = array( ! 'name' => "Glossary", ! 'link' => $_PSL['adminurl'] . "/glossaryAdmin.php3", ! 'perm' => "glossary", ! 'module' => "Glossary" ); $menuitem[] = array( ! 'name' => "Variable", ! 'link' => $_PSL['adminurl'] . "/variableAdmin.php3", ! 'perm' => "variable", ! 'module' => "Variable" ); $menuitem[] = array( ! 'name' => "Logging", ! 'link' => $_PSL['adminurl'] . "/infologAdmin.php3", ! 'perm' => "logging", ! 'module' => "Infolog" ); $menuitem[] = array( ! 'name' => "Group", ! 'link' => $_PSL['adminurl'] . "/groupAdmin.php3", ! 'perm' => "groupAdmin", ! 'module' => "Group" ); *************** *** 559,571 **** if (empty($_PSL['page_features'])) { foreach(array("sess"=>"slashSess", ! "auth"=>"slashAuth", ! "perm"=>"slashPerm") ! as $name => $class) { ! $class = pslGetClass($class); ! loadClass($class); ! $_PSL['page_features'][$name] = $class; } } ! page_open($_PSL['page_features']); /** --- 573,585 ---- if (empty($_PSL['page_features'])) { foreach(array("sess"=>"slashSess", ! "auth"=>"slashAuth", ! "perm"=>"slashPerm") ! as $name => $class) { ! $class = pslGetClass($class); ! loadClass($class); ! $_PSL['page_features'][$name] = $class; } } ! page_open($_PSL['page_features']); /** *************** *** 631,649 **** if ($_PSL['timezone']['engine']) { ! loadLibrary("tz"); ! // set up the time zone environment array ! $_TZ =& $_PSL['timezone']; ! $_TZ['templatedir'] = $_PSL['templatedir']; ! $_TZ['show_format'] = psl_getLocalInfo('LC_TIME','%a %b %e %H:%M:%S %Z %Y'); ! /* $_TZ['available'] = array("America/New_York", ! "America/Chicago", ! "America/Denver", ! "America/Los_Angeles", ! "Pacific/Honolulu"); ! */ ! // to enable setting of time zone in URL ! set_TZ($HTTP_GET_VARS['TZ'],'cookie'); ! // to disable setting in URL and to set $_PSL['timezone']['name'] as the time zone ! // set_TZ(); } --- 645,663 ---- if ($_PSL['timezone']['engine']) { ! loadLibrary("tz"); ! // set up the time zone environment array ! $_TZ =& $_PSL['timezone']; ! $_TZ['templatedir'] = $_PSL['templatedir']; ! $_TZ['show_format'] = psl_getLocalInfo('LC_TIME','%a %b %e %H:%M:%S %Z %Y'); ! /* $_TZ['available'] = array("America/New_York", ! "America/Chicago", ! "America/Denver", ! "America/Los_Angeles", ! "Pacific/Honolulu"); ! */ ! // to enable setting of time zone in URL ! set_TZ($HTTP_GET_VARS['TZ'],'cookie'); ! // to disable setting in URL and to set $_PSL['timezone']['name'] as the time zone ! // set_TZ(); } *************** *** 676,678 **** // ---------------------------------------------------------- ! ?> --- 690,692 ---- // ---------------------------------------------------------- ! ?> \ No newline at end of file |
From: Matthew L. <sym...@us...> - 2003-02-20 21:13:08
|
Update of /cvsroot/phpslash/phpslash-ft/contrib In directory sc8-pr-cvs1:/tmp/cvs-serv30578/contrib Added Files: iso3166.tab zone.tab Log Message: Added zone.tab and iso3166.tab, which the timezone class uses to name timezones (normally these are found alongside the timezone information files, but not on Macs). --- NEW FILE: iso3166.tab --- # ISO 3166 alpha-2 country codes # # @(#)iso3166.tab 1.9 # # From Paul Eggert <eg...@tw...> (2002-05-28): # # This file contains a table with the following columns: # 1. ISO 3166-1 alpha-2 country code, current as of # ISO 3166-1 Newsletter No. V-5 (2002-05-20). See: # <a href="http://www.iso.org/iso/en/prods-services/iso3166ma/index.html"> # ISO 3166 Maintenance agency (ISO 3166/MA) # </a>. # 2. The usual English name for the country, # chosen so that alphabetic sorting of subsets produces helpful lists. # This is not the same as the English name in the ISO 3166 tables. # # Columns are separated by a single tab. # The table is sorted by country code. # # Lines beginning with `#' are comments. # #country- #code country name AD Andorra AE United Arab Emirates AF Afghanistan AG Antigua & Barbuda AI Anguilla AL Albania AM Armenia AN Netherlands Antilles AO Angola AQ Antarctica AR Argentina AS Samoa (American) AT Austria AU Australia AW Aruba AZ Azerbaijan BA Bosnia & Herzegovina BB Barbados BD Bangladesh BE Belgium BF Burkina Faso BG Bulgaria BH Bahrain BI Burundi BJ Benin BM Bermuda BN Brunei BO Bolivia BR Brazil BS Bahamas BT Bhutan BV Bouvet Island BW Botswana BY Belarus BZ Belize CA Canada CC Cocos (Keeling) Islands CD Congo (Dem. Rep.) CF Central African Rep. CG Congo (Rep.) CH Switzerland CI Cote d'Ivoire CK Cook Islands CL Chile CM Cameroon CN China CO Colombia CR Costa Rica CU Cuba CV Cape Verde CX Christmas Island CY Cyprus CZ Czech Republic DE Germany DJ Djibouti DK Denmark DM Dominica DO Dominican Republic DZ Algeria EC Ecuador EE Estonia EG Egypt EH Western Sahara ER Eritrea ES Spain ET Ethiopia FI Finland FJ Fiji FK Falkland Islands FM Micronesia FO Faeroe Islands FR France GA Gabon GB Britain (UK) GD Grenada GE Georgia GF French Guiana GH Ghana GI Gibraltar GL Greenland GM Gambia GN Guinea GP Guadeloupe GQ Equatorial Guinea GR Greece GS South Georgia & the South Sandwich Islands GT Guatemala GU Guam GW Guinea-Bissau GY Guyana HK Hong Kong HM Heard Island & McDonald Islands HN Honduras HR Croatia HT Haiti HU Hungary ID Indonesia IE Ireland IL Israel IN India IO British Indian Ocean Territory IQ Iraq IR Iran IS Iceland IT Italy JM Jamaica JO Jordan JP Japan KE Kenya KG Kyrgyzstan KH Cambodia KI Kiribati KM Comoros KN St Kitts & Nevis KP Korea (North) KR Korea (South) KW Kuwait KY Cayman Islands KZ Kazakhstan LA Laos LB Lebanon LC St Lucia LI Liechtenstein LK Sri Lanka LR Liberia LS Lesotho LT Lithuania LU Luxembourg LV Latvia LY Libya MA Morocco MC Monaco MD Moldova MG Madagascar MH Marshall Islands MK Macedonia ML Mali MM Myanmar (Burma) MN Mongolia MO Macau MP Northern Mariana Islands MQ Martinique MR Mauritania MS Montserrat MT Malta MU Mauritius MV Maldives MW Malawi MX Mexico MY Malaysia MZ Mozambique NA Namibia NC New Caledonia NE Niger NF Norfolk Island NG Nigeria NI Nicaragua NL Netherlands NO Norway NP Nepal NR Nauru NU Niue NZ New Zealand OM Oman PA Panama PE Peru PF French Polynesia PG Papua New Guinea PH Philippines PK Pakistan PL Poland PM St Pierre & Miquelon PN Pitcairn PR Puerto Rico PS Palestine PT Portugal PW Palau PY Paraguay QA Qatar RE Reunion RO Romania RU Russia RW Rwanda SA Saudi Arabia SB Solomon Islands SC Seychelles SD Sudan SE Sweden SG Singapore SH St Helena SI Slovenia SJ Svalbard & Jan Mayen SK Slovakia SL Sierra Leone SM San Marino SN Senegal SO Somalia SR Suriname ST Sao Tome & Principe SV El Salvador SY Syria SZ Swaziland TC Turks & Caicos Is TD Chad TF French Southern & Antarctic Lands TG Togo TH Thailand TJ Tajikistan TK Tokelau TL East Timor TM Turkmenistan TN Tunisia TO Tonga TR Turkey TT Trinidad & Tobago TV Tuvalu TW Taiwan TZ Tanzania UA Ukraine UG Uganda UM US minor outlying islands US United States UY Uruguay UZ Uzbekistan VA Vatican City VC St Vincent VE Venezuela VG Virgin Islands (UK) VI Virgin Islands (US) VN Vietnam VU Vanuatu WF Wallis & Futuna WS Samoa (Western) YE Yemen YT Mayotte YU Yugoslavia ZA South Africa ZM Zambia ZW Zimbabwe --- NEW FILE: zone.tab --- # @(#)zone.tab 1.27 # # TZ zone descriptions # # From Paul Eggert <eg...@tw...> (1996-08-05): # # This file contains a table with the following columns: # 1. ISO 3166 2-character country code. See the file `iso3166.tab'. # 2. Latitude and longitude of the zone's principal location # in ISO 6709 sign-degrees-minutes-seconds format, # either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS, # first latitude (+ is north), then longitude (+ is east). # 3. Zone name used in value of TZ environment variable. # 4. Comments; present if and only if the country has multiple rows. # # Columns are separated by a single tab. # The table is sorted first by country, then an order within the country that # (1) makes some geographical sense, and # (2) puts the most populous zones first, where that does not contradict (1). # # Lines beginning with `#' are comments. # #country- #code coordinates TZ comments AD +4230+00131 Europe/Andorra AE +2518+05518 Asia/Dubai AF +3431+06912 Asia/Kabul AG +1703-06148 America/Antigua AI +1812-06304 America/Anguilla AL +4120+01950 Europe/Tirane AM +4011+04430 Asia/Yerevan AN +1211-06900 America/Curacao AO -0848+01314 Africa/Luanda AQ -7750+16636 Antarctica/McMurdo McMurdo Station, Ross Island AQ -9000+00000 Antarctica/South_Pole Amundsen-Scott Station, South Pole AQ -6448-06406 Antarctica/Palmer Palmer Station, Anvers Island AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula AQ -7824+10654 Antarctica/Vostok Vostok Station, S Magnetic Pole AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Base, Terre Adelie AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I AR -3436-05827 America/Buenos_Aires E Argentina (BA, DF, SC, TF) AR -3124-06411 America/Cordoba most locations (CB,CC,CH,CN,ER,FM,LP,LR,MN,NQ,RN,SA,SE,SF,SJ,SL,TM) AR -2411-06518 America/Jujuy Jujuy (JY) AR -2828-06547 America/Catamarca Catamarca (CT) AR -3253-06849 America/Mendoza Mendoza (MZ) AS -1416-17042 Pacific/Pago_Pago AT +4813+01620 Europe/Vienna AU -3133+15905 Australia/Lord_Howe Lord Howe Island AU -4253+14719 Australia/Hobart Tasmania AU -3749+14458 Australia/Melbourne Victoria AU -3352+15113 Australia/Sydney New South Wales - most locations AU -3157+14127 Australia/Broken_Hill New South Wales - Yancowinna AU -2728+15302 Australia/Brisbane Queensland - most locations AU -2016+14900 Australia/Lindeman Queensland - Holiday Islands AU -3455+13835 Australia/Adelaide South Australia AU -1228+13050 Australia/Darwin Northern Territory AU -3157+11551 Australia/Perth Western Australia AW +1230-06858 America/Aruba AZ +4023+04951 Asia/Baku BA +4352+01825 Europe/Sarajevo BB +1306-05937 America/Barbados BD +2343+09025 Asia/Dhaka BE +5050+00420 Europe/Brussels BF +1222-00131 Africa/Ouagadougou BG +4241+02319 Europe/Sofia BH +2623+05035 Asia/Bahrain BI -0323+02922 Africa/Bujumbura BJ +0629+00237 Africa/Porto-Novo BM +3217-06446 Atlantic/Bermuda BN +0456+11455 Asia/Brunei BO -1630-06809 America/La_Paz BR -0351-03225 America/Noronha Atlantic islands BR -0127-04829 America/Belem Amapa, E Para BR -0343-03830 America/Fortaleza NE Brazil (MA, PI, CE, RN, PR) BR -0803-03454 America/Recife Pernambuco BR -0712-04812 America/Araguaina Tocantins BR -0940-03543 America/Maceio Alagoas, Sergipe BR -2332-04637 America/Sao_Paulo S & SE Brazil (BA, GO, DF, MG, ES, RJ, SP, PR, SC, RS) BR -1535-05605 America/Cuiaba Mato Grosso, Mato Grosso do Sul BR -0846-06354 America/Porto_Velho W Para, Rondonia BR +0249-06040 America/Boa_Vista Roraima BR -0308-06001 America/Manaus E Amazonas BR -0640-06952 America/Eirunepe W Amazonas BR -0958-06748 America/Rio_Branco Acre BS +2505-07721 America/Nassau BT +2728+08939 Asia/Thimphu BW -2545+02555 Africa/Gaborone BY +5354+02734 Europe/Minsk BZ +1730-08812 America/Belize CA +4734-05243 America/St_Johns Newfoundland Island CA +4439-06336 America/Halifax Atlantic Time - Nova Scotia (most places), NB, W Labrador, E Quebec & PEI CA +4612-05957 America/Glace_Bay Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971 CA +5320-06025 America/Goose_Bay Atlantic Time - E Labrador CA +4531-07334 America/Montreal Eastern Time - Ontario & Quebec - most locations CA +4901-08816 America/Nipigon Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973 CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario CA +6608-06544 America/Pangnirtung Eastern Standard Time - Pangnirtung, Nunavut CA +6344-06828 America/Iqaluit Eastern Standard Time - east Nunavut CA +6245-09210 America/Rankin_Inlet Eastern Standard Time - central Nunavut CA +4953-09709 America/Winnipeg Central Time - Manitoba & west Ontario CA +4843-09429 America/Rainy_River Central Time - Rainy River & Fort Frances, Ontario CA +6903-10505 America/Cambridge_Bay Central Time - west Nunavut CA +5024-10439 America/Regina Central Standard Time - Saskatchewan - most locations CA +5017-10750 America/Swift_Current Central Standard Time - Saskatchewan - midwest CA +5333-11328 America/Edmonton Mountain Time - Alberta, east British Columbia & west Saskatchewan CA +6227-11421 America/Yellowknife Mountain Time - central Northwest Territories CA +6825-11330 America/Inuvik Mountain Time - west Northwest Territories CA +5946-12014 America/Dawson_Creek Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia CA +4916-12307 America/Vancouver Pacific Time - west British Columbia CA +6043-13503 America/Whitehorse Pacific Time - south Yukon CA +6404-13925 America/Dawson Pacific Time - north Yukon CC -1210+09655 Indian/Cocos CD -0418+01518 Africa/Kinshasa west Dem. Rep. of Congo CD -1140+02728 Africa/Lubumbashi east Dem. Rep. of Congo CF +0422+01835 Africa/Bangui CG -0416+01517 Africa/Brazzaville CH +4723+00832 Europe/Zurich CI +0519-00402 Africa/Abidjan CK -2114-15946 Pacific/Rarotonga CL -3327-07040 America/Santiago most locations CL -2710-10927 Pacific/Easter Easter Island & Sala y Gomez CM +0403+00942 Africa/Douala CN +3114+12128 Asia/Shanghai east China - Beijing, Guangdong, Shanghai, etc. CN +4545+12641 Asia/Harbin Heilongjiang CN +2934+10635 Asia/Chongqing central China - Gansu, Guizhou, Sichuan, Yunnan, etc. CN +4348+08735 Asia/Urumqi Tibet & most of Xinjiang Uyghur CN +3929+07559 Asia/Kashgar southwest Xinjiang Uyghur CO +0436-07405 America/Bogota CR +0956-08405 America/Costa_Rica CU +2308-08222 America/Havana CV +1455-02331 Atlantic/Cape_Verde CX -1025+10543 Indian/Christmas CY +3510+03322 Asia/Nicosia CZ +5005+01426 Europe/Prague DE +5230+01322 Europe/Berlin DJ +1136+04309 Africa/Djibouti DK +5540+01235 Europe/Copenhagen DM +1518-06124 America/Dominica DO +1828-06954 America/Santo_Domingo DZ +3647+00303 Africa/Algiers EC -0210-07950 America/Guayaquil mainland EC -0054-08936 Pacific/Galapagos Galapagos Islands EE +5925+02445 Europe/Tallinn EG +3003+03115 Africa/Cairo EH +2709-01312 Africa/El_Aaiun ER +1520+03853 Africa/Asmera ES +4024-00341 Europe/Madrid mainland ES +3553-00519 Africa/Ceuta Ceuta & Melilla ES +2806-01524 Atlantic/Canary Canary Islands ET +0902+03842 Africa/Addis_Ababa FI +6010+02458 Europe/Helsinki FJ -1808+17825 Pacific/Fiji FK -5142-05751 Atlantic/Stanley FM +0931+13808 Pacific/Yap Yap FM +0725+15147 Pacific/Truk Truk (Chuuk) FM +0658+15813 Pacific/Ponape Ponape (Pohnpei) FM +0519+16259 Pacific/Kosrae Kosrae FO +6201-00646 Atlantic/Faeroe FR +4852+00220 Europe/Paris GA +0023+00927 Africa/Libreville GB +512830-0001845 Europe/London Great Britain GB +5435-00555 Europe/Belfast Northern Ireland GD +1203-06145 America/Grenada GE +4143+04449 Asia/Tbilisi GF +0456-05220 America/Cayenne GH +0533-00013 Africa/Accra GI +3608-00521 Europe/Gibraltar GL +6411-05144 America/Godthab most locations GL +7646-01840 America/Danmarkshavn east coast, north of Scoresbysund GL +7030-02215 America/Scoresbysund Scoresbysund / Ittoqqortoormiit GL +7634-06847 America/Thule Thule / Pituffik GM +1328-01639 Africa/Banjul GN +0931-01343 Africa/Conakry GP +1614-06132 America/Guadeloupe GQ +0345+00847 Africa/Malabo GR +3758+02343 Europe/Athens GS -5416-03632 Atlantic/South_Georgia GT +1438-09031 America/Guatemala GU +1328+14445 Pacific/Guam GW +1151-01535 Africa/Bissau GY +0648-05810 America/Guyana HK +2217+11409 Asia/Hong_Kong HN +1406-08713 America/Tegucigalpa HR +4548+01558 Europe/Zagreb HT +1832-07220 America/Port-au-Prince HU +4730+01905 Europe/Budapest ID -0610+10648 Asia/Jakarta Java & Sumatra ID -0002+10920 Asia/Pontianak west & central Borneo ID -0507+11924 Asia/Makassar east & south Borneo, Celebes, Bali, Nusa Tengarra, west Timor ID -0232+14042 Asia/Jayapura Irian Jaya & the Moluccas IE +5320-00615 Europe/Dublin IL +3146+03514 Asia/Jerusalem IN +2232+08822 Asia/Calcutta IO -0720+07225 Indian/Chagos IQ +3321+04425 Asia/Baghdad IR +3540+05126 Asia/Tehran IS +6409-02151 Atlantic/Reykjavik IT +4154+01229 Europe/Rome JM +1800-07648 America/Jamaica JO +3157+03556 Asia/Amman JP +353916+1394441 Asia/Tokyo KE -0117+03649 Africa/Nairobi KG +4254+07436 Asia/Bishkek KH +1133+10455 Asia/Phnom_Penh KI +0125+17300 Pacific/Tarawa Gilbert Islands KI -0308-17105 Pacific/Enderbury Phoenix Islands KI +0152-15720 Pacific/Kiritimati Line Islands KM -1141+04316 Indian/Comoro KN +1718-06243 America/St_Kitts KP +3901+12545 Asia/Pyongyang KR +3733+12658 Asia/Seoul KW +2920+04759 Asia/Kuwait KY +1918-08123 America/Cayman KZ +4315+07657 Asia/Almaty most locations KZ +4448+06528 Asia/Qyzylorda Qyzylorda (Kyzylorda, Kzyl-Orda) KZ +5017+05710 Asia/Aqtobe Aqtobe (Aktobe) KZ +4431+05016 Asia/Aqtau Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau) KZ +5113+05121 Asia/Oral West Kazakhstan LA +1758+10236 Asia/Vientiane LB +3353+03530 Asia/Beirut LC +1401-06100 America/St_Lucia LI +4709+00931 Europe/Vaduz LK +0656+07951 Asia/Colombo LR +0618-01047 Africa/Monrovia LS -2928+02730 Africa/Maseru LT +5441+02519 Europe/Vilnius LU +4936+00609 Europe/Luxembourg LV +5657+02406 Europe/Riga LY +3254+01311 Africa/Tripoli MA +3339-00735 Africa/Casablanca MC +4342+00723 Europe/Monaco MD +4700+02850 Europe/Chisinau MG -1855+04731 Indian/Antananarivo MH +0709+17112 Pacific/Majuro most locations MH +0905+16720 Pacific/Kwajalein Kwajalein MK +4159+02126 Europe/Skopje ML +1239-00800 Africa/Bamako southwest Mali ML +1446-00301 Africa/Timbuktu northeast Mali MM +1647+09610 Asia/Rangoon MN +4755+10653 Asia/Ulaanbaatar most locations MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar MO +2214+11335 Asia/Macau MP +1512+14545 Pacific/Saipan MQ +1436-06105 America/Martinique MR +1806-01557 Africa/Nouakchott MS +1644-06213 America/Montserrat MT +3554+01431 Europe/Malta MU -2010+05730 Indian/Mauritius MV +0410+07330 Indian/Maldives MW -1547+03500 Africa/Blantyre MX +1924-09909 America/Mexico_City Central Time - most locations MX +2105-08646 America/Cancun Central Time - Quintana Roo MX +2058-08937 America/Merida Central Time - Campeche, Yucatan MX +2540-10019 America/Monterrey Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas MX +2313-10625 America/Mazatlan Mountain Time - S Baja, Nayarit, Sinaloa MX +2838-10605 America/Chihuahua Mountain Time - Chihuahua MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora MX +3232-11701 America/Tijuana Pacific Time MY +0310+10142 Asia/Kuala_Lumpur peninsular Malaysia MY +0133+11020 Asia/Kuching Sabah & Sarawak MZ -2558+03235 Africa/Maputo NA -2234+01706 Africa/Windhoek NC -2216+16530 Pacific/Noumea NE +1331+00207 Africa/Niamey NF -2903+16758 Pacific/Norfolk NG +0627+00324 Africa/Lagos NI +1209-08617 America/Managua NL +5222+00454 Europe/Amsterdam NO +5955+01045 Europe/Oslo NP +2743+08519 Asia/Katmandu NR -0031+16655 Pacific/Nauru NU -1901+16955 Pacific/Niue NZ -3652+17446 Pacific/Auckland most locations NZ -4355-17630 Pacific/Chatham Chatham Islands OM +2336+05835 Asia/Muscat PA +0858-07932 America/Panama PE -1203-07703 America/Lima PF -1732-14934 Pacific/Tahiti Society Islands PF -0900-13930 Pacific/Marquesas Marquesas Islands PF -2308-13457 Pacific/Gambier Gambier Islands PG -0930+14710 Pacific/Port_Moresby PH +1435+12100 Asia/Manila PK +2452+06703 Asia/Karachi PL +5215+02100 Europe/Warsaw PM +4703-05620 America/Miquelon PN -2504-13005 Pacific/Pitcairn PR +182806-0660622 America/Puerto_Rico PS +3130+03428 Asia/Gaza PT +3843-00908 Europe/Lisbon mainland PT +3238-01654 Atlantic/Madeira Madeira Islands PT +3744-02540 Atlantic/Azores Azores PW +0720+13429 Pacific/Palau PY -2516-05740 America/Asuncion QA +2517+05132 Asia/Qatar RE -2052+05528 Indian/Reunion RO +4426+02606 Europe/Bucharest RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad RU +5545+03735 Europe/Moscow Moscow+00 - west Russia RU +5312+05009 Europe/Samara Moscow+01 - Caspian Sea RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk RU +5601+09250 Asia/Krasnoyarsk Moscow+04 - Yenisei River RU +5216+10420 Asia/Irkutsk Moscow+05 - Lake Baikal RU +6200+12940 Asia/Yakutsk Moscow+06 - Lena River RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island RU +5934+15048 Asia/Magadan Moscow+08 - Magadan RU +5301+15839 Asia/Kamchatka Moscow+09 - Kamchatka RU +6445+17729 Asia/Anadyr Moscow+10 - Bering Sea RW -0157+03004 Africa/Kigali SA +2438+04643 Asia/Riyadh SB -0932+16012 Pacific/Guadalcanal SC -0440+05528 Indian/Mahe SD +1536+03232 Africa/Khartoum SE +5920+01803 Europe/Stockholm SG +0117+10351 Asia/Singapore SH -1555-00542 Atlantic/St_Helena SI +4603+01431 Europe/Ljubljana SJ +7800+01600 Arctic/Longyearbyen Svalbard SJ +7059-00805 Atlantic/Jan_Mayen Jan Mayen SK +4809+01707 Europe/Bratislava SL +0830-01315 Africa/Freetown SM +4355+01228 Europe/San_Marino SN +1440-01726 Africa/Dakar SO +0204+04522 Africa/Mogadishu SR +0550-05510 America/Paramaribo ST +0020+00644 Africa/Sao_Tome SV +1342-08912 America/El_Salvador SY +3330+03618 Asia/Damascus SZ -2618+03106 Africa/Mbabane TC +2128-07108 America/Grand_Turk TD +1207+01503 Africa/Ndjamena TF -492110+0701303 Indian/Kerguelen TG +0608+00113 Africa/Lome TH +1345+10031 Asia/Bangkok TJ +3835+06848 Asia/Dushanbe TK -0922-17114 Pacific/Fakaofo TL -0833+12535 Asia/Dili TM +3757+05823 Asia/Ashgabat TN +3648+01011 Africa/Tunis TO -2110+17510 Pacific/Tongatapu TR +4101+02858 Europe/Istanbul TT +1039-06131 America/Port_of_Spain TV -0831+17913 Pacific/Funafuti TW +2503+12130 Asia/Taipei TZ -0648+03917 Africa/Dar_es_Salaam UA +5026+03031 Europe/Kiev most locations UA +4837+02218 Europe/Uzhgorod Ruthenia UA +4750+03510 Europe/Zaporozhye Zaporozh'ye, E Lugansk UA +4457+03406 Europe/Simferopol central Crimea UG +0019+03225 Africa/Kampala UM +1700-16830 Pacific/Johnston Johnston Atoll UM +2813-17722 Pacific/Midway Midway Islands UM +1917+16637 Pacific/Wake Wake Island US +404251-0740023 America/New_York Eastern Time US +421953-0830245 America/Detroit Eastern Time - Michigan - most locations US +381515-0854534 America/Louisville Eastern Time - Kentucky - Louisville area US +364947-0845057 America/Kentucky/Monticello Eastern Time - Kentucky - Wayne County US +394606-0860929 America/Indianapolis Eastern Standard Time - Indiana - most locations US +382232-0862041 America/Indiana/Marengo Eastern Standard Time - Indiana - Crawford County US +411745-0863730 America/Indiana/Knox Eastern Standard Time - Indiana - Starke County US +384452-0850402 America/Indiana/Vevay Eastern Standard Time - Indiana - Switzerland County US +415100-0873900 America/Chicago Central Time US +450628-0873651 America/Menominee Central Time - Michigan - Wisconsin border US +470659-1011757 America/North_Dakota/Center Central Time - North Dakota - Oliver County US +394421-1045903 America/Denver Mountain Time US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon US +364708-1084111 America/Shiprock Mountain Time - Navajo US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona US +340308-1181434 America/Los_Angeles Pacific Time US +611305-1495401 America/Anchorage Alaska Time US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck US +643004-1652423 America/Nome Alaska Time - west Alaska US +515248-1763929 America/Adak Aleutian Islands US +211825-1575130 Pacific/Honolulu Hawaii UY -3453-05611 America/Montevideo UZ +3940+06648 Asia/Samarkand west Uzbekistan UZ +4120+06918 Asia/Tashkent east Uzbekistan VA +4154+01227 Europe/Vatican VC +1309-06114 America/St_Vincent VE +1030-06656 America/Caracas VG +1827-06437 America/Tortola VI +1821-06456 America/St_Thomas VN +1045+10640 Asia/Saigon VU -1740+16825 Pacific/Efate WF -1318-17610 Pacific/Wallis WS -1350-17144 Pacific/Apia YE +1245+04512 Asia/Aden YT -1247+04514 Indian/Mayotte YU +4450+02030 Europe/Belgrade ZA -2615+02800 Africa/Johannesburg ZM -1525+02817 Africa/Lusaka ZW -1750+03103 Africa/Harare |
From: Joe S. <joe...@us...> - 2003-02-20 16:42:49
|
Update of /cvsroot/phpslash/phpslash-ft/class/locale In directory sc8-pr-cvs1:/tmp/cvs-serv9886/phpslash-ft/class/locale Modified Files: no.php3 Log Message: Norwegian translation, comment IP with register globals off Index: no.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/locale/no.php3,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** no.php3 20 Feb 2003 16:38:32 -0000 1.6 --- no.php3 20 Feb 2003 16:42:44 -0000 1.7 *************** *** 1,5 **** <?php /* ! * en ( English) Language file for PHPSlash * translations named using POSIX locale conventions ( en, es, de, etc) * --- 1,5 ---- <?php /* ! * no ( Norwegian) Language file for PHPSlash * translations named using POSIX locale conventions ( en, es, de, etc) * |
From: Joe S. <joe...@us...> - 2003-02-20 16:38:36
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv6624/phpslash-ft/public_html Modified Files: comment.php3 Log Message: Norwegian translation, comment IP with register globals off Index: comment.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/comment.php3,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** comment.php3 19 Feb 2003 20:20:13 -0000 1.30 --- comment.php3 20 Feb 2003 16:38:31 -0000 1.31 *************** *** 41,45 **** // when you are previewing a comment before submitting ! $ary['replying_to'] = $cmt->formatComment($ary); $content .= $cmt->getForm($ary); --- 41,46 ---- // when you are previewing a comment before submitting ! $ary['ip'] = gethostbyaddr($HTTP_SERVER_VARS['REMOTE_ADDR']); /* add the poster's IP addr */ ! $ary['replying_to'] = $cmt->formatComment($ary); $content .= $cmt->getForm($ary); *************** *** 55,59 **** $content .= getTitlebar("100%", "Submitted Comment"); ! $ary['ip'] = $REMOTE_ADDR; /* add the poster's IP addr */ $id = $cmt->update($ary); --- 56,60 ---- $content .= getTitlebar("100%", "Submitted Comment"); ! $ary['ip'] = $HTTP_SERVER_VARS['REMOTE_ADDR']; /* add the poster's IP addr */ $id = $cmt->update($ary); |
From: Joe S. <joe...@us...> - 2003-02-20 16:38:36
|
Update of /cvsroot/phpslash/phpslash-ft/class/locale In directory sc8-pr-cvs1:/tmp/cvs-serv6624/phpslash-ft/class/locale Modified Files: no.php3 Log Message: Norwegian translation, comment IP with register globals off Index: no.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/locale/no.php3,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** no.php3 11 Nov 2002 18:13:21 -0000 1.5 --- no.php3 20 Feb 2003 16:38:32 -0000 1.6 *************** *** 1,8 **** <?php /* ! * no ( Norwegian) Language file for PHPSlash * translations named using POSIX locale conventions ( en, es, de, etc) * ! * Please don't use HTML code here! */ $pslstrings = array( --- 1,8 ---- <?php [...1337 lines suppressed...] "Comment Administration" => ! "Kommentar-administrasjon", "Poll Administration" => ! "Avstemnings-administrasjon", "Story Administration" => ! "Saks-administrasjon", "Submission Administration" => ! "Innleverings-administrasjon", "Topic Administration" => ! "Tema-administrasjon", ! ! "Group Administration" => ! "Gruppe-administrasjon" ); ?> |
From: Joe S. <joe...@us...> - 2003-02-20 16:38:36
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv6624/phpslash-ft Modified Files: CHANGES Log Message: Norwegian translation, comment IP with register globals off Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.698 retrieving revision 1.699 diff -C2 -d -r1.698 -r1.699 *** CHANGES 19 Feb 2003 20:20:10 -0000 1.698 --- CHANGES 20 Feb 2003 16:38:27 -0000 1.699 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2003-February-20 10:00AM CST Joe Stewart <joe...@us...> + [W] - no.php3 - Lars Kvanum updated the Norwegian translation. + comment.php3 - IP should now work with register globals off. + 2003-February-19 2:00PM CST Joe Stewart <joe...@us...> [W] - comment.php3 - Name used to comment is now saved in the session. |
From: Joe S. <joe...@us...> - 2003-02-19 20:20:20
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv29565/phpslash-ft/public_html Modified Files: comment.php3 Log Message: Name used to comment is now saved in the session Index: comment.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/comment.php3,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** comment.php3 23 Jan 2003 19:30:56 -0000 1.29 --- comment.php3 19 Feb 2003 20:20:13 -0000 1.30 *************** *** 22,37 **** $email = $ary['email']; $url = $ary['url']; ! ! if (!empty($ary['cookiebox'])) { ! ! $name = $ary['name']; ! $email = $ary['email']; ! $url = $ary['url']; ! $sess->register("name"); ! $sess->register("email"); ! $sess->register("url"); } ! $cmt = pslNew("Comment",$ary); --- 22,37 ---- $email = $ary['email']; $url = $ary['url']; ! ! if(!empty($ary['name'])) { ! $comment_name = $ary['name']; ! $comment_email = $ary['email']; ! $comment_url = $ary['url']; ! $sess->register("comment_name"); ! $sess->register("comment_email"); ! $sess->register("comment_url"); } ! ! $cmt = pslNew("Comment",$ary); *************** *** 61,66 **** // expire cache for this story_id ! jpcache_gc('string', "-story_id-" . $ary['story_id'], "100"); ! $content .= getMessage($cmt->getMessage()); $comment_ary = $cmt->getCommentArray($id); --- 61,67 ---- // expire cache for this story_id ! if(function_exists('jpcache_gc')) { ! jpcache_gc('string', "-story_id-" . $ary['story_id'], "100"); ! } $content .= getMessage($cmt->getMessage()); $comment_ary = $cmt->getCommentArray($id); *************** *** 88,91 **** --- 89,97 ---- if (empty($ary['parent_id'])) { $ary['parent_id'] = 0; + } + + if ($sess->is_registered("comment_name")) { + $ary['name'] = $comment_name; + $ary['email'] = $comment_email; } |
From: Joe S. <joe...@us...> - 2003-02-19 20:20:20
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv29565/phpslash-ft Modified Files: CHANGES Log Message: Name used to comment is now saved in the session Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.697 retrieving revision 1.698 diff -C2 -d -r1.697 -r1.698 *** CHANGES 19 Feb 2003 16:27:51 -0000 1.697 --- CHANGES 19 Feb 2003 20:20:10 -0000 1.698 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2003-February-19 2:00PM CST Joe Stewart <joe...@us...> + [W] - comment.php3 - Name used to comment is now saved in the session. + 2003-February-19 10:00AM CST Joe Stewart <joe...@us...> [B] - slashAuthCR.class - corrected "Account created, but validation failed" |