[geeklog-cvs] Geeklog-1.x/plugins/links config.php, 1.19, 1.20 functions.inc, 1.82, 1.83

[Oliver]

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/plugins/links
In directory qs1489.pair.com:/tmp/cvs-serv5050

Modified Files:
	config.php functions.inc 
Log Message:
new version from Euan (2nd try)

Index: functions.inc
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/plugins/links/functions.inc,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** functions.inc	28 Aug 2007 07:52:25 -0000	1.82
--- functions.inc	29 Aug 2007 04:26:59 -0000	1.83
***************
*** 141,157 ****
              $title = COM_truncate( $A['title'], $_CONF['title_trim_length'],
                                     '...' );
              if( $title != $A['title'] )
              {
!                 $newlinks[] = '<a href="' . $lcount . '" title="'
!                             . $A['title'] . '">' . $title . '</a>' . LB;
!             }
!             else
!             {
!                 $newlinks[] = '<a href="' . $lcount . '">' . $A['title']
[...1149 lines suppressed...]
-         $send_header = "HEAD {$url_arr['path']} HTTP/1.1\r\n"
-             . "User-Agent: Geeklog Link Checker\r\n"
-             . "Host: {$url_arr['host']}\r\n"
-             . "Connection: close\r\n\r\n";
-         fputs($socket, $send_header);
-         while($str = fgets($socket, 1024)) {
-             if (eregi("^http/[0-9]+.[0-9]+ ([0-9]{3}) [a-z ]*", $str)) {
-                 $status_code = trim(eregi_replace("^http/[0-9]+.[0-9]+ ([0-9]{3}) [a-z ]*", "\\1", $str));
-             }
-         }
-         fclose($socket);
-         $status_code = $status_code . ": " . $LANG_LINKS_STATUS[$status_code];
-     }
-     if (!isset($status_code)) {
-         $status_code = $LANG_LINKS_STATUS[999];
-     }
-     return $status_code;
  }
  
--- 1551,1554 ----

Index: config.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/plugins/links/config.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** config.php	28 Aug 2007 10:02:21 -0000	1.19
--- config.php	29 Aug 2007 04:26:59 -0000	1.20
***************
*** 141,149 ****
  $_LI_CONF['delete_links'] = 0;
  
  /**
   * indent used in category edit page
   * What characters to use for the indent when listing categories for editing in the admin section.
-  *
-  * @global array $_LI_CONF['show_top10']
   */
  $_LI_CONF['indent'] = "--";
--- 141,156 ----
  $_LI_CONF['delete_links'] = 0;
  
+ /** What to show after a link has been saved? Possible choices:
+  * 'item' -> forward to the target of the link
+  * 'list' -> display the admin-list of links
+  * 'plugin' -> display the public homepage of the links plugin
+  * 'home' -> display the site homepage
+  * 'admin' -> display the site admin homepage
+  */
+ $_LI_CONF['aftersave'] = 'list';
+ 
  /**
   * indent used in category edit page
   * What characters to use for the indent when listing categories for editing in the admin section.
   */
  $_LI_CONF['indent'] = "--";
***************
*** 153,157 ****
   * Whether to show subcategory descriptions when viewing a category or not.
   *
-  * @global array $_LI_CONF['show_top10']
   */
  $_LI_CONF['show_category_descriptions'] = true;
--- 160,163 ----
***************
*** 161,169 ****
   * Whether to enable simple multilingual behaviour or not.
   *
-  * @global array $_LI_CONF['show_top10']
   */
  $_LI_CONF['enable_multilingual_links'] = false;
- 
- 
  
  /**
--- 167,172 ----