diff --git a/include/functions.inc b/include/functions.inc
index f586a0c66fe067134896b646ed45ddf23feb5009..27f188dcb96f64629b80b85fc83000a51326f10f 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
/* user not found */
case 0: return (NULL);
- break;
/* valid uniq user */
case 1:
}
+function get_list2($subtreeACL, $filter, $subsearch= TRUE, $base="", $attrs= array(), $flag= FALSE)
+{
+ global $config;
+
+ /* Base the search on default base if not set */
+ $ldap= $config->get_ldap_link($flag);
+ if ($base == ""){
+ $ldap->cd ($config->current['BASE']);
+ } else {
+ $ldap->cd ($base);
+ }
+
+ /* Perform ONE or SUB scope searches? */
+ $ldap->ls ($filter);
+
+ /* Check for size limit exceeded messages for GUI feedback */
+ if (preg_match("/size limit/i", $ldap->error)){
+ $_SESSION['limit_exceeded']= TRUE;
+ } else {
+ $_SESSION['limit_exceeded']= FALSE;
+ }
+ $result= array();
+
+
+ /* Crawl through reslut entries and perform the migration to the
+ result array */
+ while($attrs = $ldap->fetch()) {
+ $dn= preg_replace("/[ ]*,[ ]*/", ",", $ldap->getDN());
+ foreach ($subtreeACL as $key => $value){
+ if (preg_match("/$key/", $dn)){
+ $attrs["dn"]= convert_department_dn($dn);
+ $result[]= $attrs;
+ break;
+ }
+ }
+ }
+
+
+ return ($result);
+
+}
+
function get_list($subtreeACL, $filter, $subsearch= TRUE, $base="", $attrs= array(), $flag= FALSE)
{
global $config;
return rtrim($dep, "/");
}
+function convert_department_dn2($dn)
+{
+ $dep= "";
+
+ /* Build a sub-directory style list of the tree level
+ specified in $dn */
+ $tmp = split (",", $dn);
+
+ $dep= preg_replace("%^.*/([^/]+)$%", "\\1", $tmp[0]);
+
+
+ /* Return and remove accidently trailing slashes */
+ $tmp = rtrim($dep, "/");
+ return $tmp;
+}
+
function get_ou($name)
{
/* CUPS is not available, try lpstat as a replacement */
} else {
- unset ($ar);
+ $ar = false;
exec("lpstat -p", $ar);
foreach($ar as $val){
list($dummy, $printer, $rest)= split(' ', $val, 3);
}
$numpages= (($dcnt / $range));
- if(((int)($numpages))!=($numpages))
+ if(((int)($numpages))!=($numpages)){
$numpages = (int)$numpages + 1;
+ }
+ if (((int)$numpages) <= 1 ){
+ return ("");
+ }
$ppage= (int)(($start / $range) + 0.5);
$begin= $end - $max_entries;
}
+ $output.= "<div style='border:1px solid #E0E0E0; background-color:#FFFFFF;'>";
+
/* Draw decrement */
if ($start > 0 ) {
$output.=" <a href= \"main.php?plug=".validate($_GET['plug'])."&start=".
"<img alt=\"\" src=\"images/forward.png\" border=0 align=\"middle\"></a>";
}
+ $output.= "</div>";
+
return($output);
}
if(!compare_revision($revision_file, $svn_revision)){
// If revision differs, clean compile directory
foreach(scan_directory($directory) as $file) {
+ if(($file==".")||($file=="..")) continue;
if( is_file($directory."/".$file) &&
is_writable($directory."/".$file)) {
// delete file