Menu
▾
▴
bbps-commits — CVS Commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(14) |
Jun
(20) |
Jul
|
Aug
(1) |
Sep
(19) |
Oct
(1) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
|
Feb
(3) |
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Christian O. <chr...@us...> - 2010-03-09 18:40:07
|
Update of /cvsroot/bbps/bbps/js In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27624/js Modified Files: mozilla_search.js Log Message: - added HTTPS functionality - fixed some search engine stuff (esp. a bit clean up and generating a host based name) Index: mozilla_search.js =================================================================== RCS file: /cvsroot/bbps/bbps/js/mozilla_search.js,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mozilla_search.js 9 Apr 2006 16:05:33 -0000 1.1 --- mozilla_search.js 9 Mar 2010 18:39:54 -0000 1.2 *************** *** 15,18 **** --- 15,19 ---- name, cat ); + return true; } else |
|
From: Christian O. <chr...@us...> - 2010-03-09 18:40:05
|
Update of /cvsroot/bbps/bbps In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27624 Modified Files: firefox_search.php support_functions.php Log Message: - added HTTPS functionality - fixed some search engine stuff (esp. a bit clean up and generating a host based name) Index: support_functions.php =================================================================== RCS file: /cvsroot/bbps/bbps/support_functions.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** support_functions.php 9 Sep 2005 14:44:14 -0000 1.3 --- support_functions.php 9 Mar 2010 18:39:54 -0000 1.4 *************** *** 152,157 **** } ! $location = "Location: http://".$_SERVER['HTTP_HOST'].$dir."/".$page; return $location; - } --- 152,161 ---- } ! if ($_SERVER['HTTPS']) { ! $protocol="https"; ! } else { ! $protocol="http"; ! } ! $location = "Location: ".$protocol."://".$_SERVER['HTTP_HOST'].$dir."/".$page; return $location; } Index: firefox_search.php =================================================================== RCS file: /cvsroot/bbps/bbps/firefox_search.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** firefox_search.php 9 Apr 2006 16:05:32 -0000 1.1 --- firefox_search.php 9 Mar 2010 18:39:54 -0000 1.2 *************** *** 1,4 **** ! /* TODO: generate a unique file name for this domain/directory ! ! * clean up the whole search engine stuff and commit to cvs ... once sourceforge is working again */ <html> --- 1,6 ---- ! /* TODO: ! * generate a unique file name for this domain/directory? ! * clean up the whole search engine stuff ! * solve caching problem with generated file */ <html> *************** *** 9,13 **** <?php function get_base() { ! return "http://" . $_SERVER['HTTP_HOST'] . ":" . $_SERVER['SERVER_PORT'] . dirname($_SERVER['PHP_SELF']) . "/"; } ?> --- 11,20 ---- <?php function get_base() { ! if ($_SERVER['HTTPS']) { ! $protocol="https"; ! } else { ! $protocol="http"; ! } ! return $protocol . "://" . $_SERVER['HTTP_HOST'] . ":" . $_SERVER['SERVER_PORT'] . dirname($_SERVER['PHP_SELF']) . "/"; } ?> *************** *** 19,23 **** while (!feof($fi)) { $line=fgets($fi); ! $line=str_replace('$NAME$','bbps',$line); $line=str_replace('$DESCRIPTION$','BBPS Search at ' . $_SERVER['HTTP_HOST'],$line); $line=str_replace('$ACTION$',get_base() . 'index.php',$line); --- 26,30 ---- while (!feof($fi)) { $line=fgets($fi); ! $line=str_replace('$NAME$','bbps@' . $_SERVER['HTTP_HOST'],$line); $line=str_replace('$DESCRIPTION$','BBPS Search at ' . $_SERVER['HTTP_HOST'],$line); $line=str_replace('$ACTION$',get_base() . 'index.php',$line); *************** *** 30,36 **** ?> <form> ! <input type="button" value="Install Search Engine" onClick="javascript:addEngine( ! '<?php echo get_base(); ?>', ! 'bbps_search','png','Web',0); window.close()" /> </form> </body> --- 37,43 ---- ?> <form> ! <input type="button" value="Install Search Engine" ! onClick="javascript:if (addEngine('<?php echo get_base(); ?>','bbps_search','png','Web',0)) {window.close()}" ! /> </form> </body> |
|
From: Christian O. <chr...@us...> - 2010-03-09 18:40:04
|
Update of /cvsroot/bbps/bbps/templates In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27624/templates Modified Files: _footer.tpl Log Message: - added HTTPS functionality - fixed some search engine stuff (esp. a bit clean up and generating a host based name) Index: _footer.tpl =================================================================== RCS file: /cvsroot/bbps/bbps/templates/_footer.tpl,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** _footer.tpl 9 Apr 2006 16:05:33 -0000 1.24 --- _footer.tpl 9 Mar 2010 18:39:54 -0000 1.25 *************** *** 1,10 **** <div id="footer"> ! <p> ! Bookmarklet (new window): <a title="You must drag this link to your browser's toolbar or add it to your favorites." href="javascript:void(window.open('http://<?php echo $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']; ?>?action=new_bm&f_bookmark_name=' + escape(document.title) + '&f_bookmark_url=' + escape(document.location), 'bbps', 'toolbar=no, location=no, directories=no, status=no, menubar=no, resizable=yes, scrollbars=yes, copyhistory=no'))" onClick="javascript:alert('You must drag this link to your browser\'s toolbar or add it to your favorites.'); return false">Add to Bookmarks</a> | Bookmarklet (existing window): <a title="You must drag this link to your browser's toolbar or add it to your favorites." href="javascript:document.location = 'http://<?php echo $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']; ?>?action=new_bm&f_bookmark_name=' + escape(document.title) + '&f_bookmark_url=' + escape(document.location)" onClick="javascript:alert('You must drag this link to your browser\'s toolbar or add it to your favorites.'); return false">Add to Bookmarks</a> | <acronym title="Between Book's Pages">bbps</acronym> <?php echo $GLOBALS['BBPS_VERSION']; ?> (<a href="http://bbps.sourceforge.net" title="bbps project page">http://bbps.sourceforge.net</a>) ! <?php if($_SESSION['AUTHORIZED']){ ! ?> ! <a href="./procesa.php?action=logout"><?php }else{ ?><a href="./procesa.php?action=login"> <?php } ?>#</a><br> Mozilla Search Engine: --- 1,24 ---- <div id="footer"> ! <?php ! if ($_SERVER['HTTPS']) { ! $protocol="https"; ! } else { ! $protocol="http"; ! } ! ?> ! <p> ! Bookmarklet (new window): ! <a title="You must drag this link to your browser's toolbar or add it to your favorites." ! href="javascript:void(window.open('<?php echo $protocol . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']; ?>?action=new_bm&f_bookmark_name=' + escape(document.title) + '&f_bookmark_url=' + escape(document.location), 'bbps', 'toolbar=no, location=no, directories=no, status=no, menubar=no, resizable=yes, scrollbars=yes, copyhistory=no'))" onClick="javascript:alert('You must drag this link to your browser\'s toolbar or add it to your favorites.'); return false">Add to Bookmarks</a> ! | Bookmarklet (existing window): ! <a title="You must drag this link to your browser's toolbar or add it to your favorites." ! href="javascript:document.location = '<?php echo $protocol . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']; ?>?action=new_bm&f_bookmark_name=' + escape(document.title) + '&f_bookmark_url=' + escape(document.location)" onClick="javascript:alert('You must drag this link to your browser\'s toolbar or add it to your favorites.'); return false">Add to Bookmarks</a> | <acronym title="Between Book's Pages">bbps</acronym> <?php echo $GLOBALS['BBPS_VERSION']; ?> (<a href="http://bbps.sourceforge.net" title="bbps project page">http://bbps.sourceforge.net</a>) ! <?php if($_SESSION['AUTHORIZED']){ ?> ! <a href="./procesa.php?action=logout"> ! <?php } else { ?> ! <a href="./procesa.php?action=login"> ! <?php } ?>#</a><br> Mozilla Search Engine: *************** *** 14,24 **** </p> </div> ! <? if (DEBUG == TRUE) { ?> <script type="text/javascript"> var parsetime = ((new Date().getTime() - starttime) / 1000); ! window.status='Remote parsetime: <? echo timing('end'); ?>, local parsetime: '+parsetime+'';</script> </body> ! <? } ?> --- 28,38 ---- </p> </div> ! <?php if (DEBUG == TRUE) { ?> <script type="text/javascript"> var parsetime = ((new Date().getTime() - starttime) / 1000); ! window.status='Remote parsetime: <?php echo timing('end'); ?>, local parsetime: '+parsetime+'';</script> </body> ! <?php } ?> |
|
From: Christian O. <chr...@us...> - 2008-10-24 20:08:30
|
Update of /cvsroot/bbps/bbps/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12901/docs Modified Files: TODO Log Message: finally a new commit in order to have both versions synchronized... Index: TODO =================================================================== RCS file: /cvsroot/bbps/bbps/docs/TODO,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TODO 5 Jun 2005 18:00:13 -0000 1.4 --- TODO 24 Oct 2008 20:08:24 -0000 1.5 *************** *** 5,9 **** Short term: - download favicon also when saving a current bookmark and only if the bookmark doesnt have an icon ! - Mozilla searchbar integration - have adminpanel option to set textsize and / or set textsize by reading screen resolution - have to pop-up 'add bookmark' window close after adding a bookmark and be a lot smaller than it is now --- 5,9 ---- Short term: - download favicon also when saving a current bookmark and only if the bookmark doesnt have an icon ! - Mozilla searchbar integration (NEARLY DONE, SOME CLEANUP NEEDED) - have adminpanel option to set textsize and / or set textsize by reading screen resolution - have to pop-up 'add bookmark' window close after adding a bookmark and be a lot smaller than it is now |
|
From: Christian O. <chr...@us...> - 2006-04-09 16:05:40
|
Update of /cvsroot/bbps/bbps/js In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6963/js Added Files: mozilla_search.js Log Message: first and very limited support for adding dynamicly generated Mozilla/Firefox search engines --- NEW FILE: mozilla_search.js --- function errorMsg() { alert("Netscape 6 or Mozilla is needed to install a sherlock plugin"); } function addEngine(base_url,name,ext,cat,type) { if ((typeof window.sidebar == "object") && (typeof window.sidebar.addSearchEngine == "function")) { //cat="Web"; //cat=prompt('In what category should this engine be installed?','Web') window.sidebar.addSearchEngine( base_url+name+".src", base_url+name+"."+ext, name, cat ); } else { errorMsg(); } } |
|
From: Christian O. <chr...@us...> - 2006-04-09 16:05:40
|
Update of /cvsroot/bbps/bbps/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6963/templates Modified Files: _footer.tpl _header.tpl Log Message: first and very limited support for adding dynamicly generated Mozilla/Firefox search engines Index: _header.tpl =================================================================== RCS file: /cvsroot/bbps/bbps/templates/_header.tpl,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** _header.tpl 9 Feb 2006 04:45:12 -0000 1.35 --- _header.tpl 9 Apr 2006 16:05:33 -0000 1.36 *************** *** 27,30 **** --- 27,31 ---- echo '<script type="text/javascript">var starttime = new Date().getTime();</script>'; } + echo "\n"; ?> </head> Index: _footer.tpl =================================================================== RCS file: /cvsroot/bbps/bbps/templates/_footer.tpl,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** _footer.tpl 9 Sep 2005 14:45:34 -0000 1.23 --- _footer.tpl 9 Apr 2006 16:05:33 -0000 1.24 *************** *** 7,10 **** --- 7,14 ---- ?> <a href="./procesa.php?action=logout"><?php }else{ ?><a href="./procesa.php?action=login"> <?php } ?>#</a><br> + + Mozilla Search Engine: + <a href="javascript:void(window.open('firefox_search.php', 'FirefoxSearch', 'toolbar=no, location=no, directories=no, status=no, menubar=no, resizable=yes, scrollbars=yes, copyhistory=no'))">install bbps search</a> + <br> <a href="http://validator.w3.org/check?uri=referer"><img border="0" src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" height="31" width="88"></a> </p> |
|
From: Christian O. <chr...@us...> - 2006-04-09 16:05:38
|
Update of /cvsroot/bbps/bbps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6963 Modified Files: bookmark.php Added Files: bbps_search.src.tpl firefox_search.php Log Message: first and very limited support for adding dynamicly generated Mozilla/Firefox search engines --- NEW FILE: bbps_search.src.tpl --- # # Mozilla/Netscape 6+ Mycroft Plugin for www.exalead.de # Created by DA on January 16, 2006. Translated to German by LK on March 18, 2006. # E-Mail: da...@ho... # <search version="7.1" name="$NAME$" description="$DESCRIPTION$" action="$ACTION$" searchForm="$SEARCHFORM$" method="GET" queryCharset="UTF-8" > <input name="action" value="search"> <input name="f_search" user> #<interpret # browserResultType="result" # resultListStart="<ol style="Margin-Top: 0px; Margin-Bottom: 0px;" start="1">" # resultListEnd="<span class="h4">????????</span>" # resultItemStart="<li>" # resultItemEnd="<div><span class="d">" #> #<interpret # browserResultType="result" #> </search> #<browser # update="http://mycroft.mozdev.org/update.php/id0/exalead-de.src" # updateIcon="http://mycroft.mozdev.org/update.php/id0/exalead-de.png" # updateCheckDays="7" #> Index: bookmark.php =================================================================== RCS file: /cvsroot/bbps/bbps/bookmark.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** bookmark.php 9 Feb 2006 03:51:39 -0000 1.26 --- bookmark.php 9 Apr 2006 16:05:32 -0000 1.27 *************** *** 183,189 **** elseif('search'==$action){ // search ! $l_strTitle = "Search for '".$_POST['f_search']."' returned: "; ! if (isset($_POST['f_search']) and strlen($_POST['f_search'])>0) { ! $l_strWhere = sprintf(" (bbps_bookmark_comment like '%%%s%%' or bbps_bookmark_name like '%%%s%%') ORDER BY bbps_bookmark_name ASC", mysql_real_escape_string($_POST['f_search']), mysql_real_escape_string($_POST['f_search'])); }else{ $l_bError = TRUE; --- 183,189 ---- elseif('search'==$action){ // search ! $l_strTitle = "Search for '".$_REQUEST['f_search']."' returned: "; ! if (isset($_REQUEST['f_search']) and strlen($_REQUEST['f_search'])>0) { ! $l_strWhere = sprintf(" (bbps_bookmark_comment like '%%%s%%' or bbps_bookmark_name like '%%%s%%') ORDER BY bbps_bookmark_name ASC", mysql_real_escape_string($_REQUEST['f_search']), mysql_real_escape_string($_REQUEST['f_search'])); }else{ $l_bError = TRUE; --- NEW FILE: firefox_search.php --- /* TODO: generate a unique file name for this domain/directory ! * clean up the whole search engine stuff and commit to cvs ... once sourceforge is working again */ <html> <head> <script language="text/javascript" type="text/javascript" src="js/mozilla_search.js"></script> </head> <body> <?php function get_base() { return "http://" . $_SERVER['HTTP_HOST'] . ":" . $_SERVER['SERVER_PORT'] . dirname($_SERVER['PHP_SELF']) . "/"; } ?> <?php echo "Generating Search engine file for " . get_base() . "<br>"; $fo=fopen ("bbps_search.src","w"); $fi=fopen ("bbps_search.src.tpl","r"); while (!feof($fi)) { $line=fgets($fi); $line=str_replace('$NAME$','bbps',$line); $line=str_replace('$DESCRIPTION$','BBPS Search at ' . $_SERVER['HTTP_HOST'],$line); $line=str_replace('$ACTION$',get_base() . 'index.php',$line); $line=str_replace('$SEARCHFORM$',get_base(),$line); fwrite($fo,$line); } fclose($fo); fclose($fi); echo "done. <br>"; ?> <form> <input type="button" value="Install Search Engine" onClick="javascript:addEngine( '<?php echo get_base(); ?>', 'bbps_search','png','Web',0); window.close()" /> </form> </body> </html> |
|
From: Christian O. <chr...@us...> - 2006-02-09 04:45:20
|
Update of /cvsroot/bbps/bbps/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8671/templates Modified Files: _header.tpl Log Message: solved debug output problem (wrong nesting of if-statements) Index: _header.tpl =================================================================== RCS file: /cvsroot/bbps/bbps/templates/_header.tpl,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** _header.tpl 9 Sep 2005 14:45:34 -0000 1.34 --- _header.tpl 9 Feb 2006 04:45:12 -0000 1.35 *************** *** 18,29 **** <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> ! <?php if($GLOBALS['CONF_ENABLE_AUTOCOMPLETE']){ ?> ! <script language="text/javascript" type="text/javascript" src="js/actb.js"></script> ! <script language="text/javascript" type="text/javascript" src="js/common.js"></script> ! <? ! if (DEBUG == TRUE) { ! echo '<script type="text/javascript">var starttime = new Date().getTime();</script>'; ! } ! } ?> </head> <body> --- 18,31 ---- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> ! <?php ! if($GLOBALS['CONF_ENABLE_AUTOCOMPLETE']) { ! echo '<script language="text/javascript" type="text/javascript" src="js/actb.js"></script>'; ! echo '<script language="text/javascript" type="text/javascript" src="js/common.js"></script>'; ! } ! ! if (DEBUG == TRUE) { ! echo '<script type="text/javascript">var starttime = new Date().getTime();</script>'; ! } ! ?> </head> <body> |
|
From: Christian O. <chr...@us...> - 2006-02-09 03:51:48
|
Update of /cvsroot/bbps/bbps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22412 Modified Files: bookmark.php procesa.php Log Message: hopefully the problems with apostrophes and such signs are gone. Index: procesa.php =================================================================== RCS file: /cvsroot/bbps/bbps/procesa.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** procesa.php 9 Sep 2005 14:50:07 -0000 1.16 --- procesa.php 9 Feb 2006 03:51:40 -0000 1.17 *************** *** 96,102 **** if (!empty($oldFavicon)) { // unset($oldFavicon); ! $pathToFavicon = $GLOBALS['CONF_FAVICON_DIR']."/".$oldFavicon; ! @unlink($pathToFavicon); ! } } else $favicon_fname = "'$oldFavicon'"; --- 96,102 ---- if (!empty($oldFavicon)) { // unset($oldFavicon); ! $pathToFavicon = $GLOBALS['CONF_FAVICON_DIR']."/".$oldFavicon; ! @unlink($pathToFavicon); ! } } else $favicon_fname = "'$oldFavicon'"; *************** *** 104,108 **** // updating the bookmark $l_strQuery = "UPDATE bbps_bookmarks set bbps_bookmark_name='%s', bbps_bookmark_comment='%s', bbps_bookmark_url='%s', bbps_bookmark_rating='%s', bbps_bookmark_private=%s, bbps_bookmark_favicon=%s WHERE bbps_bookmark_id=%s"; ! $l_strQuery = sprintf( $l_strQuery, $_POST['f_bookmark_name'], $_POST['f_bookmark_comment'], $_POST['f_bookmark_url'], $_POST['f_bookmark_rating'], $l_isPrivate, $favicon_fname, $_POST['f_bookmark_id'] ); // insert the new bookmark --- 104,108 ---- // updating the bookmark $l_strQuery = "UPDATE bbps_bookmarks set bbps_bookmark_name='%s', bbps_bookmark_comment='%s', bbps_bookmark_url='%s', bbps_bookmark_rating='%s', bbps_bookmark_private=%s, bbps_bookmark_favicon=%s WHERE bbps_bookmark_id=%s"; ! $l_strQuery = sprintf( $l_strQuery, mysql_real_escape_string($_POST['f_bookmark_name']), mysql_real_escape_string($_POST['f_bookmark_comment']), mysql_real_escape_string($_POST['f_bookmark_url']), mysql_real_escape_string($_POST['f_bookmark_rating']), $l_isPrivate, $favicon_fname, mysql_real_escape_string($_POST['f_bookmark_id']) ); // insert the new bookmark *************** *** 132,136 **** // if we made it this far, the bookmark is not link to any keywords // we need to know if the current keyword exists in the catalog ! AssignKeywordIfNecessary($keyword_name, $_POST['f_bookmark_id'] ); } // we just need to unlink the keywords --- 132,136 ---- // if we made it this far, the bookmark is not link to any keywords // we need to know if the current keyword exists in the catalog ! AssignKeywordIfNecessary($keyword_name, mysql_real_escape_string($_POST['f_bookmark_id']) ); } // we just need to unlink the keywords *************** *** 198,202 **** $l_nKeywordID = -1; $l_strQuery = "SELECT bbps_keyword_id FROM bbps_keywords WHERE bbps_keyword_name='%s'"; ! $l_strQuery = sprintf( $l_strQuery, $keyword_name ); // looking for the id $return = mysql_query( $l_strQuery ) or die(mysql_error()); --- 198,202 ---- $l_nKeywordID = -1; $l_strQuery = "SELECT bbps_keyword_id FROM bbps_keywords WHERE bbps_keyword_name='%s'"; ! $l_strQuery = sprintf( $l_strQuery, mysql_real_escape_string($keyword_name) ); // looking for the id $return = mysql_query( $l_strQuery ) or die(mysql_error()); *************** *** 217,221 **** function AddKeyword( $keyword_name ){ $l_strQuery = "INSERT INTO bbps_keywords(bbps_keyword_name) VALUES('%s')"; ! $l_strQuery = sprintf( $l_strQuery, $keyword_name ); // adding the keyword mysql_query($l_strQuery) or die (mysql_errno()); --- 217,221 ---- function AddKeyword( $keyword_name ){ $l_strQuery = "INSERT INTO bbps_keywords(bbps_keyword_name) VALUES('%s')"; ! $l_strQuery = sprintf( $l_strQuery, mysql_real_escape_string($keyword_name) ); // adding the keyword mysql_query($l_strQuery) or die (mysql_errno()); *************** *** 245,250 **** $delete_bookmark_query = "delete from bbps_bookmarks where bbps_bookmark_id = %s"; $delete_relation_query = "delete from bbps_rel_keywords_bookmarks where bbps_rel_bookmark_id = %s"; ! $delete_bookmark_query = sprintf($delete_bookmark_query, $_POST['f_bookmark_id']); ! $delete_relation_query = sprintf($delete_relation_query, $_POST['f_bookmark_id']); mysql_query($delete_bookmark_query) or die(mysql_error()); --- 245,250 ---- $delete_bookmark_query = "delete from bbps_bookmarks where bbps_bookmark_id = %s"; $delete_relation_query = "delete from bbps_rel_keywords_bookmarks where bbps_rel_bookmark_id = %s"; ! $delete_bookmark_query = sprintf($delete_bookmark_query, mysql_real_escape_string($_POST['f_bookmark_id'])); ! $delete_relation_query = sprintf($delete_relation_query, mysql_real_escape_string($_POST['f_bookmark_id'])); mysql_query($delete_bookmark_query) or die(mysql_error()); *************** *** 252,256 **** foreach( $l_currKeywords as $l_keyname ){ ! UnlinkKeyword( $l_keyname, $_POST['f_bookmark_id'] ); } --- 252,256 ---- foreach( $l_currKeywords as $l_keyname ){ ! UnlinkKeyword( $l_keyname, mysql_real_escape_string($_POST['f_bookmark_id']) ); } *************** *** 263,267 **** */ function KillKeyword() { ! $keyid = $_POST['f_keyword_id']; $delete_keyword_query = "delete from bbps_keywords where bbps_keyword_id = '$keyid'"; --- 263,267 ---- */ function KillKeyword() { ! $keyid = mysql_real_escape_string($_POST['f_keyword_id']); $delete_keyword_query = "delete from bbps_keywords where bbps_keyword_id = '$keyid'"; *************** *** 278,283 **** */ function AlterKeyword() { ! $keyid = $_POST['f_keyword_id']; ! $new_keyword_name = $_POST['new_keyword_name']; $alter_keyword_query = "update bbps_keywords set bbps_keyword_name = '$new_keyword_name' where bbps_keyword_id = '$keyid'"; --- 278,283 ---- */ function AlterKeyword() { ! $keyid = mysql_real_escape_string($_POST['f_keyword_id']); ! $new_keyword_name = mysql_real_escape_string($_POST['new_keyword_name']); $alter_keyword_query = "update bbps_keywords set bbps_keyword_name = '$new_keyword_name' where bbps_keyword_id = '$keyid'"; *************** *** 298,303 **** if ((isset($_POST['delete'])) AND ($_POST['delete'] == "Delete Relation(s)")) { ! $bookmark_id = $_POST['relations']; ! $key_id = $_POST['key_id']; if (isset($bookmark_id)) { foreach($bookmark_id as $bm_id) { --- 298,303 ---- if ((isset($_POST['delete'])) AND ($_POST['delete'] == "Delete Relation(s)")) { ! $bookmark_id = mysql_real_escape_string($_POST['relations']); ! $key_id = mysql_real_escape_string($_POST['key_id']); if (isset($bookmark_id)) { foreach($bookmark_id as $bm_id) { *************** *** 334,338 **** // Don't do work twice :) function update_stylesheet() { ! $new_css = $_POST['stylesheet']; $query1 = "update bbps_admin set bbps_admin_keyword = 'css' where bbps_admin_keyword = 'default_css'"; $query2 = "update bbps_admin set bbps_admin_keyword = 'default_css' where bbps_admin_keyword_value = '$new_css'"; --- 334,338 ---- // Don't do work twice :) function update_stylesheet() { ! $new_css = mysql_real_escape_string($_POST['stylesheet']); $query1 = "update bbps_admin set bbps_admin_keyword = 'css' where bbps_admin_keyword = 'default_css'"; $query2 = "update bbps_admin set bbps_admin_keyword = 'default_css' where bbps_admin_keyword_value = '$new_css'"; *************** *** 344,349 **** global $CONF_PASSWORD; if (($_POST['new_password_2'] == $_POST['new_password_1']) and ($CONF_PASSWORD == $_POST['old_password'])) { ! $new_pw = $_POST['new_password_2']; ! $old_pw = $CONF_PASSWORD; $query = "update bbps_admin set bbps_admin_keyword_value = '$new_pw' where (bbps_admin_keyword = 'password' and bbps_admin_keyword_value = '$old_pw')"; $res = @mysql_query($query); --- 344,349 ---- global $CONF_PASSWORD; if (($_POST['new_password_2'] == $_POST['new_password_1']) and ($CONF_PASSWORD == $_POST['old_password'])) { ! $new_pw = mysql_real_escape_string($_POST['new_password_2']); ! $old_pw = mysql_real_escape_string($CONF_PASSWORD); $query = "update bbps_admin set bbps_admin_keyword_value = '$new_pw' where (bbps_admin_keyword = 'password' and bbps_admin_keyword_value = '$old_pw')"; $res = @mysql_query($query); Index: bookmark.php =================================================================== RCS file: /cvsroot/bbps/bbps/bookmark.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** bookmark.php 9 Sep 2005 14:44:14 -0000 1.25 --- bookmark.php 9 Feb 2006 03:51:39 -0000 1.26 *************** *** 24,28 **** } if (isset($_GET['action']) and $_GET['action'] == "list_byid" and $_SESSION['AUTHORIZED'] == TRUE) { ! $key_id = $_GET['key_id']; $query = "select bbps_keyword_name from bbps_keywords where bbps_keyword_id = '$key_id'"; $get_res = mysql_query($query) or die(mysql_error()); --- 24,28 ---- } if (isset($_GET['action']) and $_GET['action'] == "list_byid" and $_SESSION['AUTHORIZED'] == TRUE) { ! $key_id = mysql_real_escape_string($_GET['key_id']); $query = "select bbps_keyword_name from bbps_keywords where bbps_keyword_id = '$key_id'"; $get_res = mysql_query($query) or die(mysql_error()); *************** *** 74,78 **** function RemoveKeyword(){ $l_strNewAction = "del_kw"; ! $key_id = $_GET['key_id']; $query = "select bbps_keyword_name from bbps_keywords where bbps_keyword_id = '$key_id'"; $get_res = mysql_query($query) or die(mysql_error()); --- 74,78 ---- function RemoveKeyword(){ $l_strNewAction = "del_kw"; ! $key_id = mysql_real_escape_string($_GET['key_id']); $query = "select bbps_keyword_name from bbps_keywords where bbps_keyword_id = '$key_id'"; $get_res = mysql_query($query) or die(mysql_error()); *************** *** 88,92 **** function EditKeyword(){ $l_strNewAction = "alter_kw"; ! $key_id = $_GET['key_id']; $query = "select bbps_keyword_name from bbps_keywords where bbps_keyword_id = '$key_id'"; $get_res = mysql_query($query) or die(mysql_error()); --- 88,92 ---- function EditKeyword(){ $l_strNewAction = "alter_kw"; ! $key_id = mysql_real_escape_string($_GET['key_id']); $query = "select bbps_keyword_name from bbps_keywords where bbps_keyword_id = '$key_id'"; $get_res = mysql_query($query) or die(mysql_error()); *************** *** 179,183 **** $letter = $_GET['starting_with_letter']; $l_strWhere = " AND ((LEFT(bbps_bookmark_name, 1) = '$letter') or (LEFT(bbps_bookmark_name, 1) = UPPER('$letter')))"; ! $l_strTitle = "All bookmarks starting with ".$_GET['starting_with_letter']; } elseif('search'==$action){ --- 179,183 ---- $letter = $_GET['starting_with_letter']; $l_strWhere = " AND ((LEFT(bbps_bookmark_name, 1) = '$letter') or (LEFT(bbps_bookmark_name, 1) = UPPER('$letter')))"; ! $l_strTitle = "All bookmarks starting with ".$_GET['starting_with_letter']; } elseif('search'==$action){ *************** *** 185,189 **** $l_strTitle = "Search for '".$_POST['f_search']."' returned: "; if (isset($_POST['f_search']) and strlen($_POST['f_search'])>0) { ! $l_strWhere = sprintf(" (bbps_bookmark_comment like '%%%s%%' or bbps_bookmark_name like '%%%s%%') ORDER BY bbps_bookmark_name ASC", $_POST['f_search'], $_POST['f_search']); }else{ $l_bError = TRUE; --- 185,189 ---- $l_strTitle = "Search for '".$_POST['f_search']."' returned: "; if (isset($_POST['f_search']) and strlen($_POST['f_search'])>0) { ! $l_strWhere = sprintf(" (bbps_bookmark_comment like '%%%s%%' or bbps_bookmark_name like '%%%s%%') ORDER BY bbps_bookmark_name ASC", mysql_real_escape_string($_POST['f_search']), mysql_real_escape_string($_POST['f_search'])); }else{ $l_bError = TRUE; *************** *** 197,201 **** $l_nKeywordCount = count($l_arKeywords); // usamos la sesion ! $l_strWhere = sprintf(" AND %s ", $l_strKeywordsSQL); $l_strExtraSQL = ', COUNT(bbps_rel_bookmark_id) as cuenta'; }else{ --- 197,201 ---- $l_nKeywordCount = count($l_arKeywords); // usamos la sesion ! $l_strWhere = sprintf(" AND %s ", mysql_real_escape_string($l_strKeywordsSQL)); $l_strExtraSQL = ', COUNT(bbps_rel_bookmark_id) as cuenta'; }else{ *************** *** 215,219 **** // usamos la sesion // we used the session (BBF) ! $l_strWhere = sprintf(" AND %s ", $l_strKeywordsSQL); $l_strExtraSQL = ', COUNT(bbps_rel_bookmark_id) as cuenta'; //echo GetBookmarksByKeywordID($l_keyID); --- 215,219 ---- // usamos la sesion // we used the session (BBF) ! $l_strWhere = sprintf(" AND %s ", mysql_real_escape_string($l_strKeywordsSQL)); $l_strExtraSQL = ', COUNT(bbps_rel_bookmark_id) as cuenta'; //echo GetBookmarksByKeywordID($l_keyID); *************** *** 465,469 **** // check if the bookmark exists if (!$override_check) { ! $l_arSimilar = SimilarBookmarkExist($_POST['f_bookmark_url']); if($l_arSimilar!==FALSE){ // converting the POST info into hidden form data in case we want to override the existence of a similar bookmark --- 465,469 ---- // check if the bookmark exists if (!$override_check) { ! $l_arSimilar = SimilarBookmarkExist(mysql_real_escape_string($_POST['f_bookmark_url'])); if($l_arSimilar!==FALSE){ // converting the POST info into hidden form data in case we want to override the existence of a similar bookmark *************** *** 487,492 **** $l_strQuery .= " VALUES('%s', '%s', '%s', '%s', NULL, %s, %s)"; // ! $l_strQuery = sprintf( $l_strQuery, $_POST['f_bookmark_name'], $_POST['f_bookmark_comment'], $_POST['f_bookmark_url'], ! $_POST['f_bookmark_rating'], $l_isPrivate, $favicon_fname); // inserting the new bookmark in the DB --- 487,492 ---- $l_strQuery .= " VALUES('%s', '%s', '%s', '%s', NULL, %s, %s)"; // ! $l_strQuery = sprintf( $l_strQuery, mysql_real_escape_string($_POST['f_bookmark_name']), mysql_real_escape_string($_POST['f_bookmark_comment']), mysql_real_escape_string($_POST['f_bookmark_url']), ! mysql_real_escape_string($_POST['f_bookmark_rating']), $l_isPrivate, $favicon_fname); // inserting the new bookmark in the DB *************** *** 497,501 **** $l_arKeywords = split("\n", $_POST['f_bookmark_keyword_list'] ); $keyword = ""; ! foreach( $l_arKeywords as $keyword ){ $keyword = trim($keyword); // if the line is empty, we ignore it --- 497,501 ---- $l_arKeywords = split("\n", $_POST['f_bookmark_keyword_list'] ); $keyword = ""; ! foreach( $l_arKeywords as $keyword ){ $keyword = trim($keyword); // if the line is empty, we ignore it *************** *** 556,560 **** // we are only interested in fields, not in the submit button if(strpos($field,"f_")===FALSE) continue; ! $l_strBuffer .= sprintf( $l_strFieldTPL, $field, $value ); } --- 556,560 ---- // we are only interested in fields, not in the submit button if(strpos($field,"f_")===FALSE) continue; ! $l_strBuffer .= sprintf( $l_strFieldTPL, $field, htmlentities($value, ENT_QUOTES) ); } *************** *** 598,602 **** function AlterKeywordRelations() { $l_strNewAction = "alter_kw_relations"; ! $key_id = $_GET['key_id']; $query = "select bbps_keyword_name from bbps_keywords where bbps_keyword_id = '$key_id'"; $get_res = mysql_query($query) or die(mysql_error()); --- 598,602 ---- function AlterKeywordRelations() { $l_strNewAction = "alter_kw_relations"; ! $key_id = mysql_real_escape_string($_GET['key_id']); $query = "select bbps_keyword_name from bbps_keywords where bbps_keyword_id = '$key_id'"; $get_res = mysql_query($query) or die(mysql_error()); |
|
From: Christian O. <chr...@us...> - 2006-02-09 03:51:48
|
Update of /cvsroot/bbps/bbps/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22412/templates Modified Files: alter_keyword.tpl Log Message: hopefully the problems with apostrophes and such signs are gone. Index: alter_keyword.tpl =================================================================== RCS file: /cvsroot/bbps/bbps/templates/alter_keyword.tpl,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** alter_keyword.tpl 19 May 2005 16:46:45 -0000 1.23 --- alter_keyword.tpl 9 Feb 2006 03:51:40 -0000 1.24 *************** *** 13,17 **** $query = "SELECT bbps_bookmark_id, bbps_bookmark_name FROM bbps_bookmarks, bbps_rel_keywords_bookmarks WHERE bbps_rel_keywords_bookmarks.bbps_rel_bookmark_id = bbps_bookmarks.bbps_bookmark_id AND bbps_rel_keyword_id = '$key_id'"; ! $get_res = mysql_query($query); $number_of_keywords = mysql_num_rows($get_res); --- 13,17 ---- $query = "SELECT bbps_bookmark_id, bbps_bookmark_name FROM bbps_bookmarks, bbps_rel_keywords_bookmarks WHERE bbps_rel_keywords_bookmarks.bbps_rel_bookmark_id = bbps_bookmarks.bbps_bookmark_id AND bbps_rel_keyword_id = '$key_id'"; ! $get_res = mysql_query($query); $number_of_keywords = mysql_num_rows($get_res); |
|
From: Christian O. <chr...@us...> - 2005-10-18 22:20:21
|
Update of /cvsroot/bbps/bbps/sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17913/sql Modified Files: upgrade_schema.sql Log Message: added missing ; Index: upgrade_schema.sql =================================================================== RCS file: /cvsroot/bbps/bbps/sql/upgrade_schema.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** upgrade_schema.sql 9 Sep 2005 15:12:23 -0000 1.3 --- upgrade_schema.sql 18 Oct 2005 22:20:10 -0000 1.4 *************** *** 6,10 **** # Creating UNIQUES and dropping unused indexes ! ALTER TABLE `bbps_keywords` DROP INDEX `keyword_id` # Updating database to hold correct relations table without dupes --- 6,10 ---- # Creating UNIQUES and dropping unused indexes ! ALTER TABLE `bbps_keywords` DROP INDEX `keyword_id` ; # Updating database to hold correct relations table without dupes |
|
From: Maxim <wz...@us...> - 2005-09-09 15:13:36
|
Update of /cvsroot/bbps/bbps/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13411 Modified Files: CHANGELOG Log Message: Keywords aren't keywords anymore. Index: CHANGELOG =================================================================== RCS file: /cvsroot/bbps/bbps/docs/CHANGELOG,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CHANGELOG 9 Sep 2005 14:44:28 -0000 1.5 --- CHANGELOG 9 Sep 2005 15:13:27 -0000 1.6 *************** *** 12,22 **** September 7, 2005 ! * FIX - Fixed to relations editor to no longer generate duplicate keywords when entering an existing one ! * FIX - Fixed to bookmarks detail screen to no longer generate duplicate keywords when entering a keyword twice * CHANGE - Fixed the SQL to remove dupes and make future dupes impossible September 6, 2005 * CHANGE - Serious enhancement of the stylesheet and addition of a fourth stylesheet: black.css ! * FIX - Bookmark - keyword relations editor no longer creates double keywords if the 'new' keyword already exists * FIX - Favicons now always show up in 16px x 16px (I know, this is part of the stylesheet CHANGE above, but worth mentioning) * ADD - Checkbox in the adminpanel to explicitly ask for the rechecking for a favicon for the edited bookmark --- 12,22 ---- September 7, 2005 ! * FIX - Fixed to relations editor to no longer generate duplicate tags when entering an existing one ! * FIX - Fixed to bookmarks detail screen to no longer generate duplicate tags when entering a tag twice * CHANGE - Fixed the SQL to remove dupes and make future dupes impossible September 6, 2005 * CHANGE - Serious enhancement of the stylesheet and addition of a fourth stylesheet: black.css ! * FIX - Bookmark - tag relations editor no longer creates double tags if the 'new' tag already exists * FIX - Favicons now always show up in 16px x 16px (I know, this is part of the stylesheet CHANGE above, but worth mentioning) * ADD - Checkbox in the adminpanel to explicitly ask for the rechecking for a favicon for the edited bookmark |
|
From: Maxim <wz...@us...> - 2005-09-09 15:12:30
|
Update of /cvsroot/bbps/bbps/sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13090 Modified Files: upgrade_schema.sql Log Message: Oops. There was a database name in there. Shouldn't have been. Sorry. Index: upgrade_schema.sql =================================================================== RCS file: /cvsroot/bbps/bbps/sql/upgrade_schema.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** upgrade_schema.sql 9 Sep 2005 14:44:45 -0000 1.2 --- upgrade_schema.sql 9 Sep 2005 15:12:23 -0000 1.3 *************** *** 11,17 **** create temporary table temp select distinct * from bbps_rel_keywords_bookmarks; ! DROP TABLE IF EXISTS `db_bbps`.`bbps_rel_keywords_bookmarks` ; ! CREATE TABLE `db_bbps`.`bbps_rel_keywords_bookmarks` ( `bbps_rel_keyword_id` int( 10 ) unsigned NOT NULL default '0', `bbps_rel_bookmark_id` int( 10 ) unsigned NOT NULL default '0', --- 11,17 ---- create temporary table temp select distinct * from bbps_rel_keywords_bookmarks; ! DROP TABLE IF EXISTS `bbps_rel_keywords_bookmarks` ; ! CREATE TABLE `bbps_rel_keywords_bookmarks` ( `bbps_rel_keyword_id` int( 10 ) unsigned NOT NULL default '0', `bbps_rel_bookmark_id` int( 10 ) unsigned NOT NULL default '0', *************** *** 25,31 **** create temporary table temp2 select * from bbps_keywords group by upper(bbps_keyword_name); ! DROP TABLE IF EXISTS `db_bbps`.`bbps_keywords` ; ! CREATE TABLE `db_bbps`.`bbps_keywords` ( `bbps_keyword_id` int( 11 ) NOT NULL AUTO_INCREMENT , `bbps_keyword_name` varchar( 32 ) default NULL , --- 25,31 ---- create temporary table temp2 select * from bbps_keywords group by upper(bbps_keyword_name); ! DROP TABLE IF EXISTS `bbps_keywords` ; ! CREATE TABLE `bbps_keywords` ( `bbps_keyword_id` int( 11 ) NOT NULL AUTO_INCREMENT , `bbps_keyword_name` varchar( 32 ) default NULL , |
|
From: Maxim <wz...@us...> - 2005-09-09 14:50:15
|
Update of /cvsroot/bbps/bbps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7873 Modified Files: procesa.php Log Message: * Fixing silly typo b0rking bbps, not even worth mentioning in CHANGELOG :P Index: procesa.php =================================================================== RCS file: /cvsroot/bbps/bbps/procesa.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** procesa.php 9 Sep 2005 14:44:14 -0000 1.15 --- procesa.php 9 Sep 2005 14:50:07 -0000 1.16 *************** *** 41,45 **** if($_SESSION['AUTHORIZED']){ // redirect to index ! $redirect = makeRedirect(index.php); header($redirect); exit; --- 41,45 ---- if($_SESSION['AUTHORIZED']){ // redirect to index ! $redirect = makeRedirect('index.php'); header($redirect); exit; *************** *** 68,72 **** // setcookie("AUTHORIZED", "", $exp_time); // redirect to index ! $redirect = makeRedirect(index.php); header($redirect); exit; --- 68,72 ---- // setcookie("AUTHORIZED", "", $exp_time); // redirect to index ! $redirect = makeRedirect('index.php'); header($redirect); exit; *************** *** 139,143 **** } // redirect ! $redirect = makeRedirect(index.php); header($redirect); exit; --- 139,143 ---- } // redirect ! $redirect = makeRedirect('index.php'); header($redirect); exit; *************** *** 255,259 **** } ! $redirect = makeRedirect(index.php); header($redirect); } --- 255,259 ---- } ! $redirect = makeRedirect('index.php'); header($redirect); } *************** *** 270,274 **** $res1 = mysql_query($delete_relations_query) or die(mysql_error()); ! $redirect = makeRedirect(index.php); header($redirect); } --- 270,274 ---- $res1 = mysql_query($delete_relations_query) or die(mysql_error()); ! $redirect = makeRedirect('index.php'); header($redirect); } *************** *** 283,287 **** $alter_keyword_query = "update bbps_keywords set bbps_keyword_name = '$new_keyword_name' where bbps_keyword_id = '$keyid'"; $res1 = mysql_query($alter_keyword_query) or die(mysql_error()); ! $redirect = makeRedirect(index.php); header($redirect); } --- 283,287 ---- $alter_keyword_query = "update bbps_keywords set bbps_keyword_name = '$new_keyword_name' where bbps_keyword_id = '$keyid'"; $res1 = mysql_query($alter_keyword_query) or die(mysql_error()); ! $redirect = makeRedirect('index.php'); header($redirect); } *************** *** 325,329 **** } ! $redirect = makeRedirect(index.php); header($redirect); } --- 325,329 ---- } ! $redirect = makeRedirect('index.php'); header($redirect); } *************** *** 356,360 **** } // Redirect to index ! $redirect = makeRedirect(index.php); header($redirect); } --- 356,360 ---- } // Redirect to index ! $redirect = makeRedirect('index.php'); header($redirect); } |
|
From: Maxim <wz...@us...> - 2005-09-09 14:45:42
|
Update of /cvsroot/bbps/bbps/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6776 Modified Files: admin_panel.tpl _footer.tpl _header.tpl Log Message: * made orphanes searchable * fixed most of the bugs that were on sf.net * making some extra comments * made upgrade schema more complete * for more info, see CHANGELOG entries for September 7 and September 9, 2005. Index: _header.tpl =================================================================== RCS file: /cvsroot/bbps/bbps/templates/_header.tpl,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** _header.tpl 4 Jun 2005 21:53:16 -0000 1.33 --- _header.tpl 9 Sep 2005 14:45:34 -0000 1.34 *************** *** 19,25 **** <?php if($GLOBALS['CONF_ENABLE_AUTOCOMPLETE']){ ?> ! <script language="javascript" type="text/javascript" src="js/actb.js"></script> ! <script language="javascript" type="text/javascript" src="js/common.js"></script> ! <?php } ?> </head> <body> --- 19,29 ---- <?php if($GLOBALS['CONF_ENABLE_AUTOCOMPLETE']){ ?> ! <script language="text/javascript" type="text/javascript" src="js/actb.js"></script> ! <script language="text/javascript" type="text/javascript" src="js/common.js"></script> ! <? ! if (DEBUG == TRUE) { ! echo '<script type="text/javascript">var starttime = new Date().getTime();</script>'; ! } ! } ?> </head> <body> Index: admin_panel.tpl =================================================================== RCS file: /cvsroot/bbps/bbps/templates/admin_panel.tpl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** admin_panel.tpl 5 Jun 2005 16:24:33 -0000 1.15 --- admin_panel.tpl 9 Sep 2005 14:45:34 -0000 1.16 *************** *** 54,58 **** </form> <? ! if (DEBUG == 1) { echo "<br>"; echo "<b>Debug information:</b><br>"; --- 54,58 ---- </form> <? ! if (DEBUG == TRUE) { echo "<br>"; echo "<b>Debug information:</b><br>"; Index: _footer.tpl =================================================================== RCS file: /cvsroot/bbps/bbps/templates/_footer.tpl,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** _footer.tpl 29 Apr 2005 09:22:41 -0000 1.22 --- _footer.tpl 9 Sep 2005 14:45:34 -0000 1.23 *************** *** 10,14 **** </p> </div> ! <script type="javascript">window.status='Parsetime: <? echo timing('end'); ?> ';</script> </body> </html> --- 10,21 ---- </p> </div> ! <? if (DEBUG == TRUE) { ! ?> ! <script type="text/javascript"> ! var parsetime = ((new Date().getTime() - starttime) / 1000); ! window.status='Remote parsetime: <? echo timing('end'); ?>, local parsetime: '+parsetime+'';</script> </body> + <? + } + ?> </html> |
|
From: Maxim <wz...@us...> - 2005-09-09 14:44:52
|
Update of /cvsroot/bbps/bbps/sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6578 Modified Files: upgrade_schema.sql Log Message: * made orphanes searchable * fixed most of the bugs that were on sf.net * making some extra comments * made upgrade schema more complete * for more info, see CHANGELOG entries for September 7 and September 9, 2005. Index: upgrade_schema.sql =================================================================== RCS file: /cvsroot/bbps/bbps/sql/upgrade_schema.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** upgrade_schema.sql 6 Sep 2005 18:07:36 -0000 1.1 --- upgrade_schema.sql 9 Sep 2005 14:44:45 -0000 1.2 *************** *** 4,5 **** --- 4,36 ---- # Insert new stylesheet into the Admin-Panel INSERT INTO `bbps_admin` VALUES ('css', 'black.css', 'Green on black stylesheet'); + + # Creating UNIQUES and dropping unused indexes + ALTER TABLE `bbps_keywords` DROP INDEX `keyword_id` + + # Updating database to hold correct relations table without dupes + create temporary table temp select distinct * from bbps_rel_keywords_bookmarks; + + DROP TABLE IF EXISTS `db_bbps`.`bbps_rel_keywords_bookmarks` ; + + CREATE TABLE `db_bbps`.`bbps_rel_keywords_bookmarks` ( + `bbps_rel_keyword_id` int( 10 ) unsigned NOT NULL default '0', + `bbps_rel_bookmark_id` int( 10 ) unsigned NOT NULL default '0', + UNIQUE KEY `rel_keyword_id` ( `bbps_rel_keyword_id` , `bbps_rel_bookmark_id` ) + ) TYPE = MYISAM ; + + insert into bbps_rel_keywords_bookmarks select * from temp; + + # Partial updating of keywords table. Not done yet. + + create temporary table temp2 select * from bbps_keywords group by upper(bbps_keyword_name); + + DROP TABLE IF EXISTS `db_bbps`.`bbps_keywords` ; + + CREATE TABLE `db_bbps`.`bbps_keywords` ( + `bbps_keyword_id` int( 11 ) NOT NULL AUTO_INCREMENT , + `bbps_keyword_name` varchar( 32 ) default NULL , + PRIMARY KEY ( `bbps_keyword_id` ) , + UNIQUE KEY `bbps_keyword_name` ( `bbps_keyword_name` ) + ) TYPE = MYISAM ; + + insert into bbps_keywords select * from temp2; |
|
From: Maxim <wz...@us...> - 2005-09-09 14:44:39
|
Update of /cvsroot/bbps/bbps/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6495 Modified Files: CHANGELOG Log Message: * made orphanes searchable * fixed most of the bugs that were on sf.net * making some extra comments * made upgrade schema more complete * for more info, see CHANGELOG entries for September 7 and September 9, 2005. Index: CHANGELOG =================================================================== RCS file: /cvsroot/bbps/bbps/docs/CHANGELOG,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CHANGELOG 7 Sep 2005 09:12:49 -0000 1.4 --- CHANGELOG 9 Sep 2005 14:44:28 -0000 1.5 *************** *** 1,4 **** --- 1,19 ---- Last Update: $Date$ + September 9, 2005 + * FIX - Orpaned bookmarks turn up in a search now + * FIX - Applied the division by zero error from BUG 1210238: + an empty bbps_cat_rating no longer generates an error, just an empty rating for all bookmarks + * FIX - Some extra comments in bookmark.php and _init.php.orig + * FIX - Fixed the redirect error in bbps, which created a second slash (like http://www.yourhost.com//) + * CHANGE - Parsetime is now only shown when DEBUG is true. Also added client parsetime in statusbar with same restrictions. + * FIX - Updated the upgrade_schema.sql file. Hope it works... /me hides + * NOTICE - When upgrading from an older version and using the above mentioned schema, please MAKE A BACKUP OF YOUR DATABASE FIRST! + + September 7, 2005 + * FIX - Fixed to relations editor to no longer generate duplicate keywords when entering an existing one + * FIX - Fixed to bookmarks detail screen to no longer generate duplicate keywords when entering a keyword twice + * CHANGE - Fixed the SQL to remove dupes and make future dupes impossible + September 6, 2005 * CHANGE - Serious enhancement of the stylesheet and addition of a fourth stylesheet: black.css |
|
From: Maxim <wz...@us...> - 2005-09-09 14:44:23
|
Update of /cvsroot/bbps/bbps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6419 Modified Files: bookmark.php procesa.php support_functions.php _init.php.orig Log Message: * made orphanes searchable * fixed most of the bugs that were on sf.net * making some extra comments * made upgrade schema more complete * for more info, see CHANGELOG entries for September 7 and September 9, 2005. Index: support_functions.php =================================================================== RCS file: /cvsroot/bbps/bbps/support_functions.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** support_functions.php 4 Jun 2005 21:09:57 -0000 1.2 --- support_functions.php 9 Sep 2005 14:44:14 -0000 1.3 *************** *** 136,138 **** function GetParameter($parameter_name, $default = null){ return isset($_GET[$parameter_name]) ? $_GET[$parameter_name] : $default; ! } \ No newline at end of file --- 136,157 ---- function GetParameter($parameter_name, $default = null){ return isset($_GET[$parameter_name]) ? $_GET[$parameter_name] : $default; ! } ! ! /** ! * @param string $page optional name of page to redirect to, if not to ./ ! * @desc creating location to redirect to, eliminating the extra slash in URL's which used to break bbps after a search ! * return string returns the location bbps should redirect to, whether it's installed in a rootdir or a subdir ! */ ! ! function makeRedirect($page='') { ! ! $dir = dirname($_SERVER['PHP_SELF']); ! ! if ( $dir == "/") { ! $dir = ""; ! } ! ! $location = "Location: http://".$_SERVER['HTTP_HOST'].$dir."/".$page; ! return $location; ! ! } Index: procesa.php =================================================================== RCS file: /cvsroot/bbps/bbps/procesa.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** procesa.php 6 Sep 2005 20:23:16 -0000 1.14 --- procesa.php 9 Sep 2005 14:44:14 -0000 1.15 *************** *** 41,45 **** if($_SESSION['AUTHORIZED']){ // redirect to index ! header("Location: http://".$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/"); exit; }else{ --- 41,46 ---- if($_SESSION['AUTHORIZED']){ // redirect to index ! $redirect = makeRedirect(index.php); ! header($redirect); exit; }else{ *************** *** 67,71 **** // setcookie("AUTHORIZED", "", $exp_time); // redirect to index ! header("Location: http://".$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/"); exit; } --- 68,73 ---- // setcookie("AUTHORIZED", "", $exp_time); // redirect to index ! $redirect = makeRedirect(index.php); ! header($redirect); exit; } *************** *** 75,79 **** * Stores changes to a bookmark */ ! function SaveBookmark(){ // we save the previous state of the bookmark so that we can compare changes // TODO: is better to compare against the db. --- 77,81 ---- * Stores changes to a bookmark */ ! function SaveBookmark(){ // we save the previous state of the bookmark so that we can compare changes // TODO: is better to compare against the db. *************** *** 87,91 **** ! if ($_POST['f_bookmark_recheck_bookmark'] == TRUE) { // Fetching or updating bookmark favicon $favicon_fname = DownloadFavicon($_POST['f_bookmark_url']); --- 89,93 ---- ! if (isset($_POST['f_bookmark_recheck_bookmark']) and $_POST['f_bookmark_recheck_bookmark'] == TRUE) { // Fetching or updating bookmark favicon $favicon_fname = DownloadFavicon($_POST['f_bookmark_url']); *************** *** 107,111 **** mysql_query( $l_strQuery ) or die(mysql_error()); ! // process keywords $l_arKeywords = split("\n", $_POST['f_bookmark_keyword_list'] ); $keyword = ""; --- 109,113 ---- mysql_query( $l_strQuery ) or die(mysql_error()); ! // process submitted keywords $l_arKeywords = split("\n", $_POST['f_bookmark_keyword_list'] ); $keyword = ""; *************** *** 122,126 **** $l_nKeyPos = array_search($keyword_name, $l_currKeywords); ! // the next line makes the program accept only php 4.2 (because of array_search). This will be fixed later. if ($l_nKeyPos !== FALSE ) { // we erase the keyword from the backup. The ones left at the end are be the ones that were erased. --- 124,128 ---- $l_nKeyPos = array_search($keyword_name, $l_currKeywords); ! // the next line makes the program accept only php 4.2 and above (because of array_search). This will be fixed later. if ($l_nKeyPos !== FALSE ) { // we erase the keyword from the backup. The ones left at the end are be the ones that were erased. *************** *** 137,141 **** } // redirect ! header("Location: http://".$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/index.php"); exit; } --- 139,144 ---- } // redirect ! $redirect = makeRedirect(index.php); ! header($redirect); exit; } *************** *** 216,220 **** $l_strQuery = sprintf( $l_strQuery, $keyword_name ); // adding the keyword ! mysql_query($l_strQuery) or die(mysql_error()); // return the new id return mysql_insert_id(); --- 219,223 ---- $l_strQuery = sprintf( $l_strQuery, $keyword_name ); // adding the keyword ! mysql_query($l_strQuery) or die (mysql_errno()); // return the new id return mysql_insert_id(); *************** *** 252,256 **** } ! header("Location: http://".$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/index.php"); } --- 255,260 ---- } ! $redirect = makeRedirect(index.php); ! header($redirect); } *************** *** 266,270 **** $res1 = mysql_query($delete_relations_query) or die(mysql_error()); ! header("Location: http://".$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/index.php"); } --- 270,275 ---- $res1 = mysql_query($delete_relations_query) or die(mysql_error()); ! $redirect = makeRedirect(index.php); ! header($redirect); } *************** *** 278,282 **** $alter_keyword_query = "update bbps_keywords set bbps_keyword_name = '$new_keyword_name' where bbps_keyword_id = '$keyid'"; $res1 = mysql_query($alter_keyword_query) or die(mysql_error()); ! header("Location: http://".$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/index.php"); } --- 283,288 ---- $alter_keyword_query = "update bbps_keywords set bbps_keyword_name = '$new_keyword_name' where bbps_keyword_id = '$keyid'"; $res1 = mysql_query($alter_keyword_query) or die(mysql_error()); ! $redirect = makeRedirect(index.php); ! header($redirect); } *************** *** 302,317 **** } elseif ($_POST['add'] == "Add New Tag") { ! $keyword_id = AddKeyword($_POST['new_keyword']); $bookmark_id = $_POST['relations']; ! ! if (isset($bookmark_id)) { foreach($bookmark_id as $bm_id) { ! LinkKeywordToBookmark($keyword_id, $bm_id); } } } ! header("Location: http://".$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/index.php"); } --- 308,330 ---- } elseif ($_POST['add'] == "Add New Tag") { ! // Check existence of keyword ! $l_nKeywordID = FindKeywordID( $_POST['new_keyword'] ); ! if( $l_nKeywordID == -1 ){ ! // keyword does not exit. Add it and link it. ! $l_nKeywordID = AddKeyword( $keyword_name ); ! } $bookmark_id = $_POST['relations']; ! ! // Make new links to the keyword from each of the submitted bookmarks ! if (isset($bookmark_id)) { foreach($bookmark_id as $bm_id) { ! LinkKeywordToBookmark($l_nKeywordID, $bm_id); } } } ! $redirect = makeRedirect(index.php); ! header($redirect); } *************** *** 343,347 **** } // Redirect to index ! header("Location: http://".$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/index.php"); } --- 356,361 ---- } // Redirect to index ! $redirect = makeRedirect(index.php); ! header($redirect); } Index: _init.php.orig =================================================================== RCS file: /cvsroot/bbps/bbps/_init.php.orig,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** _init.php.orig 4 Jun 2005 21:52:54 -0000 1.12 --- _init.php.orig 9 Sep 2005 14:44:14 -0000 1.13 *************** *** 78,81 **** --- 78,85 ---- // special when people you rate might be visiting your bookmarks and you dont want them to // see the rating you gave them + // + // Make sure you fill the table bbps_cat_ratings if you enable this option! + // Just enter an ID and a name for each rating, starting from [1], [Not too good] to [5], [Brilliant] for example + // The default schema for bbps does NOT include this! You can choose your own amount of ratings and name them. // $CONF_DISPLAY_RATING = TRUE; Index: bookmark.php =================================================================== RCS file: /cvsroot/bbps/bbps/bookmark.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** bookmark.php 7 Sep 2005 00:39:55 -0000 1.24 --- bookmark.php 9 Sep 2005 14:44:14 -0000 1.25 *************** *** 185,189 **** $l_strTitle = "Search for '".$_POST['f_search']."' returned: "; if (isset($_POST['f_search']) and strlen($_POST['f_search'])>0) { ! $l_strWhere = sprintf(" AND (bbps_bookmark_comment like '%%%s%%' or bbps_bookmark_name like '%%%s%%') ORDER BY bbps_bookmark_name ASC", $_POST['f_search'], $_POST['f_search']); }else{ $l_bError = TRUE; --- 185,189 ---- $l_strTitle = "Search for '".$_POST['f_search']."' returned: "; if (isset($_POST['f_search']) and strlen($_POST['f_search'])>0) { ! $l_strWhere = sprintf(" (bbps_bookmark_comment like '%%%s%%' or bbps_bookmark_name like '%%%s%%') ORDER BY bbps_bookmark_name ASC", $_POST['f_search'], $_POST['f_search']); }else{ $l_bError = TRUE; *************** *** 287,293 **** --- 287,300 ---- $l_strQueryKeywords = "SELECT DISTINCT bbps_keyword_id, bbps_keyword_name FROM bbps_keywords, bbps_rel_keywords_bookmarks WHERE bbps_rel_keyword_id=bbps_keyword_id AND bbps_rel_bookmark_id=%s"; + // Orphan catcher if (eregi("LEFT JOIN", $sql_where)) { $l_strQuery = $sql_where; } + // Search query (has to differ from below in order to search orpaned bookmarks too) + elseif (eregi("like", $sql_where)) { + $l_strQuery = "SELECT DISTINCT bbps_bookmarks.* FROM bbps_bookmarks WHERE %s "; + $l_strQuery = sprintf($l_strQuery, $sql_extra, $_SESSION['AUTHORIZED'] ? '' : ' AND bbps_bookmark_private = 0 ' ).$sql_where; + } + // Normal bookmarklist query else { $l_strQuery = "SELECT DISTINCT bbps_bookmarks.* %s FROM bbps_bookmarks, bbps_rel_keywords_bookmarks WHERE bbps_rel_bookmark_id=bbps_bookmark_id %s "; *************** *** 411,417 **** $RatingAmount = mysql_num_rows($GetRatingAmount); ! $Rating = (round(($curr_rating / $RatingAmount) * 10) /2); ! $RoundedRating = round($Rating,1); ! if ($text == "yes") { echo $l_strBuffer['bbps_rating_description']." <img align=\"".$align."\" src=\"images/".$RoundedRating.".png\" title=\"".$l_strBuffer['bbps_rating_description']."\" alt=\"".$l_strBuffer['bbps_rating_description']."\">"; --- 418,430 ---- $RatingAmount = mysql_num_rows($GetRatingAmount); ! //$Rating = (round(($curr_rating / $RatingAmount) * 10) /2); ! // Fix divide by zero error by daviddudek ! if ($RatingAmount != 0) { ! $Rating = (round(($curr_rating / $RatingAmount) * 10) /2); ! } else { ! $Rating = 0; ! } ! $RoundedRating = round($Rating,1); ! if ($text == "yes") { echo $l_strBuffer['bbps_rating_description']." <img align=\"".$align."\" src=\"images/".$RoundedRating.".png\" title=\"".$l_strBuffer['bbps_rating_description']."\" alt=\"".$l_strBuffer['bbps_rating_description']."\">"; *************** *** 493,497 **** // redirecting ! header("Location: http://".$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/"); exit; } --- 506,511 ---- // redirecting ! $redirect = makeRedirect(); ! header($redirect); exit; } |
|
From: Maxim <wz...@us...> - 2005-09-07 09:13:00
|
Update of /cvsroot/bbps/bbps/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17242 Modified Files: CHANGELOG Log Message: Updates on our way to 0.8 Index: CHANGELOG =================================================================== RCS file: /cvsroot/bbps/bbps/docs/CHANGELOG,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CHANGELOG 4 Jun 2005 21:53:01 -0000 1.3 --- CHANGELOG 7 Sep 2005 09:12:49 -0000 1.4 *************** *** 1,7 **** --- 1,17 ---- Last Update: $Date$ + September 6, 2005 + * CHANGE - Serious enhancement of the stylesheet and addition of a fourth stylesheet: black.css + * FIX - Bookmark - keyword relations editor no longer creates double keywords if the 'new' keyword already exists + * FIX - Favicons now always show up in 16px x 16px (I know, this is part of the stylesheet CHANGE above, but worth mentioning) + * ADD - Checkbox in the adminpanel to explicitly ask for the rechecking for a favicon for the edited bookmark + * ADD - 'Random' link in the top navigation bar, for those really bored :) + * FIX - Some old code cleanup up + * FIX - Internet Explorer layout fixed (has been done weeks earlier, never showed up here :P) + June 4, 2005 * ADD - initial autocomplete support (thanks to zichun for http://www.codeproject.com/jscript/jsactb.asp) * ADD - finally favicon support is working, but needs more testing + * CHANGE - Keywords are now called tags externally * FIX - small fixes (variables not initialized or null) * CHANGE - moved the docs and stylesheets from the root folder into the /doc ands /css directories respectively |
|
From: Christian O. <chr...@us...> - 2005-09-07 00:40:03
|
Update of /cvsroot/bbps/bbps/css In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27512/css Modified Files: Gentoo.css black.css brown.css style.css Log Message: now we have really working favicon size Index: Gentoo.css =================================================================== RCS file: /cvsroot/bbps/bbps/css/Gentoo.css,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Gentoo.css 6 Sep 2005 20:23:51 -0000 1.3 --- Gentoo.css 7 Sep 2005 00:39:55 -0000 1.4 *************** *** 250,253 **** .favicon { height: 16px; ! width: 16px; ! } --- 250,252 ---- .favicon { height: 16px; ! } Index: style.css =================================================================== RCS file: /cvsroot/bbps/bbps/css/style.css,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** style.css 6 Sep 2005 20:23:51 -0000 1.3 --- style.css 7 Sep 2005 00:39:55 -0000 1.4 *************** *** 228,231 **** .favicon { height: 16px; ! width: 16px; ! } --- 228,230 ---- .favicon { height: 16px; ! } Index: brown.css =================================================================== RCS file: /cvsroot/bbps/bbps/css/brown.css,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** brown.css 6 Sep 2005 20:23:51 -0000 1.3 --- brown.css 7 Sep 2005 00:39:55 -0000 1.4 *************** *** 234,237 **** .favicon { height: 16px; ! width: 16px; ! } --- 234,236 ---- .favicon { height: 16px; ! } Index: black.css =================================================================== RCS file: /cvsroot/bbps/bbps/css/black.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** black.css 6 Sep 2005 17:03:43 -0000 1.1 --- black.css 7 Sep 2005 00:39:55 -0000 1.2 *************** *** 252,253 **** --- 252,257 ---- font-size: small; } + .favicon { + height: 16px; + } + \ No newline at end of file |
|
From: Christian O. <chr...@us...> - 2005-09-07 00:40:03
|
Update of /cvsroot/bbps/bbps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27512 Modified Files: bookmark.php Log Message: now we have really working favicon size Index: bookmark.php =================================================================== RCS file: /cvsroot/bbps/bbps/bookmark.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** bookmark.php 6 Sep 2005 17:03:43 -0000 1.23 --- bookmark.php 7 Sep 2005 00:39:55 -0000 1.24 *************** *** 370,374 **** $favicon = ''; if($GLOBALS['CONF_ENABLE_FAVICONS']){ ! $favicon_tpl = '<img src="./%s/%s" align="middle" alt="FavIcon" /> '; if(!is_null($bookmark['bbps_bookmark_favicon']) and strlen($bookmark['bbps_bookmark_favicon'])){ $favicon = sprintf($favicon_tpl, $GLOBALS['CONF_FAVICON_DIR'], $bookmark['bbps_bookmark_favicon']); --- 370,374 ---- $favicon = ''; if($GLOBALS['CONF_ENABLE_FAVICONS']){ ! $favicon_tpl = '<img src="./%s/%s" align="middle" alt="FavIcon" class="favicon" /> '; if(!is_null($bookmark['bbps_bookmark_favicon']) and strlen($bookmark['bbps_bookmark_favicon'])){ $favicon = sprintf($favicon_tpl, $GLOBALS['CONF_FAVICON_DIR'], $bookmark['bbps_bookmark_favicon']); |
|
From: Maxim <wz...@us...> - 2005-09-06 20:23:58
|
Update of /cvsroot/bbps/bbps/css In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30728 Modified Files: brown.css Gentoo.css style.css Log Message: Added 'random link' at top of the page. Resized favicons to 16x16 in css. Rechecking for favicons when editing bookmarks now 'on demand', i.e. by setting a checkbox in bookmark editting screen. Some cleanup of old code. Index: Gentoo.css =================================================================== RCS file: /cvsroot/bbps/bbps/css/Gentoo.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Gentoo.css 6 Sep 2005 17:03:43 -0000 1.2 --- Gentoo.css 6 Sep 2005 20:23:51 -0000 1.3 *************** *** 247,248 **** --- 247,253 ---- font-size: small; } + + .favicon { + height: 16px; + width: 16px; + } Index: style.css =================================================================== RCS file: /cvsroot/bbps/bbps/css/style.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** style.css 6 Sep 2005 17:03:43 -0000 1.2 --- style.css 6 Sep 2005 20:23:51 -0000 1.3 *************** *** 225,226 **** --- 225,231 ---- font-size: small; } + + .favicon { + height: 16px; + width: 16px; + } Index: brown.css =================================================================== RCS file: /cvsroot/bbps/bbps/css/brown.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** brown.css 6 Sep 2005 17:03:43 -0000 1.2 --- brown.css 6 Sep 2005 20:23:51 -0000 1.3 *************** *** 232,233 **** --- 232,237 ---- + .favicon { + height: 16px; + width: 16px; + } |
|
From: Maxim <wz...@us...> - 2005-09-06 20:23:46
|
Update of /cvsroot/bbps/bbps/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30673 Modified Files: bookmark_detail.tpl index.tpl Log Message: Added 'random link' at top of the page. Resized favicons to 16x16 in css. Rechecking for favicons when editing bookmarks now 'on demand', i.e. by setting a checkbox in bookmark editting screen. Some cleanup of old code. Index: bookmark_detail.tpl =================================================================== RCS file: /cvsroot/bbps/bbps/templates/bookmark_detail.tpl,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** bookmark_detail.tpl 4 Jun 2005 21:53:16 -0000 1.75 --- bookmark_detail.tpl 6 Sep 2005 20:23:38 -0000 1.76 *************** *** 44,48 **** <tr valign="top"> <td><label class="label" for="f_bookmark_private" accesskey="p"><span class="accesskey">P</span>rivate</label></td> ! <td><input type="checkbox" id="f_bookmark_private" name="f_bookmark_private" value="1" <?php echo $bookmark_is_private ?> /> </tr> </table> --- 44,52 ---- <tr valign="top"> <td><label class="label" for="f_bookmark_private" accesskey="p"><span class="accesskey">P</span>rivate</label></td> ! <td><input type="checkbox" id="f_bookmark_private" name="f_bookmark_private" value="1" <?php echo $bookmark_is_private ?> /><td> ! </tr> ! <tr valign="top"> ! <td><label class="label" for="f_bookmark_recheck_bookmark" accesskey="p"><span class="accesskey">R</span>echeck favicon</label></td> ! <td><input type="checkbox" id="f_bookmark_recheck_bookmark" name="f_bookmark_recheck_bookmark" value="1"/> Current: <img src="<?php echo $GLOBALS['CONF_FAVICON_DIR']."/".$bookmark['bbps_bookmark_favicon']; ?>" title="favicon" alt="None"/> <td> </tr> </table> Index: index.tpl =================================================================== RCS file: /cvsroot/bbps/bbps/templates/index.tpl,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** index.tpl 6 Sep 2005 17:03:43 -0000 1.88 --- index.tpl 6 Sep 2005 20:23:38 -0000 1.89 *************** *** 1,3 **** - <div id="header"> <div style="width:20%; top:10px;"> --- 1,2 ---- *************** *** 45,49 **** <a href="./index.php?action=admin" title="Edit you password, colours etc.">Adminpanel</a> - <a href="./index.php?action=stats" title="Bookmark statistics">Statistics</a> - ! <?php } ?><a href="./index.php?action=mostvisited" title="List of most visited bookmarks">Most visited</a> - <?php if ($CONF_DISPLAY_RATING == TRUE) { ?> --- 44,51 ---- <a href="./index.php?action=admin" title="Edit you password, colours etc.">Adminpanel</a> - <a href="./index.php?action=stats" title="Bookmark statistics">Statistics</a> - ! <?php } ! ?> ! <a href="./index.php?action=mostvisited" title="List of most visited bookmarks">Most visited</a> - ! <a href="./redirector.php?bid=<?php echo randomBookmark(); ?>" title="Take me directly to a random bookmarked site">Random site</a> - <?php if ($CONF_DISPLAY_RATING == TRUE) { ?> *************** *** 98,100 **** <!-- Better remove this: <div class="spacer"> </div> --> ! </div> \ No newline at end of file --- 100,102 ---- <!-- Better remove this: <div class="spacer"> </div> --> ! </div> |
|
From: Maxim <wz...@us...> - 2005-09-06 20:23:24
|
Update of /cvsroot/bbps/bbps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30579 Modified Files: index.php procesa.php Log Message: Added 'random link' at top of the page. Resized favicons to 16x16 in css. Rechecking for favicons when editing bookmarks now 'on demand', i.e. by setting a checkbox in bookmark editting screen. Some cleanup of old code. Index: procesa.php =================================================================== RCS file: /cvsroot/bbps/bbps/procesa.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** procesa.php 19 May 2005 16:46:44 -0000 1.13 --- procesa.php 6 Sep 2005 20:23:16 -0000 1.14 *************** *** 33,39 **** $_SESSION['AUTHORIZED'] = $_POST['f_password'] == $GLOBALS['CONF_PASSWORD']; $_SESSION['CAN_EDIT'] = ((BBPS_MODIFY_AUTH == $GLOBALS['CONF_MODIFY']) AND $_SESSION['AUTHORIZED']) OR BBPS_MODIFY_ANYONE == $GLOBALS['CONF_MODIFY']; - //if ($_POST['f_password'] == $GLOBALS['CONF_PASSWORD']) $_SESSION['AUTHORIZED'] = true; - //if (((BBPS_MODIFY_AUTH == $GLOBALS['CONF_MODIFY']) AND $_SESSION['AUTHORIZED']) OR BBPS_MODIFY_ANYONE == $GLOBALS['CONF_MODIFY']) $_SESSION['CAN_EDIT'] = true; if($_SESSION['AUTHORIZED']){ --- 33,41 ---- $_SESSION['AUTHORIZED'] = $_POST['f_password'] == $GLOBALS['CONF_PASSWORD']; $_SESSION['CAN_EDIT'] = ((BBPS_MODIFY_AUTH == $GLOBALS['CONF_MODIFY']) AND $_SESSION['AUTHORIZED']) OR BBPS_MODIFY_ANYONE == $GLOBALS['CONF_MODIFY']; + // Something here like + // if RANDOM_NUMBER_IN_COOKIE == NUMBER_IN_TABLE + // so we can resume session even if browser has been closed and session destroyed + // after check cookie will be destroyed and new one with different random number made if($_SESSION['AUTHORIZED']){ *************** *** 78,87 **** $l_prevBookmarkInfo = GetBookmarkData( $_POST['f_bookmark_id'] ); $l_currKeywords = split("\n", $l_prevBookmarkInfo['bbps_bookmark_keywords']); unset($l_prevBookmarkInfo); $l_isPrivate = isset($_POST['f_bookmark_private']) ? 1 : 0; // updating the bookmark ! $l_strQuery = "UPDATE bbps_bookmarks set bbps_bookmark_name='%s', bbps_bookmark_comment='%s', bbps_bookmark_url='%s', bbps_bookmark_rating='%s', bbps_bookmark_private=%s WHERE bbps_bookmark_id=%s"; ! $l_strQuery = sprintf( $l_strQuery, $_POST['f_bookmark_name'], $_POST['f_bookmark_comment'], $_POST['f_bookmark_url'], $_POST['f_bookmark_rating'], $l_isPrivate, $_POST['f_bookmark_id'] ); // insert the new bookmark --- 80,106 ---- $l_prevBookmarkInfo = GetBookmarkData( $_POST['f_bookmark_id'] ); $l_currKeywords = split("\n", $l_prevBookmarkInfo['bbps_bookmark_keywords']); + $oldFavicon = $l_prevBookmarkInfo['bbps_bookmark_favicon']; unset($l_prevBookmarkInfo); + // Checking private state of bookmark $l_isPrivate = isset($_POST['f_bookmark_private']) ? 1 : 0; + + + if ($_POST['f_bookmark_recheck_bookmark'] == TRUE) { + // Fetching or updating bookmark favicon + $favicon_fname = DownloadFavicon($_POST['f_bookmark_url']); + $favicon_fname = (is_null($favicon_fname) or 0==strlen($favicon_fname)) ? "''" : "'$favicon_fname'"; + // if a new favicon is downloaded, delete the old one to avoid cluttering the favicon directory + if (!empty($oldFavicon)) { + // unset($oldFavicon); + $pathToFavicon = $GLOBALS['CONF_FAVICON_DIR']."/".$oldFavicon; + @unlink($pathToFavicon); + } + } + else $favicon_fname = "'$oldFavicon'"; + // updating the bookmark ! $l_strQuery = "UPDATE bbps_bookmarks set bbps_bookmark_name='%s', bbps_bookmark_comment='%s', bbps_bookmark_url='%s', bbps_bookmark_rating='%s', bbps_bookmark_private=%s, bbps_bookmark_favicon=%s WHERE bbps_bookmark_id=%s"; ! $l_strQuery = sprintf( $l_strQuery, $_POST['f_bookmark_name'], $_POST['f_bookmark_comment'], $_POST['f_bookmark_url'], $_POST['f_bookmark_rating'], $l_isPrivate, $favicon_fname, $_POST['f_bookmark_id'] ); // insert the new bookmark Index: index.php =================================================================== RCS file: /cvsroot/bbps/bbps/index.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** index.php 17 May 2005 18:46:16 -0000 1.9 --- index.php 6 Sep 2005 20:23:15 -0000 1.10 *************** *** 99,104 **** $l_param1 = 'keysearch'; unset($l_param2); ! break; ! default: $l_param1 = 'mostvisited'; --- 99,103 ---- $l_param1 = 'keysearch'; unset($l_param2); ! break; default: $l_param1 = 'mostvisited'; *************** *** 124,127 **** --- 123,138 ---- if (!$CONF_IS_EMBEDDED) include("./templates/_footer.tpl"); + + /** + * @desc generating a random bbps_bookmark_id directly from sql + * this prevents linking to deleted bookmarks which would happen with a php generated random bbps_bookmark_id + * @return int Returns an integer relating to a bbps_bookmark_id in bbps_bookmarks + */ + function randomBookmark() { + $query = "select `bbps_bookmark_id` from bbps_bookmarks order by rand() limit 0,1"; + $res = mysql_query($query); + $bbps_bookmark_id = mysql_fetch_array($res); + return $bbps_bookmark_id[0]; + } ?> |
|
From: Christian O. <chr...@us...> - 2005-09-06 18:07:49
|
Update of /cvsroot/bbps/bbps/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23770/docs Modified Files: INSTALL Log Message: added some docs and SQL about upgrading Index: INSTALL =================================================================== RCS file: /cvsroot/bbps/bbps/docs/INSTALL,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** INSTALL 4 Jun 2005 19:08:54 -0000 1.1 --- INSTALL 6 Sep 2005 18:07:36 -0000 1.2 *************** *** 1,9 **** +----------------------------------------------------------------+ | INSTALLATION INSTRUCTIONS | - <<<<<<< INSTALL - | Last Update: $Date$ - ======= | Last Update: $Date$ - >>>>>>> 1.8 +----------------------------------------------------------------+ --- 1,5 ---- *************** *** 33,44 **** 5. That should be it. - <<<<<<< INSTALL - 6. Optional. Add the following bookmarklet to ease adding bookmarks (edit and change "<SERVER_HERE>") - - javascript:document.location = 'http://<SERVER_HERE>/bbps/?action=new_bm&bm_name=' + escape(document.title) + '&bm_url=' +escape(document.location) - ======= 6. Optional. Add one of the bookmarklets located at the lower right corner of the main bbps page to your bookmark toolbar. Drag the link to your bookmarks toolbar, or just bookmark it. Now, whenever you want to add a page to bbps, just click your bookmarklet. - >>>>>>> 1.8 7. Optional. Some browsers allow keyword searches (typing "gg search term" in the location of bar of IE --- 29,34 ---- *************** *** 52,53 **** --- 42,47 ---- 9. **IF UPGRADING** Tables and their columns now have the "bbps_" prefix to support hosting environments. + + 9a.Upgrade the database schema for the new columns and values of this version: + + cat sql/upgrade_schema.sql | mysql -u USER -p PASSWORD MY_DB_NAME_HERE |
