Menu
▾
▴
sciret-svn — The subversion commit mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(58) |
Sep
(44) |
Oct
(7) |
Nov
(4) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(15) |
Aug
(55) |
Sep
(48) |
Oct
(56) |
Nov
(14) |
Dec
|
|
From: <al...@us...> - 2008-11-24 14:30:30
|
Revision: 785
http://sciret.svn.sourceforge.net/sciret/?rev=785&view=rev
Author: alpeb
Date: 2008-11-24 14:30:26 +0000 (Mon, 24 Nov 2008)
Log Message:
-----------
config.ini.php was renamed to config.php
Modified Paths:
--------------
trunk/actions/Install.php
Modified: trunk/actions/Install.php
===================================================================
--- trunk/actions/Install.php 2008-11-21 22:48:09 UTC (rev 784)
+++ trunk/actions/Install.php 2008-11-24 14:30:26 UTC (rev 785)
@@ -98,7 +98,7 @@
$configStr = "<?php\n\n return " . var_export($config->toArray(), true) . ";\n\n?>";
- $fp = fopen(dirname(__FILE__).'/../config.ini.php', 'w');
+ $fp = fopen(dirname(__FILE__).'/../config.php', 'w');
fwrite($fp, $configStr);
fclose($fp);
}
@@ -130,7 +130,7 @@
function _isConfigWritable() {
// is_writable() not working under windows
- if (!$fp = @fopen(dirname(__FILE__).'/../config.ini.php', 'a')) {
+ if (!$fp = @fopen(dirname(__FILE__).'/../config.php', 'a')) {
return false;
}
fclose($fp);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2008-11-21 22:48:13
|
Revision: 784
http://sciret.svn.sourceforge.net/sciret/?rev=784&view=rev
Author: reinerj
Date: 2008-11-21 22:48:09 +0000 (Fri, 21 Nov 2008)
Log Message:
-----------
mysqli is required for the upgrade of Sciret
Modified Paths:
--------------
trunk/UPGRADE.TXT
trunk/docs/sciret-install-OpenBSD-EN-images.html
trunk/docs/sciret-install-OpenBSD-EN-images.txt
trunk/docs/sciret-install-OpenBSD-EN.txt
Modified: trunk/UPGRADE.TXT
===================================================================
--- trunk/UPGRADE.TXT 2008-11-21 21:18:52 UTC (rev 783)
+++ trunk/UPGRADE.TXT 2008-11-21 22:48:09 UTC (rev 784)
@@ -8,6 +8,5 @@
mysql -u your-mysqladmin-user -p database < upgrade.sql
-and run also the follow command
+For the Release 2.0.0 for Sciret you need to have installed php mysqli
- INSERT INTO configuration (field, value) VALUES('version', '1.1.0');
Modified: trunk/docs/sciret-install-OpenBSD-EN-images.html
===================================================================
--- trunk/docs/sciret-install-OpenBSD-EN-images.html 2008-11-21 21:18:52 UTC (rev 783)
+++ trunk/docs/sciret-install-OpenBSD-EN-images.html 2008-11-21 22:48:09 UTC (rev 784)
@@ -1187,7 +1187,8 @@
</td>
<td class="content">
<div class="title">After the package upgrade</div>
-<div class="para"><p>Point your browser to the Sciret site and follow the instruction to perform the automatic database upgrade</p></div>
+<div class="para"><p>Point your browser to the Sciret site and follow the instruction
+to perform the automatic database upgrade</p></div>
</td>
</tr></table>
</div>
@@ -1198,13 +1199,17 @@
</td>
<td class="content">
<div class="title">Upgrade Sciret from a SVN development version</div>
-<div class="para"><p>Before you upgrade Sciret to the latest release, please read the release notes and the file UPGRADE.TXT. Sometimes the database schema is changed and you need to alter your database first before you can upgrade Sciret.</p></div>
-<div class="para"><p>If you update the code from the svn repository the automatic upgrade won't work since
-you are in a kind of "limbo version". The system will only do clean
-installs and upgrade from any stable version to the next stable version. To make your
-current installs work you'll have, just for this time, to manually run
-the SQL that you need under /setup/upgrade_x.x.x.sql and this:
-INSERT INTO configuration (field, value) VALUES(<em>version</em>, <em>x.x.x</em>);</p></div>
+<div class="para"><p>Before you upgrade Sciret to the latest release, please read the
+release notes and the file UPGRADE.TXT. Sometimes the database
+schema is changed and you need to alter your database first before
+you can upgrade Sciret.</p></div>
+<div class="para"><p>If you update the code from the svn repository the automatic upgrade
+won't work sinceyou are in a kind of "limbo version". The system
+will only do clean installs and upgrade from any stable version to
+the next stable version. To make your current installs work you'll
+have, just for this time, to manually run the SQL that you need
+under /setup/upgrade_x.x.x.sql and this:</p></div>
+<div class="para"><p>INSERT INTO configuration (field, value) VALUES(<em>version</em>, <em>x.x.x</em>);</p></div>
</td>
</tr></table>
</div>
@@ -1331,7 +1336,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-11-21 20:37:43 CEST
+Last updated 2008-11-21 22:47:39 CEST
</div>
</div>
</body>
Modified: trunk/docs/sciret-install-OpenBSD-EN-images.txt
===================================================================
--- trunk/docs/sciret-install-OpenBSD-EN-images.txt 2008-11-21 21:18:52 UTC (rev 783)
+++ trunk/docs/sciret-install-OpenBSD-EN-images.txt 2008-11-21 22:48:09 UTC (rev 784)
@@ -673,19 +673,25 @@
[TIP]
.After the package upgrade
================================================================
-Point your browser to the Sciret site and follow the instruction to perform the automatic database upgrade
+Point your browser to the Sciret site and follow the instruction
+to perform the automatic database upgrade
================================================================
[IMPORTANT]
.Upgrade Sciret from a SVN development version
-===============================================================
-Before you upgrade Sciret to the latest release, please read the release notes and the file UPGRADE.TXT. Sometimes the database schema is changed and you need to alter your database first before you can upgrade Sciret.
+=================================================================
+Before you upgrade Sciret to the latest release, please read the
+release notes and the file UPGRADE.TXT. Sometimes the database
+schema is changed and you need to alter your database first before
+you can upgrade Sciret.
-If you update the code from the svn repository the automatic upgrade won't work since
-you are in a kind of "limbo version". The system will only do clean
-installs and upgrade from any stable version to the next stable version. To make your
-current installs work you'll have, just for this time, to manually run
-the SQL that you need under /setup/upgrade_x.x.x.sql and this:
+If you update the code from the svn repository the automatic upgrade
+won't work sinceyou are in a kind of "limbo version". The system
+will only do clean installs and upgrade from any stable version to
+the next stable version. To make your current installs work you'll
+have, just for this time, to manually run the SQL that you need
+under /setup/upgrade_x.x.x.sql and this:
+
INSERT INTO configuration (field, value) VALUES('version', 'x.x.x');
===============================================================
Modified: trunk/docs/sciret-install-OpenBSD-EN.txt
===================================================================
--- trunk/docs/sciret-install-OpenBSD-EN.txt 2008-11-21 21:18:52 UTC (rev 783)
+++ trunk/docs/sciret-install-OpenBSD-EN.txt 2008-11-21 22:48:09 UTC (rev 784)
@@ -96,6 +96,11 @@
# ln -fs /var/www/conf/php5.sample/mysql.ini \
/var/www/conf/php5/mysql.ini
+ # pkg_add -v -i php5-mysqli
+
+ # ln -fs /var/www/conf/php5.sample/mysqli.ini \
+ /var/www/conf/php5/mysqli.ini
+
# pkg_add -v -i php5-mcrypt
# ln -fs /var/www/conf/php5.sample/mcrypt.ini \
@@ -673,19 +678,25 @@
[TIP]
.After the package upgrade
================================================================
-Point your browser to the Sciret site and follow the instruction to perform the automatic database upgrade
+Point your browser to the Sciret site and follow the instruction
+to perform the automatic database upgrade
================================================================
[IMPORTANT]
.Upgrade Sciret from a SVN development version
-===============================================================
-Before you upgrade Sciret to the latest release, please read the release notes and the file UPGRADE.TXT. Sometimes the database schema is changed and you need to alter your database first before you can upgrade Sciret.
+=================================================================
+Before you upgrade Sciret to the latest release, please read the
+release notes and the file UPGRADE.TXT. Sometimes the database
+schema is changed and you need to alter your database first before
+you can upgrade Sciret.
-If you update the code from the svn repository the automatic upgrade won't work since
-you are in a kind of "limbo version". The system will only do clean
-installs and upgrade from any stable version to the next stable version. To make your
-current installs work you'll have, just for this time, to manually run
-the SQL that you need under /setup/upgrade_x.x.x.sql and this:
+If you update the code from the svn repository the automatic upgrade
+won't work sinceyou are in a kind of "limbo version". The system
+will only do clean installs and upgrade from any stable version to
+the next stable version. To make your current installs work you'll
+have, just for this time, to manually run the SQL that you need
+under /setup/upgrade_x.x.x.sql and this:
+
INSERT INTO configuration (field, value) VALUES('version', 'x.x.x');
===============================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-11-21 21:18:56
|
Revision: 783
http://sciret.svn.sourceforge.net/sciret/?rev=783&view=rev
Author: alpeb
Date: 2008-11-21 21:18:52 +0000 (Fri, 21 Nov 2008)
Log Message:
-----------
updated snippet for uploading media in the rich-text-editor (added compatibility with YUI 2.6)
Modified Paths:
--------------
trunk/javascript/general.js
Modified: trunk/javascript/general.js
===================================================================
--- trunk/javascript/general.js 2008-11-21 20:34:01 UTC (rev 782)
+++ trunk/javascript/general.js 2008-11-21 21:18:52 UTC (rev 783)
@@ -803,72 +803,77 @@
{status:'We only allow JPEG Images.'}
*/
- var yuiImgUploader = function(rte, upload_url, upload_image_name) {
- // customize the editor img button
-
- YAHOO.log( "Adding Click Listener" ,'debug');
- rte.addListener('toolbarLoaded',function() {
- rte.toolbar.addListener ( 'insertimageClick', function(o) {
- try {
- var imgPanel=new YAHOO.util.Element('yui-editor-panel');
- imgPanel.on ( 'contentReady', function() {
- try {
- var Dom=YAHOO.util.Dom;
- var label=document.createElement('label');
- label.innerHTML='<strong>Upload:</strong>'+
- '<input type="file" id="insertimage_upload" name="'+upload_image_name+
- '" size="10" style="width: 20%" />'+
- '<a href="#" id="insertimage_upload_btn" style="width: 20%; margin-left: 10em;">Upload Image</a>'+
- '</label>';
-
- var img_elem=Dom.get('insertimage_url');
- Dom.getAncestorByTagName(img_elem, 'form').encoding = 'multipart/form-data';
-
- Dom.insertAfter(
- label,
- img_elem.parentNode);
-
- YAHOO.util.Event.on ( 'insertimage_upload_btn', 'click', function(ev) {
- YAHOO.util.Event.stopEvent(ev); // no default click action
- YAHOO.util.Connect.setForm ( img_elem.form, true, true );
- var c=YAHOO.util.Connect.asyncRequest(
- 'POST', upload_url, {
- upload:function(r){
- try {
- // strip pre tags if they got added somehow
- resp=r.responseText.replace( /<pre>/i, '').replace ( /<\/pre>/i, '');
- var o=eval('('+resp+')');
- if (o.status=='UPLOADED') {
- Dom.get('insertimage_upload').value='';
- Dom.get('insertimage_url').value=o.image_url;
- // tell the image panel the url changed
- // hack instead of fireEvent('blur')
- // which for some reason isn't working
- Dom.get('insertimage_url').focus();
- Dom.get('insertimage_upload').focus();
- } else {
- alert ( "Upload Failed: "+o.status );
- }
-
- } catch ( eee ) {
- YAHOO.log( eee.message, 'error' )
- }
- }
- }
- );
- return false;
- });
-
- } catch ( ee ) { YAHOO.log( ee.message, 'error' ) }
- });
- } catch ( e ) {
- YAHOO.log( e.message, 'error' )
- }
- });
- });
-
- }
+ var yuiImgUploader = function(rte, editor_name, upload_url, upload_image_name) {
+ // customize the editor img button
+ YAHOO.log( "Adding Click Listener" ,'debug');
+ rte.addListener('toolbarLoaded',function() {
+ rte.toolbar.addListener ( 'insertimageClick', function(o) {
+ try {
+ var imgPanel=new YAHOO.util.Element(editor_name + '-panel');
+ imgPanel.on ( 'contentReady', function() {
+ try {
+ var Dom=YAHOO.util.Dom;
+
+ if (! Dom.get(editor_name + '_insertimage_upload'))
+ {
+ var label=document.createElement('label');
+ label.innerHTML='<strong>Upload:</strong>'+
+ '<input type="file" id="' +
+ editor_name + '_insertimage_upload" name="'+upload_image_name+
+ '" size="10" style="width: 300px" />'+
+ '</label>';
+
+ var img_elem=Dom.get(editor_name + '_insertimage_url');
+ Dom.getAncestorByTagName(img_elem, 'form').encoding = 'multipart/form-data';
+
+ Dom.insertAfter(
+ label,
+ img_elem.parentNode);
+
+ YAHOO.util.Event.on ( editor_name + '_insertimage_upload', 'change', function(ev) {
+ YAHOO.util.Event.stopEvent(ev); // no default click action
+ YAHOO.util.Connect.setForm ( img_elem.form, true, true );
+ var c=YAHOO.util.Connect.asyncRequest(
+ 'POST', upload_url, {
+ upload:function(r){
+ try {
+ // strip pre tags if they got added somehow
+ resp=r.responseText.replace( /<pre>/i, '').replace ( /<\/pre>/i, '');
+ var o=eval('('+resp+')');
+ if (o.status=='UPLOADED') {
+ Dom.get(editor_name + '_insertimage_upload').value='';
+ Dom.get(editor_name + '_insertimage_url').value=o.image_url;
+ // tell the image panel the url changed
+ // hack instead of fireEvent('blur')
+ // which for some reason isn't working
+ Dom.get(editor_name + '_insertimage_url').focus();
+ Dom.get(editor_name + '_insertimage_upload').focus();
+ } else {
+ alert ( "Upload Failed: "+o.status );
+ }
+
+ } catch ( eee ) {
+ YAHOO.log( eee.message, 'error' );
+ }
+ }
+ }
+ );
+ return false;
+ });
+ }
+ }
+ catch ( ee ) { YAHOO.log( ee.message, 'error' ); }
+
+ });
+ } catch ( e ) {
+ YAHOO.log( e.message, 'error' );
+ }
+ });
+ });
+
+ };
+
return {
init: function(width, height, element) {
@@ -976,7 +981,7 @@
});
myEditor._defaultToolbar.titlebar = false;
- yuiImgUploader(myEditor, 'index.php?action=UploadImage', 'image');
+ yuiImgUploader(myEditor, 'text_content', 'index.php?action=UploadImage', 'image');
myEditor.render();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-11-21 20:34:04
|
Revision: 782
http://sciret.svn.sourceforge.net/sciret/?rev=782&view=rev
Author: alpeb
Date: 2008-11-21 20:34:01 +0000 (Fri, 21 Nov 2008)
Log Message:
-----------
re-added compatibility with older config files
Modified Paths:
--------------
trunk/index.php
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2008-11-21 20:23:50 UTC (rev 781)
+++ trunk/index.php 2008-11-21 20:34:01 UTC (rev 782)
@@ -34,7 +34,36 @@
// use a config.php with an array instead of a cleaner .ini file, because for an easy installation all files
// go under the web root, and a .ini file would be browsable
-$config = new Zend_Config(require dirname(__FILE__). '/config.php', array('allowModifications' => true));
+$configArray = require dirname(__FILE__). '/config.php';
+if (!is_array($configArray)) {
+ // config file comes from version previous than 1.9.0
+ $configArray = array(
+ 'environment' =>
+ array (
+ 'session_name' => 'SCIRET',
+ 'production' => true,
+ 'YDN' => true,
+ 'loglevel' => 0,
+ ),
+ 'general' =>
+ array (
+ 'slowdown_secs' => SLOWDOWN_SECS,
+ 'language_default' => LANGUAGE_DEFAULT,
+ ),
+ 'database' =>
+ array (
+ 'adapter' => 'mysqli',
+ 'params' =>
+ array (
+ 'host' => DB_HOST,
+ 'dbname' => DB_NAME,
+ 'username' => DB_USER,
+ 'password' => DB_PASSWORD,
+ ),
+ ),
+ );
+}
+$config = new Zend_Config($configArray, array('allowModifications' => true));
Zend_Registry::set('config', $config);
/**************************
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-11-21 20:24:00
|
Revision: 781
http://sciret.svn.sourceforge.net/sciret/?rev=781&view=rev
Author: alpeb
Date: 2008-11-21 20:23:50 +0000 (Fri, 21 Nov 2008)
Log Message:
-----------
renamed config.ini.php to config.php like before, for an easier upgrade
Modified Paths:
--------------
trunk/index.php
Added Paths:
-----------
trunk/config.php
Removed Paths:
-------------
trunk/config.ini.php
Deleted: trunk/config.ini.php
===================================================================
--- trunk/config.ini.php 2008-11-21 19:43:57 UTC (rev 780)
+++ trunk/config.ini.php 2008-11-21 20:23:50 UTC (rev 781)
@@ -1,29 +0,0 @@
-<?php
-
- return array (
- 'environment' =>
- array (
- 'session_name' => 'SCIRET',
- 'production' => true,
- 'YDN' => true,
- 'loglevel' => 0,
- ),
- 'general' =>
- array (
- 'slowdown_secs' => 0,
- 'language_default' => 'English',
- ),
- 'database' =>
- array (
- 'adapter' => 'mysqli',
- 'params' =>
- array (
- 'host' => 'localhost',
- 'dbname' => 'sciret',
- 'username' => 'root',
- 'password' => '',
- ),
- ),
-);
-
-?>
Copied: trunk/config.php (from rev 780, trunk/config.ini.php)
===================================================================
--- trunk/config.php (rev 0)
+++ trunk/config.php 2008-11-21 20:23:50 UTC (rev 781)
@@ -0,0 +1,29 @@
+<?php
+
+ return array (
+ 'environment' =>
+ array (
+ 'session_name' => 'SCIRET',
+ 'production' => true,
+ 'YDN' => true,
+ 'loglevel' => 0,
+ ),
+ 'general' =>
+ array (
+ 'slowdown_secs' => 0,
+ 'language_default' => 'English',
+ ),
+ 'database' =>
+ array (
+ 'adapter' => 'mysqli',
+ 'params' =>
+ array (
+ 'host' => 'localhost',
+ 'dbname' => 'sciret',
+ 'username' => 'root',
+ 'password' => '',
+ ),
+ ),
+);
+
+?>
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2008-11-21 19:43:57 UTC (rev 780)
+++ trunk/index.php 2008-11-21 20:23:50 UTC (rev 781)
@@ -32,9 +32,9 @@
$times = explode(' ', microtime());
$GLOBALS['startTime'] = $times[0] + $times[1];
-// use a config.ini.php with an array instead of a cleaner .ini file, because for an easy installation all files
+// use a config.php with an array instead of a cleaner .ini file, because for an easy installation all files
// go under the web root, and a .ini file would be browsable
-$config = new Zend_Config(require dirname(__FILE__). '/config.ini.php', array('allowModifications' => true));
+$config = new Zend_Config(require dirname(__FILE__). '/config.php', array('allowModifications' => true));
Zend_Registry::set('config', $config);
/**************************
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2008-11-21 19:44:04
|
Revision: 780
http://sciret.svn.sourceforge.net/sciret/?rev=780&view=rev
Author: reinerj
Date: 2008-11-21 19:43:57 +0000 (Fri, 21 Nov 2008)
Log Message:
-----------
fix a linebreak
Modified Paths:
--------------
trunk/docs/sciret-install-OpenBSD-EN-images.html
trunk/docs/sciret-install-OpenBSD-EN-images.txt
trunk/docs/sciret-install-OpenBSD-EN.txt
Modified: trunk/docs/sciret-install-OpenBSD-EN-images.html
===================================================================
--- trunk/docs/sciret-install-OpenBSD-EN-images.html 2008-11-21 19:37:19 UTC (rev 779)
+++ trunk/docs/sciret-install-OpenBSD-EN-images.html 2008-11-21 19:43:57 UTC (rev 780)
@@ -351,10 +351,7 @@
<div class="sectionbody">
<div class="para"><p><strong>Sciret</strong></p></div>
<div class="para"><p>Sciret is an advanced knowledge based system written in PHP. The software self is platform independent and should run on every platform where PHP is supported. In the further development, Sciret will be extended to a full enterprise knowledge and information storage system.</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>Sciret was developed as a internal project from http://www.kb-m.com[Keyboard Monkeys], a Open Source consulting and strategy company. After many month of internal usage, the decision was taken to release the code as an Open Source Project on http://www.sf.net[Sourceforge]. We hope that Sciret will also fulfill the requirements of other users and companies.</tt></pre>
-</div></div>
+<div class="para"><p>Sciret was developed as a internal project from <a href="http://www.kb-m.com">Keyboard Monkeys</a>, a Open Source consulting and strategy company. After many month of internal usage, the decision was taken to release the code as an Open Source Project on <a href="http://www.sf.net">Sourceforge</a>. We hope that Sciret will also fulfill the requirements of other users and companies.</p></div>
<div class="para"><p><strong>OpenBSD</strong></p></div>
<div class="para"><p><a href="http://www.openbsd.org">OpenBSD</a> is a Unix-like computer operating system descended from Berkeley Software Distribution (BSD), a Unix derivative developed at the University of California, Berkeley. It was forked from NetBSD by project leader Theo de Raadt in late 1995. The project is widely known for the developers insistence on open source code and quality documentation; uncompromising position on software licensing; and focus on security and code correctness. The project is coordinated from de Raadt's home in Calgary, Alberta, Canada. Its logo and mascot is Puffy, a blowfish.</p></div>
<div class="para"><p>OpenBSD includes a number of security features absent or optional in other operating systems and has a tradition of developers auditing the source code for software bugs and security problems. The project maintains strict policies on licensing and prefers the open source BSD licence and its variants in the past this has led to a comprehensive licence audit and moves to remove or replace code under licences found less acceptable.</p></div>
@@ -1334,7 +1331,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-11-21 20:35:59 CEST
+Last updated 2008-11-21 20:37:43 CEST
</div>
</div>
</body>
Modified: trunk/docs/sciret-install-OpenBSD-EN-images.txt
===================================================================
--- trunk/docs/sciret-install-OpenBSD-EN-images.txt 2008-11-21 19:37:19 UTC (rev 779)
+++ trunk/docs/sciret-install-OpenBSD-EN-images.txt 2008-11-21 19:43:57 UTC (rev 780)
@@ -11,7 +11,7 @@
Sciret is an advanced knowledge based system written in PHP. The software self is platform independent and should run on every platform where PHP is supported. In the further development, Sciret will be extended to a full enterprise knowledge and information storage system.
- Sciret was developed as a internal project from http://www.kb-m.com[Keyboard Monkeys], a Open Source consulting and strategy company. After many month of internal usage, the decision was taken to release the code as an Open Source Project on http://www.sf.net[Sourceforge]. We hope that Sciret will also fulfill the requirements of other users and companies.
+Sciret was developed as a internal project from http://www.kb-m.com[Keyboard Monkeys], a Open Source consulting and strategy company. After many month of internal usage, the decision was taken to release the code as an Open Source Project on http://www.sf.net[Sourceforge]. We hope that Sciret will also fulfill the requirements of other users and companies.
*OpenBSD*
Modified: trunk/docs/sciret-install-OpenBSD-EN.txt
===================================================================
--- trunk/docs/sciret-install-OpenBSD-EN.txt 2008-11-21 19:37:19 UTC (rev 779)
+++ trunk/docs/sciret-install-OpenBSD-EN.txt 2008-11-21 19:43:57 UTC (rev 780)
@@ -11,7 +11,7 @@
Sciret is an advanced knowledge based system written in PHP. The software self is platform independent and should run on every platform where PHP is supported. In the further development, Sciret will be extended to a full enterprise knowledge and information storage system.
- Sciret was developed as a internal project from http://www.kb-m.com[Keyboard Monkeys], a Open Source consulting and strategy company. After many month of internal usage, the decision was taken to release the code as an Open Source Project on http://www.sf.net[Sourceforge]. We hope that Sciret will also fulfill the requirements of other users and companies.
+Sciret was developed as a internal project from http://www.kb-m.com[Keyboard Monkeys], a Open Source consulting and strategy company. After many month of internal usage, the decision was taken to release the code as an Open Source Project on http://www.sf.net[Sourceforge]. We hope that Sciret will also fulfill the requirements of other users and companies.
*OpenBSD*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2008-11-21 19:37:26
|
Revision: 779
http://sciret.svn.sourceforge.net/sciret/?rev=779&view=rev
Author: reinerj
Date: 2008-11-21 19:37:19 +0000 (Fri, 21 Nov 2008)
Log Message:
-----------
add changes from PHP install on OpenBSD
Modified Paths:
--------------
trunk/docs/sciret-install-OpenBSD-EN-images.html
trunk/docs/sciret-install-OpenBSD-EN-images.txt
trunk/docs/sciret-install-OpenBSD-EN.txt
Modified: trunk/docs/sciret-install-OpenBSD-EN-images.html
===================================================================
--- trunk/docs/sciret-install-OpenBSD-EN-images.html 2008-11-21 19:14:04 UTC (rev 778)
+++ trunk/docs/sciret-install-OpenBSD-EN-images.html 2008-11-21 19:37:19 UTC (rev 779)
@@ -451,11 +451,6 @@
<div class="content">
<pre><tt># pkg_add -v -i php5-core</tt></pre>
</div></div>
-<div class="para"><p>Copy the php.ini file</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt># cp /usr/local/share/examples/php5/php.ini-recommended /var/www/conf/php.ini</tt></pre>
-</div></div>
<div class="para"><p>Edit the php.ini file</p></div>
<div class="literalblock">
<div class="content">
@@ -474,7 +469,8 @@
<div class="para"><p>And activate the PHP package</p></div>
<div class="literalblock">
<div class="content">
-<pre><tt># /usr/local/sbin/phpxs -s</tt></pre>
+<pre><tt># ln -s /var/www/conf/modules.sample/php5.conf \
+ /var/www/conf/modules</tt></pre>
</div></div>
<div class="para"><p>And install and activate the follow packages also</p></div>
<div class="literalblock">
@@ -483,7 +479,8 @@
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt># /usr/local/sbin/phpxs -a mysql</tt></pre>
+<pre><tt># ln -fs /var/www/conf/php5.sample/mysql.ini \
+ /var/www/conf/php5/mysql.ini</tt></pre>
</div></div>
<div class="literalblock">
<div class="content">
@@ -491,7 +488,8 @@
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt># /usr/local/sbin/phpxs -a mcrypt</tt></pre>
+<pre><tt># ln -fs /var/www/conf/php5.sample/mcrypt.ini \
+ /var/www/conf/php5/mcrypt.ini</tt></pre>
</div></div>
<div class="literalblock">
<div class="content">
@@ -499,7 +497,8 @@
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt># /usr/local/sbin/phpxs -a mhash</tt></pre>
+<pre><tt># ln -fs /var/www/conf/php5.sample/mhash.ini \
+ /var/www/conf/php5/mhash.ini</tt></pre>
</div></div>
<div class="literalblock">
<div class="content">
@@ -507,7 +506,8 @@
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt># /usr/local/sbin/phpxs -a imap/</tt></pre>
+<pre><tt># ln -fs /var/www/conf/php5.sample/imap.ini \
+ /var/www/conf/php5/imap.ini</tt></pre>
</div></div>
</td>
</tr></table>
@@ -539,16 +539,16 @@
# chown www /var/www/tmp</tt></pre>
</div></div>
<div class="para"><p>The base configuration from the Apache server is finished. Now you need to activate
-the webserver that he start on system start. Please change in the file <strong>/etc/rc.conf</strong>
-the value from</p></div>
+the webserver that he start on system start. Please add to the file
+<strong>/etc/rc.conf.local</strong></p></div>
<div class="literalblock">
<div class="content">
-<pre><tt>http_flags=NO</tt></pre>
+<pre><tt>http_flags=""</tt></pre>
</div></div>
-<div class="para"><p>to</p></div>
+<div class="para"><p>or for SSL support</p></div>
<div class="literalblock">
<div class="content">
-<pre><tt>http_flags=""</tt></pre>
+<pre><tt>http_flags="-DSSL"</tt></pre>
</div></div>
</td>
</tr></table>
@@ -748,6 +748,10 @@
<div class="content">
<pre><tt>... Success!</tt></pre>
</div></div>
+<div class="para"><p>Cleaning up…</p></div>
+<div class="para"><p>All done! If you've completed all of the above steps, your MySQL
+installation should now be secure.</p></div>
+<div class="para"><p>Thanks for using MySQL!</p></div>
</td>
</tr></table>
</div>
@@ -1330,7 +1334,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-11-21 20:09:31 CEST
+Last updated 2008-11-21 20:35:59 CEST
</div>
</div>
</body>
Modified: trunk/docs/sciret-install-OpenBSD-EN-images.txt
===================================================================
--- trunk/docs/sciret-install-OpenBSD-EN-images.txt 2008-11-21 19:14:04 UTC (rev 778)
+++ trunk/docs/sciret-install-OpenBSD-EN-images.txt 2008-11-21 19:37:19 UTC (rev 779)
@@ -72,10 +72,6 @@
# pkg_add -v -i php5-core
-Copy the php.ini file
-
- # cp /usr/local/share/examples/php5/php.ini-recommended /var/www/conf/php.ini
-
Edit the php.ini file
# vi /var/www/conf/php.ini
@@ -90,25 +86,31 @@
And activate the PHP package
- # /usr/local/sbin/phpxs -s
+ # ln -s /var/www/conf/modules.sample/php5.conf \
+ /var/www/conf/modules
And install and activate the follow packages also
# pkg_add -v -i php5-mysql
- # /usr/local/sbin/phpxs -a mysql
+ # ln -fs /var/www/conf/php5.sample/mysql.ini \
+ /var/www/conf/php5/mysql.ini
# pkg_add -v -i php5-mcrypt
- # /usr/local/sbin/phpxs -a mcrypt
+ # ln -fs /var/www/conf/php5.sample/mcrypt.ini \
+ /var/www/conf/php5/mcrypt.ini
# pkg_add -v -i php5-mhash
- # /usr/local/sbin/phpxs -a mhash
+ # ln -fs /var/www/conf/php5.sample/mhash.ini \
+ /var/www/conf/php5/mhash.ini
# pkg_add -v -i php5-imap
- # /usr/local/sbin/phpxs -a imap/
+ # ln -fs /var/www/conf/php5.sample/imap.ini \
+ /var/www/conf/php5/imap.ini
+
=====================================================================================
After the packages are installed, you need to prepare the OpenBSD Apache to support PHP
@@ -132,14 +134,14 @@
# chown www /var/www/tmp
The base configuration from the Apache server is finished. Now you need to activate
-the webserver that he start on system start. Please change in the file */etc/rc.conf*
-the value from
+the webserver that he start on system start. Please add to the file
+*/etc/rc.conf.local*
- http_flags=NO
+ http_flags=""
-to
+or for SSL support
- http_flags=""
+ http_flags="-DSSL"
=====================================================================================
PHP and the Apache web server are up and running and the first part of your installation
@@ -326,6 +328,14 @@
Reload privilege tables now? [Y/n] y
... Success!
+
+Cleaning up...
+
+All done! If you've completed all of the above steps, your MySQL
+installation should now be secure.
+
+Thanks for using MySQL!
+
=====================================================================================
Disabling and configuring Services
Modified: trunk/docs/sciret-install-OpenBSD-EN.txt
===================================================================
--- trunk/docs/sciret-install-OpenBSD-EN.txt 2008-11-21 19:14:04 UTC (rev 778)
+++ trunk/docs/sciret-install-OpenBSD-EN.txt 2008-11-21 19:37:19 UTC (rev 779)
@@ -72,10 +72,6 @@
# pkg_add -v -i php5-core
-Copy the php.ini file
-
- # cp /usr/local/share/examples/php5/php.ini-recommended /var/www/conf/php.ini
-
Edit the php.ini file
# vi /var/www/conf/php.ini
@@ -90,25 +86,31 @@
And activate the PHP package
- # /usr/local/sbin/phpxs -s
+ # ln -s /var/www/conf/modules.sample/php5.conf \
+ /var/www/conf/modules
And install and activate the follow packages also
# pkg_add -v -i php5-mysql
- # /usr/local/sbin/phpxs -a mysql
+ # ln -fs /var/www/conf/php5.sample/mysql.ini \
+ /var/www/conf/php5/mysql.ini
# pkg_add -v -i php5-mcrypt
- # /usr/local/sbin/phpxs -a mcrypt
+ # ln -fs /var/www/conf/php5.sample/mcrypt.ini \
+ /var/www/conf/php5/mcrypt.ini
# pkg_add -v -i php5-mhash
- # /usr/local/sbin/phpxs -a mhash
+ # ln -fs /var/www/conf/php5.sample/mhash.ini \
+ /var/www/conf/php5/mhash.ini
# pkg_add -v -i php5-imap
- # /usr/local/sbin/phpxs -a imap/
+ # ln -fs /var/www/conf/php5.sample/imap.ini \
+ /var/www/conf/php5/imap.ini
+
=====================================================================================
After the packages are installed, you need to prepare the OpenBSD Apache to support PHP
@@ -132,14 +134,14 @@
# chown www /var/www/tmp
The base configuration from the Apache server is finished. Now you need to activate
-the webserver that he start on system start. Please change in the file */etc/rc.conf*
-the value from
+the webserver that he start on system start. Please add to the file
+*/etc/rc.conf.local*
- http_flags=NO
+ http_flags=""
-to
+or for SSL support
- http_flags=""
+ http_flags="-DSSL"
=====================================================================================
PHP and the Apache web server are up and running and the first part of your installation
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2008-11-21 19:14:11
|
Revision: 778
http://sciret.svn.sourceforge.net/sciret/?rev=778&view=rev
Author: reinerj
Date: 2008-11-21 19:14:04 +0000 (Fri, 21 Nov 2008)
Log Message:
-----------
update the BSD doc and add new mysql security
Modified Paths:
--------------
trunk/docs/sciret-install-OpenBSD-EN-images.html
trunk/docs/sciret-install-OpenBSD-EN-images.txt
trunk/docs/sciret-install-OpenBSD-EN.txt
Modified: trunk/docs/sciret-install-OpenBSD-EN-images.html
===================================================================
--- trunk/docs/sciret-install-OpenBSD-EN-images.html 2008-11-15 18:41:44 UTC (rev 777)
+++ trunk/docs/sciret-install-OpenBSD-EN-images.html 2008-11-21 19:14:04 UTC (rev 778)
@@ -344,14 +344,17 @@
<body>
<div id="header">
<h1>Howto install Sciret on OpenBSD</h1>
-<span id="author">v1.1.3, Mai 2007</span><br />
-Reiner Jung <rj...@th...>
+<span id="author">v2.0.0, Nov 2008</span><br />
+Reiner Jung <re...@kb...>
</div>
<h2 id="_introduction">1. Introduction</h2>
<div class="sectionbody">
<div class="para"><p><strong>Sciret</strong></p></div>
<div class="para"><p>Sciret is an advanced knowledge based system written in PHP. The software self is platform independent and should run on every platform where PHP is supported. In the further development, Sciret will be extended to a full enterprise knowledge and information storage system.</p></div>
-<div class="para"><p>Sciret was developed as a internal project from <a href="http://www.the-gang.net">TheGang</a>, a Open Source consulting and strategy company. After many month of internal usage, the decision was taken to release the code as an Open Source Project on <a href="http://www.sf.net">Sourceforge</a>. We hope that Sciret will also fulfill the requirements of other users and companies.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>Sciret was developed as a internal project from http://www.kb-m.com[Keyboard Monkeys], a Open Source consulting and strategy company. After many month of internal usage, the decision was taken to release the code as an Open Source Project on http://www.sf.net[Sourceforge]. We hope that Sciret will also fulfill the requirements of other users and companies.</tt></pre>
+</div></div>
<div class="para"><p><strong>OpenBSD</strong></p></div>
<div class="para"><p><a href="http://www.openbsd.org">OpenBSD</a> is a Unix-like computer operating system descended from Berkeley Software Distribution (BSD), a Unix derivative developed at the University of California, Berkeley. It was forked from NetBSD by project leader Theo de Raadt in late 1995. The project is widely known for the developers insistence on open source code and quality documentation; uncompromising position on software licensing; and focus on security and code correctness. The project is coordinated from de Raadt's home in Calgary, Alberta, Canada. Its logo and mascot is Puffy, a blowfish.</p></div>
<div class="para"><p>OpenBSD includes a number of security features absent or optional in other operating systems and has a tradition of developers auditing the source code for software bugs and security problems. The project maintains strict policies on licensing and prefers the open source BSD licence and its variants in the past this has led to a comprehensive licence audit and moves to remove or replace code under licences found less acceptable.</p></div>
@@ -593,13 +596,40 @@
</div>
<div class="para"><p>Now you need to prepare your MySQL server that he start at system start and you need to
install the default database for your MySQL server.</p></div>
+<div class="para"><p>The basic installation from your OpenBSD system and the required servers are configured and you can
+start now to install Sciret. Sciret will be available in the OpenBSD ports tree, so you can install
+Sciret without pain. Before you can install Sciret, you need to prepare your database first. Please
+follow the instructions below.</p></div>
+</div>
+<h2 id="_database">4. Database</h2>
+<div class="sectionbody">
+<div class="para"><p>Sciret requires a database. At the moment Sciret support only MySQL as database.
+There are several ways to create a database and several tools</p></div>
<div class="admonitionblock">
<table><tr>
<td class="icon">
-<img src="./asciidoc-images/important.png" alt="Important" />
+<img src="./asciidoc-images/tip.png" alt="Tip" />
</td>
<td class="content">
-<div class="title">Configuration of your MySQL server</div>
+<div class="title">MySQL Administration</div>
+<div class="para"><p>phpMyAdmin: Web based administration tool for MySQL is as a package available in
+the OpenBSD ports tree. You can install the package like the other packages with
+the command</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>pkg_add -v -i phpMyAdmin.</tt></pre>
+</div></div>
+<div class="para"><p>For more information about phpMyAdmin you can visit the project page.</p></div>
+<div class="para"><p><a href="http://www.phpmyadmin.net">http://www.phpmyadmin.net/</a></p></div>
+<div class="para"><p>MySQL Administrator is a other tool, provided by MySQL AB and this tool is also
+available as package from the ports tree (mysql-administrator).</p></div>
+<div class="para"><p><a href="http://www.mysql.com/products/tools/administrator">http://www.mysql.com/products/tools/administrator/</a></p></div>
+</td>
+</tr></table>
+</div>
+<h3 id="_configuration_of_your_mysql_server">4.1. Configuration of your MySQL server</h3><div style="clear:left"></div>
+<div class="exampleblock">
+<div class="exampleblock-content">
<div class="para"><p>To enable MySQL to start at boot enter the following line in /etc/rc.conf.local:</p></div>
<div class="literalblock">
<div class="content">
@@ -636,41 +666,92 @@
</div></div>
<div class="para"><p>You must add this line exactly as they are written here. Otherwise your chrooted Apache will not be
able to connect to the MySQL Database server!</p></div>
-</td>
-</tr></table>
-</div>
-<div class="para"><p>The basic installation from your OpenBSD system and the required servers are configured and you can
-start now to install Sciret. Sciret will be available in the OpenBSD ports tree, so you can install
-Sciret without pain. Before you can install Sciret, you need to prepare your database first. Please
-follow the instructions below.</p></div>
-</div>
-<h2 id="_database">4. Database</h2>
-<div class="sectionbody">
-<div class="para"><p>Sciret requires a database. At the moment Sciret support only MySQL as database.
-There are several ways to create a database and several tools</p></div>
+<div class="para"><p>Now you can start your MySQL server with the follow command manually</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>/usr/local/bin/mysqld_safe &</tt></pre>
+</div></div>
+</div></div>
<div class="admonitionblock">
<table><tr>
<td class="icon">
-<img src="./asciidoc-images/tip.png" alt="Tip" />
+<img src="./asciidoc-images/important.png" alt="Important" />
</td>
<td class="content">
-<div class="title">MySQL Administration</div>
-<div class="para"><p>phpMyAdmin: Web based administration tool for MySQL is as a package available in
-the OpenBSD ports tree. You can install the package like the other packages with
-the command</p></div>
+<div class="title">Secure your MySQL server</div>
+<div class="para"><p>You should run the follow command to secure your MySQL for production environments</p></div>
<div class="literalblock">
<div class="content">
-<pre><tt>pkg_add -v -i phpMyAdmin.</tt></pre>
+<pre><tt># /usr/local/bin/mysql_secure_installation</tt></pre>
</div></div>
-<div class="para"><p>For more information about phpMyAdmin you can visit the project page.</p></div>
-<div class="para"><p><a href="http://www.phpmyadmin.net">http://www.phpmyadmin.net/</a></p></div>
-<div class="para"><p>MySQL Administrator is a other tool, provided by MySQL AB and this tool is also
-available as package from the ports tree (mysql-administrator).</p></div>
-<div class="para"><p><a href="http://www.mysql.com/products/tools/administrator">http://www.mysql.com/products/tools/administrator/</a></p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="./asciidoc-images/note.png" alt="Note" />
</td>
+<td class="content">RUNNING ALL PARTS OF THIS SCRIPT IS RECOMMENDED FOR ALL MySQL
+ SERVERS IN PRODUCTION USE! PLEASE READ EACH STEP CAREFULLY!</td>
</tr></table>
</div>
+<div class="para"><p>In order to log into MySQL to secure it, we'll need the current
+password for the root user. If you've just installed MySQL, and
+you haven't set the root password yet, the password will be blank,
+so you should just press enter here.</p></div>
+<div class="para"><p>Enter current password for root (enter for none):</p></div>
+<div class="para"><p>OK, successfully used password, moving on…</p></div>
+<div class="para"><p>Setting the root password ensures that nobody can log into the MySQL
+root user without the proper authorisation.</p></div>
+<div class="para"><p>Set root password? [Y/n] y</p></div>
+<div class="para"><p>New password:</p></div>
+<div class="para"><p>Re-enter new password:</p></div>
+<div class="para"><p>Password updated successfully!</p></div>
+<div class="para"><p>Reloading privilege tables..</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>... Success!</tt></pre>
+</div></div>
+<div class="para"><p>By default, a MySQL installation has an anonymous user, allowing anyone
+to log into MySQL without having to have a user account created for
+them. This is intended only for testing, and to make the installation
+go a bit smoother. You should remove them before moving into a
+production environment.</p></div>
+<div class="para"><p>Remove anonymous users? [Y/n] y</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>... Success!</tt></pre>
+</div></div>
+<div class="para"><p>Normally, root should only be allowed to connect from <em>localhost</em>. This
+ensures that someone cannot guess at the root password from the network.</p></div>
+<div class="para"><p>Disallow root login remotely? [Y/n] y</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>... Success!</tt></pre>
+</div></div>
+<div class="para"><p>By default, MySQL comes with a database named <em>test</em> that anyone can
+access. This is also intended only for testing, and should be removed
+before moving into a production environment.</p></div>
+<div class="para"><p>Remove test database and access to it? [Y/n] y</p></div>
+<div class="para"><p>Dropping test database…</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>... Success!</tt></pre>
+</div></div>
+<div class="para"><p>Removing privileges on test database…</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>... Success!</tt></pre>
+</div></div>
+<div class="para"><p>Reloading the privilege tables will ensure that all changes made so far
+will take effect immediately.</p></div>
+<div class="para"><p>Reload privilege tables now? [Y/n] y</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>... Success!</tt></pre>
+</div></div>
+</td>
+</tr></table>
</div>
+</div>
<h2 id="_disabling_and_configuring_services">5. Disabling and configuring Services</h2>
<div class="sectionbody">
<div class="para"><p>OpenBSD does come with a few unnecessary services enabled by default, which you don't need when you run Sciret. Turn these services off. This is completely optional and you must do so according to your own needs.</p></div>
@@ -1249,7 +1330,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-09-25 01:13:09 CEST
+Last updated 2008-11-21 20:09:31 CEST
</div>
</div>
</body>
Modified: trunk/docs/sciret-install-OpenBSD-EN-images.txt
===================================================================
--- trunk/docs/sciret-install-OpenBSD-EN-images.txt 2008-11-15 18:41:44 UTC (rev 777)
+++ trunk/docs/sciret-install-OpenBSD-EN-images.txt 2008-11-21 19:14:04 UTC (rev 778)
@@ -1,8 +1,8 @@
Howto install Sciret on OpenBSD
===============================
-v1.1.3, Mai 2007
-Reiner Jung <rj...@th...>
-:Author Initials: JR
+v2.0.0, Nov 2008
+Reiner Jung <re...@kb...>
+:Author Initials: RJ
Introduction
------------
@@ -11,7 +11,7 @@
Sciret is an advanced knowledge based system written in PHP. The software self is platform independent and should run on every platform where PHP is supported. In the further development, Sciret will be extended to a full enterprise knowledge and information storage system.
-Sciret was developed as a internal project from http://www.the-gang.net[TheGang], a Open Source consulting and strategy company. After many month of internal usage, the decision was taken to release the code as an Open Source Project on http://www.sf.net[Sourceforge]. We hope that Sciret will also fulfill the requirements of other users and companies.
+ Sciret was developed as a internal project from http://www.kb-m.com[Keyboard Monkeys], a Open Source consulting and strategy company. After many month of internal usage, the decision was taken to release the code as an Open Source Project on http://www.sf.net[Sourceforge]. We hope that Sciret will also fulfill the requirements of other users and companies.
*OpenBSD*
@@ -176,8 +176,41 @@
Now you need to prepare your MySQL server that he start at system start and you need to
install the default database for your MySQL server.
-[IMPORTANT]
-.Configuration of your MySQL server
+
+
+
+The basic installation from your OpenBSD system and the required servers are configured and you can
+start now to install Sciret. Sciret will be available in the OpenBSD ports tree, so you can install
+Sciret without pain. Before you can install Sciret, you need to prepare your database first. Please
+follow the instructions below.
+
+Database
+--------
+
+Sciret requires a database. At the moment Sciret support only MySQL as database.
+There are several ways to create a database and several tools
+
+[TIP]
+.MySQL Administration
+================================================================================
+phpMyAdmin: Web based administration tool for MySQL is as a package available in
+the OpenBSD ports tree. You can install the package like the other packages with
+the command
+
+ pkg_add -v -i phpMyAdmin.
+
+For more information about phpMyAdmin you can visit the project page.
+
+http://www.phpmyadmin.net[http://www.phpmyadmin.net/]
+
+MySQL Administrator is a other tool, provided by MySQL AB and this tool is also
+available as package from the ports tree (mysql-administrator).
+
+http://www.mysql.com/products/tools/administrator[http://www.mysql.com/products/tools/administrator/]
+================================================================================
+
+Configuration of your MySQL server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
=====================================================================================
To enable MySQL to start at boot enter the following line in /etc/rc.conf.local:
@@ -212,38 +245,89 @@
You must add this line exactly as they are written here. Otherwise your chrooted Apache will not be
able to connect to the MySQL Database server!
+
+
+Now you can start your MySQL server with the follow command manually
+
+ /usr/local/bin/mysqld_safe &
+
=====================================================================================
-The basic installation from your OpenBSD system and the required servers are configured and you can
-start now to install Sciret. Sciret will be available in the OpenBSD ports tree, so you can install
-Sciret without pain. Before you can install Sciret, you need to prepare your database first. Please
-follow the instructions below.
+[IMPORTANT]
+.Secure your MySQL server
+=====================================================================================
+You should run the follow command to secure your MySQL for production environments
-Database
---------
+ # /usr/local/bin/mysql_secure_installation
-Sciret requires a database. At the moment Sciret support only MySQL as database.
-There are several ways to create a database and several tools
+NOTE: RUNNING ALL PARTS OF THIS SCRIPT IS RECOMMENDED FOR ALL MySQL
+ SERVERS IN PRODUCTION USE! PLEASE READ EACH STEP CAREFULLY!
-[TIP]
-.MySQL Administration
-================================================================================
-phpMyAdmin: Web based administration tool for MySQL is as a package available in
-the OpenBSD ports tree. You can install the package like the other packages with
-the command
-
- pkg_add -v -i phpMyAdmin.
-For more information about phpMyAdmin you can visit the project page.
-
-http://www.phpmyadmin.net[http://www.phpmyadmin.net/]
+In order to log into MySQL to secure it, we'll need the current
+password for the root user. If you've just installed MySQL, and
+you haven't set the root password yet, the password will be blank,
+so you should just press enter here.
-MySQL Administrator is a other tool, provided by MySQL AB and this tool is also
-available as package from the ports tree (mysql-administrator).
+Enter current password for root (enter for none):
-http://www.mysql.com/products/tools/administrator[http://www.mysql.com/products/tools/administrator/]
-================================================================================
+OK, successfully used password, moving on...
+Setting the root password ensures that nobody can log into the MySQL
+root user without the proper authorisation.
+
+Set root password? [Y/n] y
+
+New password:
+
+Re-enter new password:
+
+Password updated successfully!
+
+Reloading privilege tables..
+
+ ... Success!
+
+
+By default, a MySQL installation has an anonymous user, allowing anyone
+to log into MySQL without having to have a user account created for
+them. This is intended only for testing, and to make the installation
+go a bit smoother. You should remove them before moving into a
+production environment.
+
+Remove anonymous users? [Y/n] y
+
+ ... Success!
+
+Normally, root should only be allowed to connect from 'localhost'. This
+ensures that someone cannot guess at the root password from the network.
+
+Disallow root login remotely? [Y/n] y
+
+ ... Success!
+
+By default, MySQL comes with a database named 'test' that anyone can
+access. This is also intended only for testing, and should be removed
+before moving into a production environment.
+
+Remove test database and access to it? [Y/n] y
+
+Dropping test database...
+
+ ... Success!
+
+Removing privileges on test database...
+
+ ... Success!
+
+Reloading the privilege tables will ensure that all changes made so far
+will take effect immediately.
+
+Reload privilege tables now? [Y/n] y
+
+ ... Success!
+=====================================================================================
+
Disabling and configuring Services
----------------------------------
Modified: trunk/docs/sciret-install-OpenBSD-EN.txt
===================================================================
--- trunk/docs/sciret-install-OpenBSD-EN.txt 2008-11-15 18:41:44 UTC (rev 777)
+++ trunk/docs/sciret-install-OpenBSD-EN.txt 2008-11-21 19:14:04 UTC (rev 778)
@@ -1,8 +1,8 @@
Howto install Sciret on OpenBSD
===============================
-v1.1.3, Mai 2007
+v2.0.0, Nov 2008
Reiner Jung <re...@kb...>
-:Author Initials: JR
+:Author Initials: RJ
Introduction
------------
@@ -176,8 +176,41 @@
Now you need to prepare your MySQL server that he start at system start and you need to
install the default database for your MySQL server.
-[IMPORTANT]
-.Configuration of your MySQL server
+
+
+
+The basic installation from your OpenBSD system and the required servers are configured and you can
+start now to install Sciret. Sciret will be available in the OpenBSD ports tree, so you can install
+Sciret without pain. Before you can install Sciret, you need to prepare your database first. Please
+follow the instructions below.
+
+Database
+--------
+
+Sciret requires a database. At the moment Sciret support only MySQL as database.
+There are several ways to create a database and several tools
+
+[TIP]
+.MySQL Administration
+================================================================================
+phpMyAdmin: Web based administration tool for MySQL is as a package available in
+the OpenBSD ports tree. You can install the package like the other packages with
+the command
+
+ pkg_add -v -i phpMyAdmin.
+
+For more information about phpMyAdmin you can visit the project page.
+
+http://www.phpmyadmin.net[http://www.phpmyadmin.net/]
+
+MySQL Administrator is a other tool, provided by MySQL AB and this tool is also
+available as package from the ports tree (mysql-administrator).
+
+http://www.mysql.com/products/tools/administrator[http://www.mysql.com/products/tools/administrator/]
+================================================================================
+
+Configuration of your MySQL server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
=====================================================================================
To enable MySQL to start at boot enter the following line in /etc/rc.conf.local:
@@ -212,38 +245,97 @@
You must add this line exactly as they are written here. Otherwise your chrooted Apache will not be
able to connect to the MySQL Database server!
+
+
+Now you can start your MySQL server with the follow command manually
+
+ /usr/local/bin/mysqld_safe &
+
=====================================================================================
-The basic installation from your OpenBSD system and the required servers are configured and you can
-start now to install Sciret. Sciret will be available in the OpenBSD ports tree, so you can install
-Sciret without pain. Before you can install Sciret, you need to prepare your database first. Please
-follow the instructions below.
+[IMPORTANT]
+.Secure your MySQL server
+=====================================================================================
+You should run the follow command to secure your MySQL for production environments
-Database
---------
+ # /usr/local/bin/mysql_secure_installation
-Sciret requires a database. At the moment Sciret support only MySQL as database.
-There are several ways to create a database and several tools
+NOTE: RUNNING ALL PARTS OF THIS SCRIPT IS RECOMMENDED FOR ALL MySQL
+ SERVERS IN PRODUCTION USE! PLEASE READ EACH STEP CAREFULLY!
-[TIP]
-.MySQL Administration
-================================================================================
-phpMyAdmin: Web based administration tool for MySQL is as a package available in
-the OpenBSD ports tree. You can install the package like the other packages with
-the command
-
- pkg_add -v -i phpMyAdmin.
-For more information about phpMyAdmin you can visit the project page.
-
-http://www.phpmyadmin.net[http://www.phpmyadmin.net/]
+In order to log into MySQL to secure it, we'll need the current
+password for the root user. If you've just installed MySQL, and
+you haven't set the root password yet, the password will be blank,
+so you should just press enter here.
-MySQL Administrator is a other tool, provided by MySQL AB and this tool is also
-available as package from the ports tree (mysql-administrator).
+Enter current password for root (enter for none):
-http://www.mysql.com/products/tools/administrator[http://www.mysql.com/products/tools/administrator/]
-================================================================================
+OK, successfully used password, moving on...
+Setting the root password ensures that nobody can log into the MySQL
+root user without the proper authorisation.
+
+Set root password? [Y/n] y
+
+New password:
+
+Re-enter new password:
+
+Password updated successfully!
+
+Reloading privilege tables..
+
+ ... Success!
+
+
+By default, a MySQL installation has an anonymous user, allowing anyone
+to log into MySQL without having to have a user account created for
+them. This is intended only for testing, and to make the installation
+go a bit smoother. You should remove them before moving into a
+production environment.
+
+Remove anonymous users? [Y/n] y
+
+ ... Success!
+
+Normally, root should only be allowed to connect from 'localhost'. This
+ensures that someone cannot guess at the root password from the network.
+
+Disallow root login remotely? [Y/n] y
+
+ ... Success!
+
+By default, MySQL comes with a database named 'test' that anyone can
+access. This is also intended only for testing, and should be removed
+before moving into a production environment.
+
+Remove test database and access to it? [Y/n] y
+
+Dropping test database...
+
+ ... Success!
+
+Removing privileges on test database...
+
+ ... Success!
+
+Reloading the privilege tables will ensure that all changes made so far
+will take effect immediately.
+
+Reload privilege tables now? [Y/n] y
+
+ ... Success!
+
+Cleaning up...
+
+All done! If you've completed all of the above steps, your MySQL
+installation should now be secure.
+
+Thanks for using MySQL!
+
+=====================================================================================
+
Disabling and configuring Services
----------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2008-11-15 18:41:55
|
Revision: 777
http://sciret.svn.sourceforge.net/sciret/?rev=777&view=rev
Author: reinerj
Date: 2008-11-15 18:41:44 +0000 (Sat, 15 Nov 2008)
Log Message:
-----------
replace the last gang info with monkeys
Modified Paths:
--------------
trunk/docs/sciret-install-OpenBSD-EN.txt
Modified: trunk/docs/sciret-install-OpenBSD-EN.txt
===================================================================
--- trunk/docs/sciret-install-OpenBSD-EN.txt 2008-11-06 17:27:24 UTC (rev 776)
+++ trunk/docs/sciret-install-OpenBSD-EN.txt 2008-11-15 18:41:44 UTC (rev 777)
@@ -1,7 +1,7 @@
Howto install Sciret on OpenBSD
===============================
v1.1.3, Mai 2007
-Reiner Jung <rj...@th...>
+Reiner Jung <re...@kb...>
:Author Initials: JR
Introduction
@@ -11,7 +11,7 @@
Sciret is an advanced knowledge based system written in PHP. The software self is platform independent and should run on every platform where PHP is supported. In the further development, Sciret will be extended to a full enterprise knowledge and information storage system.
-Sciret was developed as a internal project from http://www.the-gang.net[TheGang], a Open Source consulting and strategy company. After many month of internal usage, the decision was taken to release the code as an Open Source Project on http://www.sf.net[Sourceforge]. We hope that Sciret will also fulfill the requirements of other users and companies.
+ Sciret was developed as a internal project from http://www.kb-m.com[Keyboard Monkeys], a Open Source consulting and strategy company. After many month of internal usage, the decision was taken to release the code as an Open Source Project on http://www.sf.net[Sourceforge]. We hope that Sciret will also fulfill the requirements of other users and companies.
*OpenBSD*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2008-11-06 17:27:28
|
Revision: 776
http://sciret.svn.sourceforge.net/sciret/?rev=776&view=rev
Author: reinerj
Date: 2008-11-06 17:27:24 +0000 (Thu, 06 Nov 2008)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/TODO
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2008-11-06 17:26:26 UTC (rev 775)
+++ trunk/TODO 2008-11-06 17:27:24 UTC (rev 776)
@@ -1,70 +1 @@
-1.3 Release
-- Introduce group support. Admin can restrict access to User based work groups
-- Search for articles by registerd users
-- Make an article appear in more than one category
-- Add tags and tag search to article, bookmarks and documents
-- Admin must change the default password after first login
-
-1.4 Release
-- New User Interface for Sciret based on the work from Nuno Pinheiro
-- Ubuntu/Debian Packages
-- Cancel Editing
-- Send mail as PDF
-
-1.5 Release
-- Document Management Functionality
-- A category will be only visible when there is a article or bookmark in. Otherwise it will be hidden
-- Authentication again LDAP
-- Authentication again AD
-
-1.6 Release
-- One Time Passwords
-- Authentication with Secure Token
-- Category Content [Feature RQID 1776663]
-- What links here [Feature RQ ID 1776661]
-
-1.7 Release
-- Sciret will use PHPUnit testing. This will delay our further releases, but will give it more stability
-
-2.0 Release
-- Windows Installer which includes PHP, Apache, MySQL and Sciret, Maybe based on XMMP?
-- All forms must have delete/clear button
-- Questions management must be improved
-- Popup windows requires close button
-- Webdav integration into Sciret
-
-2.1 Release
-- ALC System
-- Better Category management system
-- ACL based vied of the screen
-- Annoncement in user view
-- Workflow system
-2.2 Release
-- Internal help
-- Notification per email
-- User base selection from article/bookmarks/documents
-- RSS feads implementation for Sciret
-- Syncronisation of Sciret or parts of Sciret
-
-3.0 Release
-- Live time corporation on documents
-- XML based template system
-- XML based storage of articel
-
-3.1 Release
-- Graphical template designer and editor
-- Import/Export of XML documents
-
-3.2 Release
-- Versioning for Sciret
-- Highlight changes in Sciret
-
-4.0 Release
-- Integration to the Linux Desktop (KDE/Gnome)
-
-4.1 Release
-- Integration to the Windows Desktop
-
-4.2 Release
-- Single Sign On
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2008-11-06 17:26:31
|
Revision: 775
http://sciret.svn.sourceforge.net/sciret/?rev=775&view=rev
Author: reinerj
Date: 2008-11-06 17:26:26 +0000 (Thu, 06 Nov 2008)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/VERSION
Modified: trunk/VERSION
===================================================================
--- trunk/VERSION 2008-11-06 17:25:31 UTC (rev 774)
+++ trunk/VERSION 2008-11-06 17:26:26 UTC (rev 775)
@@ -1 +1 @@
-1.2.0-SVN-Release-554
+2.0.0-SVN-Release-r771
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2008-11-06 17:25:35
|
Revision: 774
http://sciret.svn.sourceforge.net/sciret/?rev=774&view=rev
Author: reinerj
Date: 2008-11-06 17:25:31 +0000 (Thu, 06 Nov 2008)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/INSTALL
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2008-11-06 17:23:51 UTC (rev 773)
+++ trunk/INSTALL 2008-11-06 17:25:31 UTC (rev 774)
@@ -6,14 +6,10 @@
2. give writing permissions for the directories under /uploads
-3. set $Config['UserFilesPath'] to the path (relative to the webserver root dir) where
- you want to store image uploads, in both FCKeditor/editor/filemanager/browser/default/connectors/php/config.php and
- FCKeditor/editor/filemanager/upload/php/config.php
+3. Then just point your browser to index.php and follow the instructions to complete the installation.
-4. Then just point your browser to index.php and follow the instructions to complete the installation.
-
-5. Login with the default admin user with
+4. Login with the default admin user with
username: admin
password: admin
-6. Change your password after initial login
+5. Change your password after initial login
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2008-11-06 17:23:56
|
Revision: 773
http://sciret.svn.sourceforge.net/sciret/?rev=773&view=rev
Author: reinerj
Date: 2008-11-06 17:23:51 +0000 (Thu, 06 Nov 2008)
Log Message:
-----------
sync changelog
Modified Paths:
--------------
trunk/CHANGELOG
Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG 2008-11-06 15:40:16 UTC (rev 772)
+++ trunk/CHANGELOG 2008-11-06 17:23:51 UTC (rev 773)
@@ -1,3 +1,19 @@
+2008-10-06 Reiner Jung <re...@kb...>
+ * Aplpha release from Sciret
+ This is a new major release from Sciret with major changes.
+ New in this release ar:
+ * Zend Framework is now used.
+ * File uploads are scanned for Viruses
+ * Sciret support RSS feeds now for categories
+ * To scan articles for SPAM, user can choose to use between
+ Akismet, TypePad AntiSpam or Bad-Behavior
+ * Sciret have a enhanced navigation and usability
+ * A report article function allow to inform the administrators
+ regarding non compliant content
+ * Support for social bookmarks like digg ...
+ * added ability for users to register for an account
+ * Questions can be disabled in the admin section
+
2007-10-07 Lucie Goga <lg...@th...>
* update Brazil Portuguese translation from Rodrigo Lozada
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-11-06 15:40:30
|
Revision: 772
http://sciret.svn.sourceforge.net/sciret/?rev=772&view=rev
Author: alpeb
Date: 2008-11-06 15:40:16 +0000 (Thu, 06 Nov 2008)
Log Message:
-----------
added json lib
Modified Paths:
--------------
trunk/templates/head.tpl
Modified: trunk/templates/head.tpl
===================================================================
--- trunk/templates/head.tpl 2008-10-30 14:08:13 UTC (rev 771)
+++ trunk/templates/head.tpl 2008-11-06 15:40:16 UTC (rev 772)
@@ -18,6 +18,7 @@
<!-- END rtl_block -->
<script type="text/javascript" src="{YUILocation}utilities/utilities.js"></script>
+ <script type="text/javascript" src="{YUILocation}json/json-min.js"></script>
<script type="text/javascript">
var isIE7 = false;
</script>
@@ -27,7 +28,6 @@
-<!-- <script type="text/javascript" src="javascript/yui/json/json-min.js"></script> -->
</head>
<body class="yui-skin-sam">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-10-30 14:08:16
|
Revision: 771
http://sciret.svn.sourceforge.net/sciret/?rev=771&view=rev
Author: alpeb
Date: 2008-10-30 14:08:13 +0000 (Thu, 30 Oct 2008)
Log Message:
-----------
added possibility to define variable delimiters using a class variable
Modified Paths:
--------------
trunk/classes/template.php
Modified: trunk/classes/template.php
===================================================================
--- trunk/classes/template.php 2008-10-28 12:08:02 UTC (rev 770)
+++ trunk/classes/template.php 2008-10-30 14:08:13 UTC (rev 771)
@@ -47,6 +47,9 @@
/* last error message is retained here */
var $last_error = '';
+ var $left_delimiter = '{';
+ var $right_delimiter = '}';
+
/***************************************************************************/
/* public: Constructor.
* root: template directory.
@@ -149,7 +152,7 @@
// return False;
}
$this->set_var($handle,$match[1]);
- $this->set_var($parent,preg_replace($reg, '{' . "$name}",$str));
+ $this->set_var($parent,preg_replace($reg, $this->left_delimiter . $name . $this->right_delimiter,$str));
}
/* public: set_var(array $values)
@@ -343,7 +346,7 @@
case 'keep':
break;
case 'remove':
- $str = preg_replace('/{[^ \t\r\n}]+}/', '', $str);
+ $str = preg_replace('/' . preg_quote($this->left_delimiter) . '[^ \t\r\n' . preg_quote($this->right_delimiter). ']+ ' . preg_quote($this->right_delimiter) . '/', '', $str);
break;
case 'comment':
$str = preg_replace('/{([^ \t\r\n}]+)}/', "<!-- Template $handle: Variable \\1 undefined -->", $str);
@@ -407,7 +410,7 @@
*/
function varname($varname)
{
- return '{'.$varname.'}';
+ return $this->left_delimiter . $varname . $this->right_delimiter;
}
/* private: loadfile(string $handle)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-10-28 12:08:22
|
Revision: 770
http://sciret.svn.sourceforge.net/sciret/?rev=770&view=rev
Author: alpeb
Date: 2008-10-28 12:08:02 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
removed some old code
Modified Paths:
--------------
trunk/classes/template.php
Modified: trunk/classes/template.php
===================================================================
--- trunk/classes/template.php 2008-10-27 22:16:49 UTC (rev 769)
+++ trunk/classes/template.php 2008-10-28 12:08:02 UTC (rev 770)
@@ -47,9 +47,6 @@
/* last error message is retained here */
var $last_error = '';
- // if true change all phpGroupWare into eGroupWare in set_var
- var $egroupware_hack = True;
-
/***************************************************************************/
/* public: Constructor.
* root: template directory.
@@ -183,10 +180,7 @@
echo "<p>Template::set_var('$k','$v')</p>\n";
}
$this->varkeys[$k] = $this->varname($k);
- $this->varvals[$k] = $this->egroupware_hack ? str_replace(
- array('phpGroupWare','www.phpgroupware.org'),
- array('eGroupWare','www.eGroupWare.org'),$v
- ) : $v;
+ $this->varvals[$k] = $v;
}
}
}
@@ -469,8 +463,6 @@
{
echo('<b>Halted.</b>');
}
-
- $GLOBALS['phpgw']->common->phpgw_exit(True);
}
/* public, override: haltmsg($msg)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-10-27 23:12:55
|
Revision: 769
http://sciret.svn.sourceforge.net/sciret/?rev=769&view=rev
Author: alpeb
Date: 2008-10-27 22:16:49 +0000 (Mon, 27 Oct 2008)
Log Message:
-----------
added some missing template vars
Modified Paths:
--------------
trunk/views/MainView.php
Modified: trunk/views/MainView.php
===================================================================
--- trunk/views/MainView.php 2008-10-27 18:06:56 UTC (rev 768)
+++ trunk/views/MainView.php 2008-10-27 22:16:49 UTC (rev 769)
@@ -390,6 +390,7 @@
if ($article->isBookmark()) {
$this->tpl->set_var('articleImage', 'bookmark.png');
+ $this->tpl->set_var('question', '');
} elseif ($article->getQuestion()) {
$this->tpl->set_var('articleImage', 'question.png');
$this->tpl->set_var('questionStr', $article->getQuestion());
@@ -464,8 +465,10 @@
'modifOrCreated' => $article->getModifiedByUserId() > 0? $this->user->lang('Last Modified') : $this->user->lang('Created on'),
'img_stars' => $article->getTotalVotes()? '<img src="images/'.round($article->getAverageRating()).'stars.png" width="50" height="10" />' : '',
'attachment' => $article->getNumFiles()? '<img src="images/attach.gif" />' : '',
+ 'art_num' => $article->getId(),
'art_excerpt' => strip_tags($article->getExcerpt()).($article->isBookmark()? '' : '...'),
'art_author' => $article->getCreatedBy(),
+ 'bookmark_edit' => $article->isBookmark()? '<a href="'.Library::getLink(array('view' => 'ViewBookmark', 'id' => $article->getId())).'" style="font-size:10px">'.$this->user->lang('details').'</a>' : '',
));
if ($article->isBookmark()) {
@@ -501,6 +504,7 @@
while ($article = $articles->fetch()) {
unset($this->tPath);
$this->tpl->set_var(array(
+ 'art_num' => $article->getId(),
'latestLink' => Library::getLink(array('view' => ($article->isBookmark()? 'ViewBookmark' : 'ViewArticle'), 'id' => $article->getId())),
'latestTitle' => $article->getTitle(),
'latestDate' => $this->user->formatDate($article->getCreationDate()),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-10-27 18:07:01
|
Revision: 768
http://sciret.svn.sourceforge.net/sciret/?rev=768&view=rev
Author: alpeb
Date: 2008-10-27 18:06:56 +0000 (Mon, 27 Oct 2008)
Log Message:
-----------
new version
Modified Paths:
--------------
trunk/setup/final.sql
Modified: trunk/setup/final.sql
===================================================================
--- trunk/setup/final.sql 2008-10-26 20:27:28 UTC (rev 767)
+++ trunk/setup/final.sql 2008-10-27 18:06:56 UTC (rev 768)
@@ -78,7 +78,7 @@
('smtpUser', ''),
('smtpPassword', ''),
('smtpPort', '25'),
-('version', '1.2.0');
+('version', '1.9.0');
CREATE TABLE `files` (
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-10-26 20:27:32
|
Revision: 767
http://sciret.svn.sourceforge.net/sciret/?rev=767&view=rev
Author: alpeb
Date: 2008-10-26 20:27:28 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
templated article history tab
Modified Paths:
--------------
trunk/templates/ViewArticle.tpl
trunk/views/ViewArticle.php
Modified: trunk/templates/ViewArticle.tpl
===================================================================
--- trunk/templates/ViewArticle.tpl 2008-10-26 20:23:44 UTC (rev 766)
+++ trunk/templates/ViewArticle.tpl 2008-10-26 20:27:28 UTC (rev 767)
@@ -120,21 +120,21 @@
<h2>
[l]History[/l]
</h2>
- <table collspace="0" >
+ <table cellpadding="3" cellspacing="2" class="table1">
<tr>
- <th scope="col" class="specth">
+ <th class="th_h">
[l]Date[/l]
</th>
- <th scope="col">
+ <th>
[l]User[/l]
</th>
- <th scope="col">
+ <th>
[l]Action[/l]
</th>
</tr>
<!-- BEGIN history_line_block -->
- <tr>
- <td class="spec">
+ <tr class="{rowClass}">
+ <td class="td_h">
{historyDate}
</td>
<td>
Modified: trunk/views/ViewArticle.php
===================================================================
--- trunk/views/ViewArticle.php 2008-10-26 20:23:44 UTC (rev 766)
+++ trunk/views/ViewArticle.php 2008-10-26 20:27:28 UTC (rev 767)
@@ -109,8 +109,10 @@
// ** HISTORY ***
$historyGateway = new HistoryGateway;
$firstIteration = true;
+ $rowClass = 'row_off';
foreach ($historyGateway->getEvents($this->article->getId()) as $history) {
$this->tpl->set_var(array(
+ 'rowClass' => $rowClass,
'historyDate' => $this->user->formatDate($history->getDate()),
'historyUser' => $history->getUserFullName(),
));
@@ -124,6 +126,7 @@
$this->tpl->parse('history_line', 'history_line_block', !$firstIteration);
$firstIteration = false;
+ $rowClass = ($rowClass == 'row_off')? 'row_on' : 'row_off';
}
if ($firstIteration) {
$this->tpl->set_var('history_line', $this->user->lang('No events recorded'));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-10-26 20:23:49
|
Revision: 766
http://sciret.svn.sourceforge.net/sciret/?rev=766&view=rev
Author: alpeb
Date: 2008-10-26 20:23:44 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
templated bookmark details view (still to do the related articles/bookmarks section)
Modified Paths:
--------------
trunk/templates/ViewBookmark.tpl
Modified: trunk/templates/ViewBookmark.tpl
===================================================================
--- trunk/templates/ViewBookmark.tpl 2008-10-26 20:08:42 UTC (rev 765)
+++ trunk/templates/ViewBookmark.tpl 2008-10-26 20:23:44 UTC (rev 766)
@@ -12,76 +12,49 @@
<script type="text/javascript">
var artId = {bookmark_id};
</script>
-<div align="center">
- <table width="100%" border="0" cellspacing="0" cellpadding="3" style='border:1px solid black'>
- <tr class="th">
- <td colspan=3>
- <div style='font:bold 12px sans-serif;position: relative'>
- [l]Bookmark[/l] {bookmark_id} {img_stars}
- <span id="articleStatus">{lang_status}</span>
- <img id="markFinalProgressImg" src="images/progress.gif" style="visibility:hidden" />
- <span style='width:200; position: absolute;right:0; text-align:right;'>
- <a href="{mailBookmarkLink}"><img src="images/mail.gif" alt="[l]Mail Bookmark[/l]" title="[l]Mail Bookmark[/l]"></a>
- <!-- BEGIN favoriteArticle_block -->
- <a href="javascript:void(0);" onclick="addFavorite('article', {bookmark_id});"><img id="favoriteStarImg" src="images/star.png" alt="[l]Add bookmark to favorites[/l]" title="[l]Add bookmark to favorites[/l]" style="display:{favoriteArticleStarImgDisplay}" /><img id="unFavoriteStarImg" src="images/star_crossed.png" alt="[l]Remove bookmark from favorites[/l]" title="[l]Remove bookmark from favorites[/l]" style="display:{unFavoriteArticleStarImgDisplay}"/><img id="favoriteProgressImg" src="images/progress.gif" style="display:none" /></a>
- <!-- END favoriteArticle_block -->
- <a href="{reportArticleLink}"><img src="images/flag.png" alt="[l]Report article[/l]" title="[l]Report article[/l]" />
- </span>
- </div>
- </td>
- </tr>
- <tr>
- <td style="text-align:right"><span style='font:normal 12px sans-serif'>[l]Name[/l]:</span></td>
- <td style='font:bold 13px sans-serif'>{name}</td>
- <td width=30%>{createdby}</td>
- </tr>
- <tr>
- <td style="text-align:right"><span style='font:normal 12px sans-serif'>[l]URL[/l]:</span></td>
- <td style='font:bold 13px sans-serif'><a href="{urlHref}" target="_blank">{url}</a></td>
- </tr>
- <tr>
- <td width=1% style="text-align:right"><span style='font:normal 12px sans-serif'>[l]Category[/l]:</span></td>
- <td>{category}</td>
- <td>
- <!-- BEGIN lastModif_block -->
- [l]Last modification on[/l] {modificationDate}<br />
- [l]by[/l] {modifiedByUserName}
- <!-- END lastModif_block -->
- </td>
- </tr>
- <tr>
- <td style='font:normal 12px sans-serif' nowrap="true">[l]Expiration Date[/l]:</td>
- <td>{expDate}</td>
- </tr>
- <tr>
- <td width="1%" valign="top" style="text-align:right"><span style='font:normal 12px sans-serif'>[l]Description[/l]:</span></td>
- <td style="font-weight:bold">{description}</td>
- </tr>
- <tr>
- <td colspan=3>
- <table border=0>
- <tr>
- <td>
- <!-- BEGIN edit_del_block -->
- <input type="button" value="[l]Edit Bookmark[/l]" onclick="location.href='{editBookmarkLink}'" />
- </td>
- <td>
- <input type="button" value="[l]Delete Bookmark[/l]" onclick="deleteArticle({bookmark_id}, '{deleteTitle}', '[l]Are you sure you wish to delete the bookmark titled[/l]', 'MainView')" />
- <!-- END edit_del_block -->
- </td>
- <td>
- <!-- BEGIN publish_btn_block -->
- <input id="publishButton" type="button" value="[l]Publish Bookmark[/l]" onclick="publishArticle('publishCommentLoading', 'ViewBookmark');" style="display:{publishBtnDisplay}" />
- <img id='publishCommentLoading' src='images/progress.gif' style='visibility:hidden' />
- <!-- END publish_btn_block -->
- <span id="publishArticleStatusMessage" style="font-weight:bold; color:red"></span>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
+<div class="title_view">
+ <div class="title_content">
+ <span>
+ [l]Bookmark[/l] {bookmark_id}
+ {img_stars}
+ <img id="markFinalProgressImg" src="images/progress.gif" style="visibility:hidden" />
+ <a href="{mailBookmarkLink}"><img src="images/mail.gif" alt="[l]Mail Bookmark[/l]" title="[l]Mail Bookmark[/l]"></a>
+ <!-- BEGIN favoriteArticle_block -->
+ <a href="javascript:void(0);" onclick="addFavorite('article', {bookmark_id});"><img id="favoriteStarImg" src="images/star.png" alt="[l]Add bookmark to favorites[/l]" title="[l]Add bookmark to favorites[/l]" style="display:{favoriteArticleStarImgDisplay}" /><img id="unFavoriteStarImg" src="images/star_crossed.png" alt="[l]Remove bookmark from favorites[/l]" title="[l]Remove bookmark from favorites[/l]" style="display:{unFavoriteArticleStarImgDisplay}"/><img id="favoriteProgressImg" src="images/progress.gif" style="display:none" /></a>
+ <!-- END favoriteArticle_block -->
+ </span>
+ <a href="{reportArticleLink}"><img src="images/flag.png" alt="[l]Report article[/l]" title="[l]Report article[/l]" style="position:absolute; right:5px; top:5px" /></a>
+ </div>
+ <p class="view_left">
+ <strong>[l]Name[/l]:</strong> {name}<br />
+ <strong>[l]URL[/l]:</strong> <a href="{urlHref}" target="_blank" >{url}</a><br />
+ <strong>[l]Category[/l]:</strong> {category}<br />
+ <strong>[l]Expiration date[/l]:</strong> {expDate}<br />
+ <strong>[l]Description[/l]:</strong> <span>{description}</span><br />
+ <strong id="articleStatus">{lang_status}</strong>
+ </p>
+ <p class="view_right">
+ {createdby}<br />
+ <!-- BEGIN lastModif_block -->
+ [l]Last modification on[/l] {modificationDate}<br />
+ [l]by[/l] {modifiedByUserName}
+ <!-- END lastModif_block -->
+ </p>
+ <p class="view_right">
+ <!-- BEGIN edit_del_block -->
+ <span class="button_green"><a href="javascript:void(0)" onclick="location.href='{editBookmarkLink}'">[l]Edit[/l]</a></span>
+ <span class="button_red"><a href="javascript:void(0)" onclick="deleteArticle({bookmark_id}, '{deleteTitle}', '[l]Are you sure you wish to delete the bookmark titled[/l]', 'MainView')">[l]Delete[/l]</a></span>
+ <!-- END edit_del_block -->
+ <!-- BEGIN publish_btn_block -->
+ <span class="button_green" id="publishButton" style="display:{publishBtnDisplay}"><a href="javascript:void(0)" onclick="publishArticle('publishCommentLoading', 'ViewBookmark')">[l]Publish[/l]</a></span>
+ <img id='publishCommentLoading' src='images/progress.gif' style='visibility:hidden' />
+ <!-- END publish_btn_block -->
+ </p>
+ <span id="publishArticleStatusMessage" style="font-weight:bold; color:red"></span>
+</div><!--end title_view-->
+
+<div align="center">
<div id="commentsDiv">
{commentsTable}
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-10-26 20:08:48
|
Revision: 765
http://sciret.svn.sourceforge.net/sciret/?rev=765&view=rev
Author: alpeb
Date: 2008-10-26 20:08:42 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
templetized search results
Modified Paths:
--------------
trunk/templates/SearchResults.tpl
Modified: trunk/templates/SearchResults.tpl
===================================================================
--- trunk/templates/SearchResults.tpl 2008-10-26 20:07:28 UTC (rev 764)
+++ trunk/templates/SearchResults.tpl 2008-10-26 20:08:42 UTC (rev 765)
@@ -9,47 +9,44 @@
*/
-->
-<table width=100% cellspacing=0 cellpadding=0>
- <tr class="th">
- <td style="padding:3px">
- <div style="position:relative; text-align:center; font-weight:bold;">
+<div>
+ <div class="title_view">
+ <div class="title_content" style="position:relative">
+ <span>
[l]Search Results[/l]
- <span style="position:absolute; right:0">
- <a href="javascript:void(0)" onclick="addFavorite('searchResults')"><img id="favoriteStarImg" src="images/star.png" alt="[l]Add results to favorites[/l]" title="[l]Add results to favorites[/l]" style="display:{favoriteSearchResultsStarImgDisplay}" /><img id="unFavoriteStarImg" src="images/star_crossed.png" alt="[l]Remove results from favorites[/l]" title="[l]Remove results from favorites[/l]" style="display:{unFavoriteSearchResultsStarImgDisplay}" /><img id="favoriteProgressImg" src="images/progress.gif" style="display:none" /></a>
- </span>
- </div>
- </td>
- </tr>
+ <a href="javascript:void(0);" onclick="addFavorite('searchResults');"><img id="favoriteStarImg" src="images/icon_favorite_16.png" alt="[l]Add results to favorites[/l]" title="[l]Add results to favorites[/l]" style="display:{favoriteSearchResultsStarImgDisplay}" /><img id="unFavoriteStarImg" src="images/star_crossed.png" alt="[l]Remove results from favorites[/l]" title="[l]Remove results from favorites[/l]" style="display:{unFavoriteSearchResultsStarImgDisplay}"/><img id="favoriteProgressImg" src="images/progress.gif" style="display:none" /></a>
+ </span>
+ </div>
+ </div><!--end title_view-->
+
<!-- BEGIN numResults_block -->
- <tr>
- <td style="text-align:right">
- <b>{numDocsFound}</b> [l]documents found[/l] (<b>{searchTime}</b> [l]seconds[/l])
- </td>
- </tr>
+ <div>
+ <b>{numDocsFound}</b> [l]documents found[/l] (<b>{searchTime}</b> [l]seconds[/l])
+ </div>
<!-- END numResults_block -->
- <tr>
- <td>
- <!-- BEGIN articles_block -->
- <i>({art_num}) </i>
- <img src="images/{articleImage}" />
- <a href="{art_link}" {target} style="font-weight:bold; font-size:17px">{art_title}</a> {bookmark_edit}<br />
- <div>{modifOrCreated} {art_date} - {img_stars} {attachment}</div>
- <div style='font-size:15px;color:green'>{art_category}</div>
- <div style="font-size:12px">{art_excerpt}<div><br />
- <!-- END articles_block -->
- <!-- BEGIN nothingFound_block -->
- <div style="font-weight; margin-top:20px">
- [l]Your search[/l] - <b>{query}</b> - [l]did not match any documents.[/l]<br /><br />
- [l]Suggestions[/l]:
- <ul>
- <li>[l]Make sure all words are spelled correctly.[/l]</li>
- <li>[l]Try different keywords.[/l]</li>
- <li>[l]Try with rare keywords, that would more likely appear in the kind of document you're looking for.[/l]</li>
- </ul>
- </div>
- <!-- END nothingFound_block -->
- {paginationLinks}
- </td>
- </tr>
-</table>
+
+ <!-- BEGIN articles_block -->
+ <h2>
+ <i>({art_num}) </i>
+ <img src="images/{articleImage}" />
+ <a href="{art_link}" {target}>{art_title}</a> {bookmark_edit}
+ </h2>
+ <div>
+ {modifOrCreated} {art_date} - {img_stars} {attachment}
+ </div>
+ <div class="art_category">{art_category}</div>
+ <p>{art_excerpt}</p>
+ <!-- END articles_block -->
+ <!-- BEGIN nothingFound_block -->
+ <div style="margin-top:15px">
+ [l]Your search[/l] - <b>{query}</b> - [l]did not match any documents.[/l]<br /><br />
+ [l]Suggestions[/l]:
+ <ul>
+ <li>[l]Make sure all words are spelled correctly.[/l]</li>
+ <li>[l]Try different keywords.[/l]</li>
+ <li>[l]Try with rare keywords, that would more likely appear in the kind of document you're looking for.[/l]</li>
+ </ul>
+ </div>
+ <!-- END nothingFound_block -->
+</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-10-26 20:07:36
|
Revision: 764
http://sciret.svn.sourceforge.net/sciret/?rev=764&view=rev
Author: alpeb
Date: 2008-10-26 20:07:28 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
load tab lib
Modified Paths:
--------------
trunk/templates/ViewArticle.tpl
Modified: trunk/templates/ViewArticle.tpl
===================================================================
--- trunk/templates/ViewArticle.tpl 2008-10-26 19:51:01 UTC (rev 763)
+++ trunk/templates/ViewArticle.tpl 2008-10-26 20:07:28 UTC (rev 764)
@@ -8,6 +8,8 @@
* @packager Keyboard Monkeys
*/
-->
+<link rel="stylesheet" type="text/css" href="{YUILocation}tabview/assets/tabview-core.css">
+<script type="text/javascript" src="{YUILocation}tabview/tabview-min.js"></script>
<script type="text/javascript">
var artId = {art_id};
YAHOO.util.Event.onDOMReady(function() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-10-26 19:51:05
|
Revision: 763
http://sciret.svn.sourceforge.net/sciret/?rev=763&view=rev
Author: alpeb
Date: 2008-10-26 19:51:01 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
load calendar YUI widget
Modified Paths:
--------------
trunk/templates/EditBookmark.tpl
Modified: trunk/templates/EditBookmark.tpl
===================================================================
--- trunk/templates/EditBookmark.tpl 2008-10-26 19:44:17 UTC (rev 762)
+++ trunk/templates/EditBookmark.tpl 2008-10-26 19:51:01 UTC (rev 763)
@@ -72,7 +72,7 @@
<img src="images/datepopup.gif" id="expDateButton" style="cursor:pointer" />
<div id="expirationCalContainer" style="display:none; position:absolute; left:10px; z-index:1"></div>
<span id="labelSetDate" style="display:{labelSetExpDateDisplay}">([l]Currently none.<br />Click icon to set one.[/l])</span>
- <a id="removeDateLink" href="javascript:void(0);" onclick="removeArticeExpiration();" style="display:{removeExpDateLinkDisplay}; font-weight:bold; font-size:10px">[l]Remove expiration date[/l]</a>
+ <a id="removeDateLink" href="javascript:void(0);" onclick="removeArticleExpiration();" style="display:{removeExpDateLinkDisplay}; font-weight:bold; font-size:10px">[l]Remove expiration date[/l]</a>
</div>
</td>
</tr>
@@ -106,9 +106,15 @@
</form>
<script type="text/javascript">
YAHOO.util.Event.onDOMReady(function() {
- YAHOO.util.Event.addListener($("expDateButton"),
- "click",
- showArticleCalendar);
+ SCIRET.loader.insert(
+ ["calendar"],
+ function() {
+ YAHOO.util.Event.addListener($("expDateButton"),
+ "click",
+ showArticleCalendar);
+ }
+ );
+
});
function showArticleCalendar() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-10-26 19:44:20
|
Revision: 762
http://sciret.svn.sourceforge.net/sciret/?rev=762&view=rev
Author: alpeb
Date: 2008-10-26 19:44:17 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
removed the 'Add Article' and 'Add Bookmark' menu items. Replaced by buttons below the categories that'll add a new article/bookmark for the current category
Modified Paths:
--------------
trunk/templates/MainView.tpl
trunk/templates/header.tpl
trunk/views/EditArticle.php
trunk/views/EditBookmark.php
trunk/views/MainView.php
trunk/views/View.php
Modified: trunk/templates/MainView.tpl
===================================================================
--- trunk/templates/MainView.tpl 2008-10-24 00:21:54 UTC (rev 761)
+++ trunk/templates/MainView.tpl 2008-10-26 19:44:17 UTC (rev 762)
@@ -67,15 +67,24 @@
</table>
</td>
</tr>
- <!-- BEGIN addCategoryButton_block -->
<tr>
<td align="right">
+ <!-- BEGIN addArticleButton_block -->
<span class="button_green">
+ <a href="{addArticleLink}">[l]Add Article[/l]</a>
+ </span>
+ <!-- END addArticleButton_block -->
+ <!-- BEGIN addBookmarkButton_block -->
+ <span class="button_green">
+ <a href="{addBookmarkLink}">[l]Add Bookmark[/l]</a>
+ </span>
+ <!-- END addBookmarkButton_block -->
+ <!-- BEGIN addCategoryButton_block -->
+ <span class="button_green">
<a href="{addCategoryLink}">{addCategoryLabel}</a>
</span>
+ <!-- END addCategoryButton_block -->
</td>
- </tr>
- <!-- END addCategoryButton_block -->
</table>
</td>
Modified: trunk/templates/header.tpl
===================================================================
--- trunk/templates/header.tpl 2008-10-24 00:21:54 UTC (rev 761)
+++ trunk/templates/header.tpl 2008-10-26 19:44:17 UTC (rev 762)
@@ -48,12 +48,6 @@
<div id="menu">
<a href="{homeHref}">[l]Home[/l]</a>
- <!-- BEGIN addArticleLink_block -->
- <a href="{addArticleHref}">[l]Add Article[/l]</a>
- <!-- END addArticleLink_block -->
- <!-- BEGIN addBookmarkLink_block -->
- <a href="{addBookmarkHref}">[l]Add Bookmark[/l]</a>
- <!-- END addBookmarkLink_block -->
<!-- BEGIN manageUsersLink_block -->
<a href="{manageUsersHref}">[l]Manage Users[/l]</a>
<!-- END manageUsersLink_block -->
Modified: trunk/views/EditArticle.php
===================================================================
--- trunk/views/EditArticle.php 2008-10-24 00:21:54 UTC (rev 761)
+++ trunk/views/EditArticle.php 2008-10-26 19:44:17 UTC (rev 762)
@@ -17,6 +17,7 @@
function dispatch() {
$questionId = isset($_GET['qId'])? (int)$_GET['qId'] : 0;
$articleId = isset($_GET['id'])? (int)$_GET['id'] : 0;
+ $catId = isset($_GET['catId'])? (int)$_GET['catId'] : 0;
$selectedCategory = 0;
$this->tpl->set_file('edit_article', 'EditArticle.tpl');
@@ -110,6 +111,8 @@
$this->tpl->set_var('editArticleTitle', '');
$this->tpl->set_var('usage_id', '');
+
+ $selectedCategory = $catId;
}
$this->tpl->parse('saveAsDraftButton', 'saveAsDraftButton_block');
Modified: trunk/views/EditBookmark.php
===================================================================
--- trunk/views/EditBookmark.php 2008-10-24 00:21:54 UTC (rev 761)
+++ trunk/views/EditBookmark.php 2008-10-26 19:44:17 UTC (rev 762)
@@ -16,6 +16,7 @@
function dispatch() {
$bookmarkId = isset($_GET['id'])? (int)$_GET['id'] : 0;
+ $catId = isset($_GET['catId'])? (int)$_GET['catId'] : 0;
$selectedCategory = 0;
$this->tpl->set_file('edit_bookmark', 'EditBookmark.tpl');
@@ -73,6 +74,8 @@
$this->tpl->parse('addBookmarkTitle', 'addBookmarkTitle_block');
$this->tpl->set_var('editBookmarkTitle', '');
$this->tpl->parse('saveAsDraftButton', 'saveAsDraftButton_block');
+
+ $selectedCategory = $catId;
}
$categoryGateway = new CategoryGateway;
Modified: trunk/views/MainView.php
===================================================================
--- trunk/views/MainView.php 2008-10-24 00:21:54 UTC (rev 761)
+++ trunk/views/MainView.php 2008-10-26 19:44:17 UTC (rev 762)
@@ -97,6 +97,8 @@
$this->tpl->set_block('main', 'hideCategory_block', 'hideCategory');
$this->tpl->set_block('main', 'showHiddenCategories_block', 'showHiddenCategories');
$this->tpl->set_block('main', 'addCategoryButton_block', 'addCategoryButton');
+ $this->tpl->set_block('main', 'addArticleButton_block', 'addArticleButton');
+ $this->tpl->set_block('main', 'addBookmarkButton_block', 'addBookmarkButton');
$this->tpl->set_block('main', 'requestCat_block', 'requestCat');
$this->tpl->set_block('articles_block', 'status_block', 'status');
$this->tpl->set_block('articles_block', 'question_block', 'question');
@@ -172,6 +174,12 @@
'showCatAgainLink' => Library::getLink(array(
'action' => 'ShowCategory',
'catId' => $catId)),
+ 'addArticleLink' => Library::getLink(array(
+ 'view' => 'EditArticle',
+ 'catId' => $catId)),
+ 'addBookmarkLink' => Library::getLink(array(
+ 'view' => 'EditBookmark',
+ 'catId' => $catId)),
));
if ($catId != 0) {
@@ -315,6 +323,14 @@
$this->tpl->set_var('showHiddenCategories', '');
}
+ if (!$this->user->isAnonymous()) {
+ $this->tpl->parse('addArticleButton', 'addArticleButton_block');
+ $this->tpl->parse('addBookmarkButton', 'addBookmarkButton_block');
+ } else {
+ $this->tpl->set_var('addArticleButton', '');
+ $this->tpl->set_var('addBookmarkButton', '');
+ }
+
if (!$this->user->isAdmin()) {
$this->tpl->set_var('requestCatLink', Library::getLink(array('view' => 'RequestCategory',
'catId' => $catId)));
Modified: trunk/views/View.php
===================================================================
--- trunk/views/View.php 2008-10-24 00:21:54 UTC (rev 761)
+++ trunk/views/View.php 2008-10-26 19:44:17 UTC (rev 762)
@@ -133,22 +133,6 @@
'addQuestionHref' => Library::getLink(array('view' => 'AddQuestion')),
));
- $this->tpl->set_block('header', 'addArticleLink_block', 'addArticleLink');
- if (!$this->user->isAnonymous()) {
- $this->tpl->set_var('addArticleHref', Library::getLink(array('view' => 'EditArticle')));
- $this->tpl->parse('addArticleLink', 'addArticleLink_block');
- } else {
- $this->tpl->set_var('addArticleLink', '');
- }
-
- $this->tpl->set_block('header', 'addBookmarkLink_block', 'addBookmarkLink');
- if (!$this->user->isAnonymous()) {
- $this->tpl->set_var('addBookmarkHref', Library::getLink(array('view' => 'EditBookmark')));
- $this->tpl->parse('addBookmarkLink', 'addBookmarkLink_block');
- } else {
- $this->tpl->set_var('addBookmarkLink', '');
- }
-
$this->tpl->set_block('header', 'manageUsersLink_block', 'manageUsersLink');
if ($this->user->isAdmin()) {
$this->tpl->set_var('manageUsersHref', Library::getLink(array('view' => 'ManageUsers')));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-10-24 00:21:59
|
Revision: 761
http://sciret.svn.sourceforge.net/sciret/?rev=761&view=rev
Author: alpeb
Date: 2008-10-24 00:21:54 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
Optimized js lib loading, through the YUI loader facilities. Also added entry in config.ini.php, to allow downloading those libs from YDN.
Modified Paths:
--------------
trunk/classes/Controller.php
trunk/config.ini.php
trunk/flowMap.php
trunk/templates/EditArticle.tpl
trunk/templates/MainView.tpl
trunk/templates/TodosDropdown.tpl
trunk/templates/footer.tpl
trunk/templates/head.tpl
trunk/views/View.php
Modified: trunk/classes/Controller.php
===================================================================
--- trunk/classes/Controller.php 2008-10-24 00:19:17 UTC (rev 760)
+++ trunk/classes/Controller.php 2008-10-24 00:21:54 UTC (rev 761)
@@ -68,6 +68,7 @@
require "views/$view.php";
$obj = new $view($this->user, $this->configuration);
$obj->setTemplate(new KB_Template('templates', $this->user));
+ $obj->setYUIVars();
$obj->preDispatch();
if ($this->views[$view][SHOW_HEAD]) {
$obj->setHTMLHeader($this->views[$view][SHOW_HEADER]);
Modified: trunk/config.ini.php
===================================================================
--- trunk/config.ini.php 2008-10-24 00:19:17 UTC (rev 760)
+++ trunk/config.ini.php 2008-10-24 00:21:54 UTC (rev 761)
@@ -5,6 +5,7 @@
array (
'session_name' => 'SCIRET',
'production' => true,
+ 'YDN' => true,
'loglevel' => 0,
),
'general' =>
@@ -25,4 +26,4 @@
),
);
-?>
\ No newline at end of file
+?>
Modified: trunk/flowMap.php
===================================================================
--- trunk/flowMap.php 2008-10-24 00:19:17 UTC (rev 760)
+++ trunk/flowMap.php 2008-10-24 00:21:54 UTC (rev 761)
@@ -42,7 +42,7 @@
'ViewRelatedArticles' => array(User::ROLE_ANONYMOUS, true, true, false, true),
'GetFavoritesDropdown' => array(User::ROLE_REGISTERED, true, true, false),
'ViewAllFavorites' => array(User::ROLE_REGISTERED, true, true, true, false),
- 'GetTodosDropdown' => array(User::ROLE_REGISTERED, true, true, false),
+ 'GetTodosDropdown' => array(User::ROLE_REGISTERED, true, false, false),
'EditTodo' => array(User::ROLE_REGISTERED, true, false, false),
'Upgrade' => array(User::ROLE_ANONYMOUS, true, true, true, false),
'UpgradeOk' => array(User::ROLE_ANONYMOUS, true, true, true, false),
Modified: trunk/templates/EditArticle.tpl
===================================================================
--- trunk/templates/EditArticle.tpl 2008-10-24 00:19:17 UTC (rev 760)
+++ trunk/templates/EditArticle.tpl 2008-10-24 00:21:54 UTC (rev 761)
@@ -8,15 +8,6 @@
* @packager TheGang
*/
-->
-
-<!-- Needed for resizing ability -->
-<link rel="stylesheet" type="text/css" href="javascript/yui/assets/skins/sam/resize.css">
-<script type="text/javascript" src="javascript/yui/resize/resize-beta-min.js"></script>
-<!-- Needed for Menus, Buttons and Overlays used in the Toolbar -->
-<script type="text/javascript" src="javascript/yui/menu/menu-min.js"></script>
-<!-- Source file for Rich Text Editor-->
-<script src="javascript/yui/editor/editor-min.js"></script>
-
<h1>
<!-- BEGIN addArticleTitle_block -->
[l]Add Article[/l]
@@ -107,10 +98,6 @@
<tr>
<td colspan="2">
<textarea name="text_content" id="text_content" style="width: 100%; height:350px; margin:0; border:0">{textareaContent}</textarea>
- <script>
- // can't make editor bigger, or else problem under IE
- SCIRET.editor.init('100%','350px', 'text_content');
- </script>
</td>
</tr>
<tr class="th">
@@ -125,7 +112,7 @@
</td>
</tr>
<!-- BEGIN saveAsDraftButton_block -->
- <tr>
+ <tr>
<td colspan="2" class="td_submit">
<input type="button" value="[l]Save as Draft[/l]" onclick="saveDraft(form);" />
</td>
@@ -135,11 +122,19 @@
</form>
<script type="text/javascript">
YAHOO.util.Event.onDOMReady(function() {
- YAHOO.util.Event.addListener($("expDateButton"),
- "click",
- showArticleCalendar);
- });
+ SCIRET.loader.insert(
+ ["resize", "menu", "editor", "calendar"],
+ function() {
+ YAHOO.util.Event.addListener($("expDateButton"),
+ "click",
+ showArticleCalendar);
+ // can't make editor bigger, or else problem under IE
+ SCIRET.editor.init('100%','350px', 'text_content');
+ }
+ );
+ });
+
function showArticleCalendar() {
var cal = new YAHOO.widget.Calendar("expirationCalContainer", {
close: true
@@ -175,5 +170,4 @@
return true;
}
-
</script>
Modified: trunk/templates/MainView.tpl
===================================================================
--- trunk/templates/MainView.tpl 2008-10-24 00:19:17 UTC (rev 760)
+++ trunk/templates/MainView.tpl 2008-10-24 00:21:54 UTC (rev 761)
@@ -9,15 +9,16 @@
*/
-->
+<!-- only core css because we have our own skin in style.css -->
+<link rel="stylesheet" type="text/css" href="{YUILocation}tabview/assets/tabview-core.css">
+<script type="text/javascript" src="{YUILocation}tabview/tabview-min.js"></script>
<script type="text/javascript">
- YAHOO.util.Event.onDOMReady(function() {
- var mainViewTabs = new YAHOO.widget.TabView(
- "mainViewTabs"
- //,{activeIndex: {activeTabIndex}} Broken in YUI 2.6.0
- );
- });
+ var mainViewTabs = new YAHOO.widget.TabView(
+ "mainViewTabs"
+ //,{activeIndex: {activeTabIndex}} Broken in YUI 2.6.0. Gotta use class="selected" instead
+ );
</script>
-<div id="mainViewTabs" >
+<div id="mainViewTabs">
<ul class="yui-nav">
<li class="{selectedCategoriesTab}">
<a href="#categories"><em>[l]Categories[/l]</em></a>
Modified: trunk/templates/TodosDropdown.tpl
===================================================================
--- trunk/templates/TodosDropdown.tpl 2008-10-24 00:19:17 UTC (rev 760)
+++ trunk/templates/TodosDropdown.tpl 2008-10-24 00:21:54 UTC (rev 761)
@@ -47,3 +47,6 @@
<img id="editTodoProgressImg_0" src="images/progress.gif" style="visibility:hidden" />
</p>
</div>
+<script type="text/javascript">
+ SCIRET.loader.insert(["container"], null);
+</script>
Modified: trunk/templates/footer.tpl
===================================================================
--- trunk/templates/footer.tpl 2008-10-24 00:19:17 UTC (rev 760)
+++ trunk/templates/footer.tpl 2008-10-24 00:21:54 UTC (rev 761)
@@ -139,5 +139,15 @@
<p>Copyright (C) 2005-2008 Keyboard Monkeys Ltd. Community as a service (TM)</p>
</div>
+<script type="text/javascript" src="javascript/tools-min.js"></script>
+<script type="text/javascript" src="javascript/effects-min.js"></script>
+<script type="text/javascript" src="javascript/jquery.js"></script>
+<script type="text/javascript" src="javascript/general.js"></script>
+<script type="text/javascript">
+ SCIRET.loader.combine = {YUILoaderCombine};
+ SCIRET.loader.base = "{YUILocation}";
+</script>
+<script type="text/javascript" src="javascript/overlib.js"></script>
+
</body>
</html>
Modified: trunk/templates/head.tpl
===================================================================
--- trunk/templates/head.tpl 2008-10-24 00:19:17 UTC (rev 760)
+++ trunk/templates/head.tpl 2008-10-24 00:21:54 UTC (rev 761)
@@ -4,37 +4,11 @@
<head>
<title>[l]Knowledge Base[/l]</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <link rel="stylesheet" type="text/css" href="javascript/yui/assets/skins/sam/skin.css">
- <link type="text/css" rel="stylesheet" href="javascript/yui/logger/assets/skins/sam/logger.css">
- <link rel="stylesheet" type="text/css" href="javascript/yui/container/assets/skins/sam/container.css">
- <link rel="stylesheet" type="text/css" href="javascript/yui/calendar/assets/skins/sam/calendar.css">
+
<link rel="stylesheet" href="style.css" type="text/css" media="screen" charset="utf-8"/>
<!--[if IE 6]><link rel="stylesheet" href="style_ie6.css" type="text/css" media="screen" charset="utf-8"><![endif]-->
<!--[if IE 7]><link rel="stylesheet" href="style_ie7.css" type="text/css" media="screen" charset="utf-8"><![endif]-->
<link href="others.css" type="text/css" rel="StyleSheet" />
- <script type="text/javascript">var isIE7 = false;</script>
- <!--[if IE 7]>
- <script type="text/javascript">isIE7 = true;</script>
- <![endif]-->
- <!-- basic YUI libraries -->
- <script type="text/javascript" src="javascript/yui/yahoo-dom-event/yahoo-dom-event.js"></script>
- <script type="text/javascript" src="javascript/yui/connection/connection.js"></script>
- <script type="text/javascript" src="javascript/tools-min.js"></script>
- <script type="text/javascript" src="javascript/yui/element/element-beta-min.js"></script>
- <script type="text/javascript" src="javascript/yui/dragdrop/dragdrop-min.js"></script>
- <script type="text/javascript" src="javascript/yui/container/container.js"></script>
- <script type="text/javascript" src="javascript/yui/animation/animation-min.js"></script>
- <script type="text/javascript" src="javascript/yui/button/button-min.js"></script>
- <script type="text/javascript" src="javascript/yui/calendar/calendar-min.js"></script>
- <script type="text/javascript" src="javascript/yui/logger/logger-min.js"></script>
- <script type="text/javascript" src="javascript/yui/json/json-min.js"></script>
- <script type="text/javascript" src="javascript/yui/tabview/tabview-min.js"></script>
- <!-- required by effects.js -->
- <script type="text/javascript" src="javascript/effects-min.js"></script>
-
- <script src="javascript/jquery.js" type="text/javascript" charset="utf-8"></script>
- <script type="text/javascript" src="javascript/general.js"></script>
- <script type="text/javascript" src="javascript/overlib.js"></script>
<!-- BEGIN rtl_block -->
<style>
input, textarea {
@@ -42,10 +16,21 @@
}
</style>
<!-- END rtl_block -->
-</head>
-<body class="yui-skin-sam">
+
+ <script type="text/javascript" src="{YUILocation}utilities/utilities.js"></script>
<script type="text/javascript">
- // var myLogReader = new YAHOO.widget.LogReader();
+ var isIE7 = false;
</script>
+ <!--[if IE 7]>
+ <script type="text/javascript">isIE7 = true;</script>
+ <![endif]-->
+
+
+
+<!-- <script type="text/javascript" src="javascript/yui/json/json-min.js"></script> -->
+
+</head>
+<body class="yui-skin-sam">
+ <!-- <script type="text/javascript">var myLogReader = new YAHOO.widget.LogReader();</script>-->
<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
<div id="todoDialog" style="display:none"></div>
Modified: trunk/views/View.php
===================================================================
--- trunk/views/View.php 2008-10-24 00:19:17 UTC (rev 760)
+++ trunk/views/View.php 2008-10-24 00:21:54 UTC (rev 761)
@@ -12,8 +12,8 @@
require 'classes/kb_template.php';
require_once 'models/ArticleGateway.php';
-class View {
-
+abstract class View
+{
var $tpl;
var $user;
var $configuration;
@@ -40,7 +40,25 @@
$this->tpl =& $tpl;
}
- function setHTMLHeader($showHeader) {
+ public function setYUIVars()
+ {
+ if (Zend_Registry::get('config')->environment->YDN) {
+ $this->tpl->set_var(array(
+ 'YUILocation' => 'http://yui.yahooapis.com/2.6.0/build/',
+ 'YUILoaderCombine' => 'true',
+ ));
+ } else {
+ // the combiner is only available when using YDN
+ $this->tpl->set_var(array(
+ 'YUILocation' => 'javascript/yui/',
+ 'YUILoaderCombine' => 'false',
+ ));
+ }
+
+ }
+
+ function setHTMLHeader($showHeader)
+ {
$this->tpl->set_file('head', 'head.tpl');
$this->tpl->set_file('footer', 'footer.tpl');
$this->tpl->set_block('head', 'rtl_block', 'rtl');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
