phpslash-commit Mailing List for phpSlash (Page 23)
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: Luis M <le...@us...> - 2004-10-21 18:56:57
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8316 Removed Files: config_setup.ini.php Log Message: config-dist.ini.php is a superset of this file. thus removing this to avoid confusing newbies further --- config_setup.ini.php DELETED --- |
|
From: Luis M <le...@us...> - 2004-10-21 17:21:26
|
Update of /cvsroot/phpslash/phpslash-dev/contrib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20771 Added Files: phpslash-apache-virtualhost Log Message: a generic/example phpslash virtualhost file --- NEW FILE: phpslash-apache-virtualhost --- # vim: ft=apache : # Luis Mondesi < lems1 __AT__ users sourceforge net > # This is a sample virtualhost site for apache/apache2. To enable this # simple drop this file in your "conf.d" directory (for apache1) # or in "sites-available" for apache 2 and execute this from a command line: # a2enable phpslash-apache-virtualhost # # It assumes that phpslash has been unpacked in "/var/www/phpslash". And # that your server IP is 127.0.0.1 and servername is "localhost". # # You will need to modify this file to suit your needs. # # ----------- Modify from here: # - set this to your IP: NameVirtualHost 127.0.0.1 # - also put your IP here: <VirtualHost 127.0.0.1> # - set this to your real webmaster: ServerAdmin webmaster@localhost # - set this to the FQDN of your site: i.e. www.domain.com ServerName localhost # - last, set these two lines to the path of /path/to/phpslash/public_html (file path; not visible from the URL): DocumentRoot /var/www/phpslash/public_html <Directory /var/www/phpslash/public_html> Options Indexes FollowSymLinks MultiViews AllowOverride None Order allow,deny allow from all </Directory> # Uncomment these lines if needed: # - do not allow trans session ids to show in the URL: #php_flag session.use_trans_sid off # - do not quote automagicly GET/POST variables: #php_flag magic_quotes_runtime off # - do not #php_flag magic_quotes_gpc off # ------------ End Modify (no need to go beyond) <Directory /> Options FollowSymLinks AllowOverride None </Directory> # Uncomment the following to enable CGI support... not needed for phpslash # ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ # <Directory "/usr/lib/cgi-bin"> # AllowOverride None # Options ExecCGI -MultiViews +SymLinksIfOwnerMatch # Order allow,deny # Allow from all # </Directory> ErrorLog /var/log/apache2/error.log # Possible values include: debug, info, notice, warn, error, crit, # alert, emerg. LogLevel warn CustomLog /var/log/apache2/access.log combined ServerSignature On Alias /icons/ "/usr/share/apache2/icons/" <Directory "/usr/share/apache2/icons"> Options Indexes MultiViews AllowOverride None Order allow,deny Allow from all </Directory> Alias /doc/ "/usr/share/doc/" <Directory "/usr/share/doc/"> Options Indexes MultiViews FollowSymLinks AllowOverride None Order deny,allow Deny from all Allow from 127.0.0.0/255.0.0.0 ::1/128 </Directory> </VirtualHost> |
|
From: Luis M <le...@us...> - 2004-10-21 16:51:13
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15230 Modified Files: config-dist.ini.php Log Message: added note about trailing slashes in rooturl Index: config-dist.ini.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.ini.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** config-dist.ini.php 20 Oct 2004 22:05:22 -0000 1.17 --- config-dist.ini.php 21 Oct 2004 16:51:04 -0000 1.18 *************** *** 112,116 **** ; classdir = "/path/to/class" ;; ! ;; The base URL for the PHPSlash site. rooturl = "http://localhost/phpslash/public_html" ;; --- 112,116 ---- ; classdir = "/path/to/class" ;; ! ;; The base URL for the PHPSlash site. (no trailing slashes here) rooturl = "http://localhost/phpslash/public_html" ;; |
|
From: Luis M <le...@us...> - 2004-10-21 16:37:28
|
Update of /cvsroot/phpslash/phpslash-dev/doc/html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12480 Modified Files: phpslash.sgml Log Message: updated to reflect new psl_*.sql files in tables Index: phpslash.sgml =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/doc/html/phpslash.sgml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** phpslash.sgml 1 Sep 2004 18:59:58 -0000 1.5 --- phpslash.sgml 21 Oct 2004 16:37:18 -0000 1.6 *************** *** 16,20 **** <author> <url url="http://phpslash.sourceforge.net/" name="The phpSlash Group"> ! <date>v0.5, January 31, 2003 <abstract> --- 16,20 ---- <author> <url url="http://phpslash.sourceforge.net/" name="The phpSlash Group"> ! <date>v0.8, 2004-10-21 12:14 EDT <abstract> *************** *** 190,195 **** <item> Webserver Software (We like to use <url url="http://www.apache.org/" name="the Apache webserver">) <itemize> ! <item> Apache has been tested on 1.3.6 and above. ! <item> No reports on Apache 2 yet, as php tends to be broken with the 2.0-alphas. </itemize> --- 190,194 ---- <item> Webserver Software (We like to use <url url="http://www.apache.org/" name="the Apache webserver">) <itemize> ! <item> Apache has been tested on 1.3.6 and above (including apache2). </itemize> *************** *** 218,227 **** <p>This section details a browser based wizard style installation method. It does not contain exhaustive direction or details. It is geared for those that want to get started with minimal configuration. ! <sect2> 1. Decompress the phpslash-0.8.x.tar.gz files into your web directory. <p> It is critical that the files in public_html are in a public location on your web server. It is more secure to have the class directory parallel to the public_html directory so that the files are not visible to your visitors. <tscreen><verb> ! tar xzvf phplash-0.8.tar.gz ! cd phpslash-0.8 </verb></tscreen> --- 217,226 ---- <p>This section details a browser based wizard style installation method. It does not contain exhaustive direction or details. It is geared for those that want to get started with minimal configuration. ! <sect2> 1. Decompress the phpslash-VER.x.tar.gz files into your web directory. <p> It is critical that the files in public_html are in a public location on your web server. It is more secure to have the class directory parallel to the public_html directory so that the files are not visible to your visitors. <tscreen><verb> ! tar xzvf phplash-VER.tar.gz ! cd phpslash-VER </verb></tscreen> *************** *** 231,241 **** <tscreen><verb> cd public_html ! chmod 777 config.ini.php </verb></tscreen> ! <sect2> 3. Browse to the directory where you installed the public_html files and follow the configure screens to set up phpSlash (this assumes that you either have a MySQL database configured or have the permissions to set up a new database. <p> ! <sect2> 4. For security delete the config_setup.php file and set the write permissions on the config.ini.php file: <p> <tscreen><verb> --- 230,240 ---- <tscreen><verb> cd public_html ! chmod 0666 config.ini.php </verb></tscreen> ! <sect2> 3. Using a browser, browse to the directory where you installed the public_html (example: http://localhost/phpslash/public_html) files and follow the configure screens to set up phpSlash. You might need a username/password for a SQL server user who can create or modify databases.The configuration wizard will try to decide what's best. <p> ! <sect2> 4. After completion of all configuration screens, you must delete the config_setup.php file and you must set the write permissions on the config.ini.php file: <p> <tscreen><verb> *************** *** 244,248 **** </verb></tscreen> ! <sect2> 5. Follow the login instructions. <p> --- 243,247 ---- </verb></tscreen> ! <sect2> 5. Then follow to the login instructions. <p> *************** *** 253,266 **** <p> <tscreen><verb> ! tar xzvf phplash-0.8.tar.gz ! cd phpslash-0.8 </verb></tscreen> ! <sect2> Install the database schema and data. This is contained in the file tables/0.7/slash-all.sql. Example command lines: <p> <tscreen><verb> mysqladmin -u username -p create database_name ! mysql -u username -p database_name < tables/0.7/slash-all.sql </verb></tscreen> --- 252,267 ---- <p> <tscreen><verb> ! tar xzvf phplash-VER.tar.gz ! cd phpslash-VER </verb></tscreen> ! <sect2> Install the database schema and data. This is contained in the file tables/VER/psl_core.sql and if desired tables/VER/psl_example.sql right after. Example command lines: <p> <tscreen><verb> mysqladmin -u username -p create database_name ! mysql -u username -p database_name < tables/VER/psl_core.sql ! # optionally: ! mysql -u username -p database_name < tables/VER/psl_example.sql </verb></tscreen> *************** *** 268,271 **** --- 269,273 ---- <p> <tscreen><verb> + # for your own $HOME folder's public_html: mkdir ~/public_html cp -R public_html/* ~/public_html/ *************** *** 275,280 **** <p> <tscreen><verb> ! cd ~/public_html/ ! cp config-dist.ini.php config.ini.php </verb></tscreen> --- 277,281 ---- <p> <tscreen><verb> ! cp config-dist.ini.php ~/public_html/config.ini.php </verb></tscreen> *************** *** 290,294 **** <tscreen><verb> ;; The complete filesystem path to the class directory ! classdir = "/home/username/phpslash-0.7/class" </verb></tscreen> <item> The webserver address of the web documents. --- 291,295 ---- <tscreen><verb> ;; The complete filesystem path to the class directory ! classdir = "/home/username/phpslash-VER/class" </verb></tscreen> <item> The webserver address of the web documents. *************** *** 299,302 **** --- 300,304 ---- <item> The database variables. <tscreen><verb> + ;; modify this as needed: DB_Host = "localhost" DB_Database = "phpslash" *************** *** 403,411 **** Once that's done, in the PHPSlash archive, in the tables directory, ! you'll find the slash-all.sql script. Execute that in your new database so install all the default tables: <tscreen><code> ! mysql -u username -p password database name < slash-all.sql </code></tscreen> --- 405,413 ---- Once that's done, in the PHPSlash archive, in the tables directory, ! you'll find the psl_core.sql schema. Execute that in your new database so install all the default tables: <tscreen><code> ! mysql -u username -p password databasename < psl_core.sql </code></tscreen> |
|
From: Joe S. <joe...@us...> - 2004-10-21 15:44:03
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/block In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32416/phpslash-dev/include/modules/block Modified Files: admin.php Log Message: complete previous commit of UI change. Index: admin.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/admin.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin.php 22 Jun 2004 21:09:04 -0000 1.5 --- admin.php 21 Oct 2004 15:43:52 -0000 1.6 *************** *** 67,72 **** break; case "new": ! if ($perm->have_perm("blockPut")) { ! $content .= $block->putBlock($HTTP_POST_VARS); } break; --- 67,72 ---- break; case "new": ! if ($perm->have_perm("blockNew")) { ! $content .= $block->newBlock(); } break; *************** *** 92,98 **** # break; default: ! if ($perm->have_perm("blockNew")) { ! $content .= $block->newBlock(); /* prints the new block form */ ! } if ($perm->have_perm("blockList")) { $content .= $block->listBlock(); /* prints a list of current blocks */ --- 92,98 ---- # break; default: ! // if ($perm->have_perm("blockNew")) { ! // $content .= $block->newBlock(); /* prints the new block form */ ! // } if ($perm->have_perm("blockList")) { $content .= $block->listBlock(); /* prints a list of current blocks */ |
|
From: Joe S. <joe...@us...> - 2004-10-21 15:44:03
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32416/phpslash-dev Modified Files: CHANGES Log Message: complete previous commit of UI change. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** CHANGES 20 Oct 2004 17:11:07 -0000 1.123 --- CHANGES 21 Oct 2004 15:43:52 -0000 1.124 *************** *** 14,17 **** --- 14,20 ---- 2004-October 20 Joe Stewart <joe...@us... + [F] - block/admin.php - complete previous commit of UI change. + + 2004-October 20 Joe Stewart <joe...@us... [R] - Release 0.8RC1. [EFT] - basic/blockEdit.tpl, basic/blockNew.tpl, Block_admin.class, |
|
From: Luis M <le...@us...> - 2004-10-20 22:09:04
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/auth/authtypes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24068/include/modules/auth/authtypes Modified Files: slashAuthLDAP.class Log Message: still not ready for prime time... edging closer Index: slashAuthLDAP.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/auth/authtypes/slashAuthLDAP.class,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** slashAuthLDAP.class 15 Sep 2004 23:36:30 -0000 1.1 --- slashAuthLDAP.class 20 Oct 2004 22:08:49 -0000 1.2 *************** *** 1,42 **** <?php ! ! /* $Id$ ! * ! * Mostly taken from Back-End LDAP.class which was: ! * Written by Peter Starowicz <pe...@op...> for OpenConcept.ca ! * ! * This module unfinished and untested - remove this when completed ! * ! */ class slashAuth extends slashAuth_base { - - // LDAP validation - function psl_validate($username, $password, $user_info) { - global $challenge; - - $is_user = false; ! $md5_pw = $this->ldap_pass($username); ! // generate the expected response ! $expected_response = md5("$md5_pw:$challenge"); ! // 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; ! } ! /** * * Find and return the MD5 encoded password for the specified user --- 1,48 ---- <?php ! // vim: ft=php:ts=4:sts=4 : ! /** $Id$ ! * ! * Mostly taken from Back-End LDAP.class which was: ! * 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); ! // generate the expected response ! $expected_response = md5("$md5_pw:$challenge"); ! ! // 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; ! } ! ! /** * * Find and return the MD5 encoded password for the specified user *************** *** 44,60 **** * **/ ! function ldap_pass($username = "") { ! // debug('function LDAP_pass()', ""); ! ! $ldap_user = $this->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; ! } ! /** * * Find and return the specified LDAP user --- 50,66 ---- * **/ ! 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; ! } ! ! /** * * Find and return the specified LDAP user *************** *** 62,80 **** * **/ ! function 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; ! } } ?> --- 68,86 ---- * **/ ! 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; ! } } ?> |
|
From: Luis M <le...@us...> - 2004-10-20 22:07:04
|
Update of /cvsroot/phpslash/phpslash-dev/include/class/jpcache/type In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23609 Modified Files: file.php Log Message: fixed to avoid ugly warnings from php when dir doesn't exist Index: file.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/class/jpcache/type/file.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** file.php 11 Sep 2004 14:45:24 -0000 1.2 --- file.php 20 Oct 2004 22:06:53 -0000 1.3 *************** *** 96,103 **** function jpcache_do_gc($method='cachetimeout', $argv='') { switch($method) { case 'regex': - $dp=opendir($GLOBALS["JPCACHE_DIR"]); --- 96,104 ---- function jpcache_do_gc($method='cachetimeout', $argv='') { + //if ( psl_jpcache_test_dir() ) { + psl_jpcache_test_dir(); // FIXME test this now. later we should throw an exception switch($method) { case 'regex': $dp=opendir($GLOBALS["JPCACHE_DIR"]); *************** *** 134,138 **** case 'string': - $dp=opendir($GLOBALS["JPCACHE_DIR"]); --- 135,138 ---- *************** *** 170,174 **** case 'cachetimeout': default: - $dp=opendir($GLOBALS["JPCACHE_DIR"]); --- 170,173 ---- *************** *** 224,242 **** function jpcache_do_start() { ! if ( ! is_dir( $GLOBALS["JPCACHE_DIR"] ) ) ! { ! /* Attempt to create the JPCACHE_DIR ! * Note that this won't recursively make ! * the necessary directories to reach this path ! * (as would the UNIX command "mkdir -p"). ! * This functionality was added in PHP 5. ! * TODO check if we are running php5 and call: ! * mkdir($GLOBALS["JPCACHE_DIR"],0700,true). ! * This way all directories prior to the directory ! * we are making will be created as well. ! * Else we should fall back to php4's way. ! */ ! mkdir($GLOBALS["JPCACHE_DIR"],0700); ! } } --- 223,227 ---- function jpcache_do_start() { ! psl_jpcache_test_dir(); } *************** *** 309,311 **** --- 294,323 ---- // Make sure no additional lines/characters are after the closing-tag! + + /** Tests for Cache dir + * internal function + */ + function psl_jpcache_test_dir() { + if ( is_dir( $GLOBALS["JPCACHE_DIR"] ) ) + { + return true; + } else { + /* Attempt to create the JPCACHE_DIR + * Note that this won't recursively make + * the necessary directories to reach this path + * (as would the UNIX command "mkdir -p"). + * This functionality was added in PHP 5. + * TODO check if we are running php5 and call: + * mkdir($GLOBALS["JPCACHE_DIR"],0700,true). + * This way all directories prior to the directory + * we are making will be created as well. + * Else we should fall back to php4's way. + */ + if ( mkdir($GLOBALS["JPCACHE_DIR"],0700) ) { + return true; + } else { + return false; + } + } + } // end psl_jpcache_test_dir() ?> |
|
From: Luis M <le...@us...> - 2004-10-20 22:05:32
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23207 Modified Files: config-dist.ini.php Log Message: added new options for jpcache.cachedir. but commented them out Index: config-dist.ini.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.ini.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** config-dist.ini.php 20 Oct 2004 12:19:57 -0000 1.16 --- config-dist.ini.php 20 Oct 2004 22:05:22 -0000 1.17 *************** *** 174,186 **** ;; jpcache ;; ! ;; jpcache.enable - valid values = off, internal, static ! ;; ! ;; off - no output cache done ! ;; internal - output cache using either database or file storage ;; static - output cache written as html files to the basedir. ;; ! ;; static cache warning: This mechanism writes the html cache files ;; to the basedir by default. This can be a security risk on servers that ! ;; php writes files using a common user/group. ;; ;; This option should only be used where the files created are owned by --- 174,187 ---- ;; jpcache ;; ! ;; jpcache.enable - valid values = mysql, file, static, memcache, off ! ;; mysql - output to mysql ! ;; file - uses file system to cache (could be /dev/shm/ see jpcache.cachedir below) ;; static - output cache written as html files to the basedir. + ;; memcache - uses memcache module to cache to RAM disk (needs to be installed separately. http://www.danga.com/memcached/) + ;; off - no output cache done [default] ;; ! ;; STATIC CACHE WARNING: This mechanism writes the html cache files ;; to the basedir by default. This can be a security risk on servers that ! ;; php writes files using the webserver's common user/group. ;; ;; This option should only be used where the files created are owned by *************** *** 188,192 **** ;; other way. ;; ! jpcache.enable = internal ;;; --- 189,201 ---- ;; other way. ;; ! jpcache.enable = off ! ! ;; jpcache.cachedir - valid values = /path/to/cache ! ;; ! ;; This is needed only if you set jpcache.enable to static or files. ! ;; TIP: if running on *NIX, you can set this to /dev/shm/cache to cache ! ;; files directly on RAM. ! ;jpcache.cachedir = /dev/shm/cache ! ;;; |
|
From: Luis M <le...@us...> - 2004-10-20 22:04:48
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23026 Modified Files: config-dist.php Log Message: clean up code for jpcache initialization Index: config-dist.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** config-dist.php 20 Oct 2004 17:11:07 -0000 1.29 --- config-dist.php 20 Oct 2004 22:04:39 -0000 1.30 *************** *** 310,331 **** - // TODO - move out of config to generalized function - jvs - 11/20/2003 // begin built-in jpcache ! if($_PSL['jpcache.enable'] == 'internal') { ! // 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 --- 310,324 ---- // begin built-in jpcache ! if ( $_PSL['jpcache.enable'] != 'off' ) { ! /* Full path to jpcache class dir */ if(empty($_PSL['jpcachedir'])) { $_PSL['jpcachedir'] = $_PSL['classdir'] . "/jpcache"; } ! /** ! * General jpcache configuration options. ! */ $JPCACHE_TIME = 900; // Default number of seconds to cache a page $JPCACHE_DEBUG = 0; // Turn debugging on/off *************** *** 339,343 **** $JPCACHE_HASHSCRIPTKEY = 0; // Hash SCRIPT-KEY or not $JPCACHE_HASHVARKEY = 1; // Hash VAR-KEY or not - /** * File based caching setting. --- 332,335 ---- *************** *** 349,391 **** // 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! - - /** - * Memcache based caching settings - */ - $JPCACHE_MEMCACHE_HOST = "localhost"; // Memcache Server - $JPCACHE_MEMCACHE_PORT = "11211"; // Port - $JPCACHE_VERSION = "2.0.0rc1"; ! // 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 = ''; ! $scriptkey = ''; // to avoid ugly warnings/notices if (!empty($HTTP_COOKIE_VARS['slashSess'])) { // later - we check for login after page_open --- 341,359 ---- // us to (more accuratly) recognize jpcache- // files. $JPCACHE_VERSION = "2.0.0rc1"; ! ! // Standard jpcache functions // require $_PSL['jpcachedir']. "/jpcache-main.php"; addLibraryRequirement("jpcache",$_PSL['jpcachedir'] . "/jpcache-main.php"); // require $_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php"; // end of jpcache configuration ! ! // Declare some variables to avoid warnings: $varkey = ''; ! $scriptkey = ''; + // sets caching in motion: if (!empty($HTTP_COOKIE_VARS['slashSess'])) { // later - we check for login after page_open *************** *** 394,398 **** $varkey = md5("POST=" . serialize($HTTP_POST_VARS) . " GET=" . serialize($HTTP_GET_VARS) . " COOKIE=" . serialize($HTTP_COOKIE_VARS)); } else { - // $scriptkey = "-uid-nobody"; $scriptkey = ''; --- 362,365 ---- *************** *** 426,436 **** } $scriptkey .= "-"; if (!array_key_exists('slashSess', $HTTP_COOKIE_VARS)) { jpcache_start('',$scriptkey, $varkey); } - // end of jpcache invocation ! // end of built-in jpcache portion ! } elseif($_PSL['jpcache.enable'] == 'static') { --- 393,435 ---- } $scriptkey .= "-"; + + } + + if ( $_PSL['jpcache.enable'] == 'mysql' ) { + /* Uses mysql table for caching */ + $JPCACHE_TYPE = "phplib"; + /** + * 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!*/ + // PHPLIB Type specific jpcache implementations + addClassRequirement("jpcacheDB","db_sql"); + addClassRequirement("jpcacheDB",$_PSL['jpcachedir'] ."/type/phplib.php"); + addLibraryRequirement("jpcache",$_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php"); + loadLibrary("jpcache"); if (!array_key_exists('slashSess', $HTTP_COOKIE_VARS)) { jpcache_start('',$scriptkey, $varkey); } ! } elseif($_PSL['jpcache.enable'] == 'file') { ! $JPCACHE_TYPE = "file"; ! $JPCACHE_DIR = $_PSL['jpcache.cachedir']; ! $JPCACHE_FILEPREFIX = ""; ! ! addLibraryRequirement("jpcache",$_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php"); ! loadLibrary("jpcache"); ! ! // append html file extension ! $varkey .= ".html"; ! if (!array_key_exists('slashSess', $HTTP_COOKIE_VARS)) { ! jpcache_start('',$scriptkey, $varkey); ! } } elseif($_PSL['jpcache.enable'] == 'static') { *************** *** 443,474 **** // other way. - // jpcachedir -> the full directory path to the jpcache scripts. - if(empty($_PSL['jpcachedir'])) { - $_PSL['jpcachedir'] = $_PSL['classdir'] . "/jpcache"; - } - $JPCACHE_TYPE = "static"; - // $JPCACHE_TYPE = "file"; - - /** - * 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 = 100; // 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 - $JPCACHE_HASHVARKEY = 0; // Hash VAR-KEY or not /** * File based caching setting. */ ! $JPCACHE_DIR = $_PSL['basedir']; // store cache files in basedir ! // $JPCACHE_DIR = "/tmp/jpcache"; // Directory where jpcache must store // generated files. Please use a dedicated // directory, and make it writable --- 442,452 ---- // other way. $JPCACHE_TYPE = "static"; /** * File based caching setting. */ ! $JPCACHE_DIR = $_PSL['jpcache.cachedir']; // store cache files in basedir ! // Directory where jpcache must store // generated files. Please use a dedicated // directory, and make it writable *************** *** 477,534 **** // files. ! $JPCACHE_VERSION = "2.0.0rc1"; ! // Standard jpcache functions ! // require $_PSL['jpcachedir']. "/jpcache-main.php"; ! addLibraryRequirement("jpcache",$_PSL['jpcachedir'] . "/jpcache-main.php"); ! ! addLibraryRequirement("jpcache",$_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php"); loadLibrary("jpcache"); - - // end of jpcache configuration - // cache invocation - $varkey = ''; - $scriptkey = ''; // to avoid ugly warnnings/notices - - if (!empty($HTTP_COOKIE_VARS['slashSess'])) { - // later - we check for login after page_open - // $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 = ''; - // skin can be set directly with a cookie - if(!empty($HTTP_COOKIE_VARS['skin'])) { - $scriptkey .= "-skin-". $_PSL['skin']; - } - } - // if we're not using the default language - if($_PSL['language'] != $_PSL['language.current']) { - $scriptkey .= "-lang-". $_PSL['language.current']; - } - - // if we're not in the default timezone - if( !empty($HTTP_COOKIE_VARS['TZ']) && $HTTP_COOKIE_VARS['TZ'] != $_PSL['timezone']['name']) { - $scriptkey .= "-TZ-". $HTTP_COOKIE_VARS['TZ']; - } - // add GET variables to scriptkey - foreach( $_GET as $key => $value) { - $scriptkey = $key ."/". $value ."/". $scriptkey; - // $scriptkey .= "-". $key ."-". $value; - } - // if home section - add section id - /* - 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("'/|:|\\|\*|<|>|\|'","-", str_replace('.php', '',basename($_PSL['phpself'])).$scriptkey); - if($GLOBALS['JPCACHE_IGNORE_DOMAIN'] == 0) { - $scriptkey = str_replace(".","-", $HTTP_SERVER_VARS['HTTP_HOST'] .$scriptkey); - } // append html file extension $varkey .= ".html"; --- 455,461 ---- // files. ! addLibraryRequirement("jpcache",$_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php"); loadLibrary("jpcache"); // append html file extension $varkey .= ".html"; *************** *** 536,542 **** jpcache_start('',$scriptkey, $varkey); } ! // end of jpcache invocation ! } // end of static jpcache portion // 1.11.4) Other Variables... --- 463,480 ---- jpcache_start('',$scriptkey, $varkey); } ! } else if ( $_PSL['jpcache.enable'] == 'memcache' ) { ! /** ! * Memcache based caching settings ! */ ! $JPCACHE_TYPE = "memcache"; ! $JPCACHE_MEMCACHE_HOST = "localhost"; // Memcache Server ! $JPCACHE_MEMCACHE_PORT = "11211"; // Port ! addLibraryRequirement("jpcache",$_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php"); ! loadLibrary("jpcache"); // TODO this could be called from != off block ! if (!array_key_exists('slashSess', $HTTP_COOKIE_VARS)) { ! jpcache_start('',$scriptkey, $varkey); ! } ! } // end of memcache jpcache portion // 1.11.4) Other Variables... |
|
From: Luis M <le...@us...> - 2004-10-20 22:04:24
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22946 Modified Files: config_setup.ini.php Log Message: added new options for jpcache.cachedir. but commented them out Index: config_setup.ini.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config_setup.ini.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** config_setup.ini.php 20 Oct 2004 12:19:57 -0000 1.14 --- config_setup.ini.php 20 Oct 2004 22:04:15 -0000 1.15 *************** *** 173,192 **** ;; jpcache ;; ! ;; jpcache.enable - valid values = off, internal, static ! ;; ! ;; off - no output cache done ! ;; internal - output cache using either database or file storage ! ;; static - output cache written as html files to the basedir. ! ;; ! ;; static cache warning: This mechanism writes the html cache files ! ;; to the basedir by default. This can be a security risk on servers that ! ;; php writes files using a common user/group. ! ;; ! ;; This option should only be used where the files created are owned by ! ;; the user, the server is in a jail, uml, or security assured in some ! ;; other way. ;; jpcache.enable = off ;;; ;; RSS Exporter Values: --- 173,187 ---- ;; jpcache ;; ! ;; jpcache.enable - valid values = mysql, files, static, memcache, off ! ;; @see config-dist.ini.php for a description ;; jpcache.enable = off + ;; jpcache.cachedir + ;; @see config-dist.ini.php for a description + ;; + ;jpcache.cachedir = /dev/shm/PSLCache + + ;;; ;; RSS Exporter Values: |
|
From: Joe S. <joe...@us...> - 2004-10-20 17:13:08
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21092/phpslash-dev Modified Files: ChangeLog Log Message: Release 0.8RC1. Index: ChangeLog =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/ChangeLog,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ChangeLog 19 Oct 2004 21:47:19 -0000 1.14 --- ChangeLog 20 Oct 2004 17:12:42 -0000 1.15 *************** *** 1,2 **** --- 1,38 ---- + 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 + + * ChangeLog, include/modules/block/Block_i.class: split + slash-all.sql into psl_core and psl_example + + 2004-10-19 16:41 joestewart + + * CHANGES, public_html/config_setup.php, tables/0.8/psl_core.sql, + tables/0.8/psl_example.sql: split slash-all.sql into psl_core and + psl_example + + 2004-10-19 12:00 joestewart + + * CHANGES, include/class/slashAuth.class, + include/class/slashAuthLDAP.class, + include/class/authtypes/slashAuthCR.class: Removed auth files + that had been moved from class dir to auth module dir. + + 2004-10-19 11:55 joestewart + + * CHANGES, include/templates/en/basic/comment.tpl, + public_html/styles/basic_print.css, + include/templates/en/basic/slashHead.tpl, + include/templates/en/basiccurves/slashHead.tpl, + include/templates/en/basiccurves/storyRelated.tpl: printer + friendly output + 2004-10-19 10:26 joestewart |
|
From: Joe S. <joe...@us...> - 2004-10-20 17:11:27
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20668/phpslash-dev/public_html Modified Files: config-dist.php Log Message: Release 0.8RC1. Index: config-dist.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** config-dist.php 7 Oct 2004 20:42:03 -0000 1.28 --- config-dist.php 20 Oct 2004 17:11:07 -0000 1.29 *************** *** 79,83 **** $_PSL = parse_ini_file($psl_inifile, TRUE); ! $_PSL['version'] = '0.8beta'; /**** START DEBUGGING - Comment or delete this for production! ****/ --- 79,83 ---- $_PSL = parse_ini_file($psl_inifile, TRUE); ! $_PSL['version'] = '0.8RC1'; /**** START DEBUGGING - Comment or delete this for production! ****/ |
|
From: Joe S. <joe...@us...> - 2004-10-20 17:11:26
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20668/phpslash-dev Modified Files: VERSION CHANGES Log Message: Release 0.8RC1. Index: VERSION =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/VERSION,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** VERSION 1 Sep 2004 18:59:54 -0000 1.4 --- VERSION 20 Oct 2004 17:11:07 -0000 1.5 *************** *** 1 **** ! 0.8beta --- 1 ---- ! 0.8RC1 Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** CHANGES 20 Oct 2004 16:35:59 -0000 1.122 --- CHANGES 20 Oct 2004 17:11:07 -0000 1.123 *************** *** 14,17 **** --- 14,18 ---- 2004-October 20 Joe Stewart <joe...@us... + [R] - Release 0.8RC1. [EFT] - basic/blockEdit.tpl, basic/blockNew.tpl, Block_admin.class, config-dist.ini.php, config_setup.ini.php - Experimental *************** *** 20,23 **** --- 21,26 ---- [F] - config_setup.php, psl_example.sql - Require username and password entry when using the install wizard on new installations. + psl-core.sql - remove extra admin info. + VERSION, config-dist.php - bump version to 0.8RC1. 2004-October 19 Joe Stewart <joe...@us... |
|
From: Joe S. <joe...@us...> - 2004-10-20 17:11:26
|
Update of /cvsroot/phpslash/phpslash-dev/tables/0.8 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20668/phpslash-dev/tables/0.8 Modified Files: psl_core.sql Log Message: Release 0.8RC1. Index: psl_core.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/tables/0.8/psl_core.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** psl_core.sql 19 Oct 2004 21:41:19 -0000 1.1 --- psl_core.sql 20 Oct 2004 17:11:07 -0000 1.2 *************** *** 159,163 **** -- ! INSERT INTO psl_author (author_id, author_name, author_realname, url, email, quote, password, seclev, perms, author_options) VALUES (1,'god','god','http://www.god.com','go...@he...','God doesn't need a 'quote'!','a87c20fb5245ed928efec7359c128b6e',1000000,'root,nobody,user,topic,comment,story,storyeditor,section,submission,block,poll,author,variable,glossary,mailinglist,logging',''); INSERT INTO psl_author (author_id, author_name, author_realname, url, email, quote, password, seclev, perms, author_options) VALUES (20,'nobody','Anonymous','','','','7dae6bd6d92a6c64367c27ea48169e4e',0,'','N;'); --- 159,163 ---- -- ! INSERT INTO psl_author (author_id, author_name, author_realname, url, email, quote, password, seclev, perms, author_options) VALUES (1,'god','god','','','','a87c20fb5245ed928efec7359c128b6e',0,'',''); INSERT INTO psl_author (author_id, author_name, author_realname, url, email, quote, password, seclev, perms, author_options) VALUES (20,'nobody','Anonymous','','','','7dae6bd6d92a6c64367c27ea48169e4e',0,'','N;'); |
|
From: Joe S. <joe...@us...> - 2004-10-20 16:36:08
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13334/phpslash-dev Modified Files: CHANGES Log Message: Require username and password entry when using the install wizard on new installations. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.121 retrieving revision 1.122 diff -C2 -d -r1.121 -r1.122 *** CHANGES 20 Oct 2004 12:19:56 -0000 1.121 --- CHANGES 20 Oct 2004 16:35:59 -0000 1.122 *************** *** 17,21 **** config-dist.ini.php, config_setup.ini.php - Experimental changes to Block admin interface. Including htmlarea3 and ! removing the new block form from the block list. 2004-October 19 Joe Stewart <joe...@us... --- 17,23 ---- config-dist.ini.php, config_setup.ini.php - Experimental changes to Block admin interface. Including htmlarea3 and ! removing the new block form from the block list. ! [F] - config_setup.php, psl_example.sql - Require username and password ! entry when using the install wizard on new installations. 2004-October 19 Joe Stewart <joe...@us... |
|
From: Joe S. <joe...@us...> - 2004-10-20 16:36:08
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13334/phpslash-dev/public_html Modified Files: config_setup.php Log Message: Require username and password entry when using the install wizard on new installations. Index: config_setup.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config_setup.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** config_setup.php 19 Oct 2004 21:41:19 -0000 1.11 --- config_setup.php 20 Oct 2004 16:35:59 -0000 1.12 *************** *** 777,781 **** <tr class="banner"> <td>Additional Data to install</td> ! </td> <tr> --- 777,781 ---- <tr class="banner"> <td>Additional Data to install</td> ! </tr> <tr> *************** *** 792,795 **** --- 792,816 ---- </div> </td> + </tr> + <tr class="banner"> + <td>Set Adminstrator User Name and Password</td> + </tr> + <tr> + <td> + <p>Enter the name and password that will be used to administer <?php print PRODUCT;?>.</p> + <div align="center"> + <table align="center"> + <tr class="setVal" valign="top"> + <td class="name">Admin name</td> + <td class=""><input type="text" name="user[adminname]" value=""></td> + </tr> + + <tr class="setVal" valign="top"> + <td class="name">Admin Password</td> + <td class="value"><input type="text" name="user[adminpass]" value=""></td> + </tr> + </table> + </div> + </td> </tr> *************** *** 1010,1013 **** --- 1031,1058 ---- } + if(!isset($_REQUEST['user']['adminname']) || !isset($_REQUEST['user']['adminpass'])) { + _setError( + "Please set the administrator user name and password.", + __LINE__ + ); + + return STEP_ERROR; + } else { + $sqlCmd = "UPDATE psl_author + SET author_name = '" . mysql_escape_string($_REQUEST['user']['adminname'])."', + author_realname = '". mysql_escape_string($_REQUEST['user']['adminname']) ."', + password = MD5('". mysql_escape_string($_REQUEST['user']['adminname']).":".mysql_escape_string($_REQUEST['user']['adminpass'])."') + WHERE author_id = '1'"; + $result = mysql_query($sqlCmd ); + if (mysql_errno() != 0) { + _setError( + "SQL failed: <pre>$sqlCmd</pre><br>Server said: " + . mysql_error(), + __LINE__ + ); + return STEP_ERROR; + } + + } return STEP_OK; } *************** *** 1034,1039 **** <p> ! The configuration of <?php print PRODUCT;?> is complete. The default username is ! <tt>god</tt>, and the default password is <tt>password</tt>. <center> --- 1079,1083 ---- <p> ! The configuration of <?php print PRODUCT;?> is complete. <center> |
|
From: Joe S. <joe...@us...> - 2004-10-20 16:36:08
|
Update of /cvsroot/phpslash/phpslash-dev/tables/0.8 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13334/phpslash-dev/tables/0.8 Modified Files: psl_example.sql Log Message: Require username and password entry when using the install wizard on new installations. Index: psl_example.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/tables/0.8/psl_example.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** psl_example.sql 19 Oct 2004 21:41:19 -0000 1.1 --- psl_example.sql 20 Oct 2004 16:35:59 -0000 1.2 *************** *** 121,125 **** -- ! INSERT INTO psl_story (story_id, user_id, order_no, title, dept, intro_text, body_text, hits, topic_cache, story_options, date_available) VALUES (19,1,'','Congratulations! It Works!','new-stuff-is-cool','Welcome to phpslash!\r<br>\n\r<br>\nNow, login to the Admin Section with the default username of \'god\' and password of \'password\' and delete this story!\r<br>\n\r<br>\nThen, add yourself as an author (remember to give yourself all Security permissions) and logout / login again. ','',1,'','',975968996); # -------------------------------------------------------- --- 121,125 ---- -- ! INSERT INTO psl_story (story_id, user_id, order_no, title, dept, intro_text, body_text, hits, topic_cache, story_options, date_available) VALUES (19,1,'','Congratulations! It Works!','new-stuff-is-cool','Welcome to phpslash!\r<br>\n\r<br>\nNow, login to the Admin Section and delete this story!\r<br>\n\r<br>\nThen finish setting up your personal information in your User Profile. ','',1,'','',1098196196); # -------------------------------------------------------- |
|
From: Joe S. <joe...@us...> - 2004-10-20 12:21:24
|
Update of /cvsroot/phpslash/phpslash-dev/include/templates/en/basic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11531/phpslash-dev/include/templates/en/basic Modified Files: blockList.tpl Log Message: block admin interface changes Index: blockList.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/blockList.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** blockList.tpl 18 Oct 2004 17:29:59 -0000 1.2 --- blockList.tpl 20 Oct 2004 12:21:15 -0000 1.3 *************** *** 1,6 **** <!-- start blockList.tpl --> - {TITLEBAR} <div id="blockList"> <form action="{ACTION_URL}" method="post"> <table cellpadding="2" cellspacing="1" border="0"> <tr> --- 1,7 ---- <!-- start blockList.tpl --> <div id="blockList"> <form action="{ACTION_URL}" method="post"> + <input type="submit" name="submit" value="new" /><br /> + {TITLEBAR} <table cellpadding="2" cellspacing="1" border="0"> <tr> |
|
From: Joe S. <joe...@us...> - 2004-10-20 12:20:15
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11099/phpslash-dev Modified Files: CHANGES Log Message: block admin interface changes Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.120 retrieving revision 1.121 diff -C2 -d -r1.120 -r1.121 *** CHANGES 19 Oct 2004 21:41:19 -0000 1.120 --- CHANGES 20 Oct 2004 12:19:56 -0000 1.121 *************** *** 13,16 **** --- 13,22 ---- 9 - Removal of something (kill -9 :) + 2004-October 20 Joe Stewart <joe...@us... + [EFT] - basic/blockEdit.tpl, basic/blockNew.tpl, Block_admin.class, + config-dist.ini.php, config_setup.ini.php - Experimental + changes to Block admin interface. Including htmlarea3 and + removing the new block form from the block list. + 2004-October 19 Joe Stewart <joe...@us... [B] - Story_admin.class - [ 799042 ] StoryAdmin :: Adding blank story generates |
|
From: Joe S. <joe...@us...> - 2004-10-20 12:20:15
|
Update of /cvsroot/phpslash/phpslash-dev/include/templates/en/basic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11099/phpslash-dev/include/templates/en/basic Modified Files: blockEdit.tpl Log Message: block admin interface changes Index: blockEdit.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/blockEdit.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** blockEdit.tpl 18 Oct 2004 17:21:48 -0000 1.3 --- blockEdit.tpl 20 Oct 2004 12:19:57 -0000 1.4 *************** *** 2,6 **** {TITLEBAR} <div id="blockEdit"> ! <form action="{ACTION_URL}" method="post"> <input type="hidden" name="block_id" value="{BLOCK_ID}" /> <table border="0"> --- 2,6 ---- {TITLEBAR} <div id="blockEdit"> ! <form name="editNew" action="{ACTION_URL}" method="post"> <input type="hidden" name="block_id" value="{BLOCK_ID}" /> <table border="0"> *************** *** 54,61 **** <td class="descr">Data<br /><span class="hint">(if type is <b>HTML</b>)</span></td> <td> ! <textarea name="cache_data" cols="60" rows="4">{CACHE_DATA}</textarea> </td> </tr> <tr> <td class="descr"> Order Number<br /> --- 54,71 ---- <td class="descr">Data<br /><span class="hint">(if type is <b>HTML</b>)</span></td> <td> ! <textarea id="intro_text" name="cache_data" cols="80" rows="20">{CACHE_DATA}</textarea> </td> </tr> <tr> + <td class="descr"><b>WYSIWYG Editor</b><br /> + <small></small></td> + + <td> + <input type="radio" checked name="content_type" value="yes" onClick="PSL_chooseEditor(1);" /> Yes + <br /> + <input type="radio" name="content_type" value="no" onClick="PSL_chooseEditor(1);" /> No + </td> + </tr> + <tr> <td class="descr"> Order Number<br /> |
|
From: Joe S. <joe...@us...> - 2004-10-20 12:20:15
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/block In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11099/phpslash-dev/include/modules/block Modified Files: Block_admin.class Log Message: block admin interface changes Index: Block_admin.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/Block_admin.class,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Block_admin.class 24 Jun 2003 19:32:34 -0000 1.4 --- Block_admin.class 20 Oct 2004 12:19:57 -0000 1.5 *************** *** 62,65 **** --- 62,69 ---- 'BLOCK_TYPE_NAME' => $val )); + // select the default block type + if($val == $this->psl['blocktype.default']) { + $this->templ->set_var( 'SELECTED', 'selected'); + } $this->templ->parse("block_type_rows","block_type_row",true); } |
|
From: Joe S. <joe...@us...> - 2004-10-20 12:20:15
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11099/phpslash-dev/public_html Modified Files: config-dist.ini.php config_setup.ini.php Log Message: block admin interface changes Index: config-dist.ini.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.ini.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** config-dist.ini.php 18 Sep 2004 14:35:24 -0000 1.15 --- config-dist.ini.php 20 Oct 2004 12:19:57 -0000 1.16 *************** *** 339,342 **** --- 339,345 ---- ;; Use this number as the minimum number of options available for a block. block_optioncount = 4 + ;; + ;; default blocktype for new blocks + blocktype.default = "html" ;;; end of Block Options ;;; Index: config_setup.ini.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config_setup.ini.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** config_setup.ini.php 19 Oct 2004 15:26:27 -0000 1.13 --- config_setup.ini.php 20 Oct 2004 12:19:57 -0000 1.14 *************** *** 339,342 **** --- 339,345 ---- ;; Use this number as the minimum number of options available for a block. block_optioncount = 4 + ;; + ;; default blocktype for new blocks + blocktype.default = "html" ;;; end of Block Options ;;; |
|
From: Joe S. <joe...@us...> - 2004-10-19 21:47:30
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/block In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv721/phpslash-dev/include/modules/block Modified Files: Block_i.class Log Message: split slash-all.sql into psl_core and psl_example Index: Block_i.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/Block_i.class,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Block_i.class 27 Aug 2004 17:14:57 -0000 1.4 --- Block_i.class 19 Oct 2004 21:47:19 -0000 1.5 *************** *** 70,74 **** if ( $this->argv_ary != $ary) { $this->argv_ary = $ary; ! $block_ary = $this->extractBlocks( $ary); } --- 70,74 ---- if ( $this->argv_ary != $ary) { $this->argv_ary = $ary; ! $this->block_ary = $this->extractBlocks( $ary); } |
|
From: Joe S. <joe...@us...> - 2004-10-19 21:47:30
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv721/phpslash-dev Modified Files: ChangeLog Log Message: split slash-all.sql into psl_core and psl_example Index: ChangeLog =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/ChangeLog,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ChangeLog 1 Oct 2004 18:28:04 -0000 1.13 --- ChangeLog 19 Oct 2004 21:47:19 -0000 1.14 *************** *** 1,2 **** --- 1,101 ---- + 2004-10-19 10:26 joestewart + + * CHANGES, include/modules/story/Story_admin.class, + tables/0.8/slash-all.sql, public_html/config_setup.ini.php: [ + 799042 ] StoryAdmin :: Previewing blank story generates warning, + Admin module should be below Admin Tasks, breadcrumb delimiter + wasn't defined correctly + + 2004-10-18 18:30 joestewart + + * include/modules/story/Story.class, + include/templates/en/basic/storyRelated.tpl, CHANGES: printer + friendly link + + 2004-10-18 18:11 joestewart + + * CHANGES, include/class/functions.inc: allow switching css in url + + 2004-10-18 15:46 joestewart + + * CHANGES, scripts/db_xfer.php.disabled: corrected bug - [ 1035199 + ] [0.8] - upgrade script doesn't upgrade all sections. + + 2004-10-18 12:33 krabu + + * CHANGES: Sundry minor changes and bugfixes + + 2004-10-18 12:29 krabu + + * include/templates/en/basic/blockList.tpl: Experimental layout + change to fit the table better into the screen. + + 2004-10-18 12:21 krabu + + * include/templates/en/basic/: article.tpl, blockEdit.tpl, + groupNew.tpl, permissionList.tpl, permissionNew.tpl, + rssblock.tpl, storyNew.tpl: UI improvements: - mainly adding + Cancel button to edit screens - select boxes of 8 not 4 items + (much easier to use) - some rewordings too + + Tags moved to lower case where necessary + + 2004-10-18 12:18 krabu + + * include/modules/mailinglist/admin.php: Show list if nothing else + is to be done + + 2004-10-18 12:14 krabu + + * include/modules/block/blocktypes/Block_render_page.class: Make + sensible MAINPAGE value available to breadcrumb + + 2004-10-18 12:11 krabu + + * include/: locale/en.php, modules/block/Block.class: Translate + 'block added' message + + 2004-10-18 12:06 krabu + + * include/modules/auth/slashAuth.class: Make custom user-options + available to the session + + 2004-10-18 12:05 krabu + + * include/class/functions.inc: General notice squashing, adding + MAINPAGE var to getHeader, tidyup of mail-related functions + + 2004-10-18 12:00 krabu + + * include/class/slashTemplate.class: Fix for situation where + templates dont exist in current language + + 2004-10-14 13:04 joestewart + + * CHANGES, public_html/index.php: Story titles should display + correctly. + + 2004-10-14 12:55 joestewart + + * CHANGES, + include/modules/block/blocktypes/Block_render_header.class, + include/modules/story/index.php, scripts/db_xfer.php.disabled, + tables/0.8/slash-all.sql: Story titles should display correctly. + + 2004-10-07 15:42 joestewart + + * CHANGES, public_html/config-dist.php, tables/0.8/slash-all.sql: + Blog section didn't have the right blocks. bloggers group typo. + + 2004-10-01 13:28 joestewart + + * ChangeLog: changed url skin change from url to not set cookie + unless cookie argument also set. + + 2004-10-01 13:07 joestewart + + * CHANGES, public_html/config-dist.php: changed url skin change + from url to not set cookie unless cookie argument also set. + 2004-09-29 13:25 joestewart |
2 messages has been excluded from this view by a project administrator.
