phpslash-commit Mailing List for phpSlash (Page 22)
Brought to you by:
joestewart,
nhruby
Menu
▾
▴
phpslash-commit — A list for automatically mailed SCM Commits
You can subscribe to this list here.
| 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...> - 2004-10-26 19:44:27
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/auth/authtypes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15436/phpslash-dev/include/modules/auth/authtypes Modified Files: slashAuthSkel.class Log Message: comment submitter's IP or domain should display if not comment Admin. Index: slashAuthSkel.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/auth/authtypes/slashAuthSkel.class,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** slashAuthSkel.class 21 Sep 2004 11:16:59 -0000 1.1 --- slashAuthSkel.class 26 Oct 2004 19:43:46 -0000 1.2 *************** *** 12,17 **** // returns true if user is validated // false otherwise - // The parent class loginform uses attempts to use Challenge-Response and the - // password argument will typically be blank // function psl_validate($username='', $password='', $response='', $user_info='') { --- 12,15 ---- |
|
From: Joe S. <joe...@us...> - 2004-10-26 19:44:26
|
Update of /cvsroot/phpslash/phpslash-dev/tables/0.8 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15436/phpslash-dev/tables/0.8 Modified Files: psl_core.sql Log Message: comment submitter's IP or domain should display if not comment Admin. Index: psl_core.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/tables/0.8/psl_core.sql,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** psl_core.sql 23 Oct 2004 17:20:02 -0000 1.4 --- psl_core.sql 26 Oct 2004 19:43:46 -0000 1.5 *************** *** 913,917 **** INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (448,154,16); INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (449,153,16); ! -- -- Table structure for table `psl_section_lut` --- 913,917 ---- INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (448,154,16); INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (449,153,16); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (450,170,15); -- -- Table structure for table `psl_section_lut` |
|
From: Joe S. <joe...@us...> - 2004-10-26 19:44:25
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15436/phpslash-dev Modified Files: CHANGES Log Message: comment submitter's IP or domain should display if not comment Admin. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.128 retrieving revision 1.129 diff -C2 -d -r1.128 -r1.129 *** CHANGES 26 Oct 2004 09:38:35 -0000 1.128 --- CHANGES 26 Oct 2004 19:43:45 -0000 1.129 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2004-October 23 Joe Stewart <joe...@us... + [BT] - comment/index.php, Comment.class, basic: comment.tpl, comment.Display.tpl, + commentSubmitForm.tpl, storyIndex.tpl, psl_core.sql - comment submitter's + IP or domain should display if not comment Admin. comment.php is not used. + 2004-October 26 Luis M <le...@us...> [F] - config-dist.ini.php Added much needed variables for LDAP auth |
|
From: Luis M <le...@us...> - 2004-10-26 18:05:59
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/auth/authtypes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25015 Modified Files: slashAuthLDAP.class Log Message: much improved class. ldap doesn't require challenge_response Index: slashAuthLDAP.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/auth/authtypes/slashAuthLDAP.class,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** slashAuthLDAP.class 26 Oct 2004 09:34:27 -0000 1.3 --- slashAuthLDAP.class 26 Oct 2004 18:05:49 -0000 1.4 *************** *** 16,25 **** var $Base_dn = ""; /** base_dn holds our base for lookups. i.e. dc=host,dc=domain,dc=rootdomain */ var $Search_detail = "uid"; /** uid holds our usernames */ var $ds = ""; /** database connection */ /** PSL LDAP validation @param $username user name to validate (required) ! @param $password plain text of the user's password. needed only when javascript is disabled ! @param $response needed only when javascript is disabled @param $user_info ditto @return boolean true if user is validated false otherwise --- 16,28 ---- var $Base_dn = ""; /** base_dn holds our base for lookups. i.e. dc=host,dc=domain,dc=rootdomain */ var $Search_detail = "uid"; /** uid holds our usernames */ + var $userpasswd = "userPassword"; /** userpassword holds encoded passwords in ldap db */ + + /* End configuration */ var $ds = ""; /** database connection */ /** PSL LDAP validation @param $username user name to validate (required) ! @param $password plain text of the user's password ! @param $response ditto @param $user_info ditto @return boolean true if user is validated false otherwise *************** *** 27,31 **** @note The parent class loginform uses attempts to use Challenge-Response and the password argument will typically be blank */ ! function psl_validate($username, $password='', $response='', $user_info='') { global $challenge,$_PSL; $this->Host = $_PSL['LDAP_Host']; --- 30,34 ---- @note The parent class loginform uses attempts to use Challenge-Response and the password argument will typically be blank */ ! function psl_validate($username, $password, $response='', $user_info='') { global $challenge,$_PSL; $this->Host = $_PSL['LDAP_Host']; *************** *** 35,39 **** --- 38,72 ---- $is_user = false; /* assumes test will fail */ + $pw = ""; /** string (possibly encrypted) that will hold passwd from ldap */ + debug("psl_validate()","checking if user exists before getting its password:"); + if ( $this->psl_ldap_is_user($username) == true ) + { + debug("psl_validate()","user does exist! getting password:"); + $pw = $this->psl_ldap_pass($username); + } else { + debug("psl_validate()","user does not exist! bailing out"); + return false; + } + /* TODO when setting user's passwords, you might want to try: + if ( preg_match("/{md5}/i",$_PSL[LDAP_scheme]) ) + { + $my_pass = md5("$password"); + } else if ( preg_match("/{ssha}/i",$_PSL[LDAP_scheme]) ) { + mt_srand((double) microtime()*1000000); + $salt=mhash_keygen_s2k(MHASH_SHA1,$password,substr(pack("h*",md5(mt_rand())),0,8),4); + $my_pass="{ssha}".base64_encode(mhash(MHASH_SHA1, $password.$salt).$salt); + } else { + // try crypt or simply fail with a warning / + $my_pass = crypt(""); + debug("psl_validate()","We don't support this scheme for passwords yet"); + }*/ + $my_pass = md5($password); + debug("psl_validate()","$pw == $my_pass ??"); + if ( $pw == $my_pass ) + { + $is_user = true; + } + /* This is only needed for CR: $md5_pw = $this->psl_ldap_pass($username); // generate the expected response *************** *** 46,54 **** $response = md5("$md5_pw_net:$challenge"); } ! ! if ( $expected_response == $response ) { ! // success ! $is_user = true; /** TODO: might be a good thing to register this user? in SQL ?*/ --- 79,86 ---- $response = md5("$md5_pw_net:$challenge"); } ! */ ! if ( $is_user == true ) { ! // success /** TODO: might be a good thing to register this user? in SQL ?*/ *************** *** 66,98 **** } /** * ! * Find and return the MD5 encoded password for the specified user * * @param $username username to lookup ! * @return md5(username:password) * **/ function psl_ldap_pass($username = "") { ! //debug('function psl_ldap_pass()', ""); $passwd = ""; /** get user's password */ ! $ldap_user = $this->psl_ldap_search_user($username,array("userPassword")); if ( $ldap_user != false ) { ! // NOTE: userPassword because we use inetOrgPerson+posixAccount schemas ! foreach ($ldap_user as $key => $val) ! { ! if ( $key == "userpassword" ) ! { ! $passwd = $val; ! break; ! } ! } ! $md5_pw = md5($username .":". $passwd); ! return $md5_pw; } ! //debug('function psl_ldap_pass() ', 'failed'); return false; } --- 98,141 ---- } + /** + * A wrapper for psl_ldap_search_user. + * It checks whether user exists in the db. + * + * @param $username user to look for in "uid" attribute + * @return true if user exist, false otherwise + */ + function psl_ldap_is_user ($username) + { + $uid = $this->psl_ldap_search_user ($username, array($this->Search_detail)); + if ( $uid != false ) + { + return true; + } + debug("psl_ldap_is_user()","failed!"); + return false; + } + /** * ! * Find and return the encoded password for the specified user * * @param $username username to lookup ! * @return ldap passwd scalar * **/ function psl_ldap_pass($username = "") { ! debug("psl_ldap_pass()","looking for user passwd"); $passwd = ""; /** get user's password */ ! $ldap_user = $this->psl_ldap_search_user($username, ! array($this->userpassword)); if ( $ldap_user != false ) { ! // NOTE: userPassword because we use ! // inetOrgPerson+posixAccount schemas ! return $ldap_user[$this->userpassword]; } ! //debug('psl_ldap_pass()', 'failed'); return false; } *************** *** 100,112 **** /** * ! * Find and return the specified LDAP user ! * * **/ function psl_ldap_search_user ($username = "", $attributes="") { global $_PSL; ! $fields = ( is_array ( $attributes ) ) ? $attributes : array("userPassword"); ! //debug('function LDAP_search_user()', ""); ! //debug('HOST: %s && PORT: %s',$this->Host,$this->Port); if (!ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3)) { --- 143,157 ---- /** * ! * Find and return the specified LDAP user in ldap db ! * ! * @param $username username to search for using $this->Search_detail (usually 'uid') ! * @return associative array with: $ary[$this->Search_detail], $ary[$this->userpassword] # TODO should return all attributes passed in array() $attributes OR false if fails * **/ function psl_ldap_search_user ($username = "", $attributes="") { global $_PSL; ! $ary = array(); ! $fields = ( is_array ( $attributes ) ) ? $attributes : array($this->userpassword); ! debug('psl_ldap_search_user()', "searching db"); if (!ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3)) { *************** *** 118,123 **** return false; } ! // so, use preg_match() to determine if we need this... ideally, ! // we should let users say this from config.ini.php */ /* for now we assume that we are running in the same server or --- 163,169 ---- return false; } ! // so, use preg_match() to determine if we need this from LDAP ! // uri: ldaps:// doesn't need tls... ! // ideally, we should let users say this from config.ini.php */ /* for now we assume that we are running in the same server or *************** *** 125,144 **** this is a major security hole. avoid doing such things if possible*/ /** Bind to ldap host with superuser privileges so that ! we can retrieve userPassword attributes: */ $ldap_bind = ldap_bind($this->ds,$_PSL['LDAP_User'],$_PSL['LDAP_Password']); if ( $ldap_bind ) { $ldap_search_result = ldap_search($this->ds, ! $this->Base_dn, $this->Search_detail."=".$username,$attributes); if ($ldap_search_result) { - //debug("function LDAP_search() ldap_search_result",print_r($ldap_search_result)); $result = ldap_get_entries($this->ds, $ldap_search_result); ! //debug("function LDAP_search() result",print_r($result)); ! return $result; } ! debug('function LDAP_search_user() search', ' failed'); } ! debug('function LDAP_search_user() ', ' failed'); return false; } --- 171,197 ---- this is a major security hole. avoid doing such things if possible*/ /** Bind to ldap host with superuser privileges so that ! we can retrieve $this->userpassword attributes: */ $ldap_bind = ldap_bind($this->ds,$_PSL['LDAP_User'],$_PSL['LDAP_Password']); if ( $ldap_bind ) { $ldap_search_result = ldap_search($this->ds, ! $this->Base_dn, ! $this->Search_detail."=".$username, ! $attributes, ! 0, /** get all values and attributes */ ! 1 /** we only care about 1 return, @see sizelimit */ ! ); if ($ldap_search_result) { $result = ldap_get_entries($this->ds, $ldap_search_result); ! debug("psl_ldap_search_user() result",print_r($result)); ! ldap_free_result($ldap_search_result); ! $ary[$this->Search_detail] = $result[0][$this->Search_detail][0]; ! $ary[$this->Search_detail] = $result[0][$this->userpassword][0]; ! return $ary; } ! debug('function psl_ldap_search_user() search', ' failed'); } ! debug('function psl_ldap_search_user() ', ' failed'); return false; } |
|
From: Luis M <le...@us...> - 2004-10-26 09:40:05
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25218 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/ChangeLog,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ChangeLog 25 Oct 2004 18:49:58 -0000 1.16 --- ChangeLog 26 Oct 2004 09:39:55 -0000 1.17 *************** *** 1,2 **** --- 1,35 ---- + 2004-10-26 05:38 lems1 + + * CHANGES: feature notes + + 2004-10-26 05:34 lems1 + + * include/modules/auth/authtypes/slashAuthLDAP.class: new improved + class. almost able to authenticate, however, since user passwords + are usually kept encrypted in the LDAP database, we might need to + do things differently when dealing with ldap auth (perhaps we need + to use md5 exclusively with a different salting method (same as + ldap uses) and match md5 strings instead of $challenge ...) + + 2004-10-26 04:58 lems1 + + * public_html/config-dist.ini.php: added another note about + validation and avoiding CR if you need ldap v2 or if you don't want + a superuser to access all accounts for psl + + 2004-10-26 04:54 lems1 + + * public_html/config-dist.ini.php: added more notes about ldap and + what's needed to make it work + + 2004-10-26 04:37 lems1 + + * public_html/config-dist.ini.php: to read special fields in ldap + db one needs to bind with special privileges + + 2004-10-26 02:15 lems1 + + * public_html/config-dist.ini.php: added ldap variables + 2004-10-23 13:20 joestewart |
|
From: Luis M <le...@us...> - 2004-10-26 09:38:49
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24937 Modified Files: CHANGES Log Message: feature notes Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.127 retrieving revision 1.128 diff -C2 -d -r1.127 -r1.128 *** CHANGES 23 Oct 2004 17:20:02 -0000 1.127 --- CHANGES 26 Oct 2004 09:38:35 -0000 1.128 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2004-October 26 Luis M <le...@us...> + [F] - config-dist.ini.php Added much needed variables for LDAP auth + [F] - slashAuthLDAP.class almost complete. Is able to pull info from db + 2004-October 23 Joe Stewart <joe...@us... [B] - story/Story_admin.class - story options for New Stories. *************** *** 27,36 **** psl-core.sql, psl_example.sql - admin blocks should have been openbox. ! 2004-October 21 Luis M <le...@us... [W9] - Switched config_setup.php to work with config-dist.ini.php, and copied variables from config_setup.ini.php to this file. Then removed config_setup.ini.php from CVS. ! 2004-October 20 Luis M <le...@us... [FW] - Fixed config-dist.php's code for jpcache and added jpcache.cachedir variable to config-dist.ini.php. Users can now use config.ini.php --- 31,40 ---- psl-core.sql, psl_example.sql - admin blocks should have been openbox. ! 2004-October 21 Luis M <le...@us...> [W9] - Switched config_setup.php to work with config-dist.ini.php, and copied variables from config_setup.ini.php to this file. Then removed config_setup.ini.php from CVS. ! 2004-October 20 Luis M <le...@us...> [FW] - Fixed config-dist.php's code for jpcache and added jpcache.cachedir variable to config-dist.ini.php. Users can now use config.ini.php |
|
From: Luis M <le...@us...> - 2004-10-26 09:34:38
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/auth/authtypes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24199 Modified Files: slashAuthLDAP.class Log Message: new improved class. almost able to authenticate, however, since user passwords are usually kept encrypted in the LDAP database, we might need to do things differently when dealing with ldap auth (perhaps we need to use md5 exclusively with a different salting method (same as ldap uses) and match md5 strings instead of $challenge ...) Index: slashAuthLDAP.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/auth/authtypes/slashAuthLDAP.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** slashAuthLDAP.class 20 Oct 2004 22:08:49 -0000 1.2 --- slashAuthLDAP.class 26 Oct 2004 09:34:27 -0000 1.3 *************** *** 6,25 **** * Written by Peter Starowicz <pe...@op...> for OpenConcept.ca * ! * This module unfinished and untested - remove this when completed * */ class slashAuth extends slashAuth_base { ! /** PSL LDAP validation ! @param $username user name to validate ! @param $password ... @return boolean true if user is validated false otherwise @note The parent class loginform uses attempts to use Challenge-Response and the password argument will typically be blank */ ! function psl_validate($username, $password, $response='', $user_info='') { ! global $challenge; ! $is_user = false; $md5_pw = $this->psl_ldap_pass($username); --- 6,38 ---- * Written by Peter Starowicz <pe...@op...> for OpenConcept.ca * ! * 2004-10-26 00:49 EDT ! * Modified by Luis Mondesi < lems1 at users | sf | net> for PSL 0.8 * */ class slashAuth extends slashAuth_base { ! /* TODO we might need to test $_PSL vars before passing them to connect */ ! var $Host = ""; ! var $Port = ""; ! var $Base_dn = ""; /** base_dn holds our base for lookups. i.e. dc=host,dc=domain,dc=rootdomain */ ! var $Search_detail = "uid"; /** uid holds our usernames */ ! var $ds = ""; /** database connection */ ! /** PSL LDAP validation ! @param $username user name to validate (required) ! @param $password plain text of the user's password. needed only when javascript is disabled ! @param $response needed only when javascript is disabled ! @param $user_info ditto @return boolean true if user is validated false otherwise @note The parent class loginform uses attempts to use Challenge-Response and the password argument will typically be blank */ ! function psl_validate($username, $password='', $response='', $user_info='') { ! global $challenge,$_PSL; ! $this->Host = $_PSL['LDAP_Host']; ! $this->Port = $_PSL['LDAP_Port']; ! $this->Base_dn = $_PSL['LDAP_Base']; /** base_dn holds our base for lookups. i.e. dc=host,dc=domain,dc=rootdomain */ ! $this->ds = ldap_connect($this->Host, $this->Port); /** ds holds our connect socket. it hasn't "connected" yet, just setup some defaults */ ! $is_user = false; /* assumes test will fail */ $md5_pw = $this->psl_ldap_pass($username); *************** *** 28,43 **** // True when JS is disabled ! if ( $response == "" ) { $md5_pw_net = md5("$username:$password"); $response = md5("$md5_pw_net:$challenge"); } ! if ($expected_response != $response) { // failed - return with error message $this->auth["error"] = pslgetText("Either your username or password are invalid. Please try again."); ! $is_user = false; ! } else { ! // success ! $is_user = true; } return $is_user; --- 41,65 ---- // True when JS is disabled ! if ( $response == "" ) ! { $md5_pw_net = md5("$username:$password"); $response = md5("$md5_pw_net:$challenge"); } ! if ( $expected_response == $response ) ! { ! // success ! $is_user = true; ! /** TODO: might be a good thing to register this user? ! in SQL ?*/ ! /* ! $ary['username'] = $username; ! $ary['password'] = $password; ! psl_register_authed($ary); ! */ ! } else { // failed - return with error message $this->auth["error"] = pslgetText("Either your username or password are invalid. Please try again."); ! $is_user = false; /* dup! just making sure... */ } return $is_user; *************** *** 47,62 **** * * Find and return the MD5 encoded password for the specified user ! * * **/ ! function psl_ldap_pass($username = "") { ! // debug('function LDAP_pass()', ""); ! ! $ldap_user = $this->psl_ldap_search_user($username); ! if ($ldap_user) { ! $md5_pw = md5($username .":". $ldap_user[0]["password"][0]; ! // return $ldap_user[0]["password"][0]; } ! //debug('function ldap_pass() ', 'failed'); return false; } --- 69,98 ---- * * Find and return the MD5 encoded password for the specified user ! * ! * @param $username username to lookup ! * @return md5(username:password) * **/ ! function psl_ldap_pass($username = "") ! { ! //debug('function psl_ldap_pass()', ""); ! $passwd = ""; ! /** get user's password */ ! $ldap_user = $this->psl_ldap_search_user($username,array("userPassword")); ! if ( $ldap_user != false ) ! { ! // NOTE: userPassword because we use inetOrgPerson+posixAccount schemas ! foreach ($ldap_user as $key => $val) ! { ! if ( $key == "userpassword" ) ! { ! $passwd = $val; ! break; ! } ! } ! $md5_pw = md5($username .":". $passwd); ! return $md5_pw; } ! //debug('function psl_ldap_pass() ', 'failed'); return false; } *************** *** 68,87 **** * **/ ! function psl_ldap_search_user($username = "") { //debug('function LDAP_search_user()', ""); ! ! $this->ds = @ldap_connect($this->Host, $this->Port); ! $ldap_search_result = @ldap_search($this->ds, $this->Base_dn, $this->Search_detail."=".$username); ! if ($ldap_search_result) { ! //debug("function LDAP_search() ldap_search_result",print_r($ldap_search_result)); ! $result = ldap_get_entries($this->ds, $ldap_search_result); ! //debug("function LDAP_search() result",print_r($result)); ! return $result; } ! ! //debug('function LDAP_search_user() ', ' failed'); ! return false; } } ?> - --- 104,146 ---- * **/ ! function psl_ldap_search_user ($username = "", $attributes="") { ! global $_PSL; ! $fields = ( is_array ( $attributes ) ) ? $attributes : array("userPassword"); //debug('function LDAP_search_user()', ""); ! //debug('HOST: %s && PORT: %s',$this->Host,$this->Port); ! if (!ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3)) ! { ! return false; } ! /* FIXME in order to use tls to talk to remote servers, ! we might have to do: ! if (!ldap_start_tls($this->ds)) { ! return false; ! } ! // so, use preg_match() to determine if we need this... ideally, ! // we should let users say this from config.ini.php ! */ ! /* for now we assume that we are running in the same server or ! we can connect to port 389 in plaintext over a LAN/WAN; ! this is a major security hole. avoid doing such things if possible*/ ! /** Bind to ldap host with superuser privileges so that ! we can retrieve userPassword attributes: */ ! $ldap_bind = ldap_bind($this->ds,$_PSL['LDAP_User'],$_PSL['LDAP_Password']); ! if ( $ldap_bind ) ! { ! $ldap_search_result = ldap_search($this->ds, ! $this->Base_dn, $this->Search_detail."=".$username,$attributes); ! if ($ldap_search_result) { ! //debug("function LDAP_search() ldap_search_result",print_r($ldap_search_result)); ! $result = ldap_get_entries($this->ds, ! $ldap_search_result); ! //debug("function LDAP_search() result",print_r($result)); ! return $result; ! } ! debug('function LDAP_search_user() search', ' failed'); ! } ! debug('function LDAP_search_user() ', ' failed'); ! return false; } } ?> |
|
From: Luis M <le...@us...> - 2004-10-26 08:58:51
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16368 Modified Files: config-dist.ini.php Log Message: added another note about validation and avoiding CR if you need ldap v2 or if you don't want a superuser to access all accounts for psl Index: config-dist.ini.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.ini.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** config-dist.ini.php 26 Oct 2004 08:54:14 -0000 1.22 --- config-dist.ini.php 26 Oct 2004 08:58:42 -0000 1.23 *************** *** 160,164 **** ;; NOTE: * LDAP_Password needs to be set in clear text (for now) ;; * If you need tls, uncomment tls block in LDAP auth class (you will need tls if your LDAP server is not running locally) ! ;; * We only deal with LDAP protocol 3 (sorry, but if you really want to use protocol 2 comment out the bind call in LDAP auth class and tls. you will need to setup slapd.conf so that it lets anonymous users read userPassword attribute.) ;; ;; You might need to initiate a database with the sample ldif and add --- 160,164 ---- ;; NOTE: * LDAP_Password needs to be set in clear text (for now) ;; * If you need tls, uncomment tls block in LDAP auth class (you will need tls if your LDAP server is not running locally) ! ;; * We only deal with LDAP protocol 3 (sorry, but if you really want to use protocol 2 comment out the bind call in LDAP auth class and tls. you will need to setup slapd.conf so that it lets anonymous users read userPassword attribute.) You could also try NOT to use the CR login mechanisms so that user passwords are sent over http; then you can use this username/password to validate for his/her own account. ;; ;; You might need to initiate a database with the sample ldif and add |
|
From: Luis M <le...@us...> - 2004-10-26 08:54:23
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15617 Modified Files: config-dist.ini.php Log Message: added more notes about ldap and what's needed to make it work Index: config-dist.ini.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.ini.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** config-dist.ini.php 26 Oct 2004 08:37:48 -0000 1.21 --- config-dist.ini.php 26 Oct 2004 08:54:14 -0000 1.22 *************** *** 158,162 **** ;;; ;; LDAP Database variables ! ;; ;; You might need to initiate a database with the sample ldif and add ;; some users using --- 158,165 ---- ;;; ;; LDAP Database variables ! ;; NOTE: * LDAP_Password needs to be set in clear text (for now) ! ;; * If you need tls, uncomment tls block in LDAP auth class (you will need tls if your LDAP server is not running locally) ! ;; * We only deal with LDAP protocol 3 (sorry, but if you really want to use protocol 2 comment out the bind call in LDAP auth class and tls. you will need to setup slapd.conf so that it lets anonymous users read userPassword attribute.) ! ;; ;; You might need to initiate a database with the sample ldif and add ;; some users using |
|
From: Luis M <le...@us...> - 2004-10-26 08:37:57
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12210 Modified Files: config-dist.ini.php Log Message: to read special fields in ldap db one needs to bind with special privileges Index: config-dist.ini.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.ini.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** config-dist.ini.php 26 Oct 2004 06:15:25 -0000 1.20 --- config-dist.ini.php 26 Oct 2004 08:37:48 -0000 1.21 *************** *** 168,175 **** ;; LDAP_Base format: dc=domain,dc=local or o=Group or CN=Users,dc=domain. Consult your db with ldapsearch (see: man ldapsearch) LDAP_Base = "<LDAP_BASE>" ! ;; TODO: user's needed to create new users (future): ;; LDAP_User format (bind_dn): uid=user,dc=domain,dc=local LDAP_User = "<LDAP_USER>" ! ;; LDAP_PASSWORD format: {MD5}string or {SHA1}string ... etc... LDAP_Password = "<LDAP_PASSWORD>" ;; end of ldap database variables --- 168,175 ---- ;; LDAP_Base format: dc=domain,dc=local or o=Group or CN=Users,dc=domain. Consult your db with ldapsearch (see: man ldapsearch) LDAP_Base = "<LDAP_BASE>" ! ;; Need a special account that's able to create new users and read userPassword's attributes for all users under LDAP_BASE: ;; LDAP_User format (bind_dn): uid=user,dc=domain,dc=local LDAP_User = "<LDAP_USER>" ! ;; LDAP_PASSWORD format: {MD5}string or {SSHA}string ... etc... LDAP_Password = "<LDAP_PASSWORD>" ;; end of ldap database variables |
|
From: Luis M <le...@us...> - 2004-10-26 06:15:35
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16664 Modified Files: config-dist.ini.php Log Message: added ldap variables Index: config-dist.ini.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.ini.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** config-dist.ini.php 21 Oct 2004 18:58:31 -0000 1.19 --- config-dist.ini.php 26 Oct 2004 06:15:25 -0000 1.20 *************** *** 145,149 **** ;;; ! ;; Database variables ;; ;; Make sure you initialize the database with one of the sql scripts in --- 145,149 ---- ;;; ! ;; SQL Database variables ;; ;; Make sure you initialize the database with one of the sql scripts in *************** *** 153,160 **** DB_User = "<DB_USER>" DB_Password = "<DB_PASSWORD>" ! ;; end of database variables ;;; ;;; ;; PHPLIB configuration ;; --- 153,180 ---- DB_User = "<DB_USER>" DB_Password = "<DB_PASSWORD>" ! ;; end of sql database variables ;;; ;;; + ;; LDAP Database variables + ;; + ;; You might need to initiate a database with the sample ldif and add + ;; some users using + ;; + ;; LDAP_Host format: ldap[s]://domain[:389|:636] or hostname + LDAP_Host = "<LDAP_HOST>" + ;; LDAP_Port format: 389|636 (Optional: needed only if LDAP_HOST is given as 'hostname' and not as URI + LDAP_Port = "<LDAP_PORT>" + ;; LDAP_Base format: dc=domain,dc=local or o=Group or CN=Users,dc=domain. Consult your db with ldapsearch (see: man ldapsearch) + LDAP_Base = "<LDAP_BASE>" + ;; TODO: user's needed to create new users (future): + ;; LDAP_User format (bind_dn): uid=user,dc=domain,dc=local + LDAP_User = "<LDAP_USER>" + ;; LDAP_PASSWORD format: {MD5}string or {SHA1}string ... etc... + LDAP_Password = "<LDAP_PASSWORD>" + ;; end of ldap database variables + ;;; + + ;;; ;; PHPLIB configuration ;; *************** *** 253,262 **** ;; Authorization mode: ;; 'CR' - Authorize by Challenge Response [default] ! ;; 'LDAP' - auth.type = "CR" ;;;;;; ;; Registration mode: ! ;; 'reg' - allow users to register themselves and create accounts on your site ;; 'log' - restrict the creation of new accounts to administrators auth.mode = "reg" --- 273,282 ---- ;; Authorization mode: ;; 'CR' - Authorize by Challenge Response [default] ! ;; 'LDAP' - Authorize against an LDAP repository (objectclass=inetOrgPerson,posixAccount,shadowAccount) auth.type = "CR" ;;;;;; ;; Registration mode: ! ;; 'reg' - allow users to register themselves and create accounts on your site (not for LDAP) ;; 'log' - restrict the creation of new accounts to administrators auth.mode = "reg" |
|
From: Luis M <le...@us...> - 2004-10-25 18:50:07
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31747 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/ChangeLog,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ChangeLog 20 Oct 2004 17:12:42 -0000 1.15 --- ChangeLog 25 Oct 2004 18:49:58 -0000 1.16 *************** *** 1,2591 **** ! 2004-10-20 07:19 joestewart * CHANGES, include/modules/block/Block_admin.class, ! include/templates/en/basic/blockEdit.tpl, ! public_html/config-dist.ini.php, ! public_html/config_setup.ini.php, ! include/templates/en/basic/blockList.tpl: block admin interface ! changes ! 2004-10-19 16:47 joestewart [...5202 lines suppressed...] ! public_html/images/topics/topicquickies.gif, ! public_html/images/topics/topicredhat.gif, ! public_html/images/topics/topicscience.gif, ! public_html/images/topics/topicsgi.gif, ! public_html/images/topics/topicslashdot.gif, ! public_html/images/topics/topicspam.jpg, ! public_html/images/topics/topicstarwars.gif, ! public_html/images/topics/topicsun.gif, ! public_html/images/topics/topicsuse.gif, ! public_html/images/topics/topictech2.jpg, ! public_html/images/topics/topictv.jpg, ! public_html/images/topics/topicunix.jpg, ! public_html/images/topics/topicus.gif, ! public_html/images/topics/topicwine.gif, ! public_html/images/topics/topicx.jpg, ! public_html/images/topics/topicxmas.jpg, ! public_html/styles/basic.css, public_html/styles/xhtmlb.css, ! scripts/db_xfer.php3.disabled, scripts/url_test.php, ! tables/0.7/65_to_7.sql, tables/0.7/slash-all.sql: Initial revision |
|
From: Joe S. <joe...@us...> - 2004-10-23 17:20:11
|
Update of /cvsroot/phpslash/phpslash-dev/tables/0.8 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29851/phpslash-dev/tables/0.8 Modified Files: psl_core.sql psl_example.sql Log Message: story options for New Stories. Add bloggers to user group Index: psl_core.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/tables/0.8/psl_core.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** psl_core.sql 22 Oct 2004 20:12:56 -0000 1.3 --- psl_core.sql 23 Oct 2004 17:20:02 -0000 1.4 *************** *** 133,137 **** INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_section_lut_seq',66); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_permission_lut_seq',117); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_group_lut_seq',64); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_author_group_lut_seq',27); --- 133,137 ---- INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_section_lut_seq',66); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_permission_lut_seq',117); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_group_lut_seq',65); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_author_group_lut_seq',27); Index: psl_example.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/tables/0.8/psl_example.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** psl_example.sql 22 Oct 2004 20:12:56 -0000 1.3 --- psl_example.sql 23 Oct 2004 17:20:02 -0000 1.4 *************** *** 38,41 **** --- 38,47 ---- -- + -- Dumping data for table 'psl_group_group_lut' + -- + + INSERT INTO psl_group_group_lut (lut_id, group_id, childgroup_id) VALUES (65,21,28); + + -- -- Dumping data for table 'psl_poll_answer' -- *************** *** 70,74 **** INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (242,131,3); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (234,130,3); INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (263,141,5); INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (278,139,4); --- 76,80 ---- INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (242,131,3); ! -- INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (234,130,3); INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (263,141,5); INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (278,139,4); |
|
From: Joe S. <joe...@us...> - 2004-10-23 17:20:11
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29851/phpslash-dev/public_html Modified Files: config-dist.php Log Message: story options for New Stories. Add bloggers to user group Index: config-dist.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** config-dist.php 20 Oct 2004 22:04:39 -0000 1.30 --- config-dist.php 23 Oct 2004 17:20:02 -0000 1.31 *************** *** 565,576 **** 'module' => "Submission" ); - /* $menuitem[] = array( ! 'name' => "Blog", 'link' => $_PSL['rooturl'] . "/index.php?section=Blogs", ! 'perm' => "nobody", 'module' => "Story" ); - */ $menuitem[] = array( 'name' => "Glossary", --- 565,574 ---- 'module' => "Submission" ); $menuitem[] = array( ! 'name' => "Blogs", 'link' => $_PSL['rooturl'] . "/index.php?section=Blogs", ! 'perm' => "bloggers", 'module' => "Story" ); $menuitem[] = array( 'name' => "Glossary", |
|
From: Joe S. <joe...@us...> - 2004-10-23 17:20:11
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/story In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29851/phpslash-dev/include/modules/story Modified Files: Story_admin.class Log Message: story options for New Stories. Add bloggers to user group Index: Story_admin.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/story/Story_admin.class,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Story_admin.class 19 Oct 2004 15:26:26 -0000 1.6 --- Story_admin.class 23 Oct 2004 17:20:02 -0000 1.7 *************** *** 642,645 **** --- 642,647 ---- $this->template->set_block("newstory","second_row","second_rows"); $this->template->set_block("newstory","datetimeset_row","datetimeset_rows"); + + $temparray = ''; if ($data_source == "array") { /* this is what happens during a preview */ *************** *** 756,762 **** } - $options = displayOptions('story', $this->template, "newstory", ''); - $this->template->set_var('OPTIONS', $options); - $topic_ary = array(); if(array_key_exists('topic_id_ary', $ary)) { --- 758,761 ---- *************** *** 924,934 **** } } - - $temparray = ''; - if(@array_key_exists('story_options', $this->db->Record)) { - $temparray = unserialize($this->db->Record['story_options']); - } - $this->template->set_var(array( 'ACTION_URL' => "storyAdmin.php", --- 923,930 ---- } + if(@array_key_exists('story_options', $this->db->Record)) { + $temparray = unserialize($this->db->Record['story_options']); + } } $this->template->set_var(array( 'ACTION_URL' => "storyAdmin.php", |
|
From: Joe S. <joe...@us...> - 2004-10-23 17:20:11
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29851/phpslash-dev Modified Files: CHANGES Log Message: story options for New Stories. Add bloggers to user group Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.126 retrieving revision 1.127 diff -C2 -d -r1.126 -r1.127 *** CHANGES 22 Oct 2004 20:12:55 -0000 1.126 --- CHANGES 23 Oct 2004 17:20:02 -0000 1.127 *************** *** 13,16 **** --- 13,24 ---- 9 - Removal of something (kill -9 :) + 2004-October 23 Joe Stewart <joe...@us... + [B] - story/Story_admin.class - story options for New Stories. + [W] - config_setup.php - Text change. + config.php - enable blogs in menu for bloggers. + psl_core.sql, psl_example.sql - don't display calendar block + by default for php5 compatibility. Add bloggers to user + group. + 2004-October 22 Joe Stewart <joe...@us... [W] - block/Block_admin.class, basic/blockList.tpl - add column and |
|
From: Joe S. <joe...@us...> - 2004-10-22 20:47:18
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11812/phpslash-dev/include/modules/admin Modified Files: configperms.php Log Message: add column and ordernum to block list. Index: configperms.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/admin/configperms.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** configperms.php 18 Sep 2004 14:30:33 -0000 1.1 --- configperms.php 22 Oct 2004 20:47:06 -0000 1.2 *************** *** 11,15 **** // Check if config_setup.php is still enabled. if ($GLOBALS['perm']->have_perm('root') && file_exists($GLOBALS['_PSL']['basedir'] . '/config_setup.php')) { ! $securityWarning .= '<p>' . getError('Notice: After phpSlash is installed, please remove config_setup.php and config_setup.ini.php.') .'</p><p>From a linux shell the following wll make your install more secure and remove this message:' . '<br /> <em>rm ' . $GLOBALS['_PSL']['basedir'] . '/config_setup*</em></p>'; } --- 11,15 ---- // Check if config_setup.php is still enabled. if ($GLOBALS['perm']->have_perm('root') && file_exists($GLOBALS['_PSL']['basedir'] . '/config_setup.php')) { ! $securityWarning .= '<p>' . getError('Notice: After phpSlash is installed, please remove config_setup.php.') .'</p><p>From a linux shell the following wll make your install more secure and remove this message:' . '<br /> <em>rm ' . $GLOBALS['_PSL']['basedir'] . '/config_setup*</em></p>'; } |
|
From: Joe S. <joe...@us...> - 2004-10-22 20:13:13
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5039/phpslash-dev Modified Files: CHANGES Log Message: add column and ordernum to block list. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.125 retrieving revision 1.126 diff -C2 -d -r1.125 -r1.126 *** CHANGES 22 Oct 2004 14:20:58 -0000 1.125 --- CHANGES 22 Oct 2004 20:12:55 -0000 1.126 *************** *** 13,16 **** --- 13,22 ---- 9 - Removal of something (kill -9 :) + 2004-October 22 Joe Stewart <joe...@us... + [W] - block/Block_admin.class, basic/blockList.tpl - add column and + ordernum to block list. + slash-all.sql - removed since it has been split into two other files. + psl-core.sql, psl_example.sql - admin blocks should have been openbox. + 2004-October 21 Luis M <le...@us... [W9] - Switched config_setup.php to work with config-dist.ini.php, |
|
From: Joe S. <joe...@us...> - 2004-10-22 20:13:13
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/block In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5039/phpslash-dev/include/modules/block Modified Files: Block_admin.class Log Message: add column and ordernum to block list. Index: Block_admin.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/Block_admin.class,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Block_admin.class 20 Oct 2004 12:19:57 -0000 1.5 --- Block_admin.class 22 Oct 2004 20:12:56 -0000 1.6 *************** *** 221,224 **** --- 221,226 ---- location, source_url, + block_options, + ordernum, type.name AS type FROM psl_block block, *************** *** 259,262 **** --- 261,266 ---- $delurl = $this->psl['adminurl'] ."/blockAdmin.php?submit=delete&id=". $block_id; $viewurl = $this->psl['adminurl'] ."/blockAdmin.php?submit=view&id=". $block_id; + + $block_options = unserialize($this->db->f("block_options")); $this->templ->set_var(array( *************** *** 268,271 **** --- 272,277 ---- 'URL' => $this->db->f("location"), 'SOURCE_URL' => $this->db->f("source_url"), + 'ORDERNUM' => $this->db->f("ordernum"), + 'COLUMN' => $block_options['column'], 'TYPE' => $this->db->f("type") )); |
|
From: Joe S. <joe...@us...> - 2004-10-22 20:13:13
|
Update of /cvsroot/phpslash/phpslash-dev/tables/0.8 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5039/phpslash-dev/tables/0.8 Modified Files: psl_core.sql psl_example.sql Removed Files: slash-all.sql Log Message: add column and ordernum to block list. Index: psl_core.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/tables/0.8/psl_core.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** psl_core.sql 20 Oct 2004 17:11:07 -0000 1.2 --- psl_core.sql 22 Oct 2004 20:12:56 -0000 1.3 *************** *** 224,229 **** INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (171,18,'Related Links',0,'','','','a:4:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:0:\"\";s:6:\"module\";s:5:\"Story\";s:4:\"page\";s:12:\"relatedlinks\";}',92,NULL); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (172,18,'Config Files Security',0,'','','','a:5:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:6:\"module\";s:5:\"Admin\";s:4:\"page\";s:11:\"configperms\";s:8:\"box_type\";s:4:\"open\";}',90,NULL); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (173,18,'Clear Cache',0,'','','','a:4:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:6:\"module\";s:5:\"Admin\";s:4:\"page\";s:10:\"clearcache\";}',80,NULL); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (174,18,'System Details',0,'','','','a:4:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:6:\"module\";s:5:\"Admin\";s:4:\"page\";s:13:\"systemdetails\";}',70,NULL); -- --- 224,229 ---- INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (171,18,'Related Links',0,'','','','a:4:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:0:\"\";s:6:\"module\";s:5:\"Story\";s:4:\"page\";s:12:\"relatedlinks\";}',92,NULL); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (172,18,'Config Files Security',0,'','','','a:5:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:6:\"module\";s:5:\"Admin\";s:4:\"page\";s:11:\"configperms\";s:8:\"box_type\";s:4:\"open\";}',90,NULL); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (173,18,'Clear Cache',0,'','','','a:5:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:6:\"module\";s:5:\"Admin\";s:4:\"page\";s:10:\"clearcache\";s:8:\"box_type\";s:4:\"open\";}',80,NULL); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (174,18,'System Details',0,'','','','a:5:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:6:\"module\";s:5:\"Admin\";s:4:\"page\";s:13:\"systemdetails\";s:8:\"box_type\";s:4:\"open\";}',70,NULL); -- Index: psl_example.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/tables/0.8/psl_example.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** psl_example.sql 20 Oct 2004 16:35:59 -0000 1.2 --- psl_example.sql 22 Oct 2004 20:12:56 -0000 1.3 *************** *** 19,23 **** INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (144,6,'Most Popular Stories',3600,'','order=hits','','a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}',60,1053009560); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (145,6,'Older Stories',3600,'','start=5&max=5','','a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}',30,990019227); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (148,18,'Administration',0,'','','<p>A bunch of cool things like latest site activity and stats should go here. </p>\r\n <p>But until they do, just pick something from the NavBar and go about your duties...</p>\r\n','a:4:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:5:\"perms\";s:4:\"user\";s:6:\"module\";s:5:\"Admin\";}',92,NULL); --- 19,23 ---- INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (144,6,'Most Popular Stories',3600,'','order=hits','','a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}',60,1053009560); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (145,6,'Older Stories',3600,'','start=5&max=5','','a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}',30,990019227); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (148,18,'Administration',0,'','','<p>A bunch of cool things like latest site activity and stats should go here. </p>\r\n <p>But until they do, just pick something from the NavBar and go about your duties...</p>\r\n','a:5:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:5:\"perms\";s:4:\"user\";s:6:\"module\";s:5:\"Admin\";s:8:\"box_type\";s:4:\"open\";}',92,NULL); --- slash-all.sql DELETED --- |
|
From: Joe S. <joe...@us...> - 2004-10-22 20:13:13
|
Update of /cvsroot/phpslash/phpslash-dev/include/templates/en/basic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5039/phpslash-dev/include/templates/en/basic Modified Files: blockList.tpl Log Message: add column and ordernum to block list. Index: blockList.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/blockList.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** blockList.tpl 20 Oct 2004 12:21:15 -0000 1.3 --- blockList.tpl 22 Oct 2004 20:12:56 -0000 1.4 *************** *** 7,11 **** <tr> <th>Title</th> ! <th>Parameters :: Location</th> <th>Type</th> <th>Admin</th> --- 7,13 ---- <tr> <th>Title</th> ! <th>Column </th> ! <th>Priority</th> ! <th>Parameters</th> <th>Type</th> <th>Admin</th> *************** *** 15,20 **** <tr class="firstRow"> <td>{TITLE}</td> ! <td>{SOURCE_URL} :: ! {URL}</td> <td>{TYPE}</td> <td><a href="{MODIFYURL}"><span title="Modify">M</span></a> || <a href="{VIEWURL}"><span title="View">V</span></a> || <a href="{DELURL}"><span title="Delete">X</span></a></td> --- 17,23 ---- <tr class="firstRow"> <td>{TITLE}</td> ! <td>{COLUMN}</td> ! <td>{ORDERNUM}</td> ! <td>{SOURCE_URL}</td> <td>{TYPE}</td> <td><a href="{MODIFYURL}"><span title="Modify">M</span></a> || <a href="{VIEWURL}"><span title="View">V</span></a> || <a href="{DELURL}"><span title="Delete">X</span></a></td> *************** *** 24,29 **** <tr class="secondRow"> <td>{TITLE}</td> ! <td>{SOURCE_URL} :: ! {URL}</td> <td>{TYPE}</td> <td><a href="{MODIFYURL}"><span title="Modify">M</span></a> || <a href="{VIEWURL}"><span title="View">V</span></a> || <a href="{DELURL}"><span title="Delete">X</span></a></td> --- 27,33 ---- <tr class="secondRow"> <td>{TITLE}</td> ! <td>{COLUMN}</td> ! <td>{ORDERNUM}</td> ! <td>{SOURCE_URL}</td> <td>{TYPE}</td> <td><a href="{MODIFYURL}"><span title="Modify">M</span></a> || <a href="{VIEWURL}"><span title="View">V</span></a> || <a href="{DELURL}"><span title="Delete">X</span></a></td> |
|
From: Luis M <le...@us...> - 2004-10-22 14:21:08
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23353 Modified Files: CHANGES Log Message: added notes about config.php and caching Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** CHANGES 21 Oct 2004 15:43:52 -0000 1.124 --- CHANGES 22 Oct 2004 14:20:58 -0000 1.125 *************** *** 13,16 **** --- 13,27 ---- 9 - Removal of something (kill -9 :) + 2004-October 21 Luis M <le...@us... + [W9] - Switched config_setup.php to work with config-dist.ini.php, + and copied variables from config_setup.ini.php to this file. + Then removed config_setup.ini.php from CVS. + + 2004-October 20 Luis M <le...@us... + [FW] - Fixed config-dist.php's code for jpcache and added jpcache.cachedir + variable to config-dist.ini.php. Users can now use config.ini.php + to enable/disable caching and choose the location of caching files + all without having to mess with the code of config.php. + 2004-October 20 Joe Stewart <joe...@us... [F] - block/admin.php - complete previous commit of UI change. |
|
From: Joe S. <joe...@us...> - 2004-10-22 06:38:16
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32051/phpslash-dev/public_html Modified Files: config_setup.php Log Message: default to installing sample data Index: config_setup.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config_setup.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** config_setup.php 20 Oct 2004 16:35:59 -0000 1.12 --- config_setup.php 20 Oct 2004 18:01:40 -0000 1.13 *************** *** 787,791 **** <div align="center"> <label> ! <input type="checkbox" name="includeSample" /> Yes, include sample data </label> --- 787,791 ---- <div align="center"> <label> ! <input type="checkbox" checked="checked" name="includeSample" /> Yes, include sample data </label> |
|
From: Luis M <le...@us...> - 2004-10-21 18:58:41
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8637 Modified Files: config-dist.ini.php Log Message: updated to use variables for config_setup.php wizard Index: config-dist.ini.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.ini.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** config-dist.ini.php 21 Oct 2004 16:51:04 -0000 1.18 --- config-dist.ini.php 21 Oct 2004 18:58:31 -0000 1.19 *************** *** 103,110 **** ;; ;; The complete filesystem path to the pages ! basedir = "/path/to/phpslash/public_html" ;; ;; The complete filesystem path to the include directory ! dir.include = "/path/to/include" ;; ;; The complete filesystem path to the class directory --- 103,110 ---- ;; ;; The complete filesystem path to the pages ! basedir = "<PUBLIC_DIR>" ;; ;; The complete filesystem path to the include directory ! dir.include = "<INCLUDE_DIR>" ;; ;; The complete filesystem path to the class directory *************** *** 113,117 **** ;; ;; The base URL for the PHPSlash site. (no trailing slashes here) ! rooturl = "http://localhost/phpslash/public_html" ;; ;; The directories and URLs below have default values based on the above --- 113,117 ---- ;; ;; The base URL for the PHPSlash site. (no trailing slashes here) ! rooturl = "<ROOT_URL>" ;; ;; The directories and URLs below have default values based on the above *************** *** 149,156 **** ;; Make sure you initialize the database with one of the sql scripts in ;; the PHPSlash distribution and create the user below. ! DB_Host = "localhost" ! DB_Database = "phpslash" ! DB_User = "phpslash" ! DB_Password = "phpslash" ;; end of database variables ;;; --- 149,156 ---- ;; Make sure you initialize the database with one of the sql scripts in ;; the PHPSlash distribution and create the user below. ! DB_Host = "<DB_HOST>" ! DB_Database = "<DB_DB>" ! DB_User = "<DB_USER>" ! DB_Password = "<DB_PASSWORD>" ;; end of database variables ;;; *************** *** 248,252 **** ;; both HTML 4.0 Transitional. The "basic" skin does all formatting ;; with CSS, whereas the "default" skin uses <font> tags and such. ! defaultskin = "basiccurves" ;;; --- 248,252 ---- ;; both HTML 4.0 Transitional. The "basic" skin does all formatting ;; with CSS, whereas the "default" skin uses <font> tags and such. ! defaultskin = "ShankZen" ;;; |
|
From: Luis M <le...@us...> - 2004-10-21 18:58:08
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8535 Modified Files: config_setup.php Log Message: updated to use config-dist.ini.php Index: config_setup.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config_setup.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** config_setup.php 20 Oct 2004 18:01:40 -0000 1.13 --- config_setup.php 21 Oct 2004 18:57:59 -0000 1.14 *************** *** 42,46 **** // Setup of names and constants. define('PRODUCT', 'phpSlash'); // Name of the product. ! define('CONFIG_IN', 'config_setup.ini.php'); // Name of the blank config file. define('CONFIG_OUT', 'config.ini.php'); // Name of the target config file. --- 42,46 ---- // Setup of names and constants. define('PRODUCT', 'phpSlash'); // Name of the product. ! define('CONFIG_IN', 'config-dist.ini.php'); // Name of the blank config file. define('CONFIG_OUT', 'config.ini.php'); // Name of the target config file. |
2 messages has been excluded from this view by a project administrator.
