From ded1f742851775b001101411dde718d0829b3629 Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 12 Jan 2024 10:28:38 +1100 Subject: [PATCH] Remove some no longer to be referenced 1.2 files --- htdocs/add_attr_form.php | 185 -------------------------- htdocs/monitor.php | 259 ------------------------------------- lib/AttributeFactory.php | 148 --------------------- lib/MultiLineAttribute.php | 35 ----- lib/SelectionAttribute.php | 71 ---------- 5 files changed, 698 deletions(-) delete mode 100644 htdocs/add_attr_form.php delete mode 100644 htdocs/monitor.php delete mode 100644 lib/AttributeFactory.php delete mode 100644 lib/MultiLineAttribute.php delete mode 100644 lib/SelectionAttribute.php diff --git a/htdocs/add_attr_form.php b/htdocs/add_attr_form.php deleted file mode 100644 index 7f72841..0000000 --- a/htdocs/add_attr_form.php +++ /dev/null @@ -1,185 +0,0 @@ -dnExists($request['dn'])) - error(sprintf(_('The entry (%s) does not exist.'),$request['dn']),'error','index.php'); - -$request['page'] = new TemplateRender($app['server']->getIndex(),get_request('template','REQUEST',false,null)); -$request['page']->setDN($request['dn']); -$request['page']->accept(true); -$request['template'] = $request['page']->getTemplate(); - -# Render the form -if (get_request('meth','REQUEST') != 'ajax') { - $request['page']->drawTitle(sprintf('%s %s',_('Add new attribute'),get_rdn($request['dn']))); - $request['page']->drawSubTitle(); - - echo '
'; - if (count($request['template']->getAvailAttrs())) { - # If we have more than the configured entries, we'll separate our input to the old ways. - if (count($request['template']->getAvailAttrs()) > $_SESSION[APPCONFIG]->getValue('appearance','max_add_attrs')) { - $attr = array(); - $attr['avail'] = array(); - $attr['binary'] = array(); - - foreach ($request['template']->getAvailAttrs() as $attribute) - if ($app['server']->isAttrBinary($attribute->getName())) - array_push($attr['binary'],$attribute); - else - array_push($attr['avail'],$attribute); - - if (count($attr['avail']) > 0) { - echo '
'; - echo _('Add new attribute'); - echo '
'; - echo '
'; - - echo '
'; - echo '
'; - - if ($_SESSION[APPCONFIG]->getValue('confirm','update')) - echo ''; - else - echo ''; - - printf('',$app['server']->getIndex()); - printf('',htmlspecialchars($request['dn'])); - - echo ''; - - echo ''; - printf('',_('Add')); - echo '
'; - echo '
'; - - } else { - echo '
'; - printf('(%s)',_('no new attributes available for this entry')); - } - - if (count($attr['binary']) > 0) { - echo '
'; - echo _('Add new binary attribute'); - echo '
'; - echo '
'; - - echo ''; - echo '
'; - echo '
'; - - if ($_SESSION[APPCONFIG]->getValue('confirm','update')) - echo ''; - else - echo ''; - - printf('',$app['server']->getIndex()); - printf('',$request['dn']); - echo ''; - - echo ''; - - echo ''; - printf('',_('Add')); - - if (! ini_get('file_uploads')) - printf('
%s
', - _('Your PHP configuration has disabled file uploads. Please check php.ini before proceeding.')); - - else - printf('
%s: %s
',_('Maximum file size'),ini_get('upload_max_filesize')); - - echo '
'; - echo '
'; - - } else { - echo '
'; - printf('(%s)',_('no new binary attributes available for this entry')); - } - - } else { - echo '
'; - - $request['page']->drawFormStart(); - printf('',$app['server']->getIndex()); - printf('',htmlspecialchars($request['dn'])); - - echo ''; - - foreach ($request['template']->getAvailAttrs() as $attribute) - $request['page']->draw('Template',$attribute); - - $request['page']->drawFormSubmitButton(); - echo '
'; - - $request['page']->drawFormEnd(); - } - - } else { - printf('(%s)',_('no new attributes available for this entry')); - } - - echo '
'; - -# The ajax addition (it is going into an existing TemplateRendered page -} else { - # Put our DIV there for the callback - echo '
'; - printf('%s',_('Add Attribute')); - echo '
'; - echo ''; - echo ''; - echo '
'; - - printf(''; - - echo '
'; - echo '
'; - echo '
'; -} -?> diff --git a/htdocs/monitor.php b/htdocs/monitor.php deleted file mode 100644 index 5416a1a..0000000 --- a/htdocs/monitor.php +++ /dev/null @@ -1,259 +0,0 @@ -getRootDSE(); - -$query = array(); -$query['base'] = $attrs['monitorcontext'][0]; -$query['scope'] = 'sub'; -$query['attrs'] = array('+','*'); -$results = $app['server']->query($query,null); - -if (! isset($attrs['monitorcontext']) || ! count($results)) - system_message(array( - 'title'=>_('Monitoring context does not exist'), - 'body'=>sprintf('%s: %s',_('Could not obtain the monitor context for this server'),$app['server']->getName()), - 'type'=>'warn'),'index.php'); - -printf('

%s%s

',_('Monitor info for: '),$app['server']->getName()); -printf('

%s

',_('Server reports the following information about itself')); - -echo ''; - -# cn=Monitor -printf('',_('LDAP Server')); -printf(''; - -foreach (array( - 'cn=Backends,cn=Monitor' => 'cn=Backend %s,%s', - 'cn=Overlays,cn=Monitor' => 'cn=Overlay %s,%s' - ) as $dn => $child) { - - if (isset($results[$dn]['description'])) { - $description = implode(' ',$results[$dn]['description']); - - $description = preg_replace('/"/','\'',$description); - } else { - $description = ''; - } - - printf('',$description,$dn); - echo ''; -} - -# cn=Connections,cn=Monitor -printf('',$results['cn=Connections,cn=Monitor']['description'][0],_('LDAP Connections')); -printf(''; - -foreach (array( - 'cn=Listeners,cn=Monitor', - 'cn=Log,cn=Monitor', - 'cn=Operations,cn=Monitor', - 'cn=SASL,cn=Monitor', - 'cn=TLS,cn=Monitor', - 'cn=Statistics,cn=Monitor', - 'cn=Threads,cn=Monitor', - 'cn=Time,cn=Monitor', - 'cn=Waiters,cn=Monitor' - ) as $dn ) { - - $description = implode(' ',$results[$dn]['description']); - $description = preg_replace('/"/','\'',$description); - - printf('',$description,$dn); - echo ''; -} - -echo '
%s
'); - -echo ''; -printf('',$results[$attrs['monitorcontext'][0]]['monitoredinfo'][0]); -echo '
%s
'; - -echo '
%s
'; - echo ''; - echo '
'; - echo ''; - - $attrs = array( - 'monitorruntimeconfig', - 'supportedcontrol' - ); - - echo ''; - printf('',_('Type'),'namingContext'); - - foreach ($attrs as $attr) - printf('',$attr); - - echo ''; - - $counter = 0; - foreach ($results[$dn]['monitoredinfo'] as $index => $backend) { - printf('',$counter++%2==0?'even':'odd'); - printf('',$backend); - - $key = sprintf($child,$index,$dn); - - echo ''; - - foreach ($attrs as $attr) { - echo ''; - } - echo ''; - } - - echo '
%s%s%s
%s'; - if (isset($results[$key]['seealso'])) { - $seealso = is_array($results[$key]['seealso']) ? $results[$key]['seealso'] : array($results[$key]['seealso']); - - foreach ($seealso as $db) - if (isset($results[$db]['namingcontexts'])) - printf('%s
', - isset($results[$db]['labeleduri']) ? implode(' ',$results[$db]['labeleduri']) : _('Internal'), - implode(' ',$results[$db]['namingcontexts'])); - else - printf('%s ',implode(' ',$results[$db]['monitoredinfo'])); - - } else { - echo ' '; - } - echo '		'; - if (isset($results[$key][$attr])) { - if (! is_array($results[$key][$attr])) - $sc = array($results[$key][$attr]); - else - $sc = $results[$key][$attr]; - - if (strcasecmp('supportedcontrol',$attr) == 0) - foreach ($sc as $control) { - $oidtotext = support_oid_to_text($control); - - printf('%s
', - $control,$oidtotext['title']); - } - - else - printf('%s ',implode('
',$sc)); - - } else { - echo ' '; - } - - echo '
'; - echo '
%s
'); -echo ''; -echo '
'; -echo ''; - -printf('', - _('Total Connections'),$results['cn=Total,cn=Connections,cn=Monitor']['monitorcounter'][0]); -printf('', - _('Current Connections'),$results['cn=Current,cn=Connections,cn=Monitor']['monitorcounter'][0]); - -# Look for some connections -foreach ($results as $key => $value) { - if (preg_match('/^cn=Connection.*,cn=Connections,cn=Monitor$/',$key)) { - echo ''; - printf('',$results[$key]['cn'][0]); - - echo ''; - echo ''; - } -} - -echo '
%s%s
%s%s
%s'; - echo ''; - - $counter = 0; - foreach (array( - 'monitorconnectionactivitytime', - 'monitorconnectionauthzdn', - 'monitorconnectionget', - 'monitorconnectionlistener', - 'monitorconnectionlocaladdress', - 'monitorconnectionmask', - 'monitorconnectionnumber', - 'monitorconnectionopscompleted', - 'monitorconnectionopsexecuting', - 'monitorconnectionopspending', - 'monitorconnectionopsreceived', - 'monitorconnectionpeeraddress', - 'monitorconnectionpeerdomain', - 'monitorconnectionprotocol', - 'monitorconnectionread', - 'monitorconnectionstarttime', - 'monitorconnectionwrite' - ) as $metric) { - - printf('',$counter++%2==0?'even':'odd'); - - printf('', - $metric,isset($results[$key][$metric]) ? $results[$key][$metric][0] : ' '); - echo ''; - } - - echo '
%s%s
'; - echo '
'; -echo '
%s
'; - echo ''; - echo '
'; - echo ''; - - if (isset($results[$dn]['monitoropinitiated'])) - printf('', - 'monitorOpInitiated',$results[$dn]['monitoropinitiated'][0]); - if (isset($results[$dn]['monitoropcompleted'])) - printf('', - 'monitorOpCompleted',$results[$dn]['monitoropcompleted'][0]); - if (isset($results[$dn]['monitoredinfo'])) - printf('', - 'monitoredInfo',$results[$dn]['monitoredinfo'][0]); - - # Look for some connecitons - foreach ($results as $key => $value) { - if (preg_match('/^.*,'.$dn.'$/',$key)) { - echo ''; - printf('',$results[$key]['cn'][0]); - - echo ''; - echo ''; - } - } - echo '
%s%s
%s%s
%s%s
%s'; - echo ''; - - foreach (array( - 'labeleduri', - 'monitorconnectionlocaladdress', - 'monitoredinfo', - 'monitorcounter', - 'monitoropinitiated', - 'monitoropcompleted', - 'monitortimestamp' - ) as $metric) { - - if (isset($results[$key][$metric])) { - printf('',$counter++%2==0?'even':'odd'); - - printf('', - $metric,$results[$key][$metric][0]); - - echo ''; - } - } - - echo '
%s%s
'; - echo '
'; - echo '
'; -?> diff --git a/lib/AttributeFactory.php b/lib/AttributeFactory.php deleted file mode 100644 index f52e939..0000000 --- a/lib/AttributeFactory.php +++ /dev/null @@ -1,148 +0,0 @@ -getValue('appearance','hide_template_warning')) - system_message(array( - 'title'=>sprintf('%s [%s]',_('Unknown template [post] function'),$matches[1]), - 'body'=>sprintf('%s [%s]',_('The template function is not known and will be ignored.'),$values['post']), - 'type'=>'warn')); - - unset($values['post']); - } - } - } - - # Check our helper functions exists - if (isset($values['helper']['value']) && ! is_array($values['helper']['value'])) - if (preg_match('/^=php\.(\w+)\((.*)\)$/',$values['helper']['value'],$matches)) - if (! in_array($matches[1],array('GetNextNumber','PasswordEncryptionTypes'))) { - if (! $_SESSION[APPCONFIG]->getValue('appearance','hide_template_warning')) - system_message(array( - 'title'=>sprintf('%s [%s]',_('Unknown template helper function'),$matches[1]), - 'body'=>sprintf('%s [%s]',_('The template helper function is not known and will be ignored.'),$values['helper']['value']), - 'type'=>'warn')); - - unset($values['helper']['value']); - } - - # Check to see if the value is auto generated, our attribute type is dependant on the function called. - if (isset($values['value']) && ! is_array($values['value'])) { - if (preg_match('/^=php\.(\w+)\((.*)\)$/',$values['value'],$matches)) { - switch ($matches[1]) { - case 'MultiList': - if (! isset($values['type'])) - $values['type'] = 'multiselect'; - - case 'PickList': - return $this->newSelectionAttribute($name,$values,$server_id,$source); - - case 'RandomPassword': - return $this->newRandomPasswordAttribute($name,$values,$server_id,$source); - - # Fall through and determine the attribute using other methods. - case 'GetNextNumber': - case 'Function' : - break; - - default: - if (! $_SESSION[APPCONFIG]->getValue('appearance','hide_template_warning')) - system_message(array( - 'title'=>sprintf('%s [%s]',_('Unknown template function'),$matches[1]), - 'body'=>sprintf('%s [%s]',_('The template function is not known and will be ignored.'),$values['value']), - 'type'=>'warn')); - - unset($values['value']); - } - } - } - - if (isset($values['type'])) - switch ($values['type']) { - case 'password': - if (! strcasecmp($name,'sambaLMPassword') || ! strcasecmp($name,'sambaNTPassword')) - return $this->newSambaPasswordAttribute($name,$values,$server_id,$source); - else - return $this->newPasswordAttribute($name,$values,$server_id,$source); - - case 'multiselect': - case 'select': - return $this->newSelectionAttribute($name,$values,$server_id,$source); - - case 'textarea': - return $this->newMultiLineAttribute($name,$values,$server_id,$source); - } - - if ($app['server']->isAttrBinary($name)) { - return $this->newBinaryAttribute($name,$values,$server_id,$source); - - } elseif (! strcasecmp($name,'sambaLMPassword') || ! strcasecmp($name,'sambaNTPassword')) { - return $this->newSambaPasswordAttribute($name,$values,$server_id,$source); - - } elseif (in_array(strtolower($name),array_keys(array_change_key_case($_SESSION[APPCONFIG]->getValue('appearance','date_attrs'))))) { - return $this->newDateAttribute($name,$values,$server_id,$source); - - } elseif (in_array(strtolower($name),array('shadowlastchange','shadowmin','shadowmax','shadowexpire','shadowwarning','shadowinactive'))) { - return $this->newShadowAttribute($name,$values,$server_id,$source); - - } elseif ($app['server']->isAttrBoolean($name)) { - $attribute = $this->newSelectionAttribute($name,$values,$server_id,$source); - $attribute->addOption('TRUE',_('true')); - $attribute->addOption('FALSE',_('false')); - return $attribute; - - } elseif ($app['server']->isDNAttr($name)) { - return $this->newDnAttribute($name,$values,$server_id,$source); - - } elseif ($app['server']->isMultiLineAttr($name)) { - return $this->newMultiLineAttribute($name,$values,$server_id,$source); - - } else { - return new Attribute($name,$values,$server_id,$source); - } - } - - private function newSambaPasswordAttribute($name,$values,$server_id,$source) { - return new SambaPasswordAttribute($name,$values,$server_id,$source); - } - - private function newRandomPasswordAttribute($name,$values,$server_id,$source) { - return new RandomPasswordAttribute($name,$values,$server_id,$source); - } - - private function newShadowAttribute($name,$values,$server_id,$source) { - return new ShadowAttribute($name,$values,$server_id,$source); - } - - private function newSelectionAttribute($name,$values,$server_id,$source) { - return new SelectionAttribute($name,$values,$server_id,$source); - } - - private function newMultiLineAttribute($name,$values,$server_id,$source) { - return new MultiLineAttribute($name,$values,$server_id,$source); - } -} -?> diff --git a/lib/MultiLineAttribute.php b/lib/MultiLineAttribute.php deleted file mode 100644 index b6d0eb5..0000000 --- a/lib/MultiLineAttribute.php +++ /dev/null @@ -1,35 +0,0 @@ -rows; - } - - public function setRows($rows) { - $this->rows = $rows; - } - - public function getCols() { - return $this->cols; - } - - public function setCols($cols) { - $this->cols = $cols; - } -} -?> diff --git a/lib/SelectionAttribute.php b/lib/SelectionAttribute.php deleted file mode 100644 index 5f1c8bb..0000000 --- a/lib/SelectionAttribute.php +++ /dev/null @@ -1,71 +0,0 @@ -source == 'XML' && $this->values) { - $this->selection = $this->values; - $this->values = array(); - } - - if (isset($values['type']) && $values['type'] == 'multiselect') - $this->multiple = true; - else - $this->multiple = false; - } - - public function addOption($value,$description) { - $this->selection[$value] = $description; - } - - public function addValue($new_val,$i=-1) { - if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) - debug_log('Entered (%%)',5,0,__FILE__,__LINE__,__METHOD__,$fargs); - - $this->addOption($new_val,$i); - } - - public function getOptionCount() { - return count($this->selection); - } - - public function getSelection() { - return $this->selection; - } - - public function autoValue($value) { - $this->selection = $value; - } - - public function getDefault() { - return $this->default; - } - - public function isMultiple() { - return $this->multiple; - } - - public function setMultiple() { - $this->multiple = true; - } -} -?>