[Bbps-commits] bbps index.php,1.9,1.10 procesa.php,1.13,1.14

[Maxim <wz...@us...>]

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];
+      }
  ?>