phpslash-commit Mailing List for phpSlash (Page 21)
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-28 19:43:49
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/filemanager/browser/default/js In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6450/js Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/filemanager/browser/default/js added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:43:24
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/filemanager/browser/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6331/default Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/filemanager/browser/default added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:43:05
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/filemanager/browser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6177/browser Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/filemanager/browser added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:39:24
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/images/smiley/msn In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4954/msn Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/images/smiley/msn added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:39:24
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/images/smiley/fun In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4954/fun Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/images/smiley/fun added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:38:57
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/images/smiley In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4823/smiley Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/images/smiley added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:35:17
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/js In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3606/js Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/js added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:35:17
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3606/lang Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/lang added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:35:17
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/skins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3606/skins Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/skins added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:35:17
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3606/images Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/images added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:34:42
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/filemanager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3495/filemanager Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/filemanager added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:34:30
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/dialog In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3405/dialog Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/dialog added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:34:15
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/css In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3325/css Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/css added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:33:57
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/_source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3226/_source Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor/_source added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:32:45
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2910/editor Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/editor added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:30:37
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/_samples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2257/_samples Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/_samples added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:30:12
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/_jsp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2091/_jsp Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/_jsp added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:29:56
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/_documentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2023/_documentation Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/_documentation added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:29:45
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/_aspnet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1975/_aspnet Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor/_aspnet added to the repository |
|
From: Joe S. <joe...@us...> - 2004-10-28 19:27:35
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1482/fckeditor Log Message: Directory /cvsroot/phpslash/phpslash-dev/public_html/scripts/fckeditor added to the repository |
|
From: Luis M <le...@us...> - 2004-10-27 22:04:48
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/auth/authtypes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30336 Modified Files: slashAuthLDAP.class Log Message: very close to completion. eliminated useless calls and other nuances. Now only needs to compare passwords with strings returned from DB. need to figure out if passwd is {CRYPT} or whatever other schemes. Index: slashAuthLDAP.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/auth/authtypes/slashAuthLDAP.class,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** slashAuthLDAP.class 26 Oct 2004 18:05:49 -0000 1.4 --- slashAuthLDAP.class 27 Oct 2004 22:04:38 -0000 1.5 *************** *** 15,23 **** 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 $userpasswd = "userPassword"; /** userpassword holds encoded passwords in ldap db */ /* End configuration */ var $ds = ""; /** database connection */ /** PSL LDAP validation --- 15,25 ---- var $Port = ""; var $Base_dn = ""; /** base_dn holds our base for lookups. i.e. dc=host,dc=domain,dc=rootdomain */ ! /** Make sure these values are all lowercase: */ ! var $ui = "uid"; /** uid holds our usernames */ ! var $up = "userpassword"; /** userpassword holds encoded passwords in ldap db */ /* End configuration */ var $ds = ""; /** database connection */ + var $found = ""; /** search results found */ /** PSL LDAP validation *************** *** 36,47 **** $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 */ ! $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"); --- 38,61 ---- $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 */ + $this->found = $this->psl_ldap_search_user($username, + array($this->ui,$this->up)); $is_user = false; /* assumes test will fail */ ! $pw = ""; /** holds passwd from ldap */ ! ! debug("psl_validate()",$this->found); ! ! if ( !empty($this->found[$this->ui]) ) { ! debug("psl_validate()","getting password:"); ! if ( !empty($this->found[$this->up]) ) ! { ! $pw = $this->found[$this->up]; ! } else { ! /*debug("psl_validate()","password does not exist! re-querying db:"); ! $pw = $this->psl_ldap_pass($username);*/ ! debug("psl_validate()","user password does not exist! bailing out"); ! return false; ! } } else { debug("psl_validate()","user does not exist! bailing out"); *************** *** 62,67 **** 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 ) { --- 76,83 ---- debug("psl_validate()","We don't support this scheme for passwords yet"); }*/ ! $my_pass = $password; /** FIXME crypt()? md5()? */ ! debug("psl_validate()","Passwords: '$pw' == '$my_pass' ??"); ! ! /** all comes down to this test: */ if ( $pw == $my_pass ) { *************** *** 82,86 **** if ( $is_user == true ) { ! // success /** TODO: might be a good thing to register this user? in SQL ?*/ --- 98,103 ---- if ( $is_user == true ) { ! // success ! debug("psl_validate()","user exists: registering with sql"); /** TODO: might be a good thing to register this user? in SQL ?*/ *************** *** 93,97 **** // 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; --- 110,113 ---- *************** *** 105,118 **** * @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; ! } /** --- 121,136 ---- * @return true if user exist, false otherwise */ ! /*function psl_ldap_is_user ($username) { ! $uid = $this->psl_ldap_search_user($username, ! array($this->ui,$this->up)); if ( $uid != false ) { + debug("psl_ldap_is_user()",$uid[$this->ui]); return true; } debug("psl_ldap_is_user()","failed!"); return false; ! }*/ /** *************** *** 124,143 **** * **/ ! 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; ! } /** --- 142,157 ---- * **/ ! /*function psl_ldap_pass($username = "") { ! $passwd = $this->psl_ldap_search_user($username, ! array($this->ui,$this->up)); if ( $ldap_user != false ) { ! debug("psl_ldap_is_user() passwd:",$passwd[$this->up]); ! return $ldap_user[$this->up]; } ! debug('psl_ldap_pass()', 'failed!'); return false; ! }*/ /** *************** *** 145,161 **** * 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)) { return false; } /* FIXME in order to use tls to talk to remote servers, we might have to do: --- 159,178 ---- * Find and return the specified LDAP user in ldap db * ! * @param $username username to search for using $this->ui (usually 'uid') ! * @return associative array with: $ary[$this->ui], $ary[$this->up] # TODO should return all attributes passed in array() $attributes OR false if fails * **/ ! function psl_ldap_search_user ($username = "", $attributes="") ! { global $_PSL; $ary = array(); ! ! debug('psl_ldap_search_user() attributes:', $attributes); ! ! 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: *************** *** 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; } --- 188,216 ---- 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->up attributes: */ $ldap_bind = ldap_bind($this->ds,$_PSL['LDAP_User'],$_PSL['LDAP_Password']); if ( $ldap_bind ) { ! $s_result = ldap_search($this->ds, $this->Base_dn, ! $this->ui."=".$username, $attributes, 0, /** get all values and attributes */ 1 /** we only care about 1 return, @see sizelimit */ ); ! if ( $s_result > 0 ) ! { ! $result = ldap_get_entries($this->ds, $s_result); ! debug("psl_ldap_search_user() LDAP result+++: ",$result); ! $ary[$this->ui] = $result[0][$this->ui][0]; ! $ary[$this->up] = $result[0][$this->up][0]; ! ldap_free_result($s_result); ! debug("psl_ldap_search_user() formatted: ",$ary); return $ary; + } else { + debug('psl_ldap_search_user()', 's_result failed'); } } ! debug('psl_ldap_search_user() ', ' failed'); return false; } |
|
From: Joe S. <joe...@us...> - 2004-10-26 19:57:08
|
Update of /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18215/phpslash-skins/include/templates/en/ShankZen Modified Files: comment.tpl commentDisplay.tpl storyIndex.tpl Log Message: comment link updates. Index: comment.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen/comment.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** comment.tpl 29 Sep 2004 18:23:51 -0000 1.2 --- comment.tpl 26 Oct 2004 19:56:41 -0000 1.3 *************** *** 1,5 **** <!-- START comment.tpl --> <div class="psl-block"> ! <form method="get" action="comment.php"> Comment Style: <select name="mode" class="psl-text"> --- 1,5 ---- <!-- START comment.tpl --> <div class="psl-block"> ! <form method="get" action="{ACTION_URL}"> Comment Style: <select name="mode" class="psl-text"> *************** *** 9,13 **** </select> Order: ! <select name="order"> <option value="ASC">Ascending</option> <option value="DESC">Descending</option> --- 9,13 ---- </select> Order: ! <select name="asc"> <option value="ASC">Ascending</option> <option value="DESC">Descending</option> Index: commentDisplay.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen/commentDisplay.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** commentDisplay.tpl 29 Sep 2004 18:23:51 -0000 1.2 --- commentDisplay.tpl 26 Oct 2004 19:56:41 -0000 1.3 *************** *** 1,36 **** ! <!-- START commentDisplay.tpl --> ! <div class="psl-block"> ! ! <div> ! <span class="psl-commentSubject">{SUBJECT}</span> <span class="psl-commentID">[{COMMENT_ID}]</span><br /> ! <span class="psl-commentAuthor">by {NAME} {EMAIL_LINK_ON}{EMAIL}{EMAIL_LINK_OFF} on {TIME}</span> ! </div> <!-- id="commentHeader" --> ! ! <div id="commentText"> ! {COMMENT} ! </div> <!-- id="commentText" --> ! ! <!-- BEGIN admin_perm --> ! <div> ! [ ! <input type="checkbox" name="bulkdel_ary[]" value="{COMMENT_ID}" />Mark for Bulk Delete | ! ! <a href="{ROOTY}/comment.php?submit=post&story_id={STORY_ID}&parent_id={COMMENT_ID}">Reply</a> ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=delete">Delete</a> ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=edit">Edit</a> ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=markpend">Mark Pending</a> ]<br /> ! [ <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=unmarkpend">Unmark Pending</a> ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=reparentupone">Reparent Up One Level</a> ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=reparentuptop">Reparent Up To Top</a> ! ] ! </div> ! <!-- END admin_perm --> ! ! <!-- BEGIN regular_perm --> ! <div> ! [ <a href="{ROOTY}/comment.php?submit=post&story_id={STORY_ID}&parent_id={COMMENT_ID}">Reply</a> ] ! </div> ! <!-- END regular_perm --> ! ! </div> <!-- id="commentDisplay" --> ! <!-- END commentDisplay.tpl --> --- 1,72 ---- ! <!-- START commentDisplay.tpl --> ! ! <div class="psl-block"> ! ! ! ! <div> ! ! <span class="psl-commentSubject">{SUBJECT}</span> <span class="psl-commentID">[{COMMENT_ID}]</span><br /> ! ! <span class="psl-commentAuthor">by {NAME} {EMAIL_LINK_ON}{EMAIL}{EMAIL_LINK_OFF} on {TIME}</span> ! ! </div> <!-- id="commentHeader" --> ! ! ! ! <div id="commentText"> ! ! {COMMENT} ! ! </div> <!-- id="commentText" --> ! ! ! ! <!-- BEGIN admin_perm --> ! ! <div> ! ! [ ! ! <input type="checkbox" name="bulkdel_ary[]" value="{COMMENT_ID}" />Mark for Bulk Delete | ! ! ! ! <a href="{ROOTY}/index.php?submit=post&story_id={STORY_ID}&parent_id={COMMENT_ID}">Reply</a> ! ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=delete">Delete</a> ! ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=edit">Edit</a> ! ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=markpend">Mark Pending</a> ]<br /> ! ! [ <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=unmarkpend">Unmark Pending</a> ! ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=reparentupone">Reparent Up One Level</a> ! ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=reparentuptop">Reparent Up To Top</a> ! ! ] ! ! </div> ! ! <!-- END admin_perm --> ! ! ! ! <!-- BEGIN regular_perm --> ! ! <div> ! ! [ <a href="{ROOTY}/index.php?submit=post&story_id={STORY_ID}&parent_id={COMMENT_ID}">Reply</a> ] ! ! </div> ! ! <!-- END regular_perm --> ! ! ! ! </div> <!-- id="commentDisplay" --> ! ! <!-- END commentDisplay.tpl --> ! Index: storyIndex.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen/storyIndex.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** storyIndex.tpl 11 Nov 2003 20:57:21 -0000 1.2 --- storyIndex.tpl 26 Oct 2004 19:56:41 -0000 1.3 *************** *** 4,8 **** <div class="psl-block"> <!-- has to be separate block because story has to sit in its own --> <a class="psl-more" href="{ROOTDIR}/article.php?story_id={STORY_ID}">{MORE}</a> ! <a class="psl-more" href="{ROOTDIR}/article.php?story_id={STORY_ID}">[{COMMENT}]</a> </div><!-- end: block --> <!-- END each_story --> --- 4,8 ---- <div class="psl-block"> <!-- has to be separate block because story has to sit in its own --> <a class="psl-more" href="{ROOTDIR}/article.php?story_id={STORY_ID}">{MORE}</a> ! <a class="psl-more" href="{ROOTDIR}/article.php?story_id={STORY_ID}">[{COMMENT_COUNT} {COMMENT}]</a> </div><!-- end: block --> <!-- END each_story --> |
|
From: Joe S. <joe...@us...> - 2004-10-26 19:46:19
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/story In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15988/phpslash-dev/include/modules/story Modified Files: Story.class Log Message: comment submitter's IP or domain should display if not comment Admin. Index: Story.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/story/Story.class,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Story.class 18 Oct 2004 23:30:30 -0000 1.10 --- Story.class 26 Oct 2004 19:46:06 -0000 1.11 *************** *** 222,226 **** } if ($this->psl['module']['Comment']) { ! $arrows .= "<a href=\"" . $this->psl['rooturl'] . "/comment.php?submit=post" . $this->psl['amp'] . "story_id=$story_id" . $this->psl['amp'] . "parent_id=0\"><b>" . pslgetText("Reply") . "</b></a> "; } if (isset($nexttitle)) { --- 222,226 ---- } if ($this->psl['module']['Comment']) { ! $arrows .= "<a href=\"" . $this->psl['rooturl'] . "/index.php?submit=post" . $this->psl['amp'] . "story_id=$story_id" . $this->psl['amp'] . "parent_id=0\"><b>" . pslgetText("Reply") . "</b></a> "; } if (isset($nexttitle)) { *************** *** 231,235 **** } else { if ($this->psl['module']['Comment']) { ! $arrows .= "<a href=\"" . $this->psl['rooturl'] . "/comment.php?submit=post" . $this->psl['amp'] . "story_id=$story_id" . $this->psl['amp'] . "parent_id=0\"><b>" . pslgetText("Reply") . "</b></a> "; } } --- 231,235 ---- } else { if ($this->psl['module']['Comment']) { ! $arrows .= "<a href=\"" . $this->psl['rooturl'] . "index.php?submit=post" . $this->psl['amp'] . "story_id=$story_id" . $this->psl['amp'] . "parent_id=0\"><b>" . pslgetText("Reply") . "</b></a> "; } } |
|
From: Joe S. <joe...@us...> - 2004-10-26 19:44:46
|
Update of /cvsroot/phpslash/phpslash-dev/include/templates/en/basic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15436/phpslash-dev/include/templates/en/basic Modified Files: comment.tpl commentDisplay.tpl storyIndex.tpl Log Message: comment submitter's IP or domain should display if not comment Admin. Index: comment.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/comment.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** comment.tpl 19 Oct 2004 16:55:32 -0000 1.2 --- comment.tpl 26 Oct 2004 19:43:57 -0000 1.3 *************** *** 2,6 **** <div id="comment"> <div id="commentForm"> ! <form method="get" action="comment.php"> Comment Style: <select name="mode"> --- 2,6 ---- <div id="comment"> <div id="commentForm"> ! <form method="get" action="{ACTION_URL}"> Comment Style: <select name="mode"> *************** *** 10,14 **** </select> Order: ! <select name="order"> <option value="ASC">Ascending</option> <option value="DESC">Descending</option> --- 10,14 ---- </select> Order: ! <select name="asc"> <option value="ASC">Ascending</option> <option value="DESC">Descending</option> Index: commentDisplay.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/commentDisplay.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** commentDisplay.tpl 12 Mar 2003 16:12:52 -0000 1.1.1.1 --- commentDisplay.tpl 26 Oct 2004 19:43:59 -0000 1.2 *************** *** 16,20 **** <input type="checkbox" name="bulkdel_ary[]" value="{COMMENT_ID}">Mark for Bulk Delete | ! <a href="{ROOTY}/comment.php?submit=post&story_id={STORY_ID}&parent_id={COMMENT_ID}">Reply</a> | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=delete">Delete</a> --- 16,20 ---- <input type="checkbox" name="bulkdel_ary[]" value="{COMMENT_ID}">Mark for Bulk Delete | ! <a href="{ROOTY}/index.php?submit=post&story_id={STORY_ID}&parent_id={COMMENT_ID}">Reply</a> | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=delete">Delete</a> *************** *** 35,39 **** <!-- BEGIN regular_perm --> <div id="commentFooter"> ! [ <a href="{ROOTY}/comment.php?submit=post&story_id={STORY_ID}&parent_id={COMMENT_ID}">Reply</a> ] </div> <!-- id="commentFooter" --> <!-- END regular_perm --> --- 35,39 ---- <!-- BEGIN regular_perm --> <div id="commentFooter"> ! [ <a href="{ROOTY}/index.php?submit=post&story_id={STORY_ID}&parent_id={COMMENT_ID}">Reply</a> ] </div> <!-- id="commentFooter" --> <!-- END regular_perm --> Index: storyIndex.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/storyIndex.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** storyIndex.tpl 6 Nov 2003 19:15:11 -0000 1.3 --- storyIndex.tpl 26 Oct 2004 19:44:00 -0000 1.4 *************** *** 5,9 **** <a href="{ROOTDIR}/article.php?story_id={STORY_ID}">{MORE}</a> <!-- BEGIN comment_block --> ! <a href="{ROOTDIR2}/article.php?story_id={STORY_ID}">[{COMMENTCOUNT}{COMMENT}]</a> <!-- END comment_block --> </div> --- 5,9 ---- <a href="{ROOTDIR}/article.php?story_id={STORY_ID}">{MORE}</a> <!-- BEGIN comment_block --> ! <a href="{ROOTDIR2}/article.php?story_id={STORY_ID}">[{COMMENTCOUNT} {COMMENT}]</a> <!-- END comment_block --> </div> |
|
From: Joe S. <joe...@us...> - 2004-10-26 19:44:45
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/comment In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15436/phpslash-dev/include/modules/comment Modified Files: Comment.class index.php Log Message: comment submitter's IP or domain should display if not comment Admin. Index: Comment.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/comment/Comment.class,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Comment.class 24 Jun 2003 19:38:36 -0000 1.1 --- Comment.class 26 Oct 2004 19:43:47 -0000 1.2 *************** *** 41,45 **** $this->perm = $perm; $this->db = pslNew("slashDB"); ! $this->order = $ary['order']; $this->auth = $auth; --- 41,45 ---- $this->perm = $perm; $this->db = pslNew("slashDB"); ! $this->order = $ary['asc']; $this->auth = $auth; *************** *** 273,285 **** $ip_ary = explode(".", $ary['ip']); ! if( !$this->perm->have_perm("commentAdmin") ) { ! if( is_numeric($ip_ary[sizeof($ip_ary)-1]) ) { ! $ip_ary[sizeof($ip_ary)-1] = "--"; ! } else { ! $ip_ary[0] = "--"; ! } } - $ary['ip'] = implode(".", $ip_ary); - $this->ctempl->set_var(array( 'COMMENT_ID' => $ary['comment_id'], --- 273,286 ---- $ip_ary = explode(".", $ary['ip']); ! if( !$this->perm->have_perm("comment") ) { ! if( is_numeric($ip_ary[sizeof($ip_ary)-1]) ) { ! $ip_ary[sizeof($ip_ary)-1] = "--"; ! } else { ! $ip_ary[0] = "--"; ! } ! $ary['ip'] = implode(".", $ip_ary); ! } else { ! $ary['ip'] = '--'; } $this->ctempl->set_var(array( 'COMMENT_ID' => $ary['comment_id'], *************** *** 691,695 **** $fdate = date("Y-m-d H:i:s",time()); $timestamp = time(); ! $ip = gethostbyaddr($ary['ip']); $q = "INSERT INTO psl_comment (comment_id, --- 692,696 ---- $fdate = date("Y-m-d H:i:s",time()); $timestamp = time(); ! $ip = @gethostbyaddr($ary['ip']); $q = "INSERT INTO psl_comment (comment_id, *************** *** 1167,1181 **** if ($this->db->next_record()) { ! $ary['action_url'] = $this->psl['rooturl'] . "/comment.php"; if($this->db->Record['author_realname']) { ! debug("here", "good"); ! $ary['name'] = clean($this->db->f("author_realname")); ! $ary['email'] = clean($this->db->f("url")); } else { ! debug("here", "why"); ! $ary['name'] = clean($this->db->f("name")); $ary['email'] = clean($this->db->f("email")); ! } ! $ary['subject'] = clean($this->db->f("subject")); $ary['comment_text'] = clean($this->db->f("comment_text")); // $ary['story_id'] = $story_id; --- 1168,1180 ---- if ($this->db->next_record()) { ! $ary['action_url'] = $this->psl['rooturl'] . "/index.php"; if($this->db->Record['author_realname']) { ! $ary['name'] = clean($this->db->f("author_realname")); ! $ary['email'] = clean($this->db->f("url")); } else { ! $ary['name'] = clean($this->db->f("name")); $ary['email'] = clean($this->db->f("email")); ! } ! $ary['subject'] = clean($this->db->f("subject")); $ary['comment_text'] = clean($this->db->f("comment_text")); // $ary['story_id'] = $story_id; Index: index.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/comment/index.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** index.php 26 Jun 2003 18:59:35 -0000 1.3 --- index.php 26 Oct 2004 19:43:57 -0000 1.4 *************** *** 47,52 **** // 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); --- 47,51 ---- // when you are previewing a comment before submitting ! $ary['ip'] = @gethostbyaddr($_SERVER['REMOTE_ADDR']); /* add the poster's IP addr */ $ary['replying_to'] = $cmt->formatComment($ary); $content .= $cmt->getForm($ary); *************** *** 56,66 **** case "Submit Comment": ! $content .= "<BR>Click <A HREF=\"" . $return_link . "\">here</A> to go back<BR>\n"; if ($ary['parent_id']) { ! $content .= "<A HREF=\"" . $_PSL['rooturl'] . "/comment.php?submit=view&story_id=$ary[story_id]&comment_id=$ary[parent_id]&mode=flat\">".pslgetText("View Parent Comment")."</A>\n"; } ! $content .= getTitlebar("100%", "Submitted Comment"); ! $ary['ip'] = $HTTP_SERVER_VARS['REMOTE_ADDR']; /* add the poster's IP addr */ $id = $cmt->update($ary); --- 55,65 ---- case "Submit Comment": ! // $content .= "<BR>Click <A HREF=\"" . $return_link . "\">here</A> to go back<BR>\n"; if ($ary['parent_id']) { ! $content .= "<a href=\"" . $_PSL['rooturl'] . "/index.php?submit=view&story_id=$ary[story_id]&comment_id=$ary[parent_id]&mode=flat\">".pslgetText("View Parent Comment")."</a><br>\n"; } ! $content .= "<a href=\"" . $_PSL['rooturl'] . "/index.php?submit=view&story_id=".$ary[story_id] ."\">".pslgetText("View All Comments")."</a><br>\n"; $content .= getTitlebar("100%", "Submitted Comment"); ! $ary['ip'] = $_SERVER['REMOTE_ADDR']; /* add the poster's IP addr */ $id = $cmt->update($ary); *************** *** 135,139 **** } ! $ary['action_url'] = $_PSL['phpself']; $ary['siteowner'] = $_PSL['site_owner']; --- 134,138 ---- } ! $ary['action_url'] = $_SERVER['REQUEST_URI']; $ary['siteowner'] = $_PSL['site_owner']; |
2 messages has been excluded from this view by a project administrator.
